Commit Graph

21775 Commits

Author SHA1 Message Date
kevinz000 24370db5eb Merge pull request #11930 from Ghommie/Ghommie-cit693
More ToS Compliance.
2020-04-18 19:33:10 -07:00
kevinz000 ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 19:32:50 -07:00
kevinz000 b65ad491b4 Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2
Revert "Makes so turning in place updates riders when riding someone's back"
2020-04-18 19:32:34 -07:00
kevinz000 5fd862e19d Merge pull request #11860 from Trilbyspaceclone/shields!
Adds more shields and tweaks a few!
2020-04-18 19:32:09 -07:00
Trilbyspaceclone 42b81fee3d Update drink_reagents.dm 2020-04-18 21:57:36 -04:00
Ghommie 98081aa56b Some mispelled filepaths. 2020-04-19 03:15:51 +02:00
Ghommie d5a43be181 Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart. 2020-04-19 03:07:45 +02:00
Ghom 6e62f7a2a3 Merge pull request #11878 from Arturlang/fixes_zipties_being_red
Makes zipties white again
2020-04-19 02:45:31 +02:00
Ghommie 39aef14924 More ToS Compliance. 2020-04-19 02:40:58 +02:00
Lin 8d8a0b0f45 Merge pull request #11899 from Ghommie/Ghommie-cit686
Fixing some more mistakes I did to clothing.
2020-04-19 00:24:29 +00:00
Ghommie 9c8f6cd00f peeves. 2020-04-19 02:03:05 +02:00
Ghommie e3fb978465 Shielded element. 2020-04-19 01:48:51 +02:00
Ghom 998b199dba Merge pull request #11927 from kappa-sama/patch-22
ports tg's fix to instant surgery closing
2020-04-19 01:21:23 +02:00
Ghom 7e57a3410e Merge pull request #11905 from Putnam3145/fix-rads-again
Fixes a divide-by-zero
2020-04-19 00:32:41 +02:00
Putnam 9976fab42b Made traitor classes rerollable, reassignable by admins 2020-04-18 14:40:41 -07:00
kappa-sama 2654352d0c tg surgery fixes time 2020-04-18 17:37:19 -04:00
Trilbyspaceclone a5b7f506f9 Update chem_dispenser.dm 2020-04-18 16:42:46 -04:00
Trilbyspaceclone 63524b47c3 Why is ice and water so filling? 2020-04-18 16:28:51 -04:00
Trilbyspaceclone 26facfa37a honey changes + complie 2020-04-18 16:24:05 -04:00
Trilbyspaceclone 54cce75679 Update food_reagents.dm 2020-04-18 16:15:40 -04:00
necromanceranne 97bd52f03e haha me too 2020-04-19 04:49:11 +10:00
necromanceranne cb39ba3491 Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps 2020-04-19 04:25:41 +10:00
Ghom 957e92ed8f Update microwave.dm 2020-04-18 19:53:31 +02:00
Ghommie 811f65e48b Removing troublesome and filler uplink items. 2020-04-18 19:51:09 +02:00
Ghommie cc16027d1a Nerfing the bonus reagents from upgraded microwaves. 2020-04-18 19:30:14 +02:00
TrilbySpaceClone 42bb01057f now with working code! 2020-04-18 10:09:15 -04:00
TrilbySpaceClone 8ca7bb7535 Right... 2020-04-18 09:46:56 -04:00
Ghommie 8d4a67fedc Makes warm donk pockets cooling after 7 minutes canon again. 2020-04-18 15:40:18 +02:00
Anonymous 64116857cf Merge branch 'master' into trek_tmp 2020-04-18 16:34:21 +03:00
Ghom bd03d2a362 Merge pull request #11908 from Putnam3145/fix-tactical-destroy
Makes tactical component destroy() work properly.
2020-04-18 13:32:49 +02:00
Ghom 6d50b5daf0 Merge pull request #11887 from Citadel-Station-13/kevinz000-patch-1
storage boxes now have clickdrag passthrough
2020-04-18 13:28:38 +02:00
Ghom 9b981d0749 Merge pull request #11888 from Citadel-Station-13/kevinz000-patch-9
fixes closer extending too many rows up
2020-04-18 13:28:34 +02:00
Artur bbd038bba6 Ghommies suggestion 2020-04-18 14:06:38 +03:00
Artur f0823bc2b6 Combat looks better 2020-04-18 13:57:34 +03:00
Artur edb7b1d61c Fixes catstuffs 2020-04-18 13:52:27 +03:00
Artur 85c5548d1a Ports https://github.com/tgstation/tgstation/pull/50521/ 2020-04-18 13:49:06 +03:00
Seris02 cc82f08ebc weh 2020-04-18 18:28:35 +08:00
Putnam 14a5985891 Adds more service stuff to lathes. 2020-04-17 23:00:05 -07:00
Putnam d361a8d6ae Makes tactical destroy() work properly. 2020-04-17 22:33:11 -07:00
Ghom 50ee5b9de5 Merge pull request #11885 from kappa-sama/patch-21
ports "Makes visible(based on sight) messages always appear to mobs in range of 1 despite in darkness"
2020-04-18 05:44:53 +02:00
Trilbyspaceclone d26ba86660 Update shields.dm 2020-04-17 23:30:58 -04:00
Putnam 33039f9962 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization 2020-04-17 18:56:26 -07:00
Ghom 2659459233 web-editor played me a good prank. 2020-04-18 03:48:57 +02:00
Ghom 9c4d10a19c Update code/datums/radiation_wave.dm 2020-04-18 03:48:03 +02:00
Putnam c8ce60c856 Added back some vore default modes. 2020-04-17 18:46:09 -07:00
Ghom 3188ef3475 Whops 2020-04-18 03:32:54 +02:00
Ghom cf505f900a Update atoms.dm 2020-04-18 03:29:45 +02:00
Putnam cbc02a8f0b fixes a divide-by-zero whoops 2020-04-17 18:28:15 -07:00
Ghommie ac662a46c1 Extra support for bussed/lateloaded holodeck maps. 2020-04-18 03:15:05 +02:00
Ghom 2676d663d6 Revert "Makes so turning in place updates riders when riding someone's back" 2020-04-18 03:09:49 +02:00