 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 |
|
|
Putnam
|
88222c0901
|
uh, actually did that
|
2019-12-24 23:58:22 -08:00 |
|
|
Putnam
|
0b1b249eba
|
just makes alcohol toxic rather than drunk-inducing
|
2019-12-24 23:53:33 -08:00 |
|
|
kevinz000
|
8dd67afb9c
|
Update pai_defense.dm
|
2019-12-24 23:43:16 -08: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 |
|
|
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 |
|
|
Seris02
|
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 |
|
|
Hatterhat
|
d1c96237a6
|
the very shitty idea: "muh speedloader"
|
2019-12-24 04:16:33 -06:00 |
|
|
Hatterhat
|
681508482c
|
magazine metal cost tweaks, speedloader in AIB
|
2019-12-24 04:15:25 -06:00 |
|
|
Trilbyspaceclone
|
ceeab2db39
|
no longer carbon burning
|
2019-12-23 21:00:29 -05:00 |
|
|
Trilbyspaceclone
|
ca387d2bdb
|
Update others.dm
|
2019-12-23 20:51:37 -05:00 |
|
|
Lin
|
a0b90158c4
|
Merge pull request #10269 from Ghommie/Ghommie-cit488
Fix goose meat.
|
2019-12-24 00:56:07 +00:00 |
|
|
Ghommie
|
e1949b0131
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-23 19:02:20 +01:00 |
|
|
Ghom
|
37a6abd889
|
Merge pull request #10274 from kappa-sama/kappa-sama-patch-1
no more 40% time dilation from broodmother
|
2019-12-23 13:41:10 +01:00 |
|
|
Putnam
|
13a8efe616
|
no assassination at all (!!) on calm
|
2019-12-23 00:43:25 -08:00 |
|
|
Ghommie
|
187b9bb13a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483
|
2019-12-23 05:10:38 +01:00 |
|
|
Seris02
|
382c5d057a
|
updates ratvar coat
|
2019-12-23 12:02:05 +08:00 |
|
|
Ghom
|
db2a108b4a
|
Merge pull request #10246 from Citadel-Station-13/kevinz000-patch-129
Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag
|
2019-12-23 03:25:27 +01:00 |
|
|
Ghom
|
3635525c56
|
Merge pull request #10210 from Citadel-Station-13/kevinz000-patch-127
Cargo shuttle now silently leaves behind slaughter demons + revenants
|
2019-12-23 03:13:31 +01:00 |
|
|
Ghom
|
f3936f2c81
|
Merge pull request #10093 from Trilbyspaceclone/donut
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
|
2019-12-23 02:31:50 +01:00 |
|
|
kevinz000
|
6157cb0042
|
Merge pull request #10254 from r4d6/patch-1
Fix the nose boop
|
2019-12-22 14:03:02 -08:00 |
|
|
Putnam
|
801c789419
|
made toggle more indicative
|
2019-12-22 13:14:49 -08:00 |
|
|
kappa-sama
|
994cd753d5
|
no more 40% time dilation
|
2019-12-22 14:39:36 -05:00 |
|
|
Ghommie
|
0b96e469dd
|
Oh shit.
|
2019-12-22 13:07:37 +01:00 |
|
|
Ghommie
|
9034980871
|
randomized recipes fallback fix.
|
2019-12-22 12:58:11 +01:00 |
|
|
Ghommie
|
757af250cf
|
Fix goose meat.
|
2019-12-22 12:21:11 +01:00 |
|
|
Ghommie
|
4fbd9fdca0
|
Effectively removes the long unrequired roboticist encryption key.
|
2019-12-22 12:02:15 +01:00 |
|
|
kevinz000
|
f39d12527d
|
Update supply.dm
|
2019-12-21 23:50:59 -08:00 |
|
|
shellspeed1
|
1875ea3f58
|
new wings and fluff
|
2019-12-21 23:47:41 -08:00 |
|
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
|
Seris02
|
d6727bce64
|
woops
|
2019-12-22 12:26:42 +08:00 |
|
|
Seris02
|
18481ec253
|
more coat stuff yes yes
|
2019-12-22 12:19:58 +08:00 |
|
|
Trilbyspaceclone
|
f5a55aaecf
|
Nerfs fun
|
2019-12-21 21:09:22 -05:00 |
|
|
Lin
|
37a0f0d7e6
|
Merge pull request #10241 from Ghommie/Ghommie-cit482
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
|
2019-12-21 22:44:09 +00:00 |
|
|
kevinz000
|
86074ae6b1
|
lowered to 10 after i struggled to open tickets panel
|
2019-12-21 14:33:02 -08:00 |
|
|
Ghom
|
31ba9fe4a8
|
Revert "Makes HE pipes realistically radiate away heat"
|
2019-12-21 22:43:26 +01:00 |
|