146 Commits
Author SHA1 Message Date
Sara 5ba8c19b76 Plushie and Steppy
Fixes the susplush and steppy poster
2024-10-11 08:14:55 -06:00
CSDSP 4ef9284dd1 Fix problem computers 2024-08-24 00:31:15 -07:00
BongaTheProto 68ff25e205 Merge branch 'master' into pr/784 2024-05-14 19:23:36 -05:00
Elizabeth Lavenza ea6d8c3876 Fix Sandstorm-specific box overlay 2024-04-16 02:25:20 -04:00
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Elizabeth Lavenza 77058b4a6b Remove duplicated cyborg premium KA code 2024-04-01 16:05:35 -04:00
BongaTheProto d20caf7191 Merge branch '515-update' into upstream-merge 2024-03-24 17:39:24 -05:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
BongaTheProto 8bbb0fda41 Merge branch 'master' into upstream-merge 2024-03-24 16:41:07 -05:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
BongaTheProto 1883c47d5c basic ref regex
makes the proc calls compatible with 515
2024-03-11 19:46:05 -05:00
AzarakandGitHub c17eef2cec Merge branch 'master' into jank 2024-03-09 22:35:42 +01:00
ariaworld 6318464f06 Fix mecha mobs + add a chocolate box and letter to Hilbert's hotel 2024-03-02 18:26:56 +01:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
ariaworldandGitHub 0ec0526c3f Merge branch 'SPLURT-Station:master' into december-qol 2024-01-08 23:46:12 +01:00
BongaTheProtoandGitHub 024052f016 Merge branch 'Sandstorm-Station:master' into master 2024-01-08 16:32:10 -05:00
SandPoot 53c3850688 forgot it was overwritten i fucking hate skyrat 2024-01-08 14:35:59 -03:00
ariaworld fde8d80de6 Merge remote-tracking branch 'upstream/master' into december-qol 2024-01-02 21:16:39 +01:00
BongaTheProto 13cd269788 Merge remote-tracking branch 'upstream/master' 2023-12-25 14:28:51 -05:00
SandPoot be37603291 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-23 13:28:41 -03:00
ariaworld e9592e18fc Merge remote-tracking branch 'upstream/master' into december-qol 2023-12-23 15:00:19 +01:00
ariaworld 22befe7327 Winter QOL 2023-12-23 14:59:11 +01:00
BongaTheProto 32b361c846 followup 2023-12-15 18:38:06 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot bfc964b76b do you know the definition of insanity 2023-12-09 20:27:19 -03:00
BongaTheProto 73700f9417 Merge branch 'master' into pr/784 2023-11-06 15:48:57 -05:00
BongaTheProto cd026aaddb Merge remote-tracking branch 'upstream/master' 2023-10-05 13:38:12 -05:00
SandPoot e46983c7b7 no renaming 2023-10-03 22:37:41 -03:00
SandPoot 90677d70db avoid overriding the upstream code 2023-10-03 22:27:12 -03:00
SandPoot e153f780e5 actually not needed now 2023-10-03 20:57:13 -03:00
SandPoot 62c6b6881d ACTUALLY BAD, IT'S INHERITING FROM THE OTHER LIZARD! 2023-10-02 23:12:50 -03:00
SandPoot db926e7cb1 not needed 2023-10-02 22:58:43 -03:00
SandPoot cd12c202c4 updates, modularizing and generally making the code better 2023-10-02 22:53:21 -03:00
Марк e8c0eaa1c1 Plushies. 2023-10-03 04:04:54 +05:00
AzarakandGitHub f138d74bac Merge branch 'master' into jank 2023-09-24 13:13: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
Azarak 26341f1e3f Fixes runtime when unlinked underwear is used 2023-09-05 14:49:18 +02:00
Azarak 2f18939bc0 Merge remote-tracking branch 'upstream/master' into jank 2023-09-05 14:23:42 +02:00
Tsurupeta 07034d2ec0 sand 2023-08-08 14:01:15 +03:00
BongaTheProtoandGitHub 8680545f4b Merge branch 'Sandstorm-Station:master' into master 2023-07-29 17:09:12 -05:00
Dexxiol 733523bd0b he make sound, again + resprite 2023-07-29 20:55:34 +03:00
Dexxiol 8b5d6bb5b3 oh god hes here 2023-07-29 19:24:43 +03:00
BongaTheProto 21d13aae28 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:48:49 -05:00
DexxiolandGitHub 558d415bfd Update wirecutters.dm
oopsy daisy, missed a line
2023-07-26 03:13:23 +03:00
Dexxiol 735e82f192 crackhead tools
fun fact, i made this on fungus code (maconha station) so you can say it was ported from mushroom :)
2023-07-26 03:06:15 +03:00
Azarak d84343d995 Updates 2023-07-06 14:57:27 +02:00
Azarak fa9ee50a6f Merge remote-tracking branch 'upstream/master' into jank 2023-07-06 14:11:20 +02:00
Azarak 24f04f2de7 Anonymous ovi and portal orifice target fix 2023-04-21 21:12:35 +02:00