cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,285 Commits 55 Branches 0 Tags
8b36cf6f646b8ae3b0a7e4800936c46ddffa5549
Commit Graph

2386 Commits

Author SHA1 Message Date
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
silicons
9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises 
Unique slimeperson screams and laughter, and adds new customizable speech verbs
 2020-09-30 09:22:25 -07:00
LetterJay
89557a8ee3 Update custom_items.dm 2020-09-25 10:46:43 -05:00
Jay
8fef121064 Fixes missing hair when wearing halo 2020-09-25 10:45:13 -05:00
Blue Wildrose
19f14b6608 error correction 
I'm a dummy
 2020-09-22 03:22:10 -07:00
Blue Wildrose
006a625504 Slimeperson screams and laughter! 2020-09-22 02:41:11 -07:00
Jay
3864f14843 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 2020-09-21 22:19:45 -05:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Jay
67cc7ea04e getting annoying 2020-09-19 10:02:34 -05:00
Jay
a2ad87bebd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2020-09-18 19:23:31 -05:00
Jay
16e6d309b6 makes skirt a under clothing instead of a suit 2020-09-18 16:56:42 -05:00
Jay
2bcc3d59a0 oops 2020-09-18 00:56:14 -05:00
Jay
a82dc79dbb Hopefully fixes icon overlay issue for the halo 2020-09-18 00:51:59 -05:00
Jay
efa3627460 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 2020-09-16 11:20:43 -05:00
silicons
7f145b7948 Merge pull request #13388 from DeltaFire15/plush-ling 
Adds peculiar plushies, which are made by failing to make plushmium
 2020-09-15 17:31:18 -07:00
timothyteakettle
2d1f5ccb43 check your paths 2020-09-15 23:20:57 +01:00
LetterJay
e7ae124006 Update custom_items.dm 2020-09-15 12:32:39 -05:00
Jay
43ddae6542 ckey 2020-09-15 12:31:14 -05:00
Jay
05c580023d Custom atmos skirt for donator 2020-09-15 08:13:14 -05:00
LetterJay
680dee6a82 Update __donator.dm 2020-09-13 16:28:24 -05:00
Jay
511b845b75 donator 2020-09-13 15:32:09 -05:00
DeltaFire
2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03: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