Commit Graph

18311 Commits

Author SHA1 Message Date
c0 7495bf3569 Changed default message to more useful 2015-07-31 18:56:16 +03:00
c0 95285e7946 Changed cloning ghost notifications to be less copypasta 2015-07-31 18:42:03 +03:00
Cheridan 7b94435e9c Merge pull request #10924 from phil235/ProtolatheInsertFix
Fixes being able to insert sheets into the protolathe from a distance
2015-07-31 02:01:55 -05:00
Cheridan a35770928d Merge pull request #10929 from Ikarrus/gangganggang
Gang Mode Fixes
2015-07-31 01:41:53 -05:00
Cheridan 5b7c29073d Merge pull request #10872 from phil235/DisposalStuff
Some disposal fixes
2015-07-30 17:30:18 -05:00
Remie Richards f212ac2502 Merge pull request #10877 from Miauw62/spiders
Some spider improvements
2015-07-30 20:08:32 +01:00
Ikarrus 0b3a743d74 Added distinct lieutenant ranks
Fixed lieutenants being able to do what only bosses should do (Promote, recall)
2015-07-30 09:40:04 -06:00
phil235 95be17923e Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff
Conflicts:
	_maps/map_files/AsteroidStation/Asteroidstation.dmm
2015-07-30 16:34:39 +02:00
Jordie0608 1132344628 Rice hat by scones 2015-07-30 21:13:43 +10:00
Jordie 9d41569b0c Merge pull request #10918 from Ikarrus/gangending
Adds Ending Cinematic for Gang Dominations
2015-07-30 20:49:39 +10:00
Jordie d01953e2a6 Merge pull request #10916 from Shadowlight213/VVirusfix
Fixes the DNA Spread virus not transforming victims when spread from those who were already transformed
2015-07-30 20:45:45 +10:00
Jordie 233ca23e53 Merge pull request #10888 from phil235/BumpMechBot
Some fixes with Bump()
2015-07-30 20:44:56 +10:00
Jordie ce4df8c636 Merge pull request #10914 from optimumtact/patch-4
Fixes small typo in girders.dm
2015-07-30 20:44:37 +10:00
Jordie 2b01b3761d Merge pull request #10794 from GunHog/AI_Omniscience_Is_Go
Changes to two AI Malfunction camera powers
2015-07-30 20:44:14 +10:00
Ikarrus 89f539b804 no message 2015-07-29 19:11:03 -06:00
Ikarrus 3ea9de5053 Territory Tagging Fix
Fixed needing to wait for the next payday before you can tag a territory that has it's old tag cleaned off.
2015-07-29 19:10:22 -06:00
Remie Richards aff1d90848 Merge pull request #10885 from KorPhaeron/blood
Slaughter Demon powers can now be used by any mob
2015-07-29 19:42:27 +01:00
KorPhaeron 81b55f86c3 Oops 2015-07-29 13:31:30 -05:00
phil235 e670cec521 Fixes being able to insert sheets into the protolathe from a distance (w/o telekinesis).
Removes some unnecessary icon_state stuff, plus moving busy = 0 to after the end of the insertion animation.
2015-07-29 20:31:11 +02:00
KorPhaeron b521801ef9 Updated comment 2015-07-29 13:22:52 -05:00
KorPhaeron bece4783ad Last PoolOrNew 2015-07-29 13:21:27 -05:00
KorPhaeron fdf186ad5a More of the same 2015-07-29 13:20:51 -05:00
KorPhaeron f91094c2a6 Define 2015-07-29 13:19:33 -05:00
KorPhaeron ad9d75a061 PoolOrNew 2015-07-29 13:18:11 -05:00
Aranclanos 706ff7500e Merge pull request #10864 from MrStonedOne/firelockatmosfix
Atmos fixes and tweaks.
2015-07-29 13:55:57 -03:00
phil235 4d69d3ced0 Merge pull request #10790 from Jordie0608/fixingthingslikewillsmithfixedthewildwest
Energy gun overlay fixes and icon reversions
2015-07-29 15:04:27 +02:00
MrStonedOne 8d01f9f3e5 fixes edge case with meters and the singularity
If a pipe meter was singularity_pull'ed before its attached pipe, the attached pipe would not disconnect itself from the meter since the pipe checks only its own turf on deconstruction for meters.
2015-07-29 05:01:15 -07:00
Jordie 73fa75873c Merge pull request #10908 from Jordie0608/sqlstandsforseriouslyquestionablelogic
Memo update
2015-07-29 21:35:28 +10:00
phil235 cdfbaf269d simplifies mecha/Bump() a bit 2015-07-29 12:48:49 +02:00
Orange Borg 04e74a4ffd Update girders.dm 2015-07-29 22:29:12 +12:00
Jordie0608 047b49f166 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-07-29 20:05:15 +10:00
Jordie 500fed3b88 Merge pull request #10895 from xxalpha/revert-10887-revert-10826-cyberplus
Revert "Revert "Removed anti-drop implant from NukeOps uplink.""
2015-07-29 18:21:12 +10:00
Jordie 77025043c8 Merge pull request #10880 from Fayrik/GotTooManyBranches
Reverts #10619, Adds Logging and Context to Admin's Who Command
2015-07-29 18:05:54 +10:00
Jordie c12149bacd Merge pull request #10886 from optimumtact/patch-3
Add some logging to molotov
2015-07-29 17:55:01 +10:00
Jordie 217f967649 Merge pull request #10889 from phil235/LizardGenderFix
Fixes the lizard gender issue.
2015-07-29 17:48:00 +10:00
Jordie f91a03232b Merge pull request #10870 from AnturK/tunnelsnakesrule
Allows aliens to mine
2015-07-29 17:42:19 +10:00
Jordie 2d40416abd Merge pull request #10797 from Dorsisdwarf/lonescape
Corrects the Escape Alone text
2015-07-29 17:39:57 +10:00
Jordie 133bfb8ec3 Merge pull request #10823 from Ikarrus/emagviro
Virology Doors can now be emagged.
2015-07-29 17:35:01 +10:00
Jordie d841bb25b8 Merge pull request #10833 from Steelpoint/ERTDesc
[QOL] Expanded Admin Descriptions For ERT Deployment
2015-07-29 17:30:43 +10:00
Jordie 7f4b8e63da Merge pull request #10841 from phil235/MobSwapFix
Changes mob swap to use Move().
2015-07-29 17:23:37 +10:00
Jordie 9229890aae Merge pull request #10842 from lordpidey/lordpidey-new_chemicals
Added a new medication, Miner's Salve
2015-07-29 17:22:31 +10:00
Jordie 080693262a Merge pull request #10861 from bgobandit/nobodycanintocarp
Adds more feedback to traitor dehydrated space carp. Fixes spelling.
2015-07-29 17:20:44 +10:00
Jordie 4cac66aa16 Merge pull request #10890 from GunHog/Borgie_Lights_And_Biscuits
Cooldown for Cyborg Headlamps
2015-07-29 17:15:49 +10:00
Jordie adeb5f09cd Merge pull request #10589 from Chiefwaffles/Obsolete_AI_2016
Adds the Automated Announcement System
2015-07-29 17:14:02 +10:00
Jordie0608 b2591e23a3 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-07-29 16:46:42 +10:00
Ikarrus 4aedc97e82 Adds Ending Cinematic for Gang Dominations
It basically flashes the SYSTEM OVERRIDE COMPLETE animation.
2015-07-28 20:21:52 -06:00
palpatine213 70f2029666 Adds Transform to the skipped vars list 2015-07-28 18:25:38 -07:00
Orange Borg 2eb50b644a Fixes small typo in girders.dm
Prevented borgs building a false wall

Fixes #10874
2015-07-29 13:22:48 +12:00
Swag McYolosteinen 91f403a9f5 Merge pull request #10910 from Incoming5643/maybe_if_they_don't_know_theyll_act_better
Double Agents Hotfix
2015-07-28 21:52:33 +02:00
Incoming 8af5f293f0 Double Agents Hotfix
Because DA manually assigns targets instead of using find_target() the proc update_explanation_text() wasn't firing and thus the DAs couldn't figure out who they had to kill (though in actuality the objective would be fully functional.
2015-07-28 15:46:17 -04:00