Commit Graph
31 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot d71ae369d6 reorganizes flags to be alphabetical 2023-12-11 15:23:53 -03:00
SandPoot bfc964b76b do you know the definition of insanity 2023-12-09 20:27:19 -03:00
BongaTheProto 37bbecefb4 Merge remote-tracking branch 'upstream/master' 2023-11-05 18:01:32 -05:00
SandPoot 3bb6783438 content 2023-11-03 21:17:22 -03:00
BongaTheProto 604b8ea867 Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-20 22:29:47 -05:00
SandPoot 7f707da2bc forgor 2023-10-20 18:26:09 -03:00
SandPoot 3aa3aead3d re-do the whole goddamn thing. 2023-10-20 17:48:13 -03:00
BongaTheProto 3230992305 Merge remote-tracking branch 'upstream/master' 2023-10-12 13:28:32 -05:00
SandPoot ee163aae68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-12 02:40:12 -03:00
BongaTheProtoandGitHub 4742a61480 Merge branch 'Sandstorm-Station:master' into master 2023-10-08 02:36:51 -05:00
SandPoot b945e7a5ed push 2023-10-07 20:48:02 -03:00
BongaTheProto f405132915 Merge remote-tracking branch 'upstream/master' 2023-09-23 18:15:45 -05:00
SandPoot eba26a5775 push 2023-09-23 19:16:12 -03:00
BongaTheProto 635fc04860 Merge branch 'allow-old-shifting' of https://github.com/DeDrascol/Snowstorm-Station-13 into pixelshift 2023-05-19 17:32:38 -05:00
Darius f30815b889 Production topic restrictions rework
- Production access checks now use the `allowed` proc before attempting normal ID checks.
- Each successful return case now uses a unique DEFINE to allow future control over access types.
- Topic checks use a separate function
- Feedback messages have been moved out of the access check procs
2023-03-07 20:51:05 -05:00
Darius 556840700f Better old-shift compatability
This commit:
- Moves the pixel shifting defines to mob defines
- Updates pixel shifting define names to be more unique
- Updates old pixel shifting to use shift limits
2023-02-24 20:10:55 -05:00
SandPoot 11a06b1686 pixelshift + layering 2023-02-21 14:27:10 -03:00
SandPoot 992d25ea08 Revert "pixelshift + layering"
This reverts commit 51818478c5.
2023-02-21 14:25:29 -03:00
SandPoot 51818478c5 pixelshift + layering 2023-02-21 14:20:48 -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
SandPoot 04eb7226e6 general better handling of code + interaction screen tip 2023-02-15 23:26:59 -03:00
SandPootandGitHub 4a01b9f5e2 Re-UI-ing (just steals old skyrat) (#302)
* send it

* redefining counts as error, so goodbye
2023-02-13 00:22:01 -03:00
SandPoot 0fa94f6edc size peeking, both standing on table, message 2023-02-11 23:55:46 -03:00
DariusandGitHub 2ae20de930 Port estrous quirks from SPLURT (#298)
* Port estrous quirks from SPLURT

This commit ports quirks related to the animal breeding cycle from the downstream server SPLURT.

* Add null check for ashwalker round_season

Adds a null value check for round_id in ashwalker estrous code to prevent possible runtime issues.
2023-02-02 20:29:18 -03:00
DariusandGitHub 893a63cd11 [PORT] New quirk: DNC Order (#293)
* Port DNC quirt

Ports the do-not-clone quirk from SPLURT. This change is not modular.

- Added a fix for cloning heads and brains
- Removed flavor text implications that the order was voluntary
- Quirk renamed from `DNC` to `DNC Order`
- Trait renamed from `TRAIT_NO_CLONE` to `TRAIT_DNC_ORDER`

* Modularize cloning machine DNC check

Moves the code for DNC Order quirk check in the cloning machine into modular space, and removes it from base code.
2023-01-25 18:47:49 -03:00
SandPootandGitHub 0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
SandPootandGitHub 461bfc3f9c Fixing some stuff about sizecode (#257) 2022-06-03 19:45:19 -03:00
SandPootandGitHub 7aa54845d7 Changes some lewd stuff (#244)
* Upload files

* bad practices
2022-04-10 22:34:47 -03:00
SandPootandGitHub 470b02443d Reorganizes code/__DEFINES/sandcode (#236)
* Upload files

* GLOBAL_LIST_INIT() used before being defined
2022-03-20 21:02:45 -03:00