Commit Graph

26895 Commits

Author SHA1 Message Date
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
Letter N 5dff3e9a04 deletes ping 2020-08-18 11:35:10 +08: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
silicons 50eca19658 Revert "load_delay var for /obj/item/ammo_box, nerfs shotgun stripper clips (hatter why'd you pr them)" 2020-08-17 20:20:04 -07:00
Letter N 83df9159de GOONCHAT IS DEAD! LONG LIVE THE KING! 2020-08-18 10:51:13 +08:00
Letter N 90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-18 10:33:21 +08: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
lolman360 93fa8b72b8 w e w 2020-08-18 10:05:54 +10:00
lolman360 bb86003510 w e w 2020-08-18 10:04:52 +10:00
timothyteakettle 47424be1c0 tail fix 2020-08-18 00:46:05 +01:00
Hatterhat a7a58ce81d this might work better 2020-08-17 18:30:00 -05:00
Hatterhat eb69035240 holy shit i despise the copypaste on this one 2020-08-17 12:39:49 -05:00
Detective Google b13048f636 makes glass floors actually deconstructable 2020-08-17 12:15:09 -05: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
DeltaFire 31f1e04654 updates the helpertext in general
Recollection doesn't actually offer any help anymore and just redirects you to the wiki anyways.
2020-08-17 17:03:53 +02:00
DeltaFire c74803dd1a updates the wiki page link 2020-08-17 16:53:49 +02:00
Letter N 55bd3ecc26 actual tgui code 2020-08-17 21:07:09 +08:00
Letter N 610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
lolman360 2f14d8998b Update autohydro.dm 2020-08-17 22:42:41 +10:00
silicons 621f32adc3 Update output.dm 2020-08-17 03:43:32 -07: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 f611945b34 Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
2020-08-17 03:14:15 -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
Putnam 8e9fb8eaae Buffs/hugboxes slaughter demons 2020-08-17 01:39:51 -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 ac7bdb5db5 Merge branch '13175' 2020-08-16 18:53:00 -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 2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00
silicons 690f610f62 Merge branch '13168' 2020-08-16 18:52:04 -07:00
silicons 384e5ae311 Merge branch '13167' 2020-08-16 18:51:48 -07:00
silicons 83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07:00
silicons a900c07846 Merge branch '13163' 2020-08-16 18:51:24 -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 44e2327280 Merge branch '13143' 2020-08-16 18:47:48 -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