7222 Commits
Author SHA1 Message Date
Mosley 0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot 054716857f push 2025-03-10 16:11:56 -03:00
SandPoot f6405100b5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-25 21:46:53 -03:00
SandPoot 3425760ced push 2025-02-25 17:48:02 -03:00
SandPoot 2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
SandPoot 56d972eb0b all sorts of fixes and updates, may break stuff 2025-02-09 02:09:28 -03:00
MosleyandGitHub 313f48875e Merge pull request #1216 from SaraSayomi/Snaxi-regretti
Snaxi regretti
2025-02-02 23:25:27 -05:00
SandPoot 76042510df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-28 19:21:39 -03:00
SandPoot cae94afdb7 push 2025-01-26 18:06:36 -03:00
SandPoot a2aa92cbc4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-24 02:08:58 -03:00
ariaworldandGitHub 44e507dfef [BEESTATION PORT] Semi-Port of Beestation Decal Fixes, Fixes turf decals disappearing on shuttle movements (#16119)
* SEMI-PORT OF BEESTATION PR #3111: Decal fixes

* Forgot this, rotate flag
2025-01-24 01:47:50 -03:00
Mosley f700fd616b Merge remote-tracking branch 'upstream/master' 2025-01-15 17:11:43 -05:00
SandPoot e3a3ca5892 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-04 23:24:59 -03:00
SandPoot 66cc8cf50f push 2025-01-01 20:20:16 -03:00
SandPoot ce801b39b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-12-24 19:31:23 -03:00
MosleyandGitHub 2f9def7c17 Merge pull request #1219 from JWosak/master
CogStation Update and Fixes
2024-12-12 02:07:13 -05:00
SaraandGitHub 0cebc2bdda Merge branch 'SPLURT-Station:master' into Snaxi-regretti 2024-12-03 10:10:10 -07:00
ariaworld e23b1f84fd BEESTATION PORT PR#4567: Filters + plane_master atomized 2024-11-30 16:39:30 +01:00
Mosley 3c63bdc873 Merge remote-tracking branch 'upstream/master' 2024-11-29 19:41:18 -05:00
JWosakandGitHub 93c2ed44ce Genpop Update 1 2024-11-04 17:06:39 +01:00
JWosakandGitHub 68af558202 Genpop closet sprite adapter 2024-11-03 20:44:57 +01:00
Sara 8091d7a060 More maints 2024-10-31 21:04:30 -06:00
Sara b0957d7def A-Maze-ing addition 2024-10-31 11:35:52 -06:00
Sara bd5d56336b Major push 2024-10-30 23:14:31 -06:00
Mosley 518fea2b1a Merge remote-tracking branch 'upstream/master' 2024-10-24 01:00:56 -05:00
SandPoot 7fa5456cb1 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into pr/xTheLifex/388 2024-10-20 18:29:55 -03:00
SandPoot e2cc28d21d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-10-20 18:05:53 -03:00
Metis a5e9ae8bc6 Update RCD.dm 2024-10-15 00:41:11 -04:00
Sara 5ba8c19b76 Plushie and Steppy
Fixes the susplush and steppy poster
2024-10-11 08:14:55 -06:00
Mosley 87b1ecf807 Merge remote-tracking branch 'venus/master' into content-stuff 2024-09-20 12:03:46 -05:00
ariaworld e526ae6dd7 New plant sprites 2024-09-20 13:46:21 +02:00
Mosley f8c0405d06 Merge remote-tracking branch 'venus/master' into content-stuff
Gallifrey stands!
2024-09-20 01:37:56 -05:00
Mosley d0bf81dc09 Revert "Purifies code, fix collapsible TGUI component"
This reverts commit 1f38f22a58.
2024-09-20 01:22:41 -05:00
ariaworld 752f3ee63c Some fixes (parallax and closets) 2024-09-20 00:00:50 +02:00
ariaworld 93b1db7cfe + 2024-09-14 23:51:52 +02:00
ariaworld 67b519b070 Meow,, 2024-09-14 15:53:53 +02:00
ariaworld dd75dd162d Fuck 2024-09-12 23:54:19 +02:00
ariaworld 09c351482f Update 2024-09-09 14:32:53 +02:00
ariaworld e41ddf4e2b Ze update... 2024-09-09 14:08:38 +02:00
ariaworld 27e2e80cb8 Add: random-gen maintenance and other useful things 2024-09-08 22:46:28 +02:00
xTheLifex 5206550e3c Ligthers 2024-09-06 12:15:33 -03:00
ariaworldandGitHub dd5b120723 Merge pull request #2 from VENUS-Station/new-additions
Space update
2024-09-02 22:26:34 +02:00
ariaworld 1f38f22a58 Purifies code, fix collapsible TGUI component 2024-09-02 12:41:40 +02:00
ariaworld 0601002cd1 Space update 2024-09-02 00:20:38 +02:00
ariaworld 618c28cde3 Fix paramedic locker sprite 2024-08-31 00:09:38 +02:00
ariaworld b6b2a971c5 Fix cargo locker + shake animation 2024-08-29 21:39:29 +02:00
ariaworld d42c7a4f2a Merge remote-tracking branch 2024-08-29 14:42:55 +02:00
SandPoot 75d1a7d69c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-26 04:31:35 -03:00
SandPoot dc08550162 push 2024-08-25 04:38:03 -03:00
SandPoot a1905591f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-24 23:49:10 -03:00