Commit Graph

2363 Commits

Author SHA1 Message Date
DeltaFire
2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
silicons
d38cdcb6be Update fermi.dm 2020-08-31 22:35:25 -07:00
silicons
71072ebc5e Merge pull request #13260 from dapnee/deleting-time
[s] removes a certain donator item
2020-08-29 21:25:22 -07:00
silicons
7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes
every emote is unrestricted
2020-08-29 21:21:01 -07:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Timothy Teakettle
b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
dapnee
c573677030 stupid travis
aaa
2020-08-25 06:30:01 -06:00
dapnee
45cebd8ad1 inb4 this gets denied
Removes cebu soap cause not even it can clean their stain /end edgyness
2020-08-24 16:52:06 -06:00
Letter N
c13a22a841 stops kevinz from leaking his IP 2020-08-24 18:42:48 +08:00
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07:00
silicons
7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
2020-08-23 05:08:14 -07:00
zeroisthebiggay
8873b6b48f pathé
pathé
2020-08-22 18:29:33 -04:00
zeroisthebiggay
66e81c75f8 i have been convinced
: )
2020-08-22 18:22:43 -04:00
Letter N
f04918bdca working code? 2020-08-21 15:09:49 +08:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Timothy Teakettle
6392367df4 donator items 2020-08-18 17:28:09 +01:00
silicons
23443be90e Update pumpenergy.dm 2020-08-13 15:27:07 -07:00
silicons
5694923d89 Merge pull request #13095 from lolman360/liver
custom name/desc ring and necklace
2020-08-11 01:41:48 -07:00
lolman360
50448549fb ee 2020-08-09 15:26:08 +10:00
Putnam
467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
silicons
65839060c9 Fixes 2020-08-06 23:39:57 -07:00
silicons
3640a33ff6 e 2020-08-06 23:22:53 -07:00
silicons
8edb374a20 sigh 2020-08-06 23:09:02 -07:00
silicons
1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
Timothy Teakettle
b5a16d8945 MORE CLOTHES 2020-07-29 18:20:46 +01:00
Timothy Teakettle
31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
silicons
78312c23bf sigh 2020-07-28 21:53:07 -07:00
timothyteakettle
c15d0de20d subcategories work 2020-07-29 03:57:16 +01:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
Timothy Teakettle
721e018aec loadout stuff 2020-07-28 22:52:00 +01:00
silicons
cac1627d26 Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
zerothebigboy
ef720c3481 a 2020-07-27 01:37:56 -04:00
zerothebigboy
df31d90c1b a 2020-07-27 01:37:47 -04:00
zerothebigboy
9fbcd21af6 a 2020-07-27 00:36:38 -04:00
zerothebigboy
e30a60d0ba a 2020-07-26 23:42:40 -04:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
c4ec1dfdc1 Update neck.dm 2020-07-24 20:50:52 -07:00
silicons
c3be76b529 Update neck.dm 2020-07-24 19:32:51 -07:00
Lin
6fca9af0ed Merge pull request #12848 from silicons/morecolors
species customization now allows 16 million colors instead of 4 thousand
2020-07-23 13:28:50 -05:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
e1afca8617 Merge pull request #12845 from YakumoChen/MKUltra-Fix
Mk ultra fix
2020-07-22 02:30:43 -07:00
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
2020-07-21 19:20:52 -07:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
silicons
87d53957bf sigh 2020-07-20 20:09:13 -07:00
YakumoChen
8adfe633e3 Fixes MK 2020-07-21 01:27:22 +00:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
silicons
526d257410 fix 2020-07-20 11:48:08 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00