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-26 22:28:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
299 Commits
Author SHA1 Message Date
Mosley 0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot 2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
SandPoot 56d972eb0b all sorts of fixes and updates, may break stuff 2025-02-09 02:09:28 -03:00
SandPoot 76042510df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-28 19:21:39 -03:00
SandPoot cae94afdb7 push 2025-01-26 18:06:36 -03:00
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
ariaworld fecf8d1b02 Fix sleep dealing damage 2024-04-03 00:38:28 +02:00
BongaTheProto d20caf7191 Merge branch '515-update' into upstream-merge 2024-03-24 17:39:24 -05:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05: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 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
BongaTheProto 1883c47d5c basic ref regex 
makes the proc calls compatible with 515
 2024-03-11 19:46:05 -05: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
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05: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
ariaworld 76ce2e7729 Nerf: Sleep healing 2023-12-29 04:09:18 +01:00
ariaworld 270601f3df New line! 2023-12-27 20:48:23 +01:00
ariaworld 8e01ed24b0 Undead tweak + quirk and sleepheal 2023-12-27 20:37:25 +01: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
BongaTheProto 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05: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
BongaTheProto 79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
Hatterhat 38bd037b66 box that mf up 2022-10-04 14:14:04 -05:00
Toxici11iandGitHub 20aae36da7 Blood-drunk changes 2022-05-08 09:36:27 +01:00
Toxici11i 480dc34671 wah 2022-05-07 07:33:55 +01:00
Toxici11i 8f91555dd7 Massive update. 
Signed-off-by: Toxici11i
 2022-05-06 22:29:33 +01:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
siliconsandGitHub da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload) 
Every case of initialize that should have mapload, does
 2022-04-15 17:41:57 -07:00
SandPootandGitHub 13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02: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 31a179f95d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-08 13:57:46 -03:00
Artur be46eba465 Moves stasis handling to component-based 2022-04-07 14:10:51 +03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
SandPoot 04231b54f3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-17 22:46:31 -03:00
SandPoot 4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot 07fe9bdbca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-14 15:09:35 -03:00
siliconsandGitHub 861a9f854f Merge pull request #15476 from DeltaFire15/core-alt-pr 
Buffs regen core healing for robots on lavaland, nerfs regen cores when not on lavaland
 2022-03-13 14:26:06 -07:00
SandPoot 5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
SandPoot 7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03:00
siliconsandGitHub af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460) 
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
 2022-02-07 15:17:24 -08:00
DeltaFire 1d1a153808 buffnerf 
buffs cores for robots on lavaland
nerfs cores when not on mining z
 2022-01-22 19:17:05 +01:00
keronshb 8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00