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 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,371 Commits 55 Branches 0 Tags
221283c313e3d8c8bd0775c1e54d37f0dcfc560a
Commit Graph

1347 Commits

Author SHA1 Message Date
AshTheDerg
221283c313 Borg Shaker Fix 2023-01-27 15:12:54 -05:00
AshTheDerg
df98398060 Borg Shaker Fix 2023-01-27 14:00:50 -05:00
AshTheDerg
b3a4d968ba More Shaker Fix 2023-01-27 13:35:20 -05:00
AshTheDerg
6e67b60d6e Borg Shaker Fix 
I fix it.
 2023-01-27 13:23:25 -05:00
AshTheDerg
e7e8b422b4 Bork Shaker fix 
I broked it.
 2023-01-27 13:22:23 -05:00
AshTheDerg
4f4108d934 Merge branch 'SPLURT-Station:master' into patch-3 2023-01-27 13:17:09 -05:00
AshTheDerg
ce762c376c Fix broken beer shaker 
I broke the beer shaker. This SHOULD fix it.
 2023-01-27 04:37:59 -05:00
BongaTheProto
7207f6fb74 Merge pull request #718 from AshTheDerg/patch-3 
Borg Beer Shaker drink add
 2023-01-26 23:29:20 -05:00
BongaTheProto
e3d35f46aa Merge pull request #713 from Kush1Push1/splurt_pilot 
Pilot and pilot jaw body markings
 2023-01-26 16:45:35 -05:00
BongaTheProto
2aa678176e Merge pull request #600 from ShamanSliph/cloth-eater 
New Quirk: Clothes Eater and Fixes Insects chewing clothes
 2023-01-26 01:39:16 -05:00
AshTheDerg
e0f9978a11 Borg Beer Shaker additions 2023-01-26 01:10:01 -05:00
AshTheDerg
a2df6d6143 Borg Beer Shaker drink add 
Adds some extra drinks to the Borg Beer Shaker
 2023-01-26 00:59:34 -05:00
BongaTheProto
4bba867c36 Merge pull request #712 from Kush1Push1/splurt_beak 
Corvid beak
 2023-01-25 22:47:11 -05:00
BongaTheProto
4b502c8e17 Merge pull request #703 from LeDrascol/techweb-move-rack 
Move Research Rack to Biological Technology
 2023-01-25 18:16:43 -05:00
BongaTheProto
2bb3832f37 Merge pull request #716 from LeDrascol/remove-dnc 
Remove redundant use of quirk DNC
 2023-01-25 18:02:51 -05:00
Kush1Push1
f76d765d55 A fix 2023-01-25 22:06:54 +07:00
BongaTheProto
5c1351d519 Merge pull request #681 from LeDrascol/quirk-bloodfledge-overhaul 
Bloodsucker Fledgling quirk overhaul
 2023-01-24 13:10:44 -05:00
Kush1Push1
e42c2f1a1d Initial 2023-01-24 22:13:30 +07:00
Kush1Push1
fa2047291d initial 2023-01-24 22:08:42 +07:00
BongaTheProto
9d1aaabc97 Merge pull request #711 from LunarFleet/let-them-bake-cake 
Allow service borgs to cook
 2023-01-23 17:37:09 -05:00
Darius
589ecf7db9 Add Cursed Blood integration to Bloodfledge bite 
Adds an integration between Bloodsucker Fledgling that gives a positive or negative mood to the quirk holder when biting a target with cursed blood, depending on if the quirk holder also has cursed blood.
 2023-01-23 17:34:37 -05:00
LunarFleet
5dd2d46f96 Yes M'lord 2023-01-23 17:25:07 -05:00
LunarFleet
0bf3a67cee Bake maxxing 2023-01-23 03:54:38 -05:00
LunarFleet
356dd7a8cd Agony 2023-01-22 21:35:52 -05:00
Darius
67b39914bb Fix mood event newlines 
Restores missing newline markers to modular mood events. These were lost during a replacement of HTML spans. Also adds the missing span to mood event `cum_craving`.
 2023-01-22 14:43:52 -05:00
BongaTheProto
b00ac4b59e Merge pull request #708 from WoolyAypa/Holy-Clothing-Stuff 
[BOUNTY] Null Rod and Armory Beacon styles
 2023-01-22 12:31:30 -05:00
Darius
d7997fbdf9 Remove quirk DNC 
Removes the DNC quirk, as the upstream merge makes it redundant.
 2023-01-22 11:44:54 -05:00
WoolyAypa
43c362f84f ahem.. 2023-01-21 20:21:50 -03:00
WoolyAypa
32b2af9b8b newline! 2023-01-21 20:20:08 -03:00
WoolyAypa
3a4645d960 descriptions, yeaaah i don't know history 2023-01-21 20:19:02 -03:00
WoolyAypa
3c86dada16 yey 2023-01-21 19:56:10 -03:00
Darius
c46ee2a818 More bloodfledge revival checks 
Adds revival ability checks for TRAIT_NOCLONE and hellbound. These are both conditions that prevent all forms of revival, even for vampires.
 2023-01-21 10:34:54 -05:00
Darius
aeda5081b5 Move research rack techweb node 
Changes the Research Rack techweb node from Data Theory to Biological Technology. This change is made to fit the theme of "specimen research" being a medical study.
 2023-01-21 03:39:24 -05:00
zeroisthebiggay
5cdd3aeda3 Update splurt_emotes.dm 2023-01-20 22:41:52 -05:00
BongaTheProto
3e5b3bbb0e Merge pull request #699 from LeDrascol/boxed-condoms 
Adds the surplus condom box
 2023-01-20 12:47:07 -05:00
Darius
4460d9f724 Remove bloodfledge chapel checks 
Removes chapel checks and penalties from bloodfledge quirk code. Chapels are an underused portion of the station, and quirk served to increase the problem. The behavior was also inconsistent with actual bloodsuckers, and did not fit the "half vampire" theme.
 2023-01-20 09:57:06 -05:00
Darius
1e73c788df Add condom box to loadouts 
Adds a surplus condom box to the loadout selection, under the backpack tab.
 2023-01-20 05:12:00 -05:00
BongaTheProto
0d05b7eaa5 Merge pull request #692 from LeDrascol/prefs-lpd-drink 
Check client prefs before triggering LPD drink
 2023-01-19 16:32:14 -05:00
BongaTheProto
2513a9894e Merge pull request #690 from LeDrascol/merged-drink-sprites 
Deduplicate ported TG drink sprites
 2023-01-19 16:22:35 -05:00
Darius
c73684db34 Adds the surplus condom box 
Adds a box of ten condoms to the kinkmate vendor, priced at half the cost of buying all ten individually.
 2023-01-19 12:44:27 -05:00
Darius
48a7c44dd8 Fix typos in clothing files 
Fixes various typographical errors in the modular clothing files.
 2023-01-19 10:45:59 -05:00
Darius
bd8d7673f8 Minor improvements for bloodfledge ID 
Updates the Bloodfledge ID Card with behavior similar to heirlooms. Fixes an issue where the card could be lost due to a full starting backpack.

- Adds a notice in chat about the ID
- Removes the regenerate icons trigger
- Changes ID spawn location to the floor
- Changes equip type to 'if possible' variant
- Fixes some spacing issues
 2023-01-19 09:12:26 -05:00
Darius
4d32b000a5 Check client prefs before triggering LPD drink 
Updates Liquid Panty Dropper's drink effect to check the client's preferences for ERP and aphrodisiacs before triggering. Setting either to disabled will return with no effect.
 2023-01-19 02:50:26 -05:00
Darius
da942dc740 Remove unnecessary drink icon variables 
Removes unnecessary duplicate drink icon definitions for ported TG drink icons that were merged upstream.
 2023-01-19 02:11:44 -05:00
Darius
24f3acb736 Merge branch 'master' into merged-drink-sprites 2023-01-18 05:35:59 -05:00
Darius
59b3c5bd7a Merge branch 'master' into quirk-bloodfledge-overhaul 2023-01-17 19:51:27 +00:00
Darius
759f208901 Bloodfledge revival improvements 
- Added support for revival policy
- Added check for max revive brute damage
- Added check for max revive fire damage
- Added redundant check for revive (for chat output)
- Added revival sound effect
- Removed health threshold check
- Improved logging with death time and policy information
 2023-01-17 14:26:00 -05:00
JimmyDrop
82fddac441 Small batch of clothes 
Im not sure what else needs to be done. Looking around I can't find any more items that need to be specified. But its possible I missed some.
 2023-01-17 12:32:29 -05:00
Darius
2c2493225e Deduplicate TG drink sprites 
Removes drink sprite entries that were merged upstream.
 2023-01-16 23:16:35 -05:00
BongaTheProto
19fe5cf1ef Merge pull request #688 from LeDrascol/span-standardization 
Replace all modular HTML spans with defines spans
 2023-01-16 22:53:48 -05:00