Commit Graph
6140 Commits
Author SHA1 Message Date
nik707andGitHub cdeb4733aa Merge pull request #9863 from BlackMajor/Yote
No adrenals for borgs please
2019-12-12 23:50:34 -06:00
Ghommie 319d4d51bb Allows blood bank generators to be wrenched and unwrenched. 2019-12-13 04:26:37 +01:00
Ghommie 563a0fef3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390 2019-12-13 02:45:53 +01:00
BlackMajor 83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
Ghommie 4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Seris02 f565c1cd3c adds some distance checks 2019-12-12 18:48:25 +08:00
kevinz000andGitHub dfec60c557 Merge pull request #10140 from Putnam3145/dynamic-not-in-secret
Makes secret's dynamic roundstart report not tell people to contact a coder
2019-12-11 14:38:49 -07:00
kevinz000andGitHub 77327ba899 Merge pull request #10143 from Putnam3145/dynamic-midround-doubledip
Dynamic no longer double dips on refunds for ghost antags with not enough applicants
2019-12-11 14:38:17 -07:00
Linzolle 6c8dc1d294 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre-noise 2019-12-10 17:57:26 -06:00
Linzolle bdd72fc797 make sound work? 2019-12-10 17:54:52 -06:00
LinandGitHub 9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Putnam 7b10c57b5c Actually gotta rework this properly 2019-12-10 14:01:33 -08:00
Putnam 1de118d40e Dynamic no longer double dips on refunds for ghost antags 2019-12-10 13:55:58 -08:00
Putnam 10879d9984 rejection logging too 2019-12-10 10:26:18 -08:00
Putnam cda0e3470a Added a bunch of logging to dynamic. 2019-12-10 10:09:24 -08:00
Putnam 7880340142 Make dynamic message in secret not bug me 2019-12-10 07:58:13 -08:00
BlackMajorandGitHub 8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-12-10 11:18:55 +13:00
BlackMajorandGitHub 8ce9dcc471 Merge pull request #10082 from Citadel-Station-13/kevinz000-patch-122
Bluespace launchpad QoL (read: powercreep)
2019-12-10 11:16:59 +13:00
BlackMajorandGitHub 716df40d7a Merge pull request #10083 from Ghommie/Ghommie-cit439
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter.
2019-12-10 11:15:56 +13:00
Putnam3145andGitHub 0a8dcc3712 Merge pull request #10113 from Ghommie/Ghommie-cit448
Fixes a long lasting runtime with filter data sorting.
2019-12-09 13:49:41 -08:00
Artur 488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
LinandGitHub 7794cea49c Merge pull request #9538 from Citadel-Station-13/kevinz000-patch-99
Brings the combat back in combat defibrillator (DOES NOT BUFF CMO DO NOT YELL AT ME)
2019-12-09 04:33:23 +00:00
kevinz000andGitHub 9869c1c440 Merge pull request #10099 from Ghommie/Ghommie-cit446
Fixes a few holo barriers lacking transparency.
2019-12-08 19:05:10 -07:00
loginsandylogoutandGitHub 2c08f7ac95 oops 2019-12-08 17:25:17 -06:00
loginsandylogoutandGitHub 1bae17a2de gauze 2019-12-08 17:24:12 -06:00
loginsandylogoutandGitHub 17782a8c87 ports refactor 2019-12-08 17:10:50 -06:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
LinandGitHub 6368f04f2d Merge pull request #10044 from Ghommie/Ghommie-cit423
Made wooden cabinet/closets... actually made of wood.
2019-12-08 22:18:15 +00:00
Linzolle 1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
LinandGitHub ef01bbd222 Merge pull request #10075 from Ghommie/Ghommie-cit436
Demodularize defib disks and projectiles icons.
2019-12-08 20:15:01 +00:00
Artur 9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
kevinz000andGitHub 83ab577a6a Update launchpad_control.dm 2019-12-08 07:30:05 -07:00
Ghommie a9335aa946 Fixes a long lasting runtime with filter data sorting. 2019-12-08 13:21:29 +01:00
Hatterhat 6ff7083bfb the one where i buff a 4 tc item, give trilby a (You), and squash my commits 2019-12-08 01:29:08 -06:00
LinandGitHub a91139c470 Merge pull request #10068 from Ghommie/Ghommie-cit433
Ports "Makes the windup toolbox more similar to His Grace".
2019-12-07 21:52:10 +00:00
LinandGitHub 24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
2019-12-07 21:49:18 +00:00
Artur 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
UserothandGitHub 28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Ghommie 95cc84e69e Fixes a few holo barriers' transparency. 2019-12-07 12:13:33 +01:00
Useroth 5f56d40f58 Incorporated the bamboo grammar fixes. 2019-12-07 06:41:24 +01:00
Ghommie 7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Ghommie e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
kevinz000andGitHub 2d9c6e64c5 Update launchpad_control.dm 2019-12-06 19:55:54 -07:00
Artur 19ab4a5f70 Review fixes and tweaks 2019-12-07 00:43:02 +02:00
Ghommie 723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Useroth 1158c03ed7 Added bamboo. 2019-12-06 19:00:10 +01:00
Ghommie 99f694c94a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit433 2019-12-06 15:31:40 +01:00
Ghommie 622b3e5608 ddddddd 2019-12-06 15:31:05 +01:00
Sishen 8da7d1a021 b 2019-12-06 06:38:48 -07:00
Winter Flare 8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:27:44 -05:00