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
97dd684c51
fix
2023-12-12 22:12:47 -03:00
BongaTheProto
700fd57efb
Merge remote-tracking branch 'upstream/master'
2023-12-08 20:22:05 -05:00
SandPoot
9cce1aa7ba
only update mob if wearing it
2023-12-04 16:18:18 -03:00
SandPoot
02b9c5ff94
things
2023-12-04 16:09:59 -03:00
BongaTheProto
37bbecefb4
Merge remote-tracking branch 'upstream/master'
2023-11-05 18:01:32 -05:00
SandPoot
3bb6783438
content
2023-11-03 21:17:22 -03:00
BongaTheProto
604b8ea867
Merge remote-tracking branch 'upstream/master' into hate-upstream
2023-10-20 22:29:47 -05:00
SandPoot
2c4ff7b448
trailing newline
2023-10-20 17:55:09 -03:00
SandPoot
3aa3aead3d
re-do the whole goddamn thing.
2023-10-20 17:48:13 -03:00
Марк
73e33a788e
Choosable Laws.
2023-10-20 16:43:14 +05:00
BongaTheProto
ff03181384
Merge branch 'master' into hate-upstream
2023-10-18 22:02:36 -05:00
BongaTheProto and GitHub
4d5b5f6bc6
Merge pull request #963 from Kuki-kono/master
...
Fix Gladiator Infinite Shield Bug
2023-10-12 13:55:33 -05:00
BongaTheProto
3230992305
Merge remote-tracking branch 'upstream/master'
2023-10-12 13:28:32 -05:00
SandPoot
ee163aae68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-10-12 02:40:12 -03:00
BongaTheProto
dca4dab806
Merge remote-tracking branch 'upstream/master'
2023-10-10 21:58:50 -05:00
SandPoot
41671a5f22
quick dmapi stuff update
2023-10-10 18:30:48 -03:00
BongaTheProto
7b5ecc7b49
Merge remote-tracking branch 'upstream/master'
2023-10-07 23:28:42 -05:00
SandPoot and Марк
bcbecabf74
push
...
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com >
2023-10-06 01:11:28 -03:00
BongaTheProto
83918aa030
Merge remote-tracking branch 'upstream/master'
2023-09-28 14:08:02 -05:00
SandPoot
e317be4989
oh boy i can't wait to find out people managing to exploit this
2023-09-27 17:11:10 -03:00
Kuki-kono and GitHub
7ff90e0275
Update gladiator.dm
2023-09-26 00:28:38 +01: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
BongaTheProto and GitHub
27df3d0753
Merge pull request #840 from Comicao1/Races-port
...
Teshari [TESTING]
2023-09-10 23:59:28 -05:00
Comicao1
cec654a181
Modularizes stuff that needs to me modularized
2023-09-07 22:07:26 +03:00
BongaTheProto
fb1dc86226
Merge remote-tracking branch 'upstream/master'
2023-09-03 18:06:53 -05:00
SandPoot
f53a7a1f40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-09-03 17:47:27 -03:00
Tsurupeta
07034d2ec0
sand
2023-08-08 14:01:15 +03:00
BongaTheProto
cdd5bb87d8
Merge remote-tracking branch 'upstream/master'
2023-08-08 01:42:46 -05:00
SandPoot
6fb4267b56
upload
2023-08-04 23:26:33 -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
BongaTheProto and GitHub
46cb8b3252
Merge branch 'Sandstorm-Station:master' into master
2023-07-05 00:37:01 -05:00
Fennec82
3297cf11c7
Blasted Reference to SPLURT Port
2023-07-02 01:34:33 +00:00
Fennec82
d1883e892b
Ports MODsuit Engineer Alt Title from SPLURT
2023-07-02 01:20:50 +00:00
Fennec82
8fb1f17a40
I'm dumb
2023-07-02 01:13:43 +00:00
Fennec82
ec718a7e66
Adds New Alt Titles
2023-07-02 00:57:25 +00:00
Vhariik
294571aa36
Merge remote-tracking branch 'upstream/master' into pr/861
2023-06-26 21:48:33 -03:00
Vhariik
50abbe62d5
Merge remote-tracking branch 'upstream/master' into pr/861
2023-06-21 23:15:38 -03:00
BongaTheProto
148ae75649
Merge remote-tracking branch 'upstream/master' into upstream-update
2023-06-21 18:49:14 -05:00
SandPoot
15d52e5b15
update content
2023-06-20 15:39:24 -03:00
BongaTheProto and GitHub
3b4673d1db
Merge branch 'Sandstorm-Station:master' into master
2023-06-17 01:02:57 -05: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
8c42034e40
only 16 pixels??? Bruh?????
...
Reinstates the original pixelshift range and also makes the viewport shifting a config so people don't get vertigo from the sliding sprites
2023-05-19 23:35:56 -05:00
BongaTheProto
635fc04860
Merge branch 'allow-old-shifting' of https://github.com/DeDrascol/Snowstorm-Station-13 into pixelshift
2023-05-19 17:32:38 -05:00
SandPoot
9ab5c245bb
shocking
2023-05-14 03:03:16 -03:00
PhazeJump
971bcbf4c6
more tail fixes
...
this time I've managed to fix:
-Downward Fennec Tail- humans and mammals
-Zorgoia
2023-05-03 12:46:14 +02:00
BongaTheProto and GitHub
92bcccd779
Merge branch 'Sandstorm-Station:master' into master
2023-04-18 11:20:14 -05:00
SandPoot
d566cd4a26
ref
2023-04-15 20:26:20 -03:00
BongaTheProto