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

156 Commits

Author SHA1 Message Date
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 4e9ff44ee7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-29 15:49:14 -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 b36da8f5d7 Revert "Revert "[DNM] Updates firemanning, throwing stuff"" 
This reverts commit def4b38a46.
 2023-10-12 14:34:02 -03:00
BlueWildrose def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
SandPoot 5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPoot 8ea39f9cf4 helpers 2023-02-10 00:39:04 -03:00
SandPoot 4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
SandPoot 1b1154260c correct everything and some intention based checks 2023-02-08 02:17:57 -03:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03: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
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-Shade 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
SandPoot 7a2cc5ddfa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-10 22:03:11 -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
SandPoot 21b68944e7 Upload files 2022-03-05 16:00:12 -03:00
SandPoot 2761b010c6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-25 22:04:25 -03:00
silicons 224fb7f22c Update tables_racks.dm 2021-07-21 21:34:10 -07:00
silicons d38a775a16 Update tables_racks.dm 2021-07-21 21:33:46 -07:00
silicons 16622ac95a Update tables_racks.dm 2021-07-20 18:06:49 -07:00
SandPoot 002be6d415 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-31 12:39:32 -03:00
silicons cb52be5dd9 fixes linter warnings (#14778) 
* woo

* woo
 2021-05-31 10:19:20 -05:00
SandPoot d13cc725b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-28 16:50:17 -03:00
SandPoot 0994a37af5 upload files 2021-03-26 11:05:36 -03:00
SandPoot 98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
SandPoot 0d1a6c73fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 23:31:15 -03:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
SandPoot 7181e558b3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 02:42:29 -03:00
Hatterhat f8c1c829d7 maulers slam people very violently 2020-09-06 15:34:53 -05:00
Enric Gabriel 7898f1fe3e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:24:11 -03:00
Enric Gabriel da9bea69fe there 2020-08-16 15:36:51 -03:00
silicons 815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons 4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons 416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00