5174cb08a6
Made war ops always allowed on teamwork, chaotic
2019-12-27 22:45:06 -08:00
fd476b4f5b
Update language_holder.dm
2019-12-28 01:05:51 -05:00
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
139d4b4b3a
ehh fine but why would you use this proc for that
2019-12-27 18:44:46 -08:00
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
1a886adc3d
FIXEdD
2019-12-27 13:01:14 -06:00
815e57697d
vending
2019-12-27 12:29:39 -06:00
6b6ef569c2
fix
2019-12-27 12:14:46 -06:00
45e6cca8b8
clothing add
2019-12-27 11:53:57 -06:00
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
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
0b6242e25d
let the adminbus commence
2019-12-28 00:40:55 +08:00
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
160e8c1ec5
stunglasses
2019-12-27 23:21:40 +08:00
ca18f283e2
Nerfs armor and antistun
2019-12-27 16:18:05 +01:00
afd22cf618
Merge pull request #10298 from kappa-sama/patch-12
...
nerfs chain smokers, removes stocks
2019-12-27 13:37:38 +01:00
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
4e1a9b83cf
Pushing work for tonight.
2019-12-28 01:01:26 +13:00
b4b6e550e4
Merge branch 'wintercoatsagain' of https://github.com/Seris02/Citadel-Station-13 into wintercoatsagain
2019-12-27 18:10:51 +08:00
8ed4fe9c05
changes
2019-12-27 18:09:30 +08:00
e0e521977a
Start just to make the PR
2019-12-27 22:37:57 +13:00
a4f12af2e6
Update engine_goggles.dm
2019-12-26 19:28:16 -05:00
e97ca5f924
yeah fair enough
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-26 14:22:03 -05:00
1dcee075e6
f
2019-12-26 14:20:43 -05:00
35846c452a
Applied suggestions and minor tweaks.
2019-12-26 20:03:43 +01:00
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
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
4689d805a3
e
2019-12-26 02:54:38 -05:00
940efc0c1c
holy shit i hope this compiles
2019-12-26 01:46:04 -06:00
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
1931a2f715
Merge pull request #10242 from Ghommie/Ghommie-cit483
...
Ports "Refactors can_see_reagents"
2019-12-25 19:03:42 +00:00
88222c0901
uh, actually did that
2019-12-24 23:58:22 -08:00
0b1b249eba
just makes alcohol toxic rather than drunk-inducing
2019-12-24 23:53:33 -08:00
8dd67afb9c
Update pai_defense.dm
2019-12-24 23:43:16 -08:00
57cecd2499
work
2019-12-25 06:54:44 +01:00
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
cd6bf76803
f
2019-12-25 01:41:35 +01:00
53d142b4c0
more work.
2019-12-25 01:34:33 +01:00
51200db298
update ( #5 )
...
* adds the rising bass file so I can port the file over from my mac
* copying my file from my mac
henk
* ADDS THE NEW MARTIAL ART - RISING BASS!!
* Fixes the fork?
* makes rising bass a little less hacky with code
* more fixes + fixes the last fixes.
* fixes a typo
* change cost to 18 tc
* fixes it
if it breaks I blame you again putnam
* fixes combo text
* Fix goose meat.
* Automatic changelog generation for PR #10269 [ci skip]
* a few fixes here and there and updating it
* Automatic changelog generation for PR #9751 [ci skip]
Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Lin <linzolle@gmail.com >
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com >
2019-12-24 12:22:43 -05:00
85c5a5dfa1
Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass
2019-12-24 22:29:46 +08:00
9e6f0762b7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass
2019-12-24 22:27:41 +08:00
d1c96237a6
the very shitty idea: "muh speedloader"
2019-12-24 04:16:33 -06:00
681508482c
magazine metal cost tweaks, speedloader in AIB
2019-12-24 04:15:25 -06:00
ceeab2db39
no longer carbon burning
2019-12-23 21:00:29 -05:00
ca387d2bdb
Update others.dm
2019-12-23 20:51:37 -05:00
ab34faa41d
fix taur
2019-12-24 02:01:45 +01:00
a0b90158c4
Merge pull request #10269 from Ghommie/Ghommie-cit488
...
Fix goose meat.
2019-12-24 00:56:07 +00:00
d571bbd292
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-24 00:07:32 +01:00
7e8581ae88
Merge remote-tracking branch 'upstream/master'
2019-12-23 15:40:02 -05:00
864b768c67
Fixes digitigrades.
2019-12-23 19:36:47 +01:00
Putnam