Commit Graph

16247 Commits

Author SHA1 Message Date
silicons
ce80f64d27 Update suppression.dm 2020-08-18 18:52:06 -07:00
Timothy Teakettle
264e789c3d yes 2020-08-18 17:38:20 +01:00
Timothy Teakettle
6392367df4 donator items 2020-08-18 17:28:09 +01:00
lolman360
9931cb006c eee 2020-08-18 17:33:20 +10:00
tiramisuapimancer
13609ba6e6 Update ethereal.dm 2020-08-17 23:01:01 -08:00
lolman360
d8e286d7be ee 2020-08-18 16:17:00 +10:00
lolman360
325f4eb72e Updates 2 2020-08-18 15:43:44 +10:00
lolman360
6f21b23a87 Fixes Shit. 2020-08-18 14:28:57 +10:00
lolman360
f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
lolman360
8027706bea Update _box_magazine.dm 2020-08-18 13:45:44 +10:00
lolman360
2d1edc9fa2 Update _box_magazine.dm 2020-08-18 13:30:49 +10:00
lolman360
8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
lolman360
32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00
timothyteakettle
d312a5d639 fix tails 2020-08-18 01:32:06 +01:00
timothyteakettle
47424be1c0 tail fix 2020-08-18 00:46:05 +01:00
silicons
d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum
.357 DumDum Rounds (they're adminspawn only don't worry)
2020-08-17 08:58:00 -07:00
lolman360
2f14d8998b Update autohydro.dm 2020-08-17 22:42:41 +10:00
SmArtKar
e087845745 reee 2020-08-17 13:32:18 +03:00
silicons
3d69f65c6b Merge pull request #13185 from Hatterhat/large-demons
slaughter demons to MOB_SIZE_LARGE
2020-08-17 03:15:16 -07:00
silicons
7d2d4d870c Merge pull request #13179 from Detective-Google/if-chain-begoen
kills an ugly if-chain in inventory code (probably)
2020-08-17 03:13:48 -07:00
Putnam3145
23b4ba3714 Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
2020-08-17 03:13:14 -07:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
1f0f5d621a Merge branch '13176' 2020-08-16 18:52:48 -07:00
silicons
83b41b1a0f Merge branch '13174' 2020-08-16 18:52:33 -07:00
silicons
384e5ae311 Merge branch '13167' 2020-08-16 18:51:48 -07:00
silicons
a1a26d6941 Merge branch '13159' 2020-08-16 18:51:07 -07:00
silicons
66322c4d38 Merge branch '13156' 2020-08-16 18:50:29 -07:00
silicons
451d5e52de Merge branch '13148' 2020-08-16 18:49:57 -07:00
silicons
b8686ab0f9 Update _vehicle.dm 2020-08-16 18:49:49 -07:00
silicons
bc1fad653b Merge branch '13147' 2020-08-16 18:48:57 -07:00
silicons
b767c99bac Merge branch '13144' 2020-08-16 18:48:14 -07:00
silicons
38959b6120 Merge branch '13141' 2020-08-16 18:46:33 -07:00
silicons
9602f0742e Merge branch '13135' 2020-08-16 18:46:06 -07:00
silicons
b7b13403b9 Merge branch '13130' 2020-08-16 18:45:54 -07:00
silicons
fe7d8860f5 Merge branch '13124' 2020-08-16 18:45:23 -07:00
silicons
53fe2c95c5 Merge branch 'pr-13122' 2020-08-16 18:45:01 -07:00
silicons
b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
silicons
9c63a09907 Merge branch 'pr-13087' 2020-08-16 18:40:07 -07:00
silicons
01dd2f389b Merge branch 'pr-13067' 2020-08-16 18:38:13 -07:00
silicons
428bb936aa Merge pull request #13037 from timothyteakettle/freedom-in-customisation
turns 304 lines of snowflake code into 24 lines
2020-08-16 18:35:05 -07:00
Lin
2fd3e2dd87 Merge pull request #13092 from Citadel-Station-13/silicons-patch-87
active blocking now also considers a stamina damaging projectile's stamina damage to be .. damage
2020-08-16 20:20:29 -05:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
Hatterhat
89b71ddfc5 first and only occupant gets dinked 2020-08-16 15:02:04 -05:00
Hatterhat
57e01902c5 density is kill 2020-08-16 14:53:19 -05:00
Hatterhat
07e44a176d tempted to just remove the density tbqh 2020-08-16 14:52:34 -05:00
Hatterhat
88437bdea7 breakdown breakdown 2020-08-16 14:27:10 -05:00
SmArtKar
dd64dcc4ea Return of the King(and the limits) 2020-08-16 16:21:17 +03:00
SmArtKar
0a6eca818c Succesfull removal of shuttle limit 2020-08-16 15:59:31 +03:00