Commit Graph

11826 Commits

Author SHA1 Message Date
Ghommie
f93077e730 F to pay respect. 2019-12-29 00:08:34 +01:00
Ghommie
7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie
37441437d1 a 2019-12-28 23:02:28 +01:00
keronshb
390cfd8b64 Nanite ports from /tg/
Ports a couple of the newer nanite features from /tg/
2019-12-28 16:56:17 -05:00
Putnam
7947f06557 Made sure ghost cafe visitors don't get midround antags 2019-12-28 13:56:03 -08:00
Ghom
4fb549631f Don't use named arguments on new, please. 2019-12-28 19:12:10 +01:00
Seris02
897766e781 maybe fixes? 2019-12-29 00:55:13 +08:00
Seris02
70744ef171 ah 2019-12-29 00:19:19 +08:00
Seris02
46f3a70c4b even more weh. 2019-12-29 00:09:30 +08:00
Seris02
c0e8e55d70 more weh. 2019-12-29 00:07:11 +08: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
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
Arturlang
c4975d88e4 Wait no its actually the other way around. 2019-12-28 15:26:44 +02:00
Arturlang
d2709e86ec What about this? 2019-12-28 15:20:16 +02:00
Seris02
2c26c3bdec does the fix? 2019-12-28 21:11:17 +08: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
Seris02
973fdb61c6 probably fixes pandoras attacking their owners 2019-12-28 17:33:19 +08:00
Seris02
69d82338bc excludes certain ghost roles from being affected by health events 2019-12-28 16:46:50 +08:00
Seris02
4a2b7c2438 cocooooonuuuuuuts 2019-12-28 16:02:53 +08:00
Putnam
5174cb08a6 Made war ops always allowed on teamwork, chaotic 2019-12-27 22:45:06 -08: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
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
Commandersand
1a886adc3d FIXEdD 2019-12-27 13:01:14 -06:00
Commandersand
815e57697d vending 2019-12-27 12:29:39 -06:00
Commandersand
6b6ef569c2 fix 2019-12-27 12:14:46 -06:00
Commandersand
45e6cca8b8 clothing add 2019-12-27 11:53:57 -06:00
Ghommie
21cfb2914b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-27 17:49:59 +01:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Seris02
0b6242e25d let the adminbus commence 2019-12-28 00:40:55 +08: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
Arturlang
ca18f283e2 Nerfs armor and antistun 2019-12-27 16:18:05 +01: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
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
BlackMajor
4e1a9b83cf Pushing work for tonight. 2019-12-28 01:01:26 +13: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
BlackMajor
e0e521977a Start just to make the PR 2019-12-27 22:37:57 +13:00
Trilbyspaceclone
a4f12af2e6 Update engine_goggles.dm 2019-12-26 19:28:16 -05: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
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
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
kappa-sama
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
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
Lin
1931a2f715 Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
2019-12-25 19:03:42 +00:00