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

203 Commits

Author SHA1 Message Date
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 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
Jerry Wester 31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
Jerry Wester 22309324dc whitespace should not be syntax grrr 2023-05-01 00:23:09 -05:00
Jerry Wester 8271cf9bc1 move rescue plating to CMO locker 2023-05-01 00:22:59 -05:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry Wester ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Jerry Wester b1b4f96053 fix hilbert analyzer in RD locker 2022-12-17 20:10:41 -07:00
Jerry Wester 94bfa88ed9 add more platings 2022-12-13 19:14:43 -07:00
SandPoot 25deceb75f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-19 23:02:20 -03:00
TrojanCoyote 9f37ed4d35 Update code/game/objects/structures/crates_lockers/closets/secure/security.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2022-06-10 19:27:14 -05:00
TrojanCoyote b4aa87431b swap things around 
tosses plate carrier into HoS locker, out of loadout options <3
 2022-06-10 19:17:25 -05: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 ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03: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
SandPoot 34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
DeltaFire 6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
SandPoot 4b1df1bfb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-13 10:18:55 -03:00
zerothebigboy 68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
SandPoot 3d6ee4e3e6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-08 01:45:49 -03:00
zerothebigboy 3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
keronshb ea3b248e6c Ports Parade outfit changes 2021-09-05 14:17:52 -04:00
SandPoot 167ada9e17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-13 23:17:50 -03:00
qweq12yt 0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
SandPoot 795a3b3f39 Gives each department id to their respective head. (#148) 
* upload files

* oops, nobody saw this
 2021-04-02 00:37:19 -03:00
qweq12yt 04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -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 e7e655112d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-14 20:21:02 -03:00
SiliconMain cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
SandPoot e10c783cf0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-13 20:59:40 -03:00
SiliconMain 2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00
SandPoot 2ed9583fc1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-31 16:40:19 -03:00
Chiirno 35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
SandPoot c585095ba5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-04 12:29:55 -03:00
shellspeed1 3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
Enric Gabriel c27b799fc6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-01 21:16:19 -03:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
Letter N 116145872f commit thing, need to see changies but gitlens is denying me 2020-08-29 14:00:46 +08:00