Commit Graph
23909 Commits
Author SHA1 Message Date
Thalpy 72ccc5fe69 Loopzoop 2019-10-02 06:52:01 +01:00
FermiandFermi 74892648e5 Enable spookytimes 2019-10-01 08:20:53 +01:00
FermiandFermi 13276d3d96 Tests 2019-10-01 07:35:59 +01:00
CitadelStationBot 0301683ae1 Automatic changelog generation for PR #9189 [ci skip] 2019-09-28 02:40:05 -05:00
kevinz000andGitHub 6e55fec7bd Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
2019-09-28 00:40:02 -07:00
CitadelStationBot 99f61ec835 Automatic changelog generation for PR #9191 [ci skip] 2019-09-28 02:38:10 -05:00
kevinz000andGitHub 0febc1977a Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
CitadelStationBot fb26944a42 Automatic changelog generation for PR #9267 [ci skip] 2019-09-28 02:28:45 -05:00
kevinz000andGitHub 7c3036f027 Merge pull request #9267 from Tupinambis/EngineeringCriticalFix
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
2019-09-28 00:28:43 -07:00
CitadelStationBot d5e9492d2b Automatic changelog generation for PR #9336 [ci skip] 2019-09-28 02:26:53 -05:00
kevinz000andGitHub 8d9520ee58 Merge pull request #9336 from Thalpy/beakerpH_tweaks
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
2019-09-28 00:26:51 -07:00
CitadelStationBot 19c56620e7 Automatic changelog generation for PR #9321 [ci skip] 2019-09-28 02:24:17 -05:00
kevinz000andGitHub 426104021e Merge pull request #9321 from Linzolle/bloodrites
some cult fixes + cult qol
2019-09-28 00:24:15 -07:00
CitadelStationBot 91483cfa0c Automatic changelog generation for PR #9322 [ci skip] 2019-09-28 02:23:51 -05:00
kevinz000andGitHub 6b33e3bd0b Merge pull request #9322 from Sishen1542/cult
blood cult conversion no longer requires consent
2019-09-28 00:23:48 -07:00
CitadelStationBot e2e68889bb Automatic changelog generation for PR #9326 [ci skip] 2019-09-28 02:23:33 -05:00
kevinz000andGitHub cbe6a54531 Merge pull request #9326 from YakumoChen/radioactive-paperweight
Advanced energy guns glow more
2019-09-28 00:23:31 -07:00
CitadelStationBot 4fb397dee7 Automatic changelog generation for PR #9349 [ci skip] 2019-09-28 02:22:40 -05:00
kevinz000andGitHub d7d4e3cbe2 Merge pull request #9349 from Ghommie/Ghommie-cit210
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-28 00:22:38 -07:00
CitadelStationBot f0cd9bf796 Automatic changelog generation for PR #9320 [ci skip] 2019-09-28 02:22:15 -05:00
kevinz000andGitHub cc64b8e0a4 Merge pull request #9320 from Ghommie/Ghommie-cit200
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
2019-09-28 00:22:13 -07:00
CitadelStationBot a4792d4197 Automatic changelog generation for PR #9317 [ci skip] 2019-09-28 02:21:49 -05:00
kevinz000andGitHub 3ce5b318ca Merge pull request #9317 from Ghommie/Ghommie-cit199
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
2019-09-28 00:21:47 -07:00
CitadelStationBot d7c9a15cab Automatic changelog generation for PR #8914 [ci skip] 2019-09-28 02:20:44 -05:00
kevinz000andGitHub 5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147
Updating spraycans and crayons.
2019-09-28 00:20:42 -07:00
CitadelStationBot 8747b47b65 Automatic changelog generation for PR #9344 [ci skip] 2019-09-28 02:15:29 -05:00
kevinz000andGitHub b28e65637e Merge pull request #9344 from Ghommie/Ghommie-cit208
Makes abandoned crates less prone to explosions.
2019-09-28 00:15:27 -07:00
CitadelStationBot c2c23ed172 Automatic changelog generation for PR #9359 [ci skip] 2019-09-28 02:14:49 -05:00
kevinz000andGitHub 1b295c8501 Merge pull request #9359 from deathride58/fuckstoredpower
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
2019-09-28 00:14:47 -07:00
Linzolle 0d3a2cdd57 cultist check 2019-09-27 19:15:19 -05:00
FermiandFermi 3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
FermiandFermi 146219edf9 Merge branch 'master' into beakerpH_tweaks 2019-09-27 11:50:31 +01:00
CitadelStationBot 76d0cd7ef7 Automatic changelog generation for PR #9170 [ci skip] 2019-09-26 23:54:20 -05:00
nik707andGitHub 3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
2019-09-26 23:54:17 -05:00
CitadelStationBot a4a7460575 Automatic changelog generation for PR #9335 [ci skip] 2019-09-26 21:33:27 -05:00
kevinz000andGitHub 436e01ed0e Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs
Guardian/Holoparasite Buffs
2019-09-26 19:33:25 -07:00
CitadelStationBot fb8ad7c919 Automatic changelog generation for PR #9318 [ci skip] 2019-09-26 21:32:00 -05:00
kevinz000andGitHub 06eb6e1537 Merge pull request #9318 from Thalpy/clingy-Chems
[Fix] Fixes small residues of chems sitting in holders without breaking slow reactions.
2019-09-26 19:31:58 -07:00
CitadelStationBot d89975a211 Automatic changelog generation for PR #9341 [ci skip] 2019-09-26 21:31:38 -05:00
kevinz000andGitHub 35237066b8 Merge pull request #9341 from Ghommie/Ghommie-cit206
Blood cult altar, forge and archives now use radial menus.
2019-09-26 19:31:36 -07:00
CitadelStationBot 916f986b91 Automatic changelog generation for PR #9348 [ci skip] 2019-09-26 21:31:03 -05:00
kevinz000andGitHub 428a34d0f4 Merge pull request #9348 from Ghommie/Ghommie-cit209
Reduces holy water message spam for blood/clock cultists.
2019-09-26 19:31:01 -07:00
CitadelStationBot 34740e1be3 Automatic changelog generation for PR #9352 [ci skip] 2019-09-26 21:30:22 -05:00
kevinz000andGitHub a0f5fcbbef Merge pull request #9352 from JTGSZ/bugfix
Re-adds the Qualifies for Rank Proc Checks.
2019-09-26 19:30:19 -07:00
CitadelStationBot c44b41fd7a Automatic changelog generation for PR #9356 [ci skip] 2019-09-26 19:21:46 -05:00
nik707andGitHub 0c4976ae24 Merge pull request #9356 from EmeraldSundisk/master
Delta chapel rearrangements, janitorial office cleanup, and more.
2019-09-26 19:21:44 -05:00
deathride58 d0840074b5 PER MINUTE 2019-09-26 13:44:56 -04:00
deathride58 b3cd0859cd Rad collector tweaks - Makes point production use all stored power every process cycle, clears up examine text, makes the gas touching more obvious 2019-09-26 13:39:47 -04:00
EmeraldSundisk 7d64ccd273 Update DeltaStation2.dmm 2019-09-25 14:09:51 -07:00
TrilbySpaceClone 41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00