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-16 04:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

2851 Commits

Author SHA1 Message Date
BongaTheProto
d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
BongaTheProto
d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05:00
SandPoot
65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
Timothy Teakettle
390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip 
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
 2023-02-09 21:39:05 +00:00
SandPoot
9e2851b76b donator. 2023-02-06 20:01:47 -03:00
SandPoot
5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
BongaTheProto
2eccd56e6b Merge branch 'master' into pr/660 2023-02-03 19:48:12 -05:00
BongaTheProto
7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
SandPoot
8ae64b1bd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-29 19:16:50 -03:00
BongaTheProto
8a53e33271 Merge branch 'master' into pr/660 2023-01-28 22:11:29 -05:00
LetterN
d240eb5377 update mentor admin log sql query 2023-01-22 11:40:21 +08:00
BongaTheProto
620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPoot
54192d4d0d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-20 21:35:34 -03:00
Lin
6dd017fc21 Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat 
Adds the Polychromatic Cowboy Hat
 2023-01-18 18:11:21 -07:00
BongaTheProto
21c3abdfb7 Merge remote-tracking branch 'upstream/master' 2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-17 22:26:56 -03:00
Darius
aa1b82f0b1 Convert Colorist from quirk to loadout item 
Removes the Colorist quirk, and adds Hair Dye Spray to the loadout under backpack items.
 2023-01-11 14:23:14 -05:00
Darius
a8b7cd9c4a Adds the Polychromatic Cowboy Hat 
Adds a new polychromatic variant of the white cowboy hat.
 2023-01-10 20:40:01 -05:00
BongaTheProto
d6aa3acbd4 Merge remote-tracking branch 'upstream/master' 2023-01-09 17:08:06 -05:00
BongaTheProto
ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05:00
SandPoot
2a772c8482 Adds the commando skin from ror & ror2 to the mining hardsuit (#280) 
* first commit with everything

* quick fix and little extra usage!

* the boy

* previous could break

* better head
 2023-01-09 18:55:07 -03:00
SandPoot
f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
SandPoot
82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Neyusha
580bd31e12 Stowaways Role 2022-12-27 11:45:20 +03:00
Hatterhat
1e1cce6e86 forgor 2022-12-24 11:38:06 -06:00
Hatterhat
c54ed0ceda overstepped the scope tbh 2022-12-24 01:44:03 -06:00
BongaTheProto
ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05:00
SandPoot
f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
Lin
723decec2b Merge pull request #15882 from Citadel-Station-13/silicons-patch-16 
updates kate walker's donator item
 2022-12-12 19:13:42 -07:00
Cognition
b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -07:00
silicons
5b954558da Update __donator.dm 2022-11-03 22:50:56 -07:00
BongaTheProto
f923e016e9 Merge remote-tracking branch 'upstream/master' 2022-10-28 18:44:15 -05:00
SandPoot
a21a047c3d Fixes custom roundstart items (#272) 2022-10-28 20:30:36 -03:00
BongaTheProto
a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05:00
SandPoot
02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52:45 -03:00
Lin
03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot
24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Pin-alternative
e81c720f5b Merge remote-tracking branch 'upstream/master' into cursed 2022-08-30 12:19:23 +10:00
BongaTheProto
fb66dc2035 Merge remote-tracking branch 'upstream/master' 2022-08-23 20:30:19 -05:00
SandPoot
32535e69b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-23 18:31:23 -03:00
zerothebigboy
44275e7493 i am thoroughly erect 2022-08-14 21:58:48 -04:00
Pin-alternative
746ea91f9a Merge remote-tracking branch 'upstream/master' into cursed 2022-07-22 19:11:53 +10:00
BongaTheProto
a72b79f56c Merge remote-tracking branch 'upstream/master' 2022-07-20 21:41:02 -05:00
SandPoot
da1df79599 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-20 23:30:31 -03:00
LetterJay
64bcd694c1 donator blah blah, my head hurts 2022-07-18 00:20:33 -05:00
Pin-alternative
79ab402216 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-10 07:45:46 +10:00
BongaTheProto
6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot
be1357bdb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:29:38 -03:00
SandPoot
78b4d94c96 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:00:44 -03:00
Lin
6f97ec2b1d Merge pull request #15656 from deathride58/animfix 
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
 2022-06-07 18:05:07 +00:00