cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-07-19 04:09:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph

2393 Commits

Author SHA1 Message Date
Enric Gabriel 2bca904377 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-18 20:37:34 -03:00
Jay a82dc79dbb Hopefully fixes icon overlay issue for the halo 2020-09-18 00:51:59 -05:00
Enric Gabriel 0b427c9f6f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-15 23:32:38 -03: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
Enric Gabriel dd421e7e5c lemme show ya how to prevent a succesful compile with a simple trick 2020-09-15 16:27:39 -03:00
Enric Gabriel a1e9c6ea84 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-15 15:25:19 -03: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
Enric Gabriel 499fec6a16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-06 10:42:43 -03:00
silicons d38cdcb6be Update fermi.dm 2020-08-31 22:35:25 -07:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03: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
Enric Gabriel 78124ace3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-23 12:54:24 -03: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
Enric Gabriel f759503b49 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-22 20:30:49 -03: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
SandPoot 518c70e6ed Some Cit reverts and skyrat features. (#46) 2020-08-15 13:29:50 -03:00
Enric Gabriel 1afc491b5a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-13 21:23:43 -03:00
silicons 23443be90e Update pumpenergy.dm 2020-08-13 15:27:07 -07:00
Enric Gabriel 7929924d4a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-11 13:04:34 -03:00
silicons 5694923d89 Merge pull request #13095 from lolman360/liver 
custom name/desc ring and necklace
 2020-08-11 01:41:48 -07:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03: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
Enric Gabriel 55a116fd76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-07 21:24:04 -03: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
Enric Gabriel 935901593b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-29 09:52:32 -03: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
Enric Gabriel fbf9832be2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-28 14:46:14 -03:00