Commit Graph

26692 Commits

Author SHA1 Message Date
kevinz000 ded283fa55 Update conveyor2.dm 2019-12-11 14:41:58 -07:00
kevinz000 20defaba8e Update conveyor2.dm 2019-12-08 21:46:53 -07:00
CitadelStationBot 8d7427a9f4 Automatic changelog generation for PR #9538 [ci skip] 2019-12-08 22:33:25 -06: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
CitadelStationBot 994a9ecbc6 Automatic changelog generation for PR #9903 [ci skip] 2019-12-08 20:37:08 -06:00
kevinz000 3cacb998dd Merge pull request #9903 from PersianXerxes/removeFreeNVG
Removes the night vision quirk
2019-12-08 19:37:06 -07:00
CitadelStationBot 442355e86d Automatic changelog generation for PR #10099 [ci skip] 2019-12-08 20:05:12 -06: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
CitadelStationBot 9a5c7a0631 Automatic changelog generation for PR #10044 [ci skip] 2019-12-08 16:18:18 -06: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
CitadelStationBot e300bb6b84 Automatic changelog generation for PR #10071 [ci skip] 2019-12-08 14:01:54 -06:00
Lin 9c7ac9a469 Merge pull request #10071 from Ghommie/Ghommie-cit434
Fixes bubblegum's death not unlocking the arena shuttle buyment since the medals subsystem is not hub enabled
2019-12-08 20:01:50 +00:00
CitadelStationBot e9b96650f5 Automatic changelog generation for PR #10068 [ci skip] 2019-12-07 15:52:13 -06: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
CitadelStationBot ceaf097597 Automatic changelog generation for PR #10057 [ci skip] 2019-12-07 15:49:20 -06: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
CitadelStationBot 5824162b72 Automatic changelog generation for PR #10100 [ci skip] 2019-12-07 11:59:08 -06:00
Putnam3145 3e9acf73d0 Merge pull request #10100 from Thalpy/Botany-pH
[READY] Tweaks botany related reagent pHes so they don't negatively affect botany.
2019-12-07 09:59:06 -08:00
Thalpy f59bdbe14e Tweaks botany related ragent pHes so they're less likely to blow up. 2019-12-07 17:42:29 +00:00
Putnam3145 cece6dd43d Merge pull request #10098 from Ghommie/Ghommie-cit445
Fixes a lil issue with ice cream cones.
2019-12-07 08:48:21 -08:00
Ghommie 95cc84e69e Fixes a few holo barriers' transparency. 2019-12-07 12:13:33 +01:00
Ghommie d38475f06d i'm tired of this 2019-12-07 12:05:12 +01:00
CitadelStationBot fd9e09d7e6 Automatic changelog generation for PR #9912 [ci skip] 2019-12-07 02:52:37 -06:00
kevinz000 c706720dd1 Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo
Added 15+ new crates, fixed issues raised in #9901
2019-12-07 01:52:35 -07:00
CitadelStationBot 5c43a68b71 Automatic changelog generation for PR #9932 [ci skip] 2019-12-06 20:37:56 -06:00
nik707 e4a41c6169 Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
2019-12-06 20:37:53 -06:00
Lin 602bc57060 Merge pull request #10064 from Citadel-Station-13/kevinz000-patch-121
Fixes silicon hearing - "Wow I do good work when I'm not literally spamming reverts without looking, I didn't even make the reverts for the right PRs"
2019-12-07 00:51:44 +00:00
Ghommie 723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Ghommie 2addcb4142 Fixes bubblegum's death not granting the arena shuttle because the medals subsystem is not hub enabled 2019-12-06 16:37:46 +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 6377f1b3a9 Organisation 2019-12-06 03:42:57 -05:00
kevinz000 968e9c099d Update silicon.dm 2019-12-06 01:12:44 -07: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
Winter Flare 83b77650a8 Additional Cleanup
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
2019-12-06 01:13:54 -05:00
CitadelStationBot 0598c35d70 Automatic changelog generation for PR #10056 [ci skip] 2019-12-05 23:16:50 -06: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
CitadelStationBot 58e9e6e928 Automatic changelog generation for PR #9947 [ci skip] 2019-12-05 23:02:40 -06:00
kevinz000 b05854ac98 Merge pull request #9947 from Iroquois-Pliskin/ClockieSurgeryNerf
Removes Clockie Surgical capabilities
2019-12-05 22:02:38 -07:00
CitadelStationBot 3825657f5c Automatic changelog generation for PR #10034 [ci skip] 2019-12-05 23:00:40 -06: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
CitadelStationBot ad9bc36d1e Automatic changelog generation for PR #10043 [ci skip] 2019-12-05 22:58:36 -06: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
CitadelStationBot 9066a36f3a Automatic changelog generation for PR #9955 [ci skip] 2019-12-05 22:54:45 -06: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 90f31f5b2b Merge pull request #10023 from Sishen1542/i
meteors now only give 60-90 seconds warning
2019-12-05 21:52:32 -07:00