Commit Graph

21977 Commits

Author SHA1 Message Date
bgobandit e79301c304 dead AIs too 2015-12-14 14:50:35 -05:00
bgobandit 112cf3c96c AIs with wireless disabled can no longer interact with papers held up to cameras. 2015-12-14 14:47:32 -05:00
bgobandit a1634f2b51 Santa will no longer deliver the parent types of action figures. Certain action figures will now play appropriate sounds. 2015-12-14 14:32:27 -05:00
Cheridan 2a6a63253b Merge pull request #13608 from KorPhaeron/fire_defines
Makes burn_state use defines
2015-12-14 10:44:10 -06:00
CPTANT 20c6659c4a changes robocop law priority 2015-12-14 17:28:36 +01:00
KorPhaeron 316be423a5 Merge remote-tracking branch 'refs/remotes/tgstation/master' into nuclear_challenge
# Conflicts:
#	code/game/machinery/computer/syndicate_shuttle.dm
2015-12-14 05:48:09 -06:00
KorPhaeron a6194f4725 Adds an optional challenge mode to nuclear operatives 2015-12-14 05:40:19 -06:00
Cheridan 593670239c Merge pull request #13604 from optimumtact/patch-6
Remove hulk stun punch
2015-12-14 02:26:26 -06:00
KorPhaeron 619464f4e9 Patches 2015-12-14 00:52:39 -06:00
Cheridan e7ba51a0a2 Merge pull request #13601 from Incoming5643/glopatch
Fixes glowcaps being planted as glowshrooms
2015-12-14 00:46:53 -06:00
MMMiracles 6aac2874ac good 2015-12-13 23:05:46 -05:00
Cheridan ff2bc4d022 Merge pull request #13529 from KorPhaeron/tele_ops
Ops can't fly to abandoned satellite or derelict
2015-12-13 20:58:40 -06:00
xxalpha b99141260e One direction
YOU NEVER SAW THAT
2015-12-14 02:42:21 +00:00
xxalpha 051e5b889b Added code to resmooth loaded maps atoms. 2015-12-14 01:41:18 +00:00
xxalpha e9e4ff735d Added maintenance glass airlock and external glass airlock. 2015-12-14 00:48:01 +00:00
Cheridan 1e4b902ab1 Merge pull request #13595 from Menshin/broken_solar_fix
Fixes broken solar devices giving intact sheets back on deconstruction
2015-12-13 17:43:46 -06:00
xxalpha 4278334f09 Fixes airlock animation on a specific case. 2015-12-13 22:42:27 +00:00
Cheridan ef989fe1dc Merge pull request #13589 from Menshin/atmos_disconnect_runtime_fix
Fixes runtimes on unary atmos devices rotation
2015-12-13 15:09:30 -06:00
Cheridan bc164c9498 Merge pull request #13582 from Incoming5643/Ill_turn_this_game_into_a_shitty_F2P_korean_MMO_yet
[RPG Loot Intensifies]
2015-12-13 15:04:53 -06:00
duncathan salt af8e8303ae Merge pull request #13613 from as334/plasmic
Prevents trace amounts of plasma fusing at room temperature
2015-12-13 14:54:37 -06:00
as334 cf9c1daf92 Haha whoops 2015-12-13 15:47:31 -05:00
Cheridan 176967a84d Merge pull request #13594 from swankcookie/Alert_fix
Removes the word "gas" from the oxy alert
2015-12-13 14:36:40 -06:00
duncathan salt 08a62ec85f Merge pull request #13593 from as334/plasmic
Adds a new gas reaction, plasmic fusion.
2015-12-13 13:46:33 -06:00
Remie Richards c1cf3c42b0 Added sniper rifle sprites, and ammo mag sprites, Added 50 AP to standard sniper rounds, allows sniper to be worn on back. 2015-12-13 19:39:05 +00:00
Cheridan ca7aa2283b Merge pull request #13587 from Menshin/negative_temp_freezer_fix_again
Fixes upgraded freezer going into negative Kelvin temperatures
2015-12-13 10:41:02 -06:00
KorPhaeron c301b51e9a Sentience Fixes 2015-12-13 08:06:54 -06:00
AnturK 2c9adb12f3 Fixes spell logging runtime
Fixes lava runtime
Fixes mecha ore scanner runtime
Fixes crayon writing runtime
Fixes latejoin headrev runtime
2015-12-13 15:04:12 +01:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
oranges fc58a3d31c Damage standardisation for hulk punch 2015-12-13 21:53:30 +13:00
oranges ed03ffd21b standardise damage across slimes 2015-12-13 21:51:57 +13:00
oranges 94af31f7a9 Remove hulk stun punch
Increase hulk damage
2015-12-13 21:49:03 +13:00
Incoming 61e5dafb42 An oversight meant that while planted glowcaps worked fine, they'd never be created. 2015-12-13 01:33:21 -05:00
Cheridan 1019b057c5 Merge pull request #13557 from bgobandit/nanomedfix
Wall-mounted nanomeds no longer have more contents than the Nanomed Plus.
2015-12-13 00:04:25 -06:00
Cheridan dff14aa0f9 Merge pull request #13563 from RemieRichards/snipper_wiffle
Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink.
2015-12-12 23:55:55 -06:00
Cheridan 6a9a5c820e Merge pull request #13560 from Incoming5643/and_as_the_sword_looked_upon_the_infinite_cosmos_it_knew_it_just_had_to_try_and_fuck_everything_up
Supermatter swords and the infinite void
2015-12-12 23:22:48 -06:00
MMMiracles 401a947a08 fixes plasmaman corpse spawner, adds a comment about it using the typepath. 2015-12-12 23:54:00 -05:00
duncathan salt d228f911fa Merge pull request #13522 from KorPhaeron/just_an_illusion
Reactive Illusion Armour
2015-12-12 19:07:30 -06:00
Cheridan 0979b72d29 Merge pull request #13554 from bgobandit/banditfixyourshit
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
Cheridan 91c3d79f09 Merge pull request #13524 from KorPhaeron/heavy_weapon
Slowdown from inhand items
2015-12-12 18:17:47 -06:00
MMMiracles bf902bbe7c question answered, then. 2015-12-12 19:15:49 -05:00
MMMiracles a2d0086762 consistency is a virtue 2015-12-12 19:09:47 -05:00
swankcookie 5328dc8271 added "breath" 2015-12-12 17:43:01 -06:00
KorPhaeron f1a254fc27 Ups the chance a bit, makes it actually work 2015-12-12 17:16:35 -06:00
Menshin 5142a97d0e Fixes broken solar devices giving intact sheets back on deconstruction. 2015-12-12 23:40:49 +01:00
swankcookie b95c5e6c00 removed "gas" 2015-12-12 16:39:08 -06:00
Aranclanos e016275408 Merge pull request #13459 from duncathan/ohgodimdoingitimactuallytouchinggascode
Small cleanup of gas_mixture.dm
2015-12-12 19:29:08 -03:00
duncathan salt e97f647158 Merge pull request #13499 from AnturK/turretfix
Fixes syndicate turrets shooting after breaking
2015-12-12 14:54:19 -06:00
bgobandit 7d7468efe6 fixes honkworthy oversight 2015-12-12 15:38:40 -05:00
bgobandit c1e2f9b436 missing copy proc 2015-12-12 15:22:18 -05:00
bgobandit 0b505eeff0 cloning buffer 2015-12-12 15:15:34 -05:00