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

1763 Commits

Author SHA1 Message Date
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 faae67a3eb rotat 2023-03-14 15:13:51 -03:00
SandPoot f1eb8fe54f rotat 2023-03-14 15:06:18 -03:00
SandPoot f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -03:00
SandPoot d287fc25ca poosh 2023-02-21 01:55:49 -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
Timothy Teakettle 71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips 
Contextual screentips -- Screentips now show you what items/objects can do
 2023-02-15 23:04:54 +00:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -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 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03: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
silicons 23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
Jerry Wester b1b4f96053 fix hilbert analyzer in RD locker 2022-12-17 20:10:41 -07:00
SandPoot 011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
Lin 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo 
dullahans 2: electric boogaloo
 2022-12-14 19:07:59 -07:00
Jerry Wester 32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
Jerry Wester 19428e2579 revert bag dumping changes 2022-12-13 19:15:07 -07:00
Jerry Wester 94bfa88ed9 add more platings 2022-12-13 19:14:43 -07:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
PeriodicChaos 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
Timothy Teakettle 325d467ac5 Update mirror.dm 2022-08-13 18:45:25 +01:00
Timothy Teakettle 818e564c92 stable 2022-08-05 15:44:40 +01:00
SandPoot 105251893d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-01 12:45:35 -03:00
silicons eb7b3f706f Update closets.dm 2022-07-28 16:17:46 -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 fac92f66ca You can now make shuttle seats with titanium (#255) 
* Update mineral.dm

* consistency
 2022-05-23 23:04:24 -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
silicons dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
Solaris-Shade 48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 66b05f5261 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-06 16:40:58 -03:00
SandPoot 8cfb7a1bf4 They no longer snap south! 2022-03-24 01:03:42 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot 11daaadf79 arguments. 2022-03-18 18:43:40 -03:00
SandPoot 16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00