Commit Graph

16979 Commits

Author SHA1 Message Date
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
Ghommie 7958cfa548 Right file 2019-12-06 00:27: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
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
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 77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
Trilbyspaceclone 73891a02bc messenger 2019-12-04 16:56:27 -05: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
Arturlang 7d3103a260 Done 2019-12-04 15:02:36 +02:00
Ghommie 3d7ef827a9 better. 2019-12-04 06:31:48 +01:00
Ghommie dc91114e8b fixes sofa overlays doing jackshit, because their layer wasn't properly set. 2019-12-04 06:26:11 +01:00
TrilbySpaceClone e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
kappa-sama 525d36cc6b chaos 2019-12-03 23:18:45 -05:00
kappa-sama af0cbc460b charger 2019-12-03 23:18:03 -05:00
kevinz000 d578bbd10a Merge pull request #10021 from Putnam3145/rld-fix
Makes glowsticks no longer radioactively contaminable.
2019-12-03 19:53:18 -07:00
kevinz000 6e7bceb993 Merge pull request #10039 from Putnam3145/traitor-fix
makes traitor antag datum and descendents removable by admins
2019-12-03 19:15:19 -07:00
Putnam 4e2c72f2ed makes traitor removable 2019-12-03 16:58:32 -08:00
Trilbyspaceclone aa3598f166 less dope 2019-12-03 19:51:19 -05:00
Trilbyspaceclone 0b90def435 Update sheet_types.dm 2019-12-03 19:43:31 -05:00
Ghommie 3fb485c721 Fixes the incongruent bone satchel description. 2019-12-03 22:39:07 +01:00
Seris02 72e5e17c51 ratvarian and narsian winter coats 2019-12-03 18:16:36 +08:00
Ghommie 428234c0d6 Dilemma. 2019-12-03 06:53:46 +01:00
Ghommie fa270c8a79 leftovers. 2019-12-03 06:48:25 +01:00
Ghommie 6e318bfb09 Fixes traitor codewords highlight and some other hear signal hoonks. 2019-12-03 06:31:35 +01:00
Ghommie fdea134d64 dum 2019-12-03 04:30:46 +01:00
Ghommie 3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Lin b501321362 Merge pull request #9941 from Putnam3145/personal-closet-fix
Personal closets can use PDAs/tablets now
2019-12-03 01:38:42 +00:00
Lin a33dba803e Merge pull request #9992 from Ghommie/Ghommie-cit411
Fixes ai displays status being reset to "Neutral" on login, regardless of choice.
2019-12-03 01:36:02 +00:00
Ghommie 9b62a5ad01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:33:32 +01:00
Ghommie 8615c0ea8f Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:32:59 +01:00
Lin 00acb5749f Merge pull request #9988 from Ghommie/Ghommie-cit409
Fixes ED-209 being unbuildable past the welding step.
2019-12-03 01:31:40 +00:00
Lin 99e9c7299e Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
2019-12-03 01:30:51 +00:00
Winter Flare c31ca96e87 Rebalanced Meat Crate 2019-12-02 16:21:48 -05:00