cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-07-17 11:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph

513 Commits

Author SHA1 Message Date
SandPoot a2aa92cbc4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-24 02:08:58 -03:00
ariaworld 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
SandPoot a1905591f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-24 23:49:10 -03:00
SandPoot ac2a5d8eef fix for custom shuttles 2024-08-24 23:06:50 -03:00
SandPoot 09aa0f704f set those up 2024-08-24 21:41:21 -03:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot 91a9223df6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-25 17:08:42 -03:00
deathride58 0517ece12a fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon 2024-04-24 22:30:25 -04:00
SandPoot 2e2528ee56 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-13 00:36:29 -03:00
deathride58 dd8c641520 Merge pull request #15486 from SandPoot/kills-cache 
Solves issues with overlays by updating the whole subsystem
 2024-04-12 23:31:54 -04:00
SandPoot 09ec69830f synd 2024-04-12 23:00:59 -03:00
SandPoot 002a4c31c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-12 22:06:15 -03:00
SandPoot 984d7ffe9a holiday and quirk support 2024-04-10 22:51:25 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot c2df4281b9 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-05 23:31:50 -03:00
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -03:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
SandPoot 44421ed042 push 2023-11-03 23:46:34 -03: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
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
SandPoot 1607d9ead8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-19 00:54:33 -03:00
shellspeed1 dfddbc23c3 ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus 2022-09-22 01:10:08 -07:00
SandPoot 32535e69b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-23 18:31:23 -03:00
silicons 9fbc2a47f0 Update shuttle.dm 2022-08-21 18:05:19 -07:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
silicons 18b797d0f4 Merge pull request #15758 from LetterN/patch-12 
fix pod not unlocking on code delta
 2022-08-20 12:27:11 -07:00
Letter N 46fb0a5024 HACK: this is not intended but it UNLOCKS the pod 2022-08-09 12:42:28 +08:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Letter N ba74a18471 Update emergency.dm 2022-08-06 13:17:47 +08:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
Lin fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update 
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
 2022-03-06 15:20:23 -05:00