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-23 20:56:47 +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
BongaTheProto 5afdd65bdb Revert "followup" 
This reverts commit 32b361c846.
 2023-12-16 10:48:30 -05:00
BongaTheProto 32b361c846 followup 2023-12-15 18:38:06 -05:00
ariaworld 7f82de9f49 Merge remote-tracking branch 'upstream/master' into spooktober-update 2023-12-02 23:49:11 +01:00
BongaTheProtoandGitHub a4921ffa04 Merge pull request #987 from LeChatGuid2/Pet_Deathclaw_Ordering 
Pet deathclaw ordering
 2023-12-02 14:47:06 -05:00
ariaworld fab9f352e0 Fix lil' grammar thingie 2023-11-27 22:25:50 +01:00
ariaworld e0678b1360 Add: Vibrators and strap-on to loadout. 2023-11-27 22:17:18 +01:00
Satile1 a2e02563d4 Voxxie breathe the nitrogens. 2023-11-22 18:28:03 +00:00
ariaworld 3805388363 Modularize, RAHHHH! 2023-11-19 03:03:30 +01:00
PuzzleSad 06d32b1376 Fixing Misconfiguration of kinkmate item 
About
Kinkmate vendors have a contraband item "breast reduction pills"
it actually contained penis reduction pills
this pr corrects this

Port
No

Checklist
+ Tested on local server
+ No runtimes
+ Documentation: This pr would probably suffice

Changelog
🆑
Fixes Breast reduction pills contraband item in kinkmate containing penis reduction pills
(Now contains Breast reduction pills)
/🆑
 2023-10-31 20:02:31 +02:00
ariaworld 23f141965e First draft. 2023-10-31 14:03:34 +01:00
LagardereMathis b9554b8339 Bug fix & new pet_alphas 2023-10-23 19:49:24 +02:00
AshTheDergandGitHub c226169db7 Tailbag 2023-10-15 21:22:27 -04:00
AshTheDergandGitHub 0aa25faca6 Tailbags 2023-10-15 21:14:51 -04:00
AshTheDergandGitHub 2ced02580b Tailbags 2023-10-15 20:24:34 -04:00
AshTheDerg 6d433b941e Tailbags 
Tailbags as a wallet+ option, available for 1 point in loadout, or crafted
 2023-10-15 20:10:37 -04:00
BongaTheProto bebc910722 foth lmao 
plushie for a donator
 2023-10-02 23:40:38 -05:00
BongaTheProto 615a241c15 followup 
seems the code was mostly ok
 2023-09-16 14:33:15 -05:00
BongaTheProto 35c3dd0288 salvaging 
yippee
 2023-09-05 18:14:31 -05:00
BongaTheProtoandGitHub c4639cd9cc Merge pull request #881 from LeChatGuid2/LeChatGuide'sbranch 
Pet_Capsule donator item
 2023-08-22 18:04:23 -05:00
LagardereMathis 97e853283e Add male/female deathclaw features 2023-08-13 16:29:20 +02:00
Tsurupeta deb1ffc160 splurt 2023-08-08 14:01:14 +03:00
LagardereMathis 33e09dbd27 Switched pet deathclaw to femclaw 2023-08-07 15:11:45 +02:00
LagardereMathis ca87a42216 Merge remote-tracking branch 'upstream/master' into LeChatGuide'sbranch 2023-08-07 15:10:23 +02:00
BongaTheProto 70fce668c5 what's next? your tits feel full again? 
old players will remember this verb
 2023-07-18 17:57:18 -05:00
BongaTheProtoandGitHub 0059a69d98 Merge pull request #858 from AshTheDerg/Peacekeeper-Rework 
Peacekeeper Rework
 2023-07-18 12:53:27 -05:00
Lagardere 04d798f60b Merge remote-tracking branch 'upstream/master' into LeChatGuide'sbranch 2023-07-18 15:11:06 +02:00
BongaTheProtoandGitHub b139c36ba1 Merge pull request #897 from SPLURT-Station/fix-mannitol 
fixes mannitol
 2023-07-15 13:21:15 -05:00
KeplerWasTaken cb9e52722b Carving stones! 2023-07-14 20:07:43 +02:00
BongaTheProto ef5ee8996f Update chastity_hypnosis.dm 
horrid
 2023-07-08 14:20:10 -05:00
Zattarra c0f9175346 Minor fix. 2023-07-08 04:20:08 -07:00
AshTheDergandGitHub 6de2331c4c Peacekeeper Rework 
Now MAYBE it'll work correctly.
 2023-06-25 21:07:59 -04:00
AshTheDergandGitHub ca23793cdd Peacekeeper Rework 
Somehow broke the prova. Should fix it, and I'll just have to play hardball with the loadout option.
 2023-06-21 13:42:09 -04:00
LagardereMathis 0f624dfacd Pet_Capsule donator item 2023-06-21 01:08:10 +02:00
BongaTheProtoandGitHub 33a9c33e9f Merge pull request #856 from SPLURT-Station/make-code-better 
Genital equipment code cleaning
 2023-06-17 12:07:45 -05:00
BongaTheProtoandGitHub 14b731074a Merge pull request #824 from LunarFleet/quirks 
Two new, semi-NSFW quirks
 2023-06-17 01:32:55 -05:00
BongaTheProtoandGitHub 4d994fa1f9 Merge pull request #852 from Satile1/HotelComms 
Hotel Radio channel! Mapping fixes and flavour
 2023-06-14 18:51:28 -05:00
BongaTheProto a18ec96580 fuck it, we use callbacks now 
I suppose it's better than having to handle signal logic for every item
 2023-06-13 20:23:01 -05:00
BongaTheProto 377c255d88 fixes 
don't worry lunar, I know you're busy doing bakery things
 2023-06-13 19:50:17 -05:00
BongaTheProto b5c2215e80 Merge branch 'master' into pr/824 2023-06-13 19:39:51 -05:00
BongaTheProto 926e4c8bee Update metal_chastity_cage.dm 2023-06-11 16:36:37 -05:00
BongaTheProto 60512d184c Update metal_chastity_cage.dm 
I was too sleepy when I did this
 2023-06-11 16:28:55 -05:00
AshTheDerg 314c0e421f Peacekeeper Rework 
Yet another Peacekeeper Rework. This time, they've lost their tasers and now have a choice of batons! Coming soon: Peacekeeper Offices!
 2023-06-04 16:18:09 -04:00
BongaTheProto 4bb7c01050 I don't trust signals 
idk how bitflags work I suppose
 2023-06-04 03:18:03 -05:00
BongaTheProto b950414c84 genital equipment component 
holy fuck his was so difficult to get done
 2023-06-04 02:53:02 -05:00
WoolyAypa e1c9bb9775 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-05-28 13:39:05 -03:00
Satile1 61ef0f337e Hotel Radio channel! Mapping fixes and flavour 2023-05-25 17:09:21 +01:00
El Derp o Derp 4d3ba33332 I missed two lines and everything fell apart. Also forgot to even check my code, oops. 2023-05-19 21:25:19 -07:00
El Derp o Derp 77701b7917 Adds god tier short circuiting, maybe fixes some things too? 2023-05-19 21:17:51 -07:00
ZatarraGitHubBongaTheProto
 		d08ff6ff94 Update modular_splurt/code/game/objects/items/armor_kits.dm 
This is very good.

Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2023-05-19 20:59:44 -07:00
El Derp o Derp 94665e85d1 Hopefully extends the kits' capabilities to a broader range of related items. 2023-05-19 00:02:49 -07:00