Commit Graph

4364 Commits

Author SHA1 Message Date
kappa-sama f88eefa8a9 stunsword 2020-01-10 22:30:28 -05:00
Seris02 29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
kappa-sama e21cb4e67b shocking 2020-01-10 22:28:55 -05:00
kappa-sama aacf4bec8b qm set 2020-01-10 22:26:48 -05:00
kappa-sama 62ebc2d226 zoom 2020-01-10 22:25:07 -05:00
Seris02 0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
kappa-sama e5e58518e4 boomers 2020-01-10 22:22:44 -05:00
kappa-sama 412b0175b6 new file 2020-01-10 22:20:53 -05:00
kappa-sama 25422542c9 this 2020-01-10 22:19:00 -05:00
Lin fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
Lin 147d948ad8 Merge pull request #10498 from Citadel-Station-13/kevinz000-patch-13
reduces table cooldown to 0.4
2020-01-10 23:55:07 +00:00
kevinz000 b6e14c6b86 compile 2020-01-10 14:30:20 -08:00
kevinz000 2c245a18fd compile 2020-01-10 13:43:53 -08:00
kevinz000 f1a4956afc easier for me to type 2020-01-10 13:26:34 -08:00
kevinz000 9cec806875 Update scanners.dm 2020-01-10 12:48:55 -08:00
kevinz000 7392760f38 Update scanners.dm 2020-01-10 12:48:19 -08:00
kevinz000 7ace9f0203 abstract types 2020-01-10 06:25:23 -08:00
kevinz000 a16a7a7fe0 subtypes 2020-01-10 06:12:03 -08:00
kevinz000 24c1baddd0 compile compile compile 2020-01-10 05:50:19 -08:00
Letter N 315756d95a banjo 2020-01-10 19:39:57 +08:00
Letter N 6ec3fde836 better-signalers 2020-01-10 18:06:55 +08:00
Putnam e468fa3e71 Added a binary version and fixed up sprites 2020-01-10 01:26:09 -08:00
Putnam 36a6daa26f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-09 19:09:38 -08:00
Putnam bdda3f940c it works 2020-01-09 18:55:56 -08:00
Trilbyspaceclone 3c877c96f5 Update sheet_types.dm 2020-01-09 20:42:56 -05:00
Trilbyspaceclone 530d710f57 Update mineral.dm 2020-01-09 20:42:07 -05:00
Trilbyspaceclone 7df495f4ba Merge branch 'master' into plastic__world 2020-01-09 20:41:33 -05:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Hatterhat 04aa0eda5a tg 40046, 41695, 46726 - hope i didnt forget smth 2020-01-09 18:35:13 -06:00
kevinz000 52a0f5779d Update tables_racks.dm 2020-01-09 15:20:57 -08:00
Trilbyspaceclone 17afb84f94 I didnt even touch any maps 2020-01-09 05:53:23 -05:00
TrilbySpaceClone 34c6288d22 so fantastic! 2020-01-09 05:46:30 -05:00
Putnam3145 3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
Putnam fdbbcfe59a it's functional, sprite time 2020-01-08 17:05:43 -08:00
kappa-sama 35353996bd lazy copypaste 2020-01-08 16:36:53 -05:00
kevinz000 dbd2cb6195 Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08:00
kevinz000 b68f81f4e6 Merge pull request #10452 from Ghommie/Ghommie-cit499
Fixes lattice's examine.
2020-01-08 13:30:37 -08:00
Putnam3145 b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
BlackMajor 05a644cc41 Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
BlackMajor 972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
kevinz000 5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
Lin c162e9bb5d Merge pull request #10453 from Ghommie/Ghommie-cit500
Fixing an edge case runtime with ore bags.
2020-01-07 19:37:49 +00:00
r4d6 f6fef84984 Make the RCD effect not right-clickable. 2020-01-07 11:23:25 -05:00
Putnam 19887691f3 added deadchat toggle to dojo mobs too 2020-01-07 04:39:04 -08:00
Seris02 5fae814e42 did it thanks 2020-01-07 17:52:46 +08:00
Putnam 6f6f0cbb62 Tweaks to ghost dojo 2020-01-06 23:33:29 -08:00
r4d6 68e48209da Fix 2020-01-07 02:04:06 -05:00