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
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
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
Comicao1
bf6fd2ce1f
Merge remote-tracking branch 'upstream/master' into xenoarch-new
2023-05-04 02:29:52 -03: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
36f8a4ea71
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system
2023-04-26 16:12:15 -03:00
Comicao1
3941dd22a5
Final
2023-04-03 18:41:16 -03:00
Comicao1
e9b6fc8ff5
Go on
2023-04-02 20:06:45 -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
Comicao1
d1f6424325
Initial XENOARCH port
2023-03-14 19:25:05 -03:00
Pin-alternative
1c1460ecd7
Merge remote-tracking branch 'upstream/master' into rework
2023-03-08 08:14:47 +11:00
Pin-alternative
6474cb5e6f
changes
2023-03-08 08:14:16 +11:00
BongaTheProto and GitHub
db48587b4d
Merge pull request #752 from LeDrascol/vampire-overhaul-2
...
Bloodsucker Fledgling Overhaul: Part 2
2023-03-07 00:23:21 -05:00
BongaTheProto and GitHub
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
6737b2a1ce
Merge branch 'master' into vampire-overhaul-2
2023-02-23 00:40:22 -05:00
Darius
86b4f6c6ec
Merge branch 'master' into overhaul-quirk-dumb4cum
2023-02-19 20:23:16 -05:00
BongaTheProto
d08cb554e9
Merge branch 'master' into pr/660
2023-02-13 14:09:17 -05:00
Darius
71e3fce462
Use is_helpers defines for Bloodfledge trait check
...
Adds a new is_helpers definition for the bloodfledge trait.
2023-02-13 10:06:11 -05:00
Darius
bc48a6eafc
Add vampire ability permission check
...
Adds a new mob proc that allows checking if vampiric abilities should function. Allows easily checking anti-magic, trait holy, garlic necklace, garlic blood, and staked status.
Bloodfledge actions and coffin healing will now use this check. Flight potions will warn bloodfledge quirk users before allowing consumption.
2023-02-12 10:57:13 -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
Darius
666afd8124
Trigger bloodfledge coffin healing on-demand
...
Prevents quirk processing from running by default for Bloodsucker Fledgling. Processing is started and stopped by being inside a coffin when it is opened or closed. Messages have been added for all start and stop interactions.
The following changes are made for Bloodfledges:
- Added quirk processing triggers to coffins
- Added coffin check for robotic mob biotypes
- Added return for non-coffin locations to quirk processing
- Added feedback messages for open, close, synthetic, fully healed, and starving
- Removed robotic biotype check from processing
- Removed obsolete brute and burn damage adjustments
- Stop processing if fully healed
- Stop processing if below nutrition requirement
2023-02-11 12:37:18 -05: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
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
BongaTheProto