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
d333a0225e
Renamed "Classic" to "Random".
2019-12-26 18:08:10 -08:00
a4f12af2e6
Update engine_goggles.dm
2019-12-26 19:28:16 -05:00
f8557c8ae4
v o t e s a v i n g
2019-12-26 12:13:02 -08: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
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
e125dae871
yee
2019-12-26 16:36:01 +08: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
a471e26d9c
WOW WHOOPS
2019-12-25 22:53:49 -08:00
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
63112c2f49
while we're at it let's make it work for all of 'em
2019-12-25 18:30:25 -08:00
5764ccef1b
Allowed preventing dynamic storytellers if too common recently
2019-12-25 16:16:11 -08:00
72cb63ae7e
chaotic shouldn't have so many events
2019-12-25 14:23:47 -08: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
27d8684d2d
and a line break goes there
2019-12-25 00:26:24 -08:00
02bfab6bf3
made it Taller
2019-12-25 00:25:59 -08: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
95281ab590
Made ion storm not THE ONLY EVENT THAT WILL RUN ON STORY
2019-12-24 23:20:28 -08:00
c12c89e01d
Added storyteller to dynamic game mode panel.
2019-12-24 23:20:18 -08:00
5cd9edb37f
also make weight adjustment round-to-round work, probs
2019-12-24 22:05:04 -08:00
f38d1ab218
better make that logging work
2019-12-24 22:04:43 -08:00
6a5a917944
[s] fixes a little door assembly glass dupe exploit
2019-12-25 07:00:53 +01:00
57cecd2499
work
2019-12-25 06:54:44 +01:00
6058253dcf
logging!
2019-12-24 20:20:27 -08:00
ffa013af6e
Minor captains closet cleanup.
2019-12-25 03:59:21 +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
60134ea8ae
[s] Fixes singularity pulls duping rods out of engine floors.
2019-12-25 03:34:42 +01:00
124ea51c09
Revert "vote overhaul start"
...
This reverts commit 232811dd18
2019-12-24 17:52:33 -08: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
a106fde6cc
a few fixes here and there and updating it
2019-12-24 23:38:27 +08: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
232811dd18
vote overhaul start
2019-12-23 22:43:54 -08:00
Ghom