Commit Graph

23196 Commits

Author SHA1 Message Date
TrilbySpaceClone
db317b65af Grand! 2019-08-24 19:39:15 -04:00
TrilbySpaceClone
044ef51dfa Relies on a PR 2019-08-20 18:32:39 -04:00
CitadelStationBot
4a741d4938 Automatic changelog generation for PR #8349 [ci skip] 2019-08-19 03:07:44 -05:00
BlackMajor
dbe50db261 Merge pull request #8349 from Trilbyspaceclone/patch-124
Removes Nitryl bounty but adds 7 more in!
2019-08-19 20:07:40 +12:00
CitadelStationBot
7398df25dd Automatic changelog generation for PR #8636 [ci skip] 2019-08-19 03:02:28 -05:00
BlackMajor
1d22b77293 Merge pull request #8636 from Trilbyspaceclone/lighten_up
Fixes missing air in Gas the Lizards in the freezer/surgery
2019-08-19 20:02:26 +12:00
CitadelStationBot
de5a0a922d Automatic changelog generation for PR #8763 [ci skip] 2019-08-19 01:39:41 -05:00
kevinz000
3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188
Reblances bone satchles
2019-08-18 23:39:39 -07:00
CitadelStationBot
f12e7ded08 Automatic changelog generation for PR #9149 [ci skip] 2019-08-19 01:37:58 -05:00
kevinz000
47dd8d22eb Merge pull request #9149 from Trilbyspaceclone/padding_and_such
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
2019-08-18 23:37:56 -07:00
CitadelStationBot
a56bc56167 Automatic changelog generation for PR #9150 [ci skip] 2019-08-19 01:37:27 -05:00
CitadelStationBot
789d729fad Automatic changelog generation for PR #9097 [ci skip] 2019-08-19 01:37:09 -05:00
kevinz000
3ef29bbbeb Merge pull request #9097 from lolman360/durathread
Adds durathread.
2019-08-18 23:37:07 -07:00
CitadelStationBot
6cc4a62534 Automatic changelog generation for PR #9137 [ci skip] 2019-08-19 01:34:51 -05:00
kevinz000
8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz
addition of the "assistant response team" a pack of assistants sent in from CComm
2019-08-18 23:34:49 -07:00
CitadelStationBot
edc54dd2aa Automatic changelog generation for PR #9151 [ci skip] 2019-08-19 01:34:06 -05:00
kevinz000
558ea557f8 Merge pull request #9151 from Trilbyspaceclone/cloak
Adds chameloen necktie item
2019-08-18 23:34:03 -07:00
CitadelStationBot
4a9610e543 Automatic changelog generation for PR #9134 [ci skip] 2019-08-19 01:33:05 -05:00
kevinz000
ec349ae347 Merge pull request #9134 from Arturlang/Nanite-sloime-heals
Nanite Adv toxin healing now heals slimes
2019-08-18 23:33:02 -07:00
CitadelStationBot
1913d74471 Automatic changelog generation for PR #9136 [ci skip] 2019-08-19 01:32:49 -05:00
kevinz000
f55682d6dd Merge pull request #9136 from Sishen1542/strained
strained muscles now costs chems to use, slows chem regen, and drains stacking stamina over time
2019-08-18 23:32:47 -07:00
CitadelStationBot
6f918f3ef6 Automatic changelog generation for PR #9141 [ci skip] 2019-08-19 01:32:18 -05:00
kevinz000
86cfd8a561 Merge pull request #9141 from deathride58/removwarpwissle
Actually fixes warp whistle runtimes
2019-08-18 23:32:15 -07:00
lolman360
323073f8d4 Merge pull request #6 from Trilbyspaceclone/patch-213
Patch 213
2019-08-19 11:12:50 +10:00
TrilbySpaceClone
e1cee15720 seed 2019-08-18 01:40:36 -04:00
TrilbySpaceClone
566a4e65a1 right crafting 2019-08-18 01:31:38 -04:00
Trilbyspaceclone
8214a7012f I Didnt save the two corrections 2019-08-18 01:17:34 -04:00
Trilbyspaceclone
fc6633071a rwar! 2019-08-18 01:07:38 -04:00
TrilbySpaceClone
4dae36869c tada 2019-08-18 01:01:00 -04:00
TrilbySpaceClone
2b08b97f1d yay 2019-08-17 23:54:50 -04:00
BlackMajor
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
Trilbyspaceclone
43b1d0405e Update flowers.dm 2019-08-17 23:25:38 -04:00
Trilbyspaceclone
bb9aa4f039 I woulder how much this will fuck everthing up 2019-08-17 22:49:06 -04:00
Trilbyspaceclone
cfd8217947 Update flowers.dm 2019-08-17 22:10:23 -04:00
TrilbySpaceClone
e69d27f9eb Traitor armor 2019-08-17 20:36:47 -04:00
lolman360
ae2ccb2686 should be done now 2019-08-17 12:20:37 +10:00
deathride58
20d71d1196 Fixes warp whistle runtimes for real this time. 2019-08-16 22:19:37 -04:00
lolman360
7d12535ead thanks paxxy boi 2019-08-17 12:18:18 +10: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
lolman360
dace39137f Kenneth!! 2019-08-17 11:54:55 +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
CitadelStationBot
2839935209 Automatic changelog generation for PR #9138 [ci skip] 2019-08-16 19:14:31 -05: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
ce62780ba0 Merge pull request #9095 from fludd12/snowflake-b-gone
Un-snowflakes My Custom Item
2019-08-16 17:04:45 -07:00
CitadelStationBot
1adeeebcac Automatic changelog generation for PR #9130 [ci skip] 2019-08-16 19:03:13 -05:00
kevinz000
f9eb85c3c1 Merge pull request #9130 from Owai-Seek/ServiceStuff
Service QoL
2019-08-16 17:03:11 -07:00
CitadelStationBot
f376fac53d Automatic changelog generation for PR #9133 [ci skip] 2019-08-16 18:59:53 -05:00
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