MrStonedOne
71ae9d13aa
Adds lag checks to massedit, sdql2, del-all, and the map loader
2016-03-15 03:39:42 -07:00
KorPhaeron
942f0e309e
Plasamen fixes
2016-03-12 20:29:10 -06:00
AnturK
cc034af9d4
Merge pull request #15999 from ChangelingRain/placesplease
...
Goon-style blob placement
2016-03-12 21:17:57 +01:00
duncathan salt
d1f8562c04
Merge pull request #16043 from Jordie0608/ifitwasneverusedisitreallybroken
...
Fixes broken regex
2016-03-12 13:55:20 -06:00
Cheridan
af0575cf8b
Merge pull request #16016 from KorPhaeron/communications
...
Responding to a centcomm message resets the machines cooldown
2016-03-11 11:58:17 -06:00
Jordie0608
5ee92abad3
fixes broken regex
2016-03-11 21:43:32 +11:00
duncathan
12a6205372
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomRuins/SpaceRuins/asteroid4.dmm
_maps/RandomRuins/SpaceRuins/spacebar.dmm
_maps/RandomZLevels/Academy.dmm
_maps/RandomZLevels/beach.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/spacebattle.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/RandomZLevels/wildwest.dmm
_maps/map_files/AsteroidStation/AsteroidStation.dmm
_maps/map_files/BirdStation/BirdStation.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/DreamStation/z5.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/map_files/generic/z5.dmm
_maps/map_files/generic/z6.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
_maps/templates/lavaland_surface_ufo_crash.dmm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/machinery/computer/arcade.dm
code/game/objects/structures/lattice.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/misc_floor.dm
code/game/turfs/simulated/floor/plasteel_floor.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/bot/cleanbot.dm
code/modules/mob/living/simple_animal/bot/mulebot.dm
code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
duncathan
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
KorPhaeron
1f177d3ab2
Communications
2016-03-09 22:42:03 -06:00
Nerd Lord
1ead1acbfc
Goon-style blob placement
2016-03-09 20:21:19 -05:00
Jordie
3a6a038322
Merge pull request #15945 from Shadowlight213/Snpcbuttonmove
...
Moves SNPC admin buttons to the debug tab
2016-03-08 18:38:48 +11:00
Joan Lung
a5bcdb086a
Merge pull request #15924 from lordpidey/adminantaghud
...
Adds admin antag-hud
2016-03-07 17:42:22 -05:00
Shadowlight213
b5c398a252
Moves SNPC admin buttons to the debug tab
2016-03-05 19:05:54 -08:00
Mike Long
daf13e0f19
Now works with gangs too (provided the gang was created BEFORE antaghud was turned on)
2016-03-05 15:00:29 -05:00
Sawu
3aabb070d8
SNPC Update v4: ;HELP I'M BEING BEATEN TO DEATH BY GIBBERING ROBOTS
...
* Updates the CustomiseSNPC verb to be less laggy
* Adds a resetSNPC verb to manually reset one.
* Adds a toggleSNPC verb to change between high and low profile mods
* Added a "High Profile" processing mode that can allow the SNPC to tick at custom rates, for special/story SNPCs
* All SNPCs now spawn as Assistants to prevent head spam.
* SNPCs can now be spawned as a doppelganger, and will take the name of a person with the same job as them.
* SNPCs now only hack doors their job doesn't have access to.
* SNPC augmentation values tweaked
* Runtime caused by limbs fixed
* Runtime caused by assigned the SNPC to be a chef fixed.
* Bartender SNPCs now receive a module which allows them to serve drinks to nearby patrons.
* Fixed Chef SNPCs having incorrect modules and home areas.
* Certain modules will now skip being processed if combat is taking precidence.
* Fixed an incorrect emote.
* Clown SNPCs will now drop less items (to prevent massive piles of soap or bananas)
* SNPCs using the healing module will now try to use stackable healing items, and if they are out, instead use their inbuilt tricordrazine hypospray.
* Janitor SNPCs no longer attempt to mop things, and instead use an inbuilt space-cleaner spray
* Chef SNPCs will no longer leave behind uncooked food when trying to process it.
* Chef SNPCs will now use the smartfridge as a source to make custom food.
* Chef SNPCs will no longer run amok, spraying food everywhere.
* Chef SNPCs will attempt to serve up completed food to the Chef's window
* If a Chef SNPC cannot find any viable food source, they will synthesize clones of regular food, which have a lower nutriment count than the real ones.
* SNPCs will no longer explode into items when entering combat, and will no longer throw guns instead of shooting them.
2016-03-04 21:14:02 +11:00
Sawu
a932be993f
SNPC verb hotfix
2016-03-02 22:05:23 +11:00
Cheridan
ffb14ed84d
Merge pull request #15788 from Shadowlight213/Oldcultredo
...
Remake of #15690 . Replaces newcult with oldcult.
2016-03-01 22:37:58 -06:00
Cheridan
cd20e5ec4b
Merge pull request #15815 from Shadowlight213/Commandnamechange
...
Adds admin button to change central command's name.
2016-02-29 15:09:27 -06:00
tkdrg
dc9e446507
Merge pull request #15795 from Menshin/forcefield_cleaning
...
Cleaning of singularity fields code
2016-02-28 23:17:58 -03:00
Shadowlight213
98190462c0
Fixes
2016-02-28 00:21:23 -08:00
Shadowlight213
c895016caa
Adds admin button to change central command's name.
2016-02-27 23:38:21 -08:00
tkdrg
84566ef751
Merge pull request #15773 from AnturK/template_fix
...
Fixes uploaded templates size preview
2016-02-27 21:40:22 -03:00
tkdrg
77b7f02bdd
Merge pull request #15775 from AnturK/fix1
...
Bunch of fixes
2016-02-27 21:27:08 -03:00
Joan Lung
96e842b24c
Merge pull request #15737 from lzimann/ctfbutton
...
Adds a way to quickly enable/disable CTF for admins.
2016-02-27 19:11:48 -05:00
KiwiFarms
7374902800
* Cleaning field generator code
...
* Fixes runtimes on field shutdown
2016-02-27 22:44:17 +01:00
Shadowlight213
642321b5cd
Removes newcult and readds oldcult
2016-02-27 00:53:14 -08:00
Tkdrg
cd549bb33b
Fixes wrong irc message
2016-02-26 21:29:13 -03:00
AnturK
9b43816de5
Fixes check antagonists formatting for revolution
2016-02-26 21:33:05 +01:00
AnturK
19e188322c
Fixes uploaded templates.
2016-02-26 17:41:30 +01:00
tkdrg
45fca87806
Merge pull request #15687 from AnturK/template_improvements
...
Template loading improvements
2016-02-25 16:29:10 -03:00
Leo
ec90073b1d
Add two lines
...
Oops.
2016-02-24 21:33:23 -03:00
Lzimann
89610b10fb
Adds a way to quickly enable/disable CTF for admins.
2016-02-24 21:27:10 -03:00
AnturK
e22dddb50a
Minor Improvements
2016-02-23 21:44:21 +01:00
AnturK
d282727fd5
Fixes mass modify for file type.
2016-02-22 22:42:41 +01:00
AnturK
4e0db5664b
Adds /turf/template_noop and /area/template_noop to dmm reader
2016-02-22 19:24:45 +01:00
AnturK
07432da284
Fixes off-by-one errors.
...
Adds template area preview
2016-02-22 19:09:31 +01:00
Cheridan
9766395322
Merge pull request #15355 from tkdrg/yeah
...
Improves admin counting for irc
2016-02-22 01:27:43 -06:00
Joan Lung
8109c83033
Merge pull request #15643 from tkdrg/old
...
VV path edit will now use spawn-style dialogs
2016-02-21 20:12:20 -05:00
AnturK
ceb9af945c
Removes typo.
...
Makes Load Template verb get turf after input.
2016-02-20 18:12:20 +01:00
Tkdrg
6563543b5f
VV path edit will now use spawn-style dialogs
2016-02-20 12:09:16 -03:00
AnturK
77ee2ded62
Renames click intercept method to avoid collision with ClickOn
2016-02-20 15:39:14 +01:00
oranges
b6c0aa64b6
Set bomb epicenter after chosing splosion size
...
:weed:
2016-02-19 11:32:42 +13:00
tkdrg
11df2fa97a
Merge pull request #15544 from Shadowlight213/Jobbancacherebuilding
...
Fixes jobban cache not updating on jobbans and unbans
2016-02-18 14:03:58 -03:00
phil235
5db3ab47c7
Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1
...
Conflicts:
code/game/machinery/computer/aifixer.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/robot.dm
2016-02-17 00:33:26 +01:00
phil235
7e1efca13a
Created two new procs to handle reviving mobs more easily:
...
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.
I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)
This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
Shadowlight213
11ea6993e9
Fixes jobban cache not updating on jobbans and unbans
2016-02-14 21:44:29 -08:00
phil235
4aca9a1529
Fixes spawn_atom() runtime.
2016-02-14 23:49:25 +01:00
tkdrg
c26de00dae
Merge pull request #15499 from neersighted/readmin
...
Fix and refactor deadmin/readmin
2016-02-14 17:08:13 -03:00
Bjorn Neergaard
447ffb3113
aaaaaa
2016-02-13 23:05:05 -06:00
Bjorn Neergaard
c82fb09ed4
Fix and refactor deadmin/readmin
2016-02-13 13:23:40 -06:00