Commit Graph

19184 Commits

Author SHA1 Message Date
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
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
5f7ec688f2 Update clown.dm 2020-07-21 22:13:21 -07: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
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
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
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
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
Timothy Teakettle
0942b46796 more fashions 2020-07-21 18:43:58 +01: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
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
silicons
87d53957bf sigh 2020-07-20 20:09:13 -07:00
timothyteakettle
4daf71d99e woo it works 2020-07-21 03:34:50 +01:00
silicons
4832069181 Update preferences_savefile.dm 2020-07-20 18:57:09 -07:00
timothyteakettle
47ff13c539 apply the overlay 2020-07-21 02:37:21 +01:00
timothyteakettle
1ed035e4a3 move 2020-07-21 02:29:41 +01:00
timothyteakettle
3e0403a7e9 BEEPSKY FASHION 2020-07-21 02:22:42 +01:00
kappa-sama
c92abfe2ce bruh 2020-07-20 21:18:39 -04:00
silicons
6e08865b36 Update topic.dm 2020-07-20 17:30:35 -07: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
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01: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