Commit Graph
276 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
BongaTheProto efe7787917 fixes the negative size bug
lol
2023-11-19 19:53:29 -05:00
BongaTheProtoandGitHub de5e1e7611 Merge pull request #981 from ariaworld/lewd-smallupdate
[Lewd] [Semi-Modular] - Human Erect Penis and Balls Sprites-Fix & More!
2023-11-06 15:06:15 -05:00
ariaworldandGitHub f207ad0383 Merge branch 'SPLURT-Station:master' into fix-photography 2023-10-24 22:02:53 +02:00
ariaworld 708ad3d128 Revert "modularize"
Demodularizes Photography Album Persistence.

This reverts commit 7ebdfba5c9.
2023-10-24 21:59:22 +02:00
BongaTheProtoandGitHub 1e3e286dd2 Merge pull request #957 from ariaworld/master
Vacuum Resistance quirk + Haydee Snout + Various body markings
2023-10-23 19:56:32 -05:00
ariaworld 90fb76f150 Distant quirk can now be toggled, cosmetic glow starts without ugly glow. 2023-10-23 22:31:59 +02:00
ariaworld efd07a7701 Tough quirk 2 points cost. 2023-10-23 22:31:11 +02:00
Anonymous 7f2e13dabe Fixes loadout masks getting removed due Bane quirk
Also corrects indentation for gasmask loadout change. Sorry K4rlox.
2023-10-04 20:28:52 +03:00
BongaTheProtoandGitHub 31d43c4fe7 Merge pull request #947 from remuluson2/messy
Adding Messy trait, Pref for getting splashed with cum
2023-09-23 18:57:28 -05:00
BongaTheProtoandGitHub 73e71d041c Merge pull request #931 from Yawet330/master
Compressed PR | Zombie Changes | Privacy stuffs
2023-09-23 17:44:57 -05:00
Yawet330andGitHub 90c17ee241 Changes some last minute things as both modular limbs and spaceresist are their own traits now. 2023-09-17 23:14:40 +01:00
nickstershovel 53be54a122 Merge branch 'master' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 2023-09-16 21:37:37 +02:00
BongaTheProto 615a241c15 followup
seems the code was mostly ok
2023-09-16 14:33:15 -05:00
24cc3dcdbc Update modular_splurt/code/datums/traits/good.dm
Co-authored-by: Zatarra <68243757+Zattarra@users.noreply.github.com>
2023-09-12 09:35:55 +02:00
Yawet330andGitHub 62a769a0e3 Update neutral.dm 2023-09-06 20:37:37 +01:00
8037db759a Update modular_splurt/code/datums/traits/good.dm
Thank youu :P <3

Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
2023-09-02 11:12:12 +02:00
Mateusz Dargiel 4b7ee9e61b time to make a mess 2023-09-02 10:59:09 +02:00
ariaworld 0366c76bdf Vacuum Resistance quirk. 2023-09-02 00:51:21 +02:00
Yawet330 b78505c7b9 weh 2023-08-17 07:12:46 +01:00
Yawet330andGitHub c2899115c2 Update good.dm 2023-08-08 07:14:48 +01:00
Yawet330andGitHub 96d3c8df95 Update good.dm 2023-08-07 00:27:40 +01:00
Yawet330andGitHub 7d40332a6f Update trait_actions.dm 2023-08-06 17:05:52 +01:00
Yawet330 649a814d12 wow so cool and epic 2023-08-06 17:05:01 +01:00
Yawet330 1ebf3e483c aaaaaaweh 2023-08-06 13:04:49 +01: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
BongaTheProto 4b9061d567 lol sub
hopefully this fixes the blush spam
2023-07-18 17:25:30 -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
ZatarraandGitHub f0d7708a36 Update good.dm
Formatting.
2023-06-12 16:43:40 +09:00
ZatarraandGitHub 46b5b23076 Update good.dm
Grammar.
2023-06-12 16:42:26 +09:00
Zattarra ed1e1bc6eb Adds first implementation of Hallowed quirk. 2023-06-11 21:45:59 +09:00
LunarFleet cadf189aca Quirky 2023-05-02 03:07:00 -04:00
Azarak 079f1aa437 Body Morpher Quirk 2023-04-22 10:01:51 +02:00
BongaTheProtoandGitHub d6306694ca Merge pull request #766 from LeDrascol/quirk-hypno-expanded
New Cybernetic: Mesmer Eyes
2023-03-23 17:33:33 -05:00
Darius c283277fdc Merge branch 'master' into overhaul-quirk-nudist 2023-03-09 23:16:10 -05:00
Darius 31e6236ee5 Merge branch 'master' into quirk-hypno-expanded 2023-03-09 23:14:17 -05:00
BongaTheProtoandGitHub db48587b4d Merge pull request #752 from LeDrascol/vampire-overhaul-2
Bloodsucker Fledgling Overhaul: Part 2
2023-03-07 00:23:21 -05:00
Darius 8249f34be3 Merge branch 'master' into quirk-hypno-expanded 2023-02-23 00:43:09 -05:00
Darius 6737b2a1ce Merge branch 'master' into vampire-overhaul-2 2023-02-23 00:40:22 -05:00
Darius d48025140b Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-23 00:37:04 -05:00
Darius 9ba0f38a7f Merge branch 'master' into overhaul-quirk-nudist 2023-02-19 20:44:08 -05:00
Darius 2a93d4ccba Merge branch 'master' into quirk-rad-immune 2023-02-19 20:40:04 -05:00
Darius c201c1f941 Use proper defines for D4C quirk
Updates the Dumb For Cum quirk to use proper defines for assigned traits and mood events. Also merges the mood events to reduce redundancy.
2023-02-19 20:38:23 -05:00
Darius 86b4f6c6ec Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-19 20:23:16 -05:00
Darius 2589833163 Nudist quirk refactor
This commit does the following involving the nudist quirk:
- Add examine text
- Add mood gain/loss messages
- Add signal support
- Add proper removal support
- Remove processing
- Remove useless comments
- Remove useless returns

And the following general changes:
- Add signal `COMSIG_MOB_UPDATE_GENITALS` for proc `update_genitals()`
2023-02-19 20:01:52 -05:00
Darius b2143122f9 Fix define name oversight for trait mood
Fixes a mislabeled defines in the trait defines moods.
2023-02-19 18:03:54 -05:00
Darius 7fdd375a29 Move quirk mood types to defines
Adds defines to all quirk mood types, and removes their associated variables. Reduces the amount of variables used by quirks.
2023-02-19 17:59:41 -05:00
Darius 82b4a4e9c5 Hypnotic Gaze standards improvements
This commit makes various changes to the Hypnotic Gaze quirk to bring it in line with other quirk abilities.

- Added cooldown support
- - Defaults to 3 seconds
- - Increases to 30 seconds in brainwash mode
- - Resets when toggling brainwash mode
- Added parent return checks
- Added check wearing eye protection
- Added check for having eyes
- Added check for being blind
- Changed type from innate to cooldown
- Changes time variables to use defines
2023-02-18 17:59:51 -05:00