Commit Graph

6044 Commits

Author SHA1 Message Date
kevinz000
1701811fb6 kay 2019-12-16 11:35:04 -07:00
kevinz000
b3ad352a96 stuff 2019-12-16 08:10:41 -07:00
kevinz000
3b47949f82 haha fuck that's a lotta changes 2019-12-15 19:59:15 -07:00
kevinz000
586dcb6f81 welp i got lazy 2019-12-15 00:15:32 -07:00
kevinz000
4970675467 s 2019-12-15 00:06:11 -07:00
Lin
43646434a0 Merge pull request #10163 from Ghommie/Ghommie-cit455
Allows blood bank generators to be wrenched and unwrenched.
2019-12-14 23:59:58 +00:00
Lin
2e003b7383 Merge pull request #10050 from Ghommie/Ghommie-cit427
Adds view and viewers checks for ranged construction devices such as ARCD and RLD.
2019-12-14 05:33:31 +00:00
kevinz000
659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
2019-12-13 16:52:22 -07:00
nik707
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
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
kevinz000
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
kevinz000
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
Lin
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
7880340142 Make dynamic message in secret not bug me 2019-12-10 07:58:13 -08:00
BlackMajor
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
BlackMajor
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
BlackMajor
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
Putnam3145
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
Lin
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
kevinz000
9869c1c440 Merge pull request #10099 from Ghommie/Ghommie-cit446
Fixes a few holo barriers lacking transparency.
2019-12-08 19:05:10 -07: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
Lin
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
Lin
ef01bbd222 Merge pull request #10075 from Ghommie/Ghommie-cit436
Demodularize defib disks and projectiles icons.
2019-12-08 20:15:01 +00:00
kevinz000
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
Lin
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
Lin
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
Ghommie
95cc84e69e Fixes a few holo barriers' transparency. 2019-12-07 12:13:33 +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
kevinz000
2d9c6e64c5 Update launchpad_control.dm 2019-12-06 19:55:54 -07:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +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
Winter Flare
8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:27:44 -05:00
Winter Flare
b860c6e0bb Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:14:44 -05:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
kevinz000
8cb6ff10b8 Merge pull request #10034 from Ghommie/Ghommie-cit420
Fixes the incongruent bone satchel description.
2019-12-05 22:00:38 -07:00
kevinz000
e16b61b865 Merge pull request #10043 from Arturlang/patch-1
PDA cartridges and their contents can no longer be contaminated
2019-12-05 21:58:33 -07:00
kevinz000
b8bb0f2924 Merge pull request #10048 from Ghommie/Ghommie-cit426
Demodularize moodlets.
2019-12-05 21:56:29 -07:00
kevinz000
6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
2019-12-05 21:54:42 -07:00
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000
a65588009c Merge pull request #10038 from Trilbyspaceclone/patch-240
Makes trash carts craftable with plastic
2019-12-05 21:51:30 -07:00
kevinz000
13f43eb783 Merge pull request #10045 from Trilbyspaceclone/patch-241
Makes wallets hold more stuff
2019-12-05 21:49:50 -07:00
kevinz000
b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-12-05 21:47:29 -07:00
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