Commit Graph
18086 Commits
Author SHA1 Message Date
GhomandGitHub 0e74c94d8c Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
2020-01-05 15:17:14 +01:00
GhomandGitHub eeb9ec5f35 Merge pull request #10380 from Hatterhat/tg-43000-powerfists
powerfists throw people faster but also leak their gas into the air
2020-01-05 15:12:06 +01:00
GhomandGitHub 2cbf2a2574 Merge pull request #10429 from Trilbyspaceclone/patch-262
Corrects MASON Rig's missing flags
2020-01-05 15:09:05 +01:00
Putnam be98704abe weird super secret vote 2020-01-05 04:19:21 -08:00
Letter N ba7f0dab62 doppler logs! 2020-01-05 19:16:37 +08:00
TrilbyspacecloneandGitHub 609f120c28 Update hardsuit.dm 2020-01-04 22:29:42 -05:00
Hatterhat f166586ca0 a comma 2020-01-04 21:05:55 -06:00
Hatterhat 5b0d20cf37 this one fucking tab 2020-01-04 19:52:01 -06:00
Hatterhat 46ced736ba what the fuck was that damage my guy 2020-01-04 19:51:06 -06:00
Hatterhat c0e010c612 e 2020-01-04 16:44:11 -06:00
GhomandGitHub ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
GhomandGitHub 9e257599ab Merge pull request #10413 from nik707/master
Reduces engraving light power
2020-01-04 22:30:37 +01:00
GhomandGitHub 7bebd13c54 Merge pull request #10412 from Linzolle/matchbox-cars
matchbox runtime fix
2020-01-04 22:30:13 +01:00
GhomandGitHub e85c710962 Merge pull request #10399 from Citadel-Station-13/kevinz000-patch-4
Knocks down cargo passive gen 750 -> 500
2020-01-04 21:48:48 +01:00
Ghommie 356304f68f Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!! 2020-01-04 20:34:31 +01:00
GhomandGitHub a75b8a387e ok 2020-01-04 18:30:37 +01:00
GhomandGitHub 07a5f052d3 Merge pull request #10400 from chefferz/chefferz-toiletshuttle
Gives ability to buckle yourself to a toilet
2020-01-04 14:25:54 +01:00
GhomandGitHub 3086b5eb38 boolean 2020-01-04 14:19:15 +01:00
Hatterhat 92f6fe129a tgstation 40394 port 2020-01-04 07:14:39 -06:00
GhomandGitHub 499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
2020-01-04 14:07:25 +01:00
GhomandGitHub 39da7cc58e Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
2020-01-04 14:03:01 +01:00
kevinz000andGitHub a930464f57 Update extra_drone_types.dm 2020-01-04 00:54:06 -08:00
Hatterhat 97242050ec bad idea 2020-01-04 02:16:55 -06:00
Hatterhat 5142a0e4ae that should probably be there 2020-01-04 02:07:19 -06:00
Hatterhat 7c98656939 upstream merge 2020-01-04 01:48:50 -06:00
kevinz000andGitHub 0567dcd6df Update godhand.dm 2020-01-03 23:34:37 -08:00
kevinz000andGitHub a4fa24ac15 Update touch_attacks.dm 2020-01-03 23:33:39 -08:00
Hatterhat 186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
TrilbyspacecloneandGitHub 94fb114611 Update hardsuit.dm 2020-01-04 02:11:23 -05:00
Putnam b1b1d7171e hard crit actually 2020-01-03 23:07:34 -08:00
Putnam e54ec9ec09 shh 2020-01-03 23:03:45 -08:00
Hatterhat e65583c403 set_AFTFT verb, tweaking shit 2020-01-04 00:44:01 -06:00
Linzolle d0263fc669 don't act on non mobs 2020-01-03 18:21:08 -06:00
Ghommie f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
kevinz000andGitHub d1d9b7a179 Merge pull request #10403 from r4d6/patch-1
Add a way to make opaque plastic flaps
2020-01-03 08:16:17 -08:00
MrJWhit 44b96f01ea Make radiation collectors move faster
Words
2020-01-03 06:04:10 -05:00
kevinz000andGitHub 04649efc62 Update stack.dm 2020-01-03 02:46:57 -08:00
Seris02 519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock 2020-01-03 17:42:53 +08:00
BlackMajor a4d2ea0281 Small fix 2020-01-03 22:39:58 +13:00
Putnam adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08:00
nik707andGitHub 8054b08dc3 reduces light power of soapstone engravings 2020-01-02 23:11:40 -06:00
nik707andGitHub 0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers
n word
2020-01-02 22:01:19 -06:00
LinandGitHub f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
LinandGitHub b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
LinandGitHub 4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489
randomized recipes fallback fix.
2020-01-02 23:56:43 +00:00
LinandGitHub 5d667a3540 Merge pull request #10388 from CameronWoof/ez-valids
Adds the "View Crew Manifest" verb to Robots
2020-01-02 23:54:14 +00:00
kevinz000andGitHub b580d1dc32 Merge pull request #10390 from deathride58/orangespleasestopforcepushing
[s] removes fun
2020-01-02 08:56:49 -08:00
Ghommie 4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Seris02andGitHub a6a110bca3 nopenopenope 2020-01-02 19:29:11 +08:00
BlackMajor dd68be6d31 IM NOT TRYING TO EDIT CARBON.DM GITHUB, PLEASE. 2020-01-02 22:20:54 +13:00