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-27 22:57:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
132 Commits
Author SHA1 Message Date
El Derp o Derp 629fcb06ac Adds the sec armor kits (rampart) into the security vendor. 2023-05-17 18:11:33 -07:00
El Derp o Derp bf09846a8c Adds the headgear version of the aegis armoring kit. Also makes the normal aegis kit look less bad. 2023-05-13 12:24:10 -07:00
El Derp o Derp bc6caf990f Adds a single comment. 2023-05-13 11:31:00 -07:00
El Derp o Derp 228bfa867e Attempts to add the aegis kit. 2023-05-13 11:12:02 -07:00
WoolyAypa 0c1609fbae amen 2023-05-03 18:50:01 -03:00
WoolyAypa 1ea2e00cc2 bigger cages 2023-05-03 00:08:56 -03:00
LunarFleet d6a68ebfc1 The one line, the one line is real! 2023-05-02 03:16:26 -04:00
LunarFleet cadf189aca Quirky 2023-05-02 03:07:00 -04:00
WoolyAypa 15b088239e lower chances 2023-04-29 19:26:13 -03:00
WoolyAypa d494396196 safe condition for chastity cage 2023-04-29 19:25:47 -03:00
WoolyAypa e6757735ae remove hypno verb 2023-04-29 19:25:18 -03:00
WoolyAypa c0cfc5a807 chastity cages work again and can be deleted 2023-04-29 17:10:16 -03:00
WoolyAypa f098cf7076 yeaah? 2023-04-27 22:57:20 -03:00
WoolyAypa f70e1e901e Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-03-24 23:46:54 -03:00
BongaTheProtoandGitHub 227afc63c0 Merge pull request #776 from SPLURT-Station/moar-itemb 
Some donator updates
 2023-03-01 14:31:54 -05:00
BongaTheProto 9e21a4feda deluxe plushie box 2023-02-23 23:35:06 -05:00
Darius 86b4f6c6ec Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-19 20:23:16 -05:00
WoolyAypa 078413e553 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-02-11 22:37:34 -03:00
WoolyAypa 10be40ce81 yep 2023-02-11 20:07:17 -03:00
WoolyAypa e4d35beb7d hope it works 2023-02-11 16:28:54 -03:00
WoolyAypa 94d24dfb31 mebbe? 2023-02-11 12:22:05 -03:00
AypaGitHubBongaTheProto
 		e141034070 Update modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_cage.dm 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2023-02-09 22:28:20 -03:00
Comicao1 ed4a96d900 Update toys.dm 2023-02-09 22:02:18 -03:00
Darius bcf5904b6c Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-08 21:49:37 -05:00
Comicao1 5f4f7eebed Update toys.dm 2023-02-08 19:18:16 -03:00
Comicao1 a4fa7a2d68 Cleans a few things 2023-02-08 19:17:21 -03:00
Comicao1 cb355bd50f A few requested things 2023-02-08 18:18:09 -03:00
Comicao1 2141ebc0cb Modularized 2023-02-07 20:27:01 -03:00
Comicao1 4722e7b54b Opsie 2023-02-07 18:45:23 -03:00
Comicao1 9feb3c31c8 Bounty beachball 2023-02-07 18:30:00 -03:00
Darius 8f8d521365 D4C quirk parity improvements 
This commit makes the following changes:
- Added pacifism trait to D4C craving
- Added D4C craving text to illiteracy warning
- Updated text for cum_stuffed mood event
- Updated D4C craving removal to trigger regardless of timer
- Fix incorrect type assignment for craving trait removal

Adds Dumb For Cum quirk craving checks to:
- Mob proc can_read
- PDA send_message
- PDA receive_message
 2023-02-06 20:21:12 -05:00
Darius fce50e1b81 Add roleplay brain trauma toys 
Adds arcade machine prizes that grant roleplay-oriented brain traumas; Split Personality and Imaginary Friend. Each item is single use.
 2023-02-01 16:31:48 -05:00
Darius 3851370f89 Reduce condom prices 
Sets a price for the condom item at PRICE_CHEAP_AS_FREE (10 credits), and updates the price for surplus condom box item to PRICE_BELOW_NORMAL (80 credits).
 2023-01-30 16:52:52 -05:00
BongaTheProtoandGitHub 5c1351d519 Merge pull request #681 from LeDrascol/quirk-bloodfledge-overhaul 
Bloodsucker Fledgling quirk overhaul
 2023-01-24 13:10:44 -05:00
BongaTheProtoandGitHub 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 0bf3a67cee Bake maxxing 2023-01-23 03:54:38 -05:00
BongaTheProtoandGitHub 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
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 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
WoolyAypa f04f9ce559 doone, opt-out pref 2023-01-19 00:43:16 -03:00
WoolyAypa 4cd6975b3b conflictos 2023-01-18 21:27:19 -03:00
DariusandGitHub 59b3c5bd7a Merge branch 'master' into quirk-bloodfledge-overhaul 2023-01-17 19:51:27 +00: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
BongaTheProto 5e784f40b7 thibgies 
yeee
 2023-01-15 16:51:04 -05:00
Darius 2118b148e4 Bloodfledge ID improvements 
- Flavor text consistency improvements
- Automatically link to the holder's account
- Added a job assignment
- Prevent overlays from applying
- Modularized and recreated icon
 2023-01-15 02:13:47 -05:00
BongaTheProtoandGitHub 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