13f27c040e
Merge pull request #8848 from Citadel-Station-13/trait_blacklisting
...
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
2019-08-18 15:33:08 +12:00
43b1d0405e
Update flowers.dm
2019-08-17 23:25:38 -04:00
bb9aa4f039
I woulder how much this will fuck everthing up
2019-08-17 22:49:06 -04:00
cfd8217947
Update flowers.dm
2019-08-17 22:10:23 -04:00
e69d27f9eb
Traitor armor
2019-08-17 20:36:47 -04:00
ff58fec243
New plant type: Peaches
...
Botanists can now grow peaches from a new pack of seeds!
2019-08-17 02:50:56 -05:00
906e7a1bd8
Update backpack.dm
2019-08-17 00:25:40 -04:00
7ddfff7f5c
Update uplink_items.dm
2019-08-16 23:07:15 -04:00
ae2ccb2686
should be done now
2019-08-17 12:20:37 +10:00
20d71d1196
Fixes warp whistle runtimes for real this time.
2019-08-16 22:19:37 -04:00
7d12535ead
thanks paxxy boi
2019-08-17 12:18:18 +10:00
d93fceec98
oops recipe time thanks pax
2019-08-17 12:15:17 +10:00
e838da8039
Merge pull request #3 from Citadel-Station-13/master
...
3
2019-08-17 11:55:56 +10:00
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
f26718aab2
Merge pull request #9138 from kappa-sama/canefix
...
re-adds sugarcane seeds to megaseed vendors
2019-08-16 17:14:28 -07:00
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
f9eb85c3c1
Merge pull request #9130 from Owai-Seek/ServiceStuff
...
Service QoL
2019-08-16 17:03:11 -07:00
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
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
bdf7fb6980
Merge pull request #9119 from Linzolle/miningshuttle
...
Adds mining shuttle console to the techweb.
2019-08-16 16:58:27 -07:00
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
4ca72c7733
re-add sugarcane to megaseed vendors
...
how did this happen
2019-08-16 14:38:25 -04:00
b7ae88b6e3
Made it sound a bit nicer
2019-08-16 19:40:22 +03:00
542915faa6
Update ert.dm
2019-08-16 10:53:24 -04:00
26de2b8111
greybois
2019-08-16 10:49:26 -04:00
03ec103e3d
Update strained_muscles.dm
2019-08-16 10:02:52 -04:00
2ca6464242
Update healing.dm
2019-08-16 15:32:08 +03:00
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
4c5eba6acb
t
2019-08-15 14:35:00 -07:00
cc86a84274
stuff
2019-08-15 14:30:48 -07:00
6fab91046d
Update misc.dm
2019-08-15 13:04:28 -04:00
017a3111ec
Yeah this is a much, much better way of doing it.
2019-08-15 08:37:10 -05:00
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
d16ee247a0
Update maintenance_loot.dm
...
Double the amount of peaches that spawn within Maintenance
2019-08-15 07:24:09 -05:00
a6d10885ec
Revert "Update maintenance_loot.dm"
...
This reverts commit 087bca85e8
2019-08-15 07:11:57 -05:00
087bca85e8
Update maintenance_loot.dm
...
Double the amount of canned peaches that spawn within maintenance
2019-08-15 07:08:27 -05:00
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
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
ad91152c83
Update misc.dm
2019-08-14 17:08:33 -04:00
f6baaf8c58
honk honk
2019-08-14 17:06:58 -04:00
3281f23eb6
made changes as per bhijns request
2019-08-14 16:30:54 -04:00
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
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
089a613683
Merge pull request #9098 from cebutris/tea-fix
...
Fixes Tea Aspera
2019-08-14 15:31:46 -04:00
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
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
5a4d0a73ce
Merge pull request #9038 from Citadel-Station-13/kevinz000-patch-67
...
Fixes/tweaks jump boots
2019-08-14 15:00:36 -04:00
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
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
382487fdc2
viruseseses-cures
2019-08-13 05:32:37 -04:00
BlackMajor