Commit Graph
43 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 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
BongaTheProto 35c3dd0288 salvaging
yippee
2023-09-05 18:14:31 -05:00
Tsurupeta deb1ffc160 splurt 2023-08-08 14:01:14 +03:00
BongaTheProto ef5ee8996f Update chastity_hypnosis.dm
horrid
2023-07-08 14:20:10 -05: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
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
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 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 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
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
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
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
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
WoolyAypa 48d33e9fb2 mf SHOULD_NOT_SLEEP 2022-12-13 19:15:56 -03:00
WoolyAypa 4eb101982f not 'lazy' enough; safer now 2022-12-13 18:25:48 -03:00
WoolyAypa fe8e23f406 no need for dis 2022-12-13 18:03:16 -03:00
WoolyAypa b1c288d267 help! 2022-12-12 12:38:18 -03:00
zeroisthebiggayandGitHub 3a6adcef6f Update leash.dm 2022-10-22 02:42:09 -04:00
zeroisthebiggayandGitHub d59c142435 Update leash.dm 2022-10-22 01:38:31 -04:00
zeroisthebiggayandGitHub a8a7ff832e Update leash.dm 2022-10-18 22:10:18 -04:00
zeroisthebiggayandGitHub 1618b0c7b2 Update leash.dm 2022-10-18 22:10:04 -04:00
zeroisthebiggayandGitHub 5ea1bd92c3 Update leash.dm 2022-10-18 22:08:11 -04:00
BongaTheProto bad153f1a3 object(s)
S
2022-10-15 17:05:06 -05:00