Commit Graph
229 Commits
Author SHA1 Message Date
BongaTheProto f353115f71 the cum bathing is real!!!!!
cum overlays have been fixed once and for all
2023-08-26 03:42:29 -05:00
BongaTheProto cdd5bb87d8 Merge remote-tracking branch 'upstream/master' 2023-08-08 01:42:46 -05:00
SandPoot 1ae7c2272a quick-fix 2023-08-07 16:53:05 -03:00
SandPoot 6fb4267b56 upload 2023-08-04 23:26:33 -03:00
BongaTheProto ea324c5bc1 Merge remote-tracking branch 'upstream/master' 2023-07-28 20:43:43 -05:00
SandPoot 613f6694d3 extra behavior 2023-07-28 21:09:20 -03:00
SandPoot 5fb9aa4152 change 2023-07-28 21:00:29 -03:00
BongaTheProto 650642d379 Merge remote-tracking branch 'upstream/master' 2023-07-20 00:23:25 -05:00
SandPoot 2b9660664e poosh 2023-07-19 17:48:43 -03:00
BongaTheProto f4e7294296 Merge remote-tracking branch 'upstream/master' 2023-07-13 19:57:48 -05:00
SandPoot 737c2f200d content 2023-07-12 13:04:01 -03:00
BongaTheProto 148ae75649 Merge remote-tracking branch 'upstream/master' into upstream-update 2023-06-21 18:49:14 -05:00
SandPoot 15d52e5b15 update content 2023-06-20 15:39:24 -03:00
WoolyAypa 71983d21a8 Merge branch 'Chastity-system' of https://github.com/WoolyAypa/S.P.L.U.R.T-Station-13 into Chastity-system 2023-05-28 18:33:09 -03:00
WoolyAypa 7b9d0f43a5 , B gone 2023-05-28 18:33:01 -03:00
2bc6ce835f Update modular_sand/code/datums/interactions/lewd_definitions.dm
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
2023-05-28 16:36:30 -03:00
WoolyAypa f475015d09 removed unnecessary stuff 2023-05-28 15:02:01 -03:00
WoolyAypa c0cfc5a807 chastity cages work again and can be deleted 2023-04-29 17:10:16 -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
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
Pin-alternative c9457047aa Merge remote-tracking branch 'upstream/master' into rework 2023-03-22 15:45:09 +11:00
BongaTheProto 017c235b4f Merge remote-tracking branch 'upstream/master' 2023-03-14 17:43:38 -05:00
SandPoot 50620b906f gone 2023-03-14 18:40:17 -03:00
BongaTheProto 9e65955803 Update holder_micro.dm
makes you able to interact with mobs you're holding again
2023-03-14 16:37:59 -05:00
BongaTheProto c7569b07a5 Merge remote-tracking branch 'upstream/master' 2023-03-13 02:25:18 -05:00
SandPoot 0dd6daf5d5 lust sight 2023-03-12 03:02:00 -03:00
Pin-alternative 5ce56db316 Merge branch 'rework' of pin:Pin-alternative/S.P.L.U.R.T-Station-13 into rework 2023-03-05 19:17:54 +11:00
Pin-alternative d1b3acbc5c Merge remote-tracking branch 'upstream/master' into rework 2023-03-05 19:16:26 +11:00
BongaTheProto 5ec4443259 Merge remote-tracking branch 'upstream/master' 2023-02-20 11:36:04 -05:00
DariusandGitHub e11aa3fb1d Use english list for In Estrous examine text (#308)
* Convert In Estrous text to english lists

This commit does the following for In Estrous examine text:
- Adds English list support
- Adds support for synthetic species
- Removes check for Vagina organ
- Updates text to prevent double "and"

* Reduce In Estrous sub-list usage

Removes unnecessary sub-list generation for the In Estrous quirk, and reduces the length of the synth message.
2023-02-19 19:34:41 -03:00
93147fe800 Add organ-specific In Estrous quirk text (#305)
* Add organ-specific estrous messages

Adds differing messages for the In Estrous quirk based on what reproductive organs the quirk holder possesses.
Adds support for changing the message ending, which is intended for use downstream.
Changes the gain text to be less specific.

* Fix minor typo for In Estrous examine text

Fixes a potential case of "currently in influenced" that could occur due to a text oversight.

* Use signals for Estrous organ change

Updates for the In Estrous quirk to use signal handlers.

This commit does the following
- Adds signal for organ insertion
- Adds signal for organ removal
- Adds quirk function for updating organs
- Adds quirk signal handlers for organ adding and removing
- Adds quirk check for no valid organs

* Fix positional argument use for organ signals

Removes improper use of positional arguments from the organ insertion and removal functions, and improves the variable name for mob.

* Organ manipulation argument fixes

Restores missing arguments and adds additional signal arguments for organ insertion and removal.

* Unregister In Estrous quirk signals as a list

Combines the UnregisterSignal functions in the In Estrous quirk removal.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

---------

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2023-02-19 15:14:11 -03:00
BongaTheProtoandGitHub e42db7f37c Merge branch 'Sandstorm-Station:master' into master 2023-02-17 18:50:34 -05:00
Pin-alternative 05e486ea8e Merge remote-tracking branch 'upstream/master' into rework 2023-02-17 21:13:35 +11:00
SandPoot beb9ffbe36 simple fix for admin spawn 2023-02-17 02:07:30 -03:00
BongaTheProto b61500c13a followup 2023-02-16 17:04:00 -05:00
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot 04eb7226e6 general better handling of code + interaction screen tip 2023-02-15 23:26:59 -03:00
BongaTheProtoandGitHub 0a48421882 Merge branch 'Sandstorm-Station:master' into master 2023-02-12 16:13:29 -05:00
SandPoot e1c9fdaf00 fucking fix that mosley annoys me about 2023-02-12 18:03:41 -03:00
BongaTheProto 73abec3913 Merge remote-tracking branch 'upstream/master' 2023-02-11 22:21:31 -05:00
BongaTheProto ee9800f843 Update holder_micro.dm 2023-02-11 22:20:47 -05:00
SandPoot 0fa94f6edc size peeking, both standing on table, message 2023-02-11 23:55:46 -03:00
BongaTheProto 929f5399aa followup 2023-02-11 21:34:18 -05:00
BongaTheProto a65cd6c96b Merge remote-tracking branch 'upstream/master' 2023-02-11 21:26:36 -05:00
BongaTheProto ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -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
SandPoot 243e7ea02f safety i guess, people are afraid that someone is SOMEHOW gonna manage to open their menu without being admin 2023-02-11 21:54:20 -03:00
WoolyAypa e4d35beb7d hope it works 2023-02-11 16:28:54 -03:00
SandPootandGitHub 117919fe2b Componentizes Interaction menu + prepares it for screentips by adding a shortcut (#301)
* files

* let's just use our own parent

* necessary

* two istypes on a row
2023-02-11 14:39:29 -03:00
WoolyAypa 94d24dfb31 mebbe? 2023-02-11 12:22:05 -03:00