 silicons
|
697cef017b
|
Update living.dm
|
2020-07-22 23:43:57 -07:00 |
|
|
silicons
|
d976e2186c
|
Merge branch 'master' into drag
|
2020-07-22 23:43:09 -07:00 |
|
|
Changelogs
|
ed25929fec
|
Automatic changelog compile [ci skip]
|
2020-07-23 00:10:46 +00:00 |
|
|
CitadelStationBot
|
cf91303290
|
Automatic changelog generation for PR #12855 [ci skip]
|
2020-07-22 13:41:52 -05:00 |
|
|
silicons
|
efb4d19a40
|
Merge pull request #12855 from DeltaFire15/AAAAAAAA
Unfucks the monophobia traits (Aswell as traits in general) with this one simple trick
|
2020-07-22 11:41:48 -07:00 |
|
|
CitadelStationBot
|
f9e7d9dd6f
|
Automatic changelog generation for PR #12835 [ci skip]
|
2020-07-22 04:31:25 -05:00 |
|
|
silicons
|
60a25981bc
|
Merge pull request #12835 from kappa-sama/patch-36
might fix necropolis chests turning up completely empty
|
2020-07-22 02:31:21 -07:00 |
|
|
silicons
|
e1afca8617
|
Merge pull request #12845 from YakumoChen/MKUltra-Fix
Mk ultra fix
|
2020-07-22 02:30:43 -07:00 |
|
|
CitadelStationBot
|
dff4e13ddd
|
Automatic changelog generation for PR #12847 [ci skip]
|
2020-07-22 04:30:35 -05:00 |
|
|
silicons
|
a22c6b21c4
|
Merge pull request #12847 from Putnam3145/faster-chat
Chat queue optimization
|
2020-07-22 02:30:31 -07:00 |
|
|
CitadelStationBot
|
7c53135650
|
Automatic changelog generation for PR #12851 [ci skip]
|
2020-07-21 21:20:56 -05:00 |
|
|
silicons
|
744b6d6b48
|
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
|
2020-07-21 19:20:52 -07:00 |
|
|
Changelogs
|
8b170ec840
|
Automatic changelog compile [ci skip]
|
2020-07-22 00:10:20 +00:00 |
|
|
DeltaFire
|
73925501ae
|
I will now proceed to scream internally
Tabby boi bad
|
2020-07-21 20:13:30 +02:00 |
|
|
CitadelStationBot
|
4ac4d94c31
|
Automatic changelog generation for PR #12852 [ci skip]
|
2020-07-21 12:06:08 -05:00 |
|
|
silicons
|
bf8ca6d310
|
Merge pull request #12852 from Ludox235/Abductors-are-cringe
This shit creeped me out so there's a good chance it creeps other people out
|
2020-07-21 10:06:05 -07:00 |
|
|
Ludox
|
401d7b14b5
|
Get that shit off my screen
Who tought this was a good idea for fuck sake
|
2020-07-21 10:18:39 +02:00 |
|
|
zerothebigboy
|
7b35c5fd9d
|
a
|
2020-07-21 02:30:32 -04:00 |
|
|
zerothebigboy
|
fb35248e3b
|
a
|
2020-07-21 02:24:22 -04:00 |
|
|
silicons
|
1450b11b01
|
sigh
|
2020-07-20 21:37:44 -07:00 |
|
|
Putnam
|
3faa9d6f13
|
Chat queue optimization.
To be exact, makes it only do the expensive text replacement when there's a client to receive the text.
|
2020-07-20 19:58:44 -07:00 |
|
|
YakumoChen
|
8adfe633e3
|
Fixes MK
|
2020-07-21 01:27:22 +00:00 |
|
|
YakumoChen
|
d5301c095d
|
Merge pull request #7 from Citadel-Station-13/master
f
|
2020-07-20 21:21:49 -04:00 |
|
|
kappa-sama
|
c92abfe2ce
|
bruh
|
2020-07-20 21:18:39 -04:00 |
|
|
CitadelStationBot
|
c27f339049
|
Automatic changelog generation for PR #12824 [ci skip]
|
2020-07-20 19:25:57 -05:00 |
|
|
silicons
|
aa3cc9fae8
|
Merge pull request #12824 from kappa-sama/patch-35
makes brainwashing disk role restricted and debuffs its price
|
2020-07-20 17:25:53 -07:00 |
|
|
Changelogs
|
f4c5796b6d
|
Automatic changelog compile [ci skip]
|
2020-07-21 00:10:06 +00:00 |
|
|
Lin
|
b6f689b06d
|
Merge pull request #12843 from Citadel-Station-13/silicons-patch-40
uhhhhhhh ok nothing to see here let's fix spell packets this time again
|
2020-07-20 19:05:28 -05:00 |
|
|
CitadelStationBot
|
9a798c7ba8
|
Automatic changelog generation for PR #12787 [ci skip]
|
2020-07-20 19:01:36 -05:00 |
|
|
silicons
|
3d2995b4e8
|
Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
|
2020-07-20 17:01:32 -07:00 |
|
|
CitadelStationBot
|
9ea17928a5
|
Automatic changelog generation for PR #12829 [ci skip]
|
2020-07-20 18:59:40 -05:00 |
|
|
silicons
|
a7144d2404
|
Merge pull request #12829 from timothyteakettle/fried-component
the fried component
|
2020-07-20 16:59:36 -07:00 |
|
|
CitadelStationBot
|
8c254744bf
|
Automatic changelog generation for PR #12811 [ci skip]
|
2020-07-20 18:58:05 -05:00 |
|
|
silicons
|
7df369e5d7
|
Merge pull request #12811 from kappa-sama/patch-33
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
|
2020-07-20 16:58:01 -07:00 |
|
|
CitadelStationBot
|
3efe9c8c00
|
Automatic changelog generation for PR #12807 [ci skip]
|
2020-07-20 18:57:27 -05:00 |
|
|
silicons
|
1d99591b6b
|
Merge pull request #12807 from kappa-sama/patch-32
lowers stray cargo pod weight from 2x normal to 1/2 normal
|
2020-07-20 16:57:24 -07:00 |
|
|
CitadelStationBot
|
12a09bee52
|
Automatic changelog generation for PR #12805 [ci skip]
|
2020-07-20 18:56:59 -05:00 |
|
|
silicons
|
9bb92f8d4d
|
Merge pull request #12805 from SiliconMain/patch-1
This is stupid
|
2020-07-20 16:56:57 -07:00 |
|
|
CitadelStationBot
|
53e18d0314
|
Automatic changelog generation for PR #12826 [ci skip]
|
2020-07-20 18:56:25 -05:00 |
|
|
silicons
|
3f2cab02eb
|
Merge pull request #12826 from Kraseo/instastuns-bad
Makes damp rags no longer instantly apply chemicals
|
2020-07-20 16:56:22 -07:00 |
|
|
CitadelStationBot
|
38557d0b29
|
Automatic changelog generation for PR #12804 [ci skip]
|
2020-07-20 18:55:41 -05:00 |
|
|
silicons
|
947b050c47
|
Merge pull request #12804 from Arturlang/decal_painter_fix
Decal Painter ui fix
|
2020-07-20 16:55:38 -07:00 |
|
|
CitadelStationBot
|
ef9a757a82
|
Automatic changelog generation for PR #12800 [ci skip]
|
2020-07-20 18:55:03 -05:00 |
|
|
silicons
|
c7022445b5
|
Merge pull request #12800 from DeltaFire15/swarmer-fix
Fixes swarmers not being able to eat any items at all
|
2020-07-20 16:55:00 -07:00 |
|
|
silicons
|
fefc0530b8
|
Merge pull request #12795 from TheSpaghetti/patch-3
Makes extradimensional oranges weirder. [/TG/ PORT]
|
2020-07-20 16:54:43 -07:00 |
|
|
CitadelStationBot
|
2e09ecee4c
|
Automatic changelog generation for PR #12749 [ci skip]
|
2020-07-20 18:54:28 -05:00 |
|
|
silicons
|
448706d540
|
Merge pull request #12749 from TheSpaghetti/patch-2
Adds monophobia quirk.
|
2020-07-20 16:54:25 -07:00 |
|
|
silicons
|
4d4133a8da
|
Merge pull request #12819 from Arturlang/bloodsucker_typo
Fixes a bloodsucker lair typo
|
2020-07-20 16:53:42 -07:00 |
|
|
silicons
|
2ec64f3e05
|
Update wizard.dm
|
2020-07-20 16:50:56 -07:00 |
|
|
Lin
|
210b7b281c
|
Merge pull request #12727 from Citadel-Station-13/silicons-patch-19
bandaids around turnstiles being bad code until it can have its movement checks refactored
|
2020-07-20 18:25:01 -05:00 |
|