Commit Graph

9386 Commits

Author SHA1 Message Date
Trilbyspaceclone 7ddfff7f5c Update uplink_items.dm 2019-08-16 23:07:15 -04:00
deathride58 20d71d1196 Fixes warp whistle runtimes for real this time. 2019-08-16 22:19:37 -04:00
lolman360 d93fceec98 oops recipe time thanks pax 2019-08-17 12:15:17 +10:00
lolman360 e838da8039 Merge pull request #3 from Citadel-Station-13/master
3
2019-08-17 11:55:56 +10:00
kevinz000 c2dd7111d0 Merge pull request #9112 from Trilbyspaceclone/patch-209
Heyyyy lets make sure the strawberry seeds are in the vender and spelled correctly
2019-08-16 17:17:04 -07:00
kevinz000 f26718aab2 Merge pull request #9138 from kappa-sama/canefix
re-adds sugarcane seeds to megaseed vendors
2019-08-16 17:14:28 -07:00
kevinz000 9071917e72 Merge pull request #9088 from Poojawa/blurry-runtimes
Fixes some runtimes and removes a holodeck exploit
2019-08-16 17:05:21 -07:00
kevinz000 f9eb85c3c1 Merge pull request #9130 from Owai-Seek/ServiceStuff
Service QoL
2019-08-16 17:03:11 -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
kappa-sama 4ca72c7733 re-add sugarcane to megaseed vendors
how did this happen
2019-08-16 14:38:25 -04:00
Arturlang b7ae88b6e3 Made it sound a bit nicer 2019-08-16 19:40:22 +03:00
Sishen 542915faa6 Update ert.dm 2019-08-16 10:53:24 -04:00
Sishen 26de2b8111 greybois 2019-08-16 10:49:26 -04:00
Sishen 03ec103e3d Update strained_muscles.dm 2019-08-16 10:02:52 -04:00
Arturlang 2ca6464242 Update healing.dm 2019-08-16 15:32:08 +03:00
kevinz000 fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00
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
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
Trilbyspaceclone 32d70bbb6a >_< 2019-08-11 19:10:34 -04:00
Trilbyspaceclone d30df526f7 Update berries.dm 2019-08-11 19:05:36 -04: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