Commit Graph
35903 Commits
Author SHA1 Message Date
siliconsandGitHub e0e2cd561a Update revive.dm 2020-07-22 11:38:26 -07:00
timothyteakettle a155f24253 let santa hat go on 2020-07-22 16:53:51 +01:00
timothyteakettle b15393cfbb more 2020-07-22 16:37:15 +01:00
timothyteakettle 6c308ec420 more accessories 2020-07-22 16:34:37 +01:00
timothyteakettle a607130e3c please compile 2020-07-22 16:24:35 +01:00
timothyteakettle ed1e8c4221 support for masks 2020-07-22 15:43:58 +01:00
timothyteakettle 0ccbe0b793 it works 2020-07-22 14:49:22 +01:00
CitadelStationBot f9e7d9dd6f Automatic changelog generation for PR #12835 [ci skip] 2020-07-22 04:31:25 -05:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub a22c6b21c4 Merge pull request #12847 from Putnam3145/faster-chat
Chat queue optimization
2020-07-22 02:30:31 -07:00
siliconsandGitHub 0acf7b82d5 Update revive.dm 2020-07-22 02:20:10 -07:00
siliconsandGitHub 919edfa2fd Update revive.dm 2020-07-22 02:11:20 -07:00
siliconsandGitHub 30e7483e89 Update absorb.dm 2020-07-22 02:10:24 -07:00
siliconsandGitHub 9fc669b4ea Update changeling.dm 2020-07-22 02:09:49 -07:00
zerothebigboy 9f657a2030 a 2020-07-22 04:17:20 -04:00
zerothebigboy 1d6e0e3a16 a 2020-07-22 04:15:21 -04:00
zerothebigboy 7870d90de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly
# Conflicts:
#	icons/mob/clothing/hands.dmi
#	icons/mob/clothing/head.dmi
#	icons/obj/clothing/gloves.dmi
#	icons/obj/clothing/hats.dmi
2020-07-22 01:03:55 -04:00
CitadelStationBot 7c53135650 Automatic changelog generation for PR #12851 [ci skip] 2020-07-21 21:20:56 -05:00
siliconsandGitHub 744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
2020-07-21 19:20:52 -07:00
zerothebigboy f875d6401a a 2020-07-21 21:35:38 -04:00
Sneakyrat6 402f13ce1b Fixes dressers not giving you undies 2020-07-21 20:33:58 -05:00
Sneakyrat6 2968963f19 Allows Photos to be Burned 2020-07-21 20:20:51 -05:00
zerothebigboy 86ba14a30c a 2020-07-21 21:10:35 -04:00
Changelogs 8b170ec840 Automatic changelog compile [ci skip] 2020-07-22 00:10:20 +00:00
timothyteakettle 6a4264085c woops 2: electric boogaloo 2020-07-22 00:17:03 +01:00
timothyteakettle 0706ac9d2a woops 2020-07-22 00:14:26 +01:00
timothyteakettle 6891bff9d3 further emotes 2020-07-22 00:07:15 +01:00
timothyteakettle 3a520bba3f more hats 2020-07-21 23:45:04 +01:00
Timothy Teakettle 5c88253f93 lots more hats 2020-07-21 22:58:13 +01:00
zerothebigboy 75c87077ec a 2020-07-21 17:22:35 -04:00
zerothebigboy 8b4aa20693 a 2020-07-21 17:11:17 -04:00
Timothy Teakettle aea268548c some fixes 2020-07-21 19:54:42 +01:00
DeltaFire 73925501ae I will now proceed to scream internally
Tabby boi bad
2020-07-21 20:13:30 +02:00
Timothy Teakettle 8260862d96 sprites 2020-07-21 18:48:17 +01:00
Timothy Teakettle 0942b46796 more fashions 2020-07-21 18:43:58 +01:00
CitadelStationBot 4ac4d94c31 Automatic changelog generation for PR #12852 [ci skip] 2020-07-21 12:06:08 -05:00
siliconsandGitHub 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
Zandario bbf38c9898 tipes 2020-07-21 11:22:21 -05:00
timothyteakettle 8e2c76db7c two more 2020-07-21 16:42:59 +01:00
timothyteakettle 99a2068dd2 its cool and hip 2020-07-21 16:26:51 +01: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
EmeraldSundisk bcec131eff Update OmegaStation.dmm 2020-07-20 22:06:00 -07:00
silicons 1450b11b01 sigh 2020-07-20 21:37:44 -07:00
siliconsandGitHub 5347b9f6a5 Update keybindings.dm 2020-07-20 21:33:03 -07:00
silicons 87d53957bf sigh 2020-07-20 20:09:13 -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