Commit Graph

27423 Commits

Author SHA1 Message Date
Seris02
c7790aba1a moves observe to ghost tab 2020-01-09 10:46:18 +08: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
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
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
Ghom
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
Ghom
12ca3a008e Merge pull request #10283 from Detective-Google/unfuckhair
unfucks short hair 80s
2019-12-26 16:07:18 +01:00
Ghom
0e16f4052d Merge pull request #10292 from Citadel-Station-13/miku-fix
fixes bad sprite states
2019-12-26 16:06:19 +01:00
CitadelStationBot
fac8f5dd84 Automatic changelog generation for PR #10128 [ci skip] 2019-12-26 06:58:48 -06:00
Ghom
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
Seris02
e125dae871 yee 2019-12-26 16:36:01 +08:00
kappa-sama
4689d805a3 e 2019-12-26 02:54:38 -05: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
Lin
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
Lin
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
TrilbySpaceClone
1c34ab661d Update BoxStation.dmm 2019-12-25 02:07:33 -05:00
Ghommie
6a5a917944 [s] fixes a little door assembly glass dupe exploit 2019-12-25 07:00:53 +01:00
Hatterhat
f3fed71e08 ah, the wonders of atomization 2019-12-24 21:28:32 -06:00
CitadelStationBot
765832373d Automatic changelog generation for PR #10266 [ci skip] 2019-12-24 20:43:32 -06:00
Ghom
e7cf680ca7 Merge pull request #10266 from shellspeed1/master
New insect marking customization option and three new wings.
2019-12-25 03:43:29 +01:00
Detective Google
a480d00c94 unfucks short hair 80s so the left facing sprite doesnt make you look like a crackhead 2019-12-24 17:05:07 -06:00
CitadelStationBot
c50c1ee4df Automatic changelog generation for PR #10282 [ci skip] 2019-12-24 15:07:44 -06:00
kevinz000
c022325159 Merge pull request #10282 from Putnam3145/fix-config
Updating dynamic config, some balancing
2019-12-24 13:07:40 -08:00
Putnam
ca1f7839bb Updating dynamic config, some balancing 2019-12-24 10:10:24 -08:00
CitadelStationBot
b48f18fbc6 Automatic changelog generation for PR #9751 [ci skip] 2019-12-24 09:57:13 -06:00
Ghom
c38611afcd Merge pull request #9751 from Seris02/rising_bass
RISING BASS, THE NEW MARTIAL ARTS
2019-12-24 16:57:10 +01:00
Seris02
a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Seris02
85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08:00