ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
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
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
2839935209
Automatic changelog generation for PR #9138 [ci skip]
2019-08-16 19:14:31 -05: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
ce62780ba0
Merge pull request #9095 from fludd12/snowflake-b-gone
...
Un-snowflakes My Custom Item
2019-08-16 17:04:45 -07:00
1adeeebcac
Automatic changelog generation for PR #9130 [ci skip]
2019-08-16 19:03:13 -05:00
f9eb85c3c1
Merge pull request #9130 from Owai-Seek/ServiceStuff
...
Service QoL
2019-08-16 17:03:11 -07:00
f376fac53d
Automatic changelog generation for PR #9133 [ci skip]
2019-08-16 18:59:53 -05: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
dea9ea4b3f
Automatic changelog generation for PR #9119 [ci skip]
2019-08-16 18:58:29 -05:00
bdf7fb6980
Merge pull request #9119 from Linzolle/miningshuttle
...
Adds mining shuttle console to the techweb.
2019-08-16 16:58:27 -07:00
a124b02ee2
Automatic changelog generation for PR #9107 [ci skip]
2019-08-16 18:57:39 -05: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
69bb779a76
Merge pull request #3 from Citadel-Station-13/master
...
make master not behind or something i dunno
2019-08-16 14:32:42 -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
0125a20252
Automatic changelog generation for PR #9126 [ci skip]
2019-08-15 03:12:15 -05: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
7879d1ce13
Merge pull request #9103 from Citadel-Station-13/atmosberet
...
Donator item
2019-08-14 15:44:24 -04:00
e84bad1e55
Automatic changelog generation for PR #9052 [ci skip]
2019-08-14 14:43:53 -05: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
bcf3c1a172
Automatic changelog generation for PR #9100 [ci skip]
2019-08-14 14:40:56 -05: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
b6478b0254
Automatic changelog generation for PR #9098 [ci skip]
2019-08-14 14:31:49 -05: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
3610d14869
Automatic changelog generation for PR #9115 [ci skip]
2019-08-14 13:59:44 -05:00
93721c5224
Merge pull request #9115 from Thalpy/wah
...
Removes wah! from message_admins
2019-08-14 14:59:42 -04:00
b23b574baf
Automatic changelog generation for PR #9113 [ci skip]
2019-08-14 13:59:16 -05:00
315828845d
Merge pull request #9113 from Thalpy/RoundingErrors
...
[SUGGESTED TESTMERGE] Fixes rounding errors with chemical reactions
2019-08-14 14:59:13 -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
13b3552e64
i'm dumb
2019-08-12 14:37:48 -05:00
2095a14256
add mining shuttle console to techweb
2019-08-12 13:49:26 -05:00
411e0cc2cc
Update on_move.dm
2019-08-12 00:17:31 -07:00
5a9b2bcad7
Added COORD
2019-08-12 05:10:46 +01:00
ae1191a469
Changes an oversight (and a unintended wah!)
2019-08-12 05:10:05 +01:00
51a6ae96a0
R.data
2019-08-12 00:37:57 +01:00
c0bbb099f8
Fixes disappearing chems.
2019-08-12 00:36:45 +01:00
Sishen