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-20 19:26:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
2356 Commits
Author SHA1 Message Date
ariaworld 0c2be63a85 Add: Milk decal + organize stripper outfits. 2023-11-18 17:58:53 +01:00
ariaworld 1f463a734c Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update 2023-11-17 23:26:33 +01:00
ariaworld e98019e91e Push, push, push. 2023-11-17 21:34:27 +01:00
BongaTheProto 37bbecefb4 Merge remote-tracking branch 'upstream/master' 2023-11-05 18:01:32 -05:00
SandPoot 9dcb996901 additional 2023-11-04 01:11:52 -03:00
SandPoot 3bb6783438 content 2023-11-03 21:17:22 -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
BongaTheProto e87e828638 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:47:02 -05:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
BongaTheProto 148ae75649 Merge remote-tracking branch 'upstream/master' into upstream-update 2023-06-21 18:49:14 -05:00
SandPoot 15d52e5b15 update content 2023-06-20 15:39:24 -03:00
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03: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
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
DariusandGitHub 59b3c5bd7a Merge branch 'master' into quirk-bloodfledge-overhaul 2023-01-17 19:51:27 +00:00
BongaTheProto 596ab81dd0 Merge remote-tracking branch 'upstream/master' 2023-01-16 01:06:20 -05:00
SandPootandGitHub 0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
Darius 56e43c9879 Bloodsucker Fledgeling overhaul 
This commit refactors most of bloodfledge's code, adjusts balance, and adds new features. See the associated PR for full details.
 2023-01-13 05:06:31 -05:00
Timothy TeakettleandGitHub c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning 
Update to reskinning
 2023-01-11 01:00:35 +00:00
BongaTheProto d6aa3acbd4 Merge remote-tracking branch 'upstream/master' 2023-01-09 17:08:06 -05:00
SandPootandGitHub 2a772c8482 Adds the commando skin from ror & ror2 to the mining hardsuit (#280) 
* first commit with everything

* quick fix and little extra usage!

* the boy

* previous could break

* better head
 2023-01-09 18:55:07 -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
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -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
Darius 39ff3eeb2f Refactor cursed blood effect into modular 
Moves TRAIT_CURSED_BLOOD effects into modular code. Makes change to holy water and blood drunk miner.
 2022-12-18 18:26:38 -05:00
Jerry Wester 13f8559190 add springlock module 2022-12-17 16:54: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
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
Nukechickenu64 37fd47d8f7 modulizing 6 
should be the final commit that modulizes as much as possible
 2022-10-05 18:44:50 -04:00
Nukechickenu64 9d91bd48bd value fix 
simple value fix
 2022-10-05 01:16:55 -04:00
Nukechickenu64 e6928f01ef Merge remote-tracking branch 'upstream/master' into nukechickens_forge 2022-10-03 20:40:23 -04:00
Nukechickenu64 94759db4c8 Bloodsucker Fledgeling quirk and quirk ability section in code 
adds a vampiric quirk that makes you only be able to gain nutrients from blood and be able to bite, along with their problems, also adds section to add in abilities for neutral quirks
 2022-10-01 20:04:53 -04: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
Zirok 42b0733cf7 Fix a runtime with mkII hypospray injections 
INDIVIDUAL_ATTACK_LOG is not a valid category, so this just runtimes.
Since this is already being logged above I decided to just cut this.
 2022-09-16 21:06:36 +02:00
Putnam3145 e1cfa92080 fixes the worst use of a for loop ever 2022-09-13 23:19:12 -07: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