kevinz000
|
762cd00a5f
|
Update eyes.dm
|
2019-12-15 16:55:56 -07:00 |
|
kevinz000
|
c0f8a42e0f
|
Update eyes.dm
|
2019-12-08 19:49:15 -07:00 |
|
kevinz000
|
c38f4989be
|
Update eyes.dm
|
2019-12-08 19:45:27 -07:00 |
|
Lin
|
ef01bbd222
|
Merge pull request #10075 from Ghommie/Ghommie-cit436
Demodularize defib disks and projectiles icons.
|
2019-12-08 20:15:01 +00:00 |
|
Lin
|
9c7ac9a469
|
Merge pull request #10071 from Ghommie/Ghommie-cit434
Fixes bubblegum's death not unlocking the arena shuttle buyment since the medals subsystem is not hub enabled
|
2019-12-08 20:01:50 +00:00 |
|
Lin
|
24e4673c2b
|
Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
|
2019-12-07 21:49:18 +00:00 |
|
Thalpy
|
f59bdbe14e
|
Tweaks botany related ragent pHes so they're less likely to blow up.
|
2019-12-07 17:42:29 +00:00 |
|
Putnam3145
|
cece6dd43d
|
Merge pull request #10098 from Ghommie/Ghommie-cit445
Fixes a lil issue with ice cream cones.
|
2019-12-07 08:48:21 -08:00 |
|
Ghommie
|
d38475f06d
|
i'm tired of this
|
2019-12-07 12:05:12 +01:00 |
|
kevinz000
|
c706720dd1
|
Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo
Added 15+ new crates, fixed issues raised in #9901
|
2019-12-07 01:52:35 -07:00 |
|
nik707
|
e4a41c6169
|
Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
|
2019-12-06 20:37:53 -06:00 |
|
Ghommie
|
723690bab0
|
Demodularize defib disks and projectiles icons.
|
2019-12-06 23:07:50 +01:00 |
|
Ghommie
|
2addcb4142
|
Fixes bubblegum's death not granting the arena shuttle because the medals subsystem is not hub enabled
|
2019-12-06 16:37:46 +01:00 |
|
Winter Flare
|
6377f1b3a9
|
Organisation
|
2019-12-06 03:42:57 -05:00 |
|
kevinz000
|
968e9c099d
|
Update silicon.dm
|
2019-12-06 01:12:44 -07:00 |
|
Winter Flare
|
8bd6c58bcd
|
Merge branch 'master' into cargocleanupv2boogaloo
|
2019-12-06 01:27:44 -05:00 |
|
Winter Flare
|
b860c6e0bb
|
Merge branch 'master' into cargocleanupv2boogaloo
|
2019-12-06 01:14:44 -05:00 |
|
Winter Flare
|
83b77650a8
|
Additional Cleanup
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
|
2019-12-06 01:13:54 -05:00 |
|
Putnam3145
|
4e022af46f
|
Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
|
2019-12-05 21:16:47 -08:00 |
|
kevinz000
|
6a305dfe4f
|
Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
|
2019-12-05 21:54:42 -07:00 |
|
Putnam3145
|
6b2d3b116d
|
Merge branch 'master' into Ghommie-cit430
|
2019-12-05 20:53:14 -08:00 |
|
kevinz000
|
90f31f5b2b
|
Merge pull request #10023 from Sishen1542/i
meteors now only give 60-90 seconds warning
|
2019-12-05 21:52:32 -07:00 |
|
kevinz000
|
54be35a243
|
Merge pull request #9997 from Sishen1542/nuked
removes superspeed from nuka cola
|
2019-12-05 21:48:34 -07:00 |
|
Putnam3145
|
3633c6936d
|
Merge pull request #10052 from Ghommie/Ghommie-cit428
Banishes some "me" emote magic numbers from this realm.
|
2019-12-05 20:47:39 -08:00 |
|
kevinz000
|
b932841adf
|
Merge pull request #9975 from Ghommie/Ghommie-cit404
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
|
2019-12-05 21:47:29 -07:00 |
|
Putnam3145
|
62c0d59102
|
Merge pull request #10008 from Seris02/sleepingcarphallucination
adds sleeping carp wrist wrench/violent grab hallucination
|
2019-12-05 20:46:26 -08:00 |
|
kevinz000
|
176bde7829
|
Merge pull request #9990 from Linzolle/strange-reagent
Fixes to strange reagent and very slight nerf I guess.
|
2019-12-05 21:45:09 -07:00 |
|
kevinz000
|
5048995a58
|
Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
|
2019-12-05 21:44:25 -07:00 |
|
kevinz000
|
e2f9a68c2c
|
Merge pull request #10049 from Useroth/new-tg-plants
Colored fairy grass, because fuck your eyes.
|
2019-12-05 21:43:24 -07:00 |
|
kevinz000
|
b5595114c1
|
Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
|
2019-12-05 21:40:09 -07:00 |
|
Ghommie
|
4ceb0a25d0
|
undefined var.
|
2019-12-06 05:38:03 +01:00 |
|
kevinz000
|
d217a9f445
|
Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
|
2019-12-05 21:33:12 -07:00 |
|
kevinz000
|
bd1b79b182
|
Merge pull request #10041 from kappa-sama/patch-8
[SALT] chargers and chaos stands are now reasonable to fight
|
2019-12-05 21:29:39 -07:00 |
|
kevinz000
|
2fcdb24fe3
|
Merge pull request #10019 from Seris02/wintercoattide
Adds CentCom, Assistant's formal, ratvarian and narsian winter coats + loadout for formal
|
2019-12-05 21:29:08 -07:00 |
|
kevinz000
|
bbd482015c
|
Merge pull request #10033 from Ghommie/Ghommie-cit419
Fixes traitor codewords highlight and some other hear signal hooks.
|
2019-12-05 21:28:03 -07:00 |
|
kevinz000
|
29497320c1
|
Merge pull request #10025 from Linzolle/butchering
refactor butchering component
|
2019-12-05 21:19:57 -07:00 |
|
Ghommie
|
d6fe78f4a7
|
fixes on_mob eyes overlays not updating properly sometimes.
|
2019-12-06 03:38:39 +01:00 |
|
Ghommie
|
5024e900f7
|
Ooow fuck.
|
2019-12-06 02:45:55 +01:00 |
|
Ghommie
|
f1ccccbf36
|
drake.
|
2019-12-06 02:14:15 +01:00 |
|
Ghommie
|
9ca7bb759c
|
Ports "Slightly improves visible and audible messages."
|
2019-12-06 02:02:12 +01:00 |
|
BlackMajor
|
b7d0cc6516
|
Merge pull request #9884 from Useroth/blackpowder-alternative
Black powder fix. Alternative to #9861
|
2019-12-06 11:32:17 +13:00 |
|
BlackMajor
|
a6f48ea74c
|
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
[Ready] [Test Merge] Ports Xenobio Hotkeys
|
2019-12-06 11:29:34 +13:00 |
|
Ghommie
|
53ff425f04
|
Banishes some magic numbers from this realm.
|
2019-12-05 21:55:28 +01:00 |
|
Useroth
|
f4bffdc56d
|
To make sure it doesn't runtime
|
2019-12-05 19:05:57 +01:00 |
|
Useroth
|
2e84c30e59
|
Tiny touch-ups
|
2019-12-05 16:29:50 +01:00 |
|
Seris02
|
0c5a1b900b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide
|
2019-12-05 21:09:38 +08:00 |
|
Seris02
|
2ce79828b8
|
ratvar coat updated
|
2019-12-05 20:46:59 +08:00 |
|
Useroth
|
950b884da5
|
Adds colored fairygrass.
|
2019-12-05 01:47:42 +01:00 |
|
TrilbySpaceClone
|
e1717bb534
|
Merge branch 'master' into crow
|
2019-12-03 23:45:05 -05:00 |
|
kappa-sama
|
525d36cc6b
|
chaos
|
2019-12-03 23:18:45 -05:00 |
|