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-19 10:47:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1130 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
 2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 8cdb82a23f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-12 22:06:13 -03:00
SandPoot e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot 36f3edaf4c push 2023-12-10 15:16:51 -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
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Satile1 61ef0f337e Hotel Radio channel! Mapping fixes and flavour 2023-05-25 17:09:21 +01:00
Darius 86b4f6c6ec Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-19 20:23:16 -05:00
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05: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 78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -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
Darius f2cf15c590 Refactor Dumb For Cum quirk 
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
 2023-02-02 17:21:54 -05:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
BongaTheProto 86a005b590 Merge remote-tracking branch 'upstream/master' 2023-01-11 12:51:40 -05:00
SandPoot 03304ba2c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-10 22:50:16 -03:00
SandPoot 3b8d102fac puts pda in the system to remove shitcode 2023-01-10 20:02:12 -03:00
SandPoot cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
BongaTheProto ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05:00
SandPoot 42d4abc164 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 16:44:44 -03:00
Darius e5813bec20 Play BSLR effects only when replacing 
Prevents the Bluespace Light Replacer from playing sounds or displaying a beam when the target's light won't be replaced. Based on the BSRPED's behavior.
 2023-01-03 14:36:56 -05:00
BongaTheProto 8034d9fb22 Merge remote-tracking branch 'upstream/master' 2022-12-31 14:31:12 -05:00
SandPoot d337852c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-28 16:56:04 -03:00
Darius d3e018720c Port the Bluespace Light Replacer 
- Ports the Bluespace Light Replacer from TG
-- Added to Applied Bluespace Research instead of Advanced Sanitation Technology
- Makes the basic Light Replacer a default tech node
 2022-12-24 15:57:11 -05: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
LinandGitHub 7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song 
Solves some harddels
 2022-12-12 19:11:49 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
BongaTheProto f0b7bd40a6 follow-up 
because some stuff got ported
 2022-09-27 23:39:10 -05:00
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
siliconsandGitHub b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements 
Ports Adding radio access to borgs by default from splurt. Credit to NopemanMcHalt for the splurt port and Ayfa212 for the initial work.
 2022-09-23 16:26:54 -07:00
siliconsandGitHub a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition 
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
 2022-09-23 16:16:03 -07:00
BongaTheProto 9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00
shellspeed1andGitHub d83747dc74 Ports Quantum Spin Inverter from TG. (#15846) 
* ports bluespace swapper

* fixes materials so we can print quantum spin inverters

* its diamond not diamoond
 2022-09-17 13:39:32 -07:00
shellspeed1 11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
shellspeed1 8d9804e953 adds radio access to borgs by default 2022-09-17 02:20:36 -07:00
Pin-alternative 9e377c644b Merge remote-tracking branch 'upstream/master' into cursed 2022-08-23 07:41:40 +10:00
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
Putnam3145 d08a570c5f Makes binary translator not show a wrong description 2022-08-18 21:51:39 -07:00
Pin-alternative 58eac01841 Merge remote-tracking branch 'upstream/master' into cursed 2022-07-17 20:57:03 +10:00
BongaTheProtoandGitHub 16ecfb8078 Merge pull request #359 from Yatiyaya/Zombie-unfuckery 
Updating the zombie race to support modular creation
 2022-07-15 18:10:11 -05:00
Pin-alternative 2fb97598f9 Merge remote-tracking branch 'upstream/master' into cursed 2022-07-10 19:49:01 +10:00
Aphast 90c7222460 Mosley forced me down and tried to seggs me for this 2022-07-06 05:09:16 -04:00