Commit Graph

14465 Commits

Author SHA1 Message Date
kevinz000 da7f4bfb9b Merge pull request #9133 from Raptorizer/Peaches
Increase the amount of canned peaches that spawn within maintenance
2019-08-16 16:59:52 -07:00
kevinz000 cf55151f04 Merge pull request #9131 from jakeramsay007/Runtime-Fixes
Prevents runtime spam from Hugs of the North Star
2019-08-16 16:59:11 -07:00
kevinz000 bdf7fb6980 Merge pull request #9119 from Linzolle/miningshuttle
Adds mining shuttle console to the techweb.
2019-08-16 16:58:27 -07:00
kevinz000 97306ff53c Merge pull request #9107 from deathride58/fixesarest
Fixes handcuffs being impossible to actually resist out of
2019-08-16 16:57:36 -07:00
Raptorizer d16ee247a0 Update maintenance_loot.dm
Double the amount of peaches that spawn within Maintenance
2019-08-15 07:24:09 -05:00
Raptorizer a6d10885ec Revert "Update maintenance_loot.dm"
This reverts commit 087bca85e8.
2019-08-15 07:11:57 -05:00
Raptorizer 087bca85e8 Update maintenance_loot.dm
Double the amount of canned peaches that spawn within maintenance
2019-08-15 07:08:27 -05: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 9010b9003a Merge pull request #8930 from Citadel-Station-13/kevinz000-patch-54
Fixes nanite viruses take two
2019-08-14 15:01:33 -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
Sishen 382487fdc2 viruseseses-cures 2019-08-13 05:32:37 -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 51a6ae96a0 R.data 2019-08-12 00:37:57 +01:00
Fermi c0bbb099f8 Fixes disappearing chems. 2019-08-12 00:36:45 +01: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
kevinz000 69884d1abe Merge pull request #9062 from Trilbyspaceclone/patch-207
Makes smile not as horrable.
2019-08-11 10:08:45 -07: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 3b5600b81d Merge pull request #9092 from Sishen1542/emp-beacons
crew combat mechs are now spawned in with a tracking beacon
2019-08-11 10:00:36 -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
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
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
Cebutris d77360c794 gives tea aspera proper reagents 2019-08-10 19:32:12 -04:00
Sishen 234d058cc2 Update mecha_control_console.dm 2019-08-10 07:28:35 -04:00
Sishen 51011ccf97 Update guardian.dm 2019-08-10 07:05:53 -04:00
Sishen 15dbb7ff32 Update guardian.dm 2019-08-10 07:03:45 -04:00
Sishen b0a28d1a29 Update mutations.dm 2019-08-10 02:16:07 -04:00
kevinz000 40b89f49cc Merge pull request #9078 from kappa-sama/moth1
Changes teleporter machines to apply flyperson (more) equally
2019-08-09 22:22:29 -07:00
kevinz000 b3b22029a6 Merge pull request #9064 from cebutris/hugloves
Hugs of the North Star
2019-08-09 22:20:18 -07:00
kevinz000 74008beb8f Merge pull request #9066 from Ghommie/Ghommie-cit181
Two lines fixes for invisible zipties and borked legcuffs.
2019-08-09 22:17:31 -07:00
kevinz000 f516fcf539 Merge pull request #9083 from Trilbyspaceclone/fruit
Strawbarries, and more
2019-08-09 22:16:34 -07:00
kevinz000 b213b0ed2b Merge pull request #9084 from Ghommie/Ghommie-cit185
Fixes clock cult mass recall.
2019-08-09 22:16:09 -07:00
kevinz000 14033d9876 Merge pull request #9085 from Ghommie/Ghommie-cit186
underwear colors fix 2: The revenge of the crunch.
2019-08-09 22:15:55 -07:00
kevinz000 0329a80086 Merge pull request #9081 from BurgerLUA/Meteor-Fair-Warning
Central Command informs you when a Meteor Storm is about to hit 5 to 10 minutes before it happens
2019-08-09 11:20:16 -07:00
MrJWhit 77e0551616 Adds a line in the spawntext for IAA
Adds "By no means reveal that you, or any other NT employees, are undercover agents." at the spawntext
2019-08-09 13:56:07 -04:00
Sishen b8907c2f97 fixing what i forgot to do 2019-08-09 13:47:36 -04:00
Fermi 02b5100be7 Made scans advanced. 2019-08-09 13:01:14 +01:00