Elizabeth Lavenza
d1365fac5f
Fix SPLURT-specific box overlays
2024-04-16 02:25:20 -04:00
BongaTheProto
dc057a41ad
Merge branch 'master' into upstream-merge
2024-04-06 18:51:51 -05:00
Elizabeth Lavenza
61b42df4df
Rewrite leashes to have better code quality
2024-04-01 19:23:48 -04:00
Elizabeth Lavenza
e3af7ec906
Fix mispathed screen alerts
2024-04-01 16:17:39 -04:00
BongaTheProto
1883c47d5c
basic ref regex
...
makes the proc calls compatible with 515
2024-03-11 19:46:05 -05:00
ariaworld and GitHub
e155e394c3
Merge branch 'SPLURT-Station:master' into tweak-undead
2024-02-10 21:56:42 +01:00
ariaworld
58bbf47fa9
(Hopefully) fix the unit test error for chastity cages
2024-01-10 01:25:23 +01:00
ariaworld and GitHub
fd2cf853ac
Merge branch 'SPLURT-Station:master' into tweak-undead
2024-01-05 00:58:00 +01:00
ariaworld
b4dbb92dc0
And fix the overlay not hiding for metal!
2024-01-02 16:52:13 +01:00
ariaworld
c9824c8663
Also this.
2024-01-02 15:32:43 +01:00
ariaworld
65bcb5a7db
FIX CHASTITY CAGES
2024-01-02 15:27:59 +01:00
ariaworld
236901ca0a
Text refactor + more layer shifting
2023-12-31 15:42:27 +01:00
ariaworld
7f940eba77
Quirk rebalance
2023-12-31 15:05:38 +01:00
BongaTheProto
7263373341
Update lewd.dm
2023-12-28 18:14:23 -05:00
BongaTheProto
90e6ac16e7
Merge branch 'master' into pr/783
2023-12-28 18:14:20 -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
BongaTheProto and GitHub
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
FLME
8079a58bb7
add_sc_kit_and_put_it_in_the_loadout
2023-03-07 13:40:10 -06: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
Elizabeth Lavenza