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-17 21:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

924 Commits

Author SHA1 Message Date
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
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
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
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
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
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
BongaTheProto
1c0c91faf6 Merge pull request #669 from Kush1Push1/splurt_keybinds 
Keybinds for suit storage and pockets
 2023-01-16 22:49:51 -05:00
Darius
ad0239b5de Replace all modular HTML spans with defines spans 
In total:
- Adds span defines for `reallybig hypnophrase`, `big warning`, `header`
- Fixes a missing apostrophe for hypno stare
- Makes a special exception for cuddling.dm, which uses an irregular span
- Puts the spans file back
 2023-01-16 04:05:27 -05:00
Darius
19980ae75c Bloodfledge span standards compliance 
Converts all HTML spans to defines spans for files updated in the quirk overhaul.
 2023-01-16 03:46:39 -05:00
BongaTheProto
d8141d260e Merge branch 'master' into pr/600 2023-01-16 02:31:47 -05:00
BongaTheProto
5e784f40b7 thibgies 
yeee
 2023-01-15 16:51:04 -05:00
Darius
12d31faecb Prevent bloodfledge power cord exploit 
Stops bloodfledges from using the power cord implant to gain nutrition, as this would negate all quirk balancing. Synthetic races start with this implant by default.
 2023-01-15 02:35:05 -05:00
BongaTheProto
34507c49b6 Update _under.dm 
don't let the traditions die
 2023-01-14 21:18:48 -05:00
BongaTheProto
a23bafa37f Merge pull request #684 from LeDrascol/bluespace-wallet 
Adds the Wallet of Holding
 2023-01-14 16:30:08 -05:00
BongaTheProto
d330a7c498 Merge branch 'master' into pr/673 2023-01-14 16:01:59 -05:00
Darius
7ca55c7e37 Adds the Wallet of Holding 
Functions like a normal wallet, but with 3x more space. Included in Bluespace Pockets, and available from a science protolathe.
 2023-01-14 06:19:54 -05:00
Darius
64ef8148c8 Plushmium crate updates 
- Reduces the amount from 30 to 5
- - Allows converting only one plushie per shipment
- Adds a spray bottle variant
- Prevents using the spray bottle on non-plushies
- Adds a boxed set for the items
- Adds a lore note explaining how to use it
- Updates shipment information
 2023-01-13 21:40:21 -05:00
BongaTheProto
c7b89635c6 Merge branch 'pr/652' 2023-01-13 18:40:27 -05: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
BongaTheProto
d4c5a3f0d7 Merge pull request #676 from LeDrascol/cargo-crate-plushmium 
Adds a Plushmium Crate
 2023-01-12 13:25:24 -05:00
BongaTheProto
d972b715e2 fixes our reskins 
btw cit's prs aren't making any changelogs for some reason just fyi
 2023-01-11 13:44:42 -05:00
Darius
b605e0ee6a Merge branch 'master' into implant-clothes-burst 2023-01-10 17:53:58 -05:00
Darius
c8acb8c218 Adds a Plushmium Crate to cargo 
Adds the new Plushmium Crate, which contains a bottle of Plushmium and a plushie choice box. Also adds an item for the Plushmium Bottle, so it can be in the crate.
 2023-01-10 14:28:51 -05:00
Darius
96bd348f1b Update LPD drink effects 
- Ignores held items
- Only plays rip noise once
- Displays a different chat message for the target user
- Items are thrown, instead of dropped
- Moves functional code from alcohol_reagents to a mob proc
- - This change is made so other items can use the effect
 2023-01-10 13:15:30 -05:00
BongaTheProto
7d5fbe0412 the glooby update 
very slimy!
 2023-01-10 03:36:39 -05:00
Darius
f979781b8f Adds the Rapid Disrobe Implant 
Adds a new implant for nudist quirk users that launches away clothing item that would cause a negative mood reaction.

Quirk holders automatically gain this implant. Other crew members can buy it from a hacked kinkmate vending machine.
 2023-01-09 20:51:09 -05:00
Kush1Push1
07b4d658ef initial 2023-01-06 16:29:49 +07:00
Darius
8e64b4cac4 Remove unused call from icon updates 
Removes duplicate funny byond dots from the hidden backpack trait's icon update code.
 2023-01-05 15:49:48 -05:00
Darius
2a649892e6 Makes Storage Concealment Implant obtainable 
Adds the Storage Concealment Implant to techweb research and protolathes. Uses the same nodes as other implants.
 2023-01-05 11:03:47 -05:00
Darius
f05d6bf3ed Adds the storage concealment implant 
Adds a new implant that hides back slot items when active. Uses a new trait, and a new check in back sprite update code.
Currently NOT obtainable yet.
 2023-01-05 10:48:33 -05:00
BongaTheProto
962fd9c37b Merge pull request #653 from KeplerWasTaken/master 
Kilo Cargo Shuttle, Box Sec Etrance, and Mining Point Vending Machine fixes, and Buffs Moth in Command drink
 2023-01-03 14:23:34 -05:00
BongaTheProto
b05290e952 Merge branch 'master' into pr/609 2023-01-03 12:23:32 -05:00
BongaTheProto
749b7a7598 guh 
modularized
 2023-01-03 12:23:23 -05:00