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
Poojawa
8bd54bcc54
I'm just waiting for a better idea before dumping this hot garbage again
2019-08-16 06:24:42 -05:00
Poojawa
c3fb13c140
meh.
2019-08-16 05:10:55 -05:00
Poojawa
d71f37167f
I'm about to go fucking APE
...
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
2019-08-16 04:58:16 -05:00
kevinz000
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
kevinz000
4c5eba6acb
t
2019-08-15 14:35:00 -07:00
kevinz000
cc86a84274
stuff
2019-08-15 14:30:48 -07:00
Poojawa
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
Sishen
6fab91046d
Update misc.dm
2019-08-15 13:04:28 -04:00
Poojawa
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05: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
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
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
Sishen
ad91152c83
Update misc.dm
2019-08-14 17:08:33 -04:00
Sishen
f6baaf8c58
honk honk
2019-08-14 17:06:58 -04:00
Sishen
3281f23eb6
made changes as per bhijns request
2019-08-14 16:30:54 -04: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
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