Commit Graph

19834 Commits

Author SHA1 Message Date
kevinz000 5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
kevinz000 e2f9a68c2c Merge pull request #10049 from Useroth/new-tg-plants
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
kevinz000 b5595114c1 Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
2019-12-05 21:40:09 -07:00
Ghommie 4ceb0a25d0 undefined var. 2019-12-06 05:38:03 +01:00
kevinz000 d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
2019-12-05 21:33:12 -07:00
kevinz000 bd1b79b182 Merge pull request #10041 from kappa-sama/patch-8
[SALT] chargers and chaos stands are now reasonable to fight
2019-12-05 21:29:39 -07:00
kevinz000 2fcdb24fe3 Merge pull request #10019 from Seris02/wintercoattide
Adds CentCom, Assistant's formal, ratvarian and narsian winter coats + loadout for formal
2019-12-05 21:29:08 -07:00
kevinz000 70d305611c Merge pull request #10042 from Ghommie/Ghommie-cit422
fixes sofa overlays doing nothing, because their layer wasn't properly set.
2019-12-05 21:28:24 -07:00
kevinz000 bbd482015c Merge pull request #10033 from Ghommie/Ghommie-cit419
Fixes traitor codewords highlight and some other hear signal hooks.
2019-12-05 21:28:03 -07:00
kevinz000 29497320c1 Merge pull request #10025 from Linzolle/butchering
refactor butchering component
2019-12-05 21:19:57 -07:00
Ghommie d3d1116094 null = n_color, no. 2019-12-06 03:59:51 +01:00
Ghommie 2528714035 I have no liability about glowing robotic eyes not automatically updating right here. 2019-12-06 03:56:48 +01:00
Ghommie d6fe78f4a7 fixes on_mob eyes overlays not updating properly sometimes. 2019-12-06 03:38:39 +01:00
Ghommie 5024e900f7 Ooow fuck. 2019-12-06 02:45:55 +01:00
Ghommie f1ccccbf36 drake. 2019-12-06 02:14:15 +01:00
Ghommie 9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
kappa-sama c1c2661b8c consistency 2019-12-05 19:54:58 -05:00
kappa-sama 994411cc4e metal 2019-12-05 19:49:48 -05:00
kappa-sama d78df2cc5d since they're gone from autos 2019-12-05 19:47:54 -05:00
Ghommie b143a2d302 Right file. 2019-12-06 00:31:32 +01:00
Ghommie 7958cfa548 Right file 2019-12-06 00:27:50 +01:00
Ghommie 238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
BlackMajor b7d0cc6516 Merge pull request #9884 from Useroth/blackpowder-alternative
Black powder fix. Alternative to #9861
2019-12-06 11:32:17 +13:00
BlackMajor a6f48ea74c Merge pull request #9372 from Weblure/Xenobio-Hotkeys
[Ready] [Test Merge] Ports Xenobio Hotkeys
2019-12-06 11:29:34 +13:00
Ghommie 53ff425f04 Banishes some magic numbers from this realm. 2019-12-05 21:55:28 +01:00
Useroth f4bffdc56d To make sure it doesn't runtime 2019-12-05 19:05:57 +01:00
Useroth 2e84c30e59 Tiny touch-ups 2019-12-05 16:29:50 +01:00
Artur 82d1497ddc Fixes bad buds and toxin healing 2019-12-05 17:29:00 +02:00
kappa-sama 676476726f i forgot to actually add the bullet 2019-12-05 09:50:34 -05:00
kappa-sama df0fa330bf bullet 2019-12-05 09:49:09 -05:00
kappa-sama 329e07b037 357 bullets and rifle clips 2019-12-05 09:46:13 -05:00
Seris02 0c5a1b900b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide 2019-12-05 21:09:38 +08:00
Seris02 2ce79828b8 ratvar coat updated 2019-12-05 20:46:59 +08:00
kappa-sama 7d77159748 5->20 2019-12-04 21:04:47 -05:00
Ghommie 33fee5bd37 Witty remark included. 2019-12-05 02:12:34 +01:00
Ghommie a7d2fac0e9 "Why does it tell me it's "out of range", but not to you, X-ray man?" 2019-12-05 01:55:21 +01:00
Useroth b9ce4a8622 Oopsie 2019-12-05 01:49:55 +01:00
Useroth 950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00
Ghommie 7fa2232fc7 Adds view and viewers checks for ranged construction devices such as ARCD and RLD. 2019-12-05 01:28:44 +01:00
Ghommie 77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
Trilbyspaceclone 73891a02bc messenger 2019-12-04 16:56:27 -05:00
Ghommie ccd966ed28 Update, fix. 2019-12-04 20:32:25 +01:00
Ghommie 9455597e31 special snowflake. 2019-12-04 20:23:44 +01:00
Ghommie dfa57173db D'aww, a mistake... 2019-12-04 20:20:01 +01:00
Ghommie c25508f1c2 turns dog/cat petting into an element. 2019-12-04 20:18:03 +01:00
Arturlang 138847838a I suppose 2019-12-04 21:17:49 +02:00
Ghommie 07bd51f79a Ports flag for bespoke elements. 2019-12-04 19:38:25 +01:00
Trilbyspaceclone 2a591df09a Update wallets.dm 2019-12-04 12:50:18 -05:00
Ghommie 3f0d1e275e Made wooden cabinet/closets... actually made of wood. 2019-12-04 18:27:17 +01:00
Trilbyspaceclone 8ecb920c7f Update bins.dm 2019-12-04 12:20:24 -05:00