Commit Graph

24553 Commits

Author SHA1 Message Date
silicons 21d57eeeac sigh 2020-07-23 00:27:45 -07:00
silicons 3a38344a04 fix 2020-07-23 00:25:06 -07:00
silicons 910290edcf buffers 2020-07-23 00:22:33 -07:00
silicons 76f885e1a6 ok 2020-07-23 00:16:43 -07:00
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
timothyteakettle a5945d3dc2 slight zombie tweaking 2020-07-23 01:09:09 +01:00
silicons 66e4d98141 Update datacore.dm 2020-07-22 16:59:51 -07: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
silicons 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 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
lolman360 6b23138b31 l 2020-07-22 22:20:42 +10: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 a22c6b21c4 Merge pull request #12847 from Putnam3145/faster-chat
Chat queue optimization
2020-07-22 02:30:31 -07:00
silicons 0acf7b82d5 Update revive.dm 2020-07-22 02:20:10 -07:00
silicons 919edfa2fd Update revive.dm 2020-07-22 02:11:20 -07:00
silicons 30e7483e89 Update absorb.dm 2020-07-22 02:10:24 -07:00
silicons 9fc669b4ea Update changeling.dm 2020-07-22 02:09:49 -07:00
silicons 6d4f5c633b Update clown_ops.dm 2020-07-21 22:13:58 -07:00
silicons 5f7ec688f2 Update clown.dm 2020-07-21 22:13:21 -07: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
Letter N d5a6a3ecd9 actual code chang 2020-07-22 12:02:31 +08:00
lolman360 0854702762 whoops 2020-07-22 12:45:42 +10:00
lolman360 17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
silicons 3ed854bdb3 Update gun.dm 2020-07-21 19:38:38 -07:00
silicons 3a83c526b6 Update gun.dm 2020-07-21 19:36:37 -07:00
Letter N 49941ea2e6 code, still not enabled 2020-07-22 10:27:37 +08:00
silicons 744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
2020-07-21 19:20:52 -07:00
Letter N 827a1ad523 the define 2020-07-22 10:12:33 +08:00
lolman360 f33487e972 complie 2020-07-22 11:36:50 +10:00
Sneakyrat6 402f13ce1b Fixes dressers not giving you undies 2020-07-21 20:33:58 -05:00
lolman360 c07e5d544b wweeee 2020-07-22 11:27:26 +10:00
Sneakyrat6 2968963f19 Allows Photos to be Burned 2020-07-21 20:20:51 -05:00
lolman360 661b9920fc luh mayo 2020-07-22 10:59:21 +10:00
lolman360 0f1aa3c0ca 'lolman? did you test your code?'
no i did not ms. kevinz
2020-07-22 10:49:56 +10: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
silicons 286e5384d1 fix 2020-07-21 12:07:24 -07:00
silicons 2f11fb6a8b ok 2020-07-21 11:59:39 -07:00
silicons 9a5e53a21f ok 2020-07-21 11:57:47 -07:00
silicons 184e3992f3 fixes 2020-07-21 11:56:23 -07:00
Timothy Teakettle aea268548c some fixes 2020-07-21 19:54:42 +01:00
silicons 4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00