BongaTheProto
2d1d665e41
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit c1c9fef2246767f48e82
2023-12-16 10:48:35 -05:00
BongaTheProto
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
SandPoot
8cdb82a23f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-12 22:06:13 -03:00
SandPoot
e457f40328
maptext
2023-12-11 17:43:24 -03:00
ariaworld
3805388363
Modularize, RAHHHH!
2023-11-19 03:03:30 +01:00
ariaworld
1f463a734c
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
2023-11-17 23:26:33 +01:00
ariaworld
e98019e91e
Push, push, push.
2023-11-17 21:34:27 +01:00
ariaworld
23f141965e
First draft.
2023-10-31 14:03:34 +01:00
ariaworld
d74d2656e5
Revert erroneous attack_paw proc muzzle removal.
2023-10-24 11:57:34 +02:00
ariaworld
08ca1f392c
Muzzle can be self-removed and locked.
2023-10-23 22:28:57 +02:00
BongaTheProto
085bb06e94
Merge remote-tracking branch 'upstream/master'
2023-09-16 14:32:38 -05:00
SandPoot
0b04af4b76
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-09-14 22:32:47 -03:00
SandPoot
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
Tsurupeta
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
BongaTheProto
e87e828638
Merge remote-tracking branch 'upstream/master'
2023-07-25 22:47:02 -05:00
SandPoot
7e51ef0b98
fix merge
2023-07-23 19:06:55 -03:00
SandPoot
ef186347ca
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-23 18:56:20 -03:00
SandPoot
994ff214d5
?
2023-07-23 15:06:20 -03:00
SandPoot
3645d00ec0
alright then
2023-07-19 21:15:52 -03:00
SandPoot
19ee7f8bd2
some hints
2023-07-19 20:51:25 -03:00
PhazeJump
defdf2f6b2
FIXING MY OWN SHIT CODE MAKES ME FUCKING SCREAM
...
anyways
techpriest robes are now un-shitty-fixed and fixed again. Should be working properly now. No idea how to get the naga taur sprite working because it was supposed to be added in sand modular but sand modular was the one breaking it all so 🤷
2023-07-07 11:22:42 +02:00
Vhariik
7ea1e5be04
Subby clothing
2023-06-11 22:39:10 -03:00
Vhariik
56c161f309
Flannel jackets and centcomdress
2023-06-08 09:23:51 -03:00
PhazeJump
f1862cb499
SS13 CODE MAKES ME FUCKING SCREAM
...
enables anthro characters to wear techpriest robes and Virginkiller without the suits breaking
2023-06-08 13:48:09 +02:00
BongaTheProto
d08cb554e9
Merge branch 'master' into pr/660
2023-02-13 14:09:17 -05:00
BongaTheProto and GitHub
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 and GitHub
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
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
9e9f9915fa
Merge remote-tracking branch 'upstream/master'
2023-02-03 17:23:22 -05:00
SandPoot
996e472f80
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-03 18:53:29 -03:00
zerothebigboy
d93dcf5b76
sickkicks
2023-02-01 08:25:30 -05:00
BongaTheProto
8a53e33271
Merge branch 'master' into pr/660
2023-01-28 22:11:29 -05:00
BongaTheProto and GitHub
2aa678176e
Merge pull request #600 from ShamanSliph/cloth-eater
...
New Quirk: Clothes Eater and Fixes Insects chewing clothes
2023-01-26 01:39:16 -05:00
BongaTheProto
3ae8edf803
Merge remote-tracking branch 'upstream/master'
2023-01-22 01:06:28 -05:00
SandPoot and GitHub
79c8c61459
Makes skirt peeking into an element ( #292 )
2023-01-21 19:30:59 -03: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 and GitHub
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
BongaTheProto
d8141d260e
Merge branch 'master' into pr/600
2023-01-16 02:31:47 -05:00
Hatterhat
e9ff5e00e0
works on my machine
2023-01-11 20:49:26 -06:00
Hatterhat
e2b476ffa8
guess i forgot this
2023-01-11 18:33:34 -06:00
BongaTheProto
86a005b590
Merge remote-tracking branch 'upstream/master'
2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-10 22:50:16 -03: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
SandPoot
cf51a4dce9
dusting off
2023-01-10 18:32:49 -03:00
BongaTheProto
d6aa3acbd4
Merge remote-tracking branch 'upstream/master'
2023-01-09 17:08:06 -05:00
BongaTheProto