Commit Graph

17828 Commits

Author SHA1 Message Date
Ghom
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
Ghom
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
Ghom
2cbf2a2574 Merge pull request #10429 from Trilbyspaceclone/patch-262
Corrects MASON Rig's missing flags
2020-01-05 15:09:05 +01:00
Trilbyspaceclone
609f120c28 Update hardsuit.dm 2020-01-04 22:29:42 -05:00
Ghom
9e257599ab Merge pull request #10413 from nik707/master
Reduces engraving light power
2020-01-04 22:30:37 +01:00
Ghom
7bebd13c54 Merge pull request #10412 from Linzolle/matchbox-cars
matchbox runtime fix
2020-01-04 22:30:13 +01:00
Ghom
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
Ghom
a75b8a387e ok 2020-01-04 18:30:37 +01:00
Ghom
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
Ghom
3086b5eb38 boolean 2020-01-04 14:19:15 +01:00
Ghom
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
Ghom
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
Trilbyspaceclone
94fb114611 Update hardsuit.dm 2020-01-04 02:11:23 -05:00
Linzolle
d0263fc669 don't act on non mobs 2020-01-03 18:21:08 -06:00
kevinz000
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
kevinz000
04649efc62 Update stack.dm 2020-01-03 02:46:57 -08:00
nik707
8054b08dc3 reduces light power of soapstone engravings 2020-01-02 23:11:40 -06:00
nik707
0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers
n word
2020-01-02 22:01:19 -06:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Lin
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
Lin
4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489
randomized recipes fallback fix.
2020-01-02 23:56:43 +00:00
Lin
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
kevinz000
b580d1dc32 Merge pull request #10390 from deathride58/orangespleasestopforcepushing
[s] removes fun
2020-01-02 08:56:49 -08:00
r4d6
6e5d04ff1f Adding a way to make opaque plastic flaps 2020-01-02 02:52:48 -05:00
Putnam
12680566b7 fixed voting.
FUCK
2020-01-01 23:37:14 -08:00
chefferz
46feaf9663 Update watercloset.dm 2020-01-02 01:09:29 -05:00
kevinz000
67d9923ff7 Merge pull request #10371 from kappa-sama/patch-15
call of duty loot boxes
2020-01-01 22:08:20 -08:00
kevinz000
16172f68aa Merge pull request #10366 from Hatterhat/beaker-buff
beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers
2020-01-01 22:07:40 -08:00
kevinz000
e771ea9066 Merge pull request #10374 from Trilbyspaceclone/patch-260
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
2020-01-01 22:07:18 -08:00
kevinz000
b5b00102a0 Update shuttle.dm 2020-01-01 22:04:34 -08:00
Linzolle
74c308c16c runtime fix 2020-01-01 22:23:16 -06:00
Putnam
21fc6d1d2b saving is back 2020-01-01 19:24:13 -08:00
nik707
a881231149 Merge pull request #10395 from Hatterhat/shit-and-cum
space cola isnt a reagent idiot, codeside change only
2020-01-01 20:45:33 -06:00
Hatterhat
1195762f86 space cola isnt a reagent idiot 2020-01-01 20:37:09 -06:00
nik707
1e6a485976 Merge pull request #10368 from Hatterhat/orm-laser-fix-question-mark
ORM lasers actually affect point return
2020-01-01 20:32:48 -06:00
nik707
75d5e324ec Merge pull request #10379 from Hatterhat/tg-47443-shotgunpbs
shotgun pointblanking people actually throws them
2020-01-01 20:32:16 -06:00
nik707
e232b13119 Merge pull request #10369 from Hatterhat/patch-4
crusher trophy drop chance increase
2020-01-01 20:28:35 -06:00
nik707
be9912227f Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
2020-01-01 20:28:15 -06:00
deathride58
8390334d1e mirrors tgstation 48524 2020-01-01 18:59:05 -05:00
Putnam
00bc8dbc97 actually no 2020-01-01 15:06:37 -08:00
CameronWoof
9a54467064 Robots can now view the crew manifest 2020-01-01 14:38:46 -08:00
Putnam
b69950ac2b wow good thing this was impossible to check 2020-01-01 13:47:51 -08:00
Putnam
1acb499929 moved a thing to prevent a runtime 2020-01-01 13:26:43 -08:00
Lin
c836889944 Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad
blood drunk buff probably shouldnt cripple you
2020-01-01 21:21:39 +00:00
Putnam
d0b1c442a0 tweaks 2020-01-01 13:15:13 -08:00
Putnam
607109e0d2 also added individual ballot gathering 2020-01-01 12:29:13 -08:00
Putnam
444f862a4d Renamed the options to make clear this isn't scoring? 2020-01-01 11:37:40 -08:00
Hatterhat
200de62b8e tweaks transfer amounts, uncucks hypovials 2020-01-01 08:50:15 -06:00
kevinz000
68bc6dcc2a Update megafauna.dm 2020-01-01 02:43:43 -08:00
Putnam
96cbc2704f Made random always available. 2020-01-01 00:32:49 -08:00