Commit Graph

10561 Commits

Author SHA1 Message Date
Poojawa 017a3111ec Yeah this is a much, much better way of doing it. 2019-08-15 08:37:10 -05:00
Poojawa 3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes 2019-08-15 08:24:55 -05:00
Poojawa b671384015 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-15 08:23:48 -05:00
Winter Flare 04c302b08e Service Tweaks
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.

Allows the plant DNA maniuplator to be wrenched and moved.
2019-08-15 06:28:46 -04:00
kevinz000 2cdfa9cf2f Merge pull request #9126 from Sishen1542/viro-cures
Adds more variety in virus cures, more consistent difficulty scaling.
2019-08-15 01:12:12 -07:00
deathride58 5f6a110f73 Merge pull request #9052 from Citadel-Station-13/kevinz000-patch-71
Hmm, today the Hierophant will go sicko mode on shaft miners.
2019-08-14 15:43:51 -04:00
deathride58 2406254faa Merge pull request #9100 from cebutris/got-milk
Breasts no longer lactate by default, Lactation is now a preference
2019-08-14 15:40:53 -04:00
deathride58 089a613683 Merge pull request #9098 from cebutris/tea-fix
Fixes Tea Aspera
2019-08-14 15:31:46 -04:00
deathride58 2302e24255 Merge pull request #9116 from Citadel-Station-13/kevinz000-patch-73
Changes beforeShuttleMove on airlock to addtimer(0) rather than InvokeAsync
2019-08-14 15:10:49 -04:00
deathride58 5a4d0a73ce Merge pull request #9038 from Citadel-Station-13/kevinz000-patch-67
Fixes/tweaks jump boots
2019-08-14 15:00:36 -04:00
Chayse Ramsay 97c3b2eda7 Prevents runtime spam from Hugs of the North Star
Also fixes an unintended oversight of the Gloves of the North Star, with them causing the warcry upon picking up any item or clicking on any item in harm intent.
2019-08-14 18:29:35 +01:00
Winter Flare 141a93236c Service QoL
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
2019-08-14 04:01:18 -04:00
Trilbyspaceclone 0056e3eb61 Update other_reagents.dm 2019-08-13 11:49:00 -04:00
Trilbyspaceclone 3224e6ca4a ..() 2019-08-13 11:46:52 -04:00
Sishen 382487fdc2 viruseseses-cures 2019-08-13 05:32:37 -04:00
Sishen 08bba425e4 run in a straight line to win gamemode lol 2019-08-12 19:42:58 -04:00
Linzolle 13b3552e64 i'm dumb 2019-08-12 14:37:48 -05:00
Linzolle 2095a14256 add mining shuttle console to techweb 2019-08-12 13:49:26 -05:00
kevinz000 411e0cc2cc Update on_move.dm 2019-08-12 00:17:31 -07:00
Fermi 0f4469e59f Re-enables fermiexplosions in grenades. 2019-08-12 01:03:35 +01:00
Fermi 51a6ae96a0 R.data 2019-08-12 00:37:57 +01:00
Fermi c0bbb099f8 Fixes disappearing chems. 2019-08-12 00:36:45 +01:00
Trilbyspaceclone 32d70bbb6a >_< 2019-08-11 19:10:34 -04:00
Trilbyspaceclone d30df526f7 Update berries.dm 2019-08-11 19:05:36 -04:00
Fermi e30f72067e Merge branch 'master' into NeuroFix 2019-08-12 00:00:28 +01:00
Sishen ffa574b1be Update machine_vending.dm 2019-08-11 13:17:55 -04:00
kevinz000 a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
kevinz000 d3b3836d33 Merge pull request #9010 from BurgerLUA/Actual-War-Ops
War Ops now informs the crew where the Nuclear Device is located when activated.
2019-08-11 10:13:02 -07:00
kevinz000 123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
kevinz000 b75c82b4ee Merge pull request #9054 from Sishen1542/stando
stands now remove trait_nodeath from their user if given by memento mori
2019-08-11 10:11:11 -07:00
Sishen f1bc6e42c8 Update machine_vending.dm 2019-08-11 13:10:14 -04:00
kevinz000 96842ed1c3 Merge pull request #9075 from Ghommie/Ghommie-cit184
Removes a redunant Remove() from high luminosity eyes.
2019-08-11 10:05:58 -07:00
kevinz000 cba8d3478a Merge pull request #9079 from Sishen1542/lingblade
gives ling armblade 20 armor pen to make it more in line with eswords
2019-08-11 10:01:10 -07:00
kevinz000 a576e71a01 Merge pull request #9101 from Sishen1542/stealthy-surgery
obfuscates specific surgeries, gives generalized areas to anybody in viewing range
2019-08-11 09:59:29 -07:00
TrilbySpaceClone 821463f59c Nya 2019-08-11 11:47:56 -04:00
kevinz000 b2eda962d1 Merge pull request #9093 from MrJWhit/Change-IAA-Text
Adds a line in the spawntext for IAA
2019-08-11 08:34:21 -07:00
deathride58 5dddb11773 Fixes handcuffs being impossible to actually resist out of 2019-08-11 08:37:00 -04:00
Sishen 23d4b9827d fix, yadda yadda 2019-08-11 01:19:37 -04:00
Poojawa dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
Poojawa 2b2bdb37ba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 23:26:20 -05:00
BlackMajor 5dcd419d8a Merge pull request #8356 from Thalpy/master
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
Cebutris df136ab96c lactation is now a preference 2019-08-10 23:28:16 -04:00
lolman360 da61b66f5c ban me? 2019-08-11 11:11:30 +10:00
lolman360 92c7ae8732 yea i use webgit what ya gonna do 2019-08-11 11:07:17 +10:00
Poojawa a3cd143131 whaccky github hijinks 2019-08-10 19:28:47 -05:00
Poojawa 57835e2f81 head announce datums 2019-08-10 19:20:05 -05:00
Poojawa d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 19:14:41 -05:00
Fermi 251ac24e02 [NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction. 2019-08-11 00:35:36 +01:00
Cebutris d77360c794 gives tea aspera proper reagents 2019-08-10 19:32:12 -04:00
Sishen 51011ccf97 Update guardian.dm 2019-08-10 07:05:53 -04:00