cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-22 04:07:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1798 Commits
Author SHA1 Message Date
Jerry Wester 549482770c Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into modsuits 2023-01-09 22:42:25 -07: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 WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
siliconsandGitHub 23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
Jerry Wester 63aa6294dd whitespace should not be syntax grrr 2023-01-07 06:41:05 -07:00
Jerry Wester 21b0a9d222 move rescue plating to CMO locker 2023-01-07 06:23:53 -07:00
Jerry Wester b1b4f96053 fix hilbert analyzer in RD locker 2022-12-17 20:10:41 -07:00
BongaTheProto a04476b38d Merge remote-tracking branch 'upstream/master' 2022-12-16 20:39:53 -05:00
SandPoot 011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
LinandGitHub 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo 
dullahans 2: electric boogaloo
 2022-12-14 19:07:59 -07:00
Jerry WesterandGitHub 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
Jerry Wester 8b4795ca2b revert bag dumping changes 2022-12-13 17:37:47 -07:00
Jerry Wester c2b7f8ae8c add more platings 2022-12-13 16:55:12 -07:00
BongaTheProto ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
PeriodicChaosandJerry Wester 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
PeriodicChaosandJerry Wester fa9e075758 modsuits part 1 2022-12-05 20:38:37 -07: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
BongaTheProto 9e980f825f Merge remote-tracking branch 'upstream/master' 2022-08-01 17:19:36 -05:00
SandPoot 105251893d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-01 12:45:35 -03:00
siliconsandGitHub eb7b3f706f Update closets.dm 2022-07-28 16:17:46 -07:00
BongaTheProtoandGitHub 34c6184cd4 Merge pull request #378 from WoolyAypa/dumb4cum 2022-06-21 08:49:30 -07:00
BongaTheProto 0b89d8c778 Merge remote-tracking branch 'upstream/master' 2022-06-20 01:08:17 -05:00
SandPoot 25deceb75f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-19 23:02:20 -03:00
WoolyAypa 9c94cad910 modularization and removed the is_dumb4cum proc 2022-06-17 14:03:48 -03:00
WoolyAypa af3df23c49 dumb4cum that is 2022-06-17 02:46:28 -03:00
TrojanCoyoteGitHubSandPoot
 		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
BongaTheProto 4735651dd4 Merge remote-tracking branch 'upstream/master' 2022-05-24 09:35:48 -05:00
SandPootandGitHub fac92f66ca You can now make shuttle seats with titanium (#255) 
* Update mineral.dm

* consistency
 2022-05-23 23:04:24 -03:00
AshTheDergandGitHub 635d1afc60 Fix for missing Hotel Staff outfit 
Replaces the Telegram Outfit, which seems to be missing a sprite, with the Red Suit outfit. Temporary fix. Staff will now no longer be inappropriately nude.
 2022-04-29 02:13:13 -04:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -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
BongaTheProtoandGitHub 032a0c1cf6 Merge pull request #277 from AManWithAToolbox/ashie 
Small ashie update
 2022-04-09 12:24:47 -05:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05: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
LinandGitHub 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
siliconsandGitHub dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
AManWithAToolbox fc962c2680 update 2022-04-08 15:49:50 -05:00
Solaris-ShadeandGitHub 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
BongaTheProtoandGitHub f5af499eee Merge branch 'Sandstorm-Station:master' into master 2022-04-06 16:01:25 -05:00