Commit Graph

27455 Commits

Author SHA1 Message Date
CitadelStationBot
c9cbd55fed Automatic changelog generation for PR #10324 [ci skip] 2019-12-29 10:24:22 -06:00
Ghom
b549670e39 Merge pull request #10324 from Trilbyspaceclone/patch-253
Honey no longer murders slimes
2019-12-29 17:24:19 +01:00
CitadelStationBot
a4a49defe9 Automatic changelog generation for PR #10091 [ci skip] 2019-12-28 20:08:36 -06:00
kevinz000
96d9fed565 Merge pull request #10091 from Ghommie/Ghommie-cit442
Reduces the blue, amber and red alert sounds volume.
2019-12-28 18:08:33 -08:00
CitadelStationBot
3938d774bb Automatic changelog generation for PR #10318 [ci skip] 2019-12-28 20:07:58 -06:00
kevinz000
429aaaa342 Merge pull request #10318 from Trilbyspaceclone/patch-252
Allows AI/Sillicons to speak slime
2019-12-28 18:07:55 -08:00
CitadelStationBot
aa725a9608 Automatic changelog generation for PR #10328 [ci skip] 2019-12-28 17:08:45 -06:00
Ghom
f68d7fa1a3 Merge pull request #10328 from Putnam3145/dynamic-ghost-tweaks
Makes ghost cafe mobs actually a ghost role
2019-12-29 00:08:38 +01:00
Putnam
7947f06557 Made sure ghost cafe visitors don't get midround antags 2019-12-28 13:56:03 -08:00
Putnam
a0374f82e2 Made a line use the dang macro 2019-12-28 13:55:54 -08:00
CitadelStationBot
7e5e241bd2 Automatic changelog generation for PR #10217 [ci skip] 2019-12-28 10:21:27 -06:00
Ghom
2ad4698225 Merge pull request #10217 from Putnam3145/radiation
Nerfing radioactive contamination
2019-12-28 17:21:25 +01:00
CitadelStationBot
9335f1a236 Automatic changelog generation for PR #10299 [ci skip] 2019-12-28 10:02:53 -06:00
Ghom
d2c1eb3e47 Merge pull request #10299 from kappa-sama/patch-13
sunflowers are no longer explosive
2019-12-28 17:02:50 +01:00
CitadelStationBot
80f2f004ab Automatic changelog generation for PR #10297 [ci skip] 2019-12-28 10:00:21 -06:00
Ghom
fe78c98f71 Merge pull request #10297 from Hatterhat/tg-45547-luxbar
the one with the luxury bar capsule
2019-12-28 17:00:19 +01:00
CitadelStationBot
bdc1f432d1 Automatic changelog generation for PR #10322 [ci skip] 2019-12-28 06:17:46 -06:00
Ghom
ada00039b4 Merge pull request #10322 from Citadel-Station-13/kevinz000-patch-3
fixes stamina and sprint hud buttons
2019-12-28 13:17:44 +01:00
Ghom
a7ccd85bdb Merge pull request #10291 from Citadel-Station-13/kevinz000-patch-1
fixes pai holochassis spam
2019-12-28 13:15:42 +01:00
Trilbyspaceclone
3177b5786a Update food_reagents.dm 2019-12-28 05:26:46 -05:00
kevinz000
f14448109d Update sprint.dm 2019-12-28 01:34:29 -08:00
kevinz000
a7323fa424 Update stamina.dm 2019-12-28 01:33:39 -08:00
CitadelStationBot
dcc73773da Automatic changelog generation for PR #10315 [ci skip] 2019-12-28 00:51:29 -06:00
BlackMajor
d8269fa784 Merge pull request #10315 from Trilbyspaceclone/patch-251
Removes thunder domes lighters
2019-12-28 19:51:26 +13:00
Trilbyspaceclone
fd476b4f5b Update language_holder.dm 2019-12-28 01:05:51 -05:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
kevinz000
139d4b4b3a ehh fine but why would you use this proc for that 2019-12-27 18:44:46 -08:00
Trilbyspaceclone
f8c039f9eb Update CentCom.dmm 2019-12-27 21:39:01 -05:00
CitadelStationBot
1fdce63b00 Automatic changelog generation for PR #10268 [ci skip] 2019-12-27 18:08:26 -06:00
Lin
80daaacc86 Merge pull request #10268 from Ghommie/Ghommie-cit487
Effectively removes the old unused roboticist encryption key and headset.
2019-12-28 00:08:24 +00:00
CitadelStationBot
c0067c6ff9 Automatic changelog generation for PR #10289 [ci skip] 2019-12-27 18:06:28 -06:00
Lin
be57c26acc Merge pull request #10289 from Ghommie/Ghommie-cit493
[s] fixes a little door assembly glass dupe exploit
2019-12-28 00:06:25 +00:00
CitadelStationBot
9d8e12fa4a Automatic changelog generation for PR #10265 [ci skip] 2019-12-27 15:54:39 -06:00
Ghom
93248336ea Merge pull request #10265 from Trilbyspaceclone/map_redo
Cit-iftyed Box map as well as adding back blasters back to armory
2019-12-27 22:54:35 +01:00
CitadelStationBot
21c6cdec42 Automatic changelog generation for PR #10296 [ci skip] 2019-12-27 09:30:16 -06:00
Ghom
13fc20c7c3 Merge pull request #10296 from Useroth/ghostcafe
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
2019-12-27 16:30:13 +01:00
Useroth
a3776fb966 Small touch-up. 2019-12-27 16:05:07 +01:00
Useroth
c3298d525f Good idea, tbh. 2019-12-27 15:57:49 +01:00
CitadelStationBot
92c88f71c3 Automatic changelog generation for PR #10298 [ci skip] 2019-12-27 06:37:41 -06:00
Ghom
afd22cf618 Merge pull request #10298 from kappa-sama/patch-12
nerfs chain smokers, removes stocks
2019-12-27 13:37:38 +01:00
CitadelStationBot
56b9d3ef61 Automatic changelog generation for PR #10264 [ci skip] 2019-12-27 06:27:07 -06:00
Ghom
5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
2019-12-27 13:27:04 +01:00
Seris02
b4b6e550e4 Merge branch 'wintercoatsagain' of https://github.com/Seris02/Citadel-Station-13 into wintercoatsagain 2019-12-27 18:10:51 +08:00
Seris02
8ed4fe9c05 changes 2019-12-27 18:09:30 +08:00
kappa-sama
e97ca5f924 yeah fair enough
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-26 14:22:03 -05:00
kappa-sama
1dcee075e6 f 2019-12-26 14:20:43 -05:00
Useroth
35846c452a Applied suggestions and minor tweaks. 2019-12-26 20:03:43 +01:00
CitadelStationBot
05775ae5f6 Automatic changelog generation for PR #10250 [ci skip] 2019-12-26 09:11:57 -06:00
Ghom
05bde370ec Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis
Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code
2019-12-26 16:11:54 +01:00
CitadelStationBot
34c36161fc Automatic changelog generation for PR #10281 [ci skip] 2019-12-26 09:07:48 -06:00