Commit Graph
27435 Commits
Author SHA1 Message Date
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub a7ccd85bdb Merge pull request #10291 from Citadel-Station-13/kevinz000-patch-1
fixes pai holochassis spam
2019-12-28 13:15:42 +01:00
kevinz000andGitHub f14448109d Update sprint.dm 2019-12-28 01:34:29 -08:00
kevinz000andGitHub 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
BlackMajorandGitHub d8269fa784 Merge pull request #10315 from Trilbyspaceclone/patch-251
Removes thunder domes lighters
2019-12-28 19:51:26 +13:00
LinandGitHub 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
kevinz000andGitHub 139d4b4b3a ehh fine but why would you use this proc for that 2019-12-27 18:44:46 -08:00
TrilbyspacecloneandGitHub 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
LinandGitHub 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
LinandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
e97ca5f924 yeah fair enough
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-26 14:22:03 -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
GhomandGitHub 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
GhomandGitHub 12d0a2ee4c Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
2019-12-26 16:07:45 +01:00
CitadelStationBot 4c6673b651 Automatic changelog generation for PR #10283 [ci skip] 2019-12-26 09:07:21 -06:00
GhomandGitHub 12ca3a008e Merge pull request #10283 from Detective-Google/unfuckhair
unfucks short hair 80s
2019-12-26 16:07:18 +01:00
GhomandGitHub 0e16f4052d Merge pull request #10292 from Citadel-Station-13/miku-fix
fixes bad sprite states
2019-12-26 16:06:19 +01:00
GhomandGitHub 3203441abe Nope, it didn't compile, Harold. 2019-12-26 15:48:46 +01:00
CitadelStationBot fac8f5dd84 Automatic changelog generation for PR #10128 [ci skip] 2019-12-26 06:58:48 -06:00
GhomandGitHub 512d046f18 Merge pull request #10128 from Seris02/clownheadset
gives the clown a headset with a clown megaphone loudmode
2019-12-26 13:58:45 +01:00
Seris02andGitHub e125dae871 yee 2019-12-26 16:36:01 +08:00
kappa-samaandGitHub 4689d805a3 e 2019-12-26 02:54:38 -05:00
Hatterhat 940efc0c1c holy shit i hope this compiles 2019-12-26 01:46:04 -06:00
Useroth cbff758d1a Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility. 2019-12-26 07:49:48 +01:00
CitadelStationBot 7892d84f09 Automatic changelog generation for PR #10237 [ci skip] 2019-12-25 13:06:49 -06:00
LinandGitHub 5670276c70 Merge pull request #10237 from Ghommie/Ghommie-cit479
Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.
2019-12-25 19:06:46 +00:00
CitadelStationBot 1320952cdf Automatic changelog generation for PR #10242 [ci skip] 2019-12-25 13:03:45 -06:00
LinandGitHub 1931a2f715 Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
2019-12-25 19:03:42 +00:00
Jay b33a167906 fixes bad sprite states 2019-12-25 02:22:10 -06:00
kevinz000andGitHub 8dd67afb9c Update pai_defense.dm 2019-12-24 23:43:16 -08:00
TrilbySpaceClone 1c34ab661d Update BoxStation.dmm 2019-12-25 02:07:33 -05:00