Commit Graph

341 Commits

Author SHA1 Message Date
BongaTheProto
09e336118f Merge remote-tracking branch 'upstream/master' 2023-03-09 22:15:43 -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
720b4be2c1 Allow material access from protolathes
Allows crew with `ACCESS_MINERAL_STOREROOM` access to use production machinery in 'mineral only' mode when normal access isn't found.
2023-03-07 16:39:03 -05:00
BongaTheProto
57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot
46df70dd73 not a quick fix. 2023-03-05 18:32:12 -03:00
SandPoot
c1c1083b30 Merge pull request #315 from DeDrascol/fix-cargo-production-access
Fix cargo production access
2023-03-04 12:32:24 -03:00
Darius
4fbc8c22b2 Alternative fix for Cargo production access
Updates the Cargo production machines to use either `ACCESS_CARGO` or `ACCESS_MINING`.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2023-03-04 04:00:41 +00:00
Darius
efbdb42874 Fix cargo techfab access
Makes an associated fix from protolathe access to techfab access.
2023-03-03 16:13:18 -05:00
Darius
816dbcd364 Fix cargo production access
Changes the production machinery access requirement for cargo from `ACCESS_CARGO` to `ACCESS_MAILSORTING` to fix an issue that prevented Shaft Miners from using the machine.
2023-03-03 16:10:58 -05:00
BongaTheProto
d0fa6c842e Merge remote-tracking branch 'upstream/master' 2023-03-01 14:58:31 -05:00
SandPoot
6e55b682a7 touch ups, polychromic not working 2023-02-27 23:13:43 -03:00
SandPoot
d422d1a5e7 solve a couple things, put on loadout 2023-02-27 22:19:58 -03:00
Koboboldic
f6198de83d Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into snax 2023-02-28 05:39:28 +05:00
FurryDog
00bb5159d5 Stirrups! 2023-02-28 04:58:15 +05:00
SandPoot
a1823e7ca8 fix pixel shift 2023-02-27 19:36:01 -03:00
BongaTheProto
2151624f10 Merge remote-tracking branch 'upstream/master' 2023-02-22 19:14:08 -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
BongaTheProto
5ec4443259 Merge remote-tracking branch 'upstream/master' 2023-02-20 11:36:04 -05:00
Darius
8f5584eec4 Make gear harness non-covering (#309)
Sets the gear harness to non-covering by default, and removes the ability to adjust it. The toggle function has been updated to prevent false feedback.
2023-02-19 16:42:35 -03:00
Darius
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
Darius
50e0ed8105 Job Restricted Protolathes (#303)
* Block protolathe use without job access

Prevents opening the UI for any R&D production machinery without proper job access on the mob's mind. This change impacts protolathes and circuit imprinters.

* Check protolathe access using face and ID

Changes the protolathe access check to use ID card or face name, instead of mind.

* Always allow Captain protolathe use

Allows the captain to use any protolathe or circuit imprinter.

* Check protolathe access using only ID

Updates the RND production machine access checks to only use the ID card, instead of checking face or security records.

* Lock RND console by default

Sets the R&D console locked variable to TRUE by default to prevent unauthorized access exploits.

* Use req_access for RND production machines

Converts the ID check used by RND production machines to use req_access flags.

* Check Topic for protolathe restrictions

Moves protolathe access checks into a mob proc, and checks Topic call the same way UI open is checked.

* Production restriction low-population improvements

This commit fixes potential problems for low-population servers using production machinery restrictions. The following changes are made:

- Allow skeleton crew to ignore research machinery restrictions
- Option to check all living crew IDs for access (disabled by default)
- Configuration options for using global ID checks and skeleton crew access

* Production machine locking feedback commit

This commit makes changes requested by Sandpoot:
- Renames 'nonmin' to 'lowpop'
- Removes all global ID check code

* Fix improper configuration defines

Fixes an oversight that caused some variable names to not be updated.

* Remove obsolete mob defines

Removes the obsolete PROTOLOCK_CHECK_ALL_IDS define, which related to a removed feature.

* Reverse protolock check ordering

Reverses the configuration check order for PROTOLOCK_DURING_LOWPOP and JOB_MINIMAL_ACCESS at the request of SandPoot.

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

---------

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2023-02-19 15:05:44 -03:00
Darius
9bdbdaa3ae Fix 357 speed loader exploit (#306)
Marks the 357 speed loader as non-illegal-tech to prevent an exploit with the research techweb.
2023-02-19 00:43:07 -03: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
BongaTheProto
73abec3913 Merge remote-tracking branch 'upstream/master' 2023-02-11 22:21:31 -05:00
SandPoot
0fa94f6edc size peeking, both standing on table, message 2023-02-11 23:55:46 -03: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
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
SandPoot
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
BongaTheProto
d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05:00
SandPoot
65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
BongaTheProto
8f46cd88c9 Merge pull request #715 from LeDrascol/revert-cryptominer-removal
Revert non-modular removal of cryptominers
2023-02-03 18:18:31 -05:00
BongaTheProto
86a1bb06b0 Merge remote-tracking branch 'upstream/master' 2023-02-02 18:56:02 -05:00
Darius
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
BongaTheProto
7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
Darius
eb0b27889b Add Sandstorm balance config (#279)
* Add Sandstorm balance config

Allows changing settings for the Cryptominer, Autodoc, and Bluespace Miner.

* Update server config with real-time values

Sandstorm balance configurations have been updated to read values in real time whenever possible.

Values are now set using defines, and any that could not use them have been disabled.

A new configuration has been added to control when the bluespace mining machine can produce bluespace crystals.

* Fixes a critical cryptominer issue

Fixes a tremendous coding oversight that added two additional whitespace characters to the cryptominer machine file.

* Fix incorrect config value for BSMs

Fixes a mistaken definition for BLUESPACE_MINER_CRYSTAL_TIER pointing to a previously used value.

* Undefine balance config defines

Adds an undefine statement for all balance config value defines.

* Properly undefine definitions

Fixes incorrect term usage for undefining a value.
2023-01-29 22:29:33 -03:00
SandPoot
b1fc4ebaef prisoners allowed, roundstart 2023-01-29 16:43:39 -03:00
BongaTheProto
e8adfea83f Merge remote-tracking branch 'upstream/master' 2023-01-28 19:12:34 -05:00
Darius
c64cc87581 Saliith plushie overhaul (#294)
* Saliith plushie overhaul

This commit makes the following changes
- Adds comments
- Adds resistance flags
- Adds flag unstuffable
- Adds more examine messages
- Adds exemption for brainwashed victims
- Adds a pinpointer to find the toy
- Removes obsolete grenade check
- Removes unnecessary for loop
- Removes most forms of depression
- Updates flavor text
- Updates variable names to better match standards
- Changes item to subtype of lizardplushie
- Changes knife to be thrown instead of deleted
- Changes most local messages to visible ones
- Changes antagonist penalty from gib to lightning smite
- Prevents Saliith from stabbing his own plushie

* Minor Saliith Plushie updates

- Adds the Saliith Plushie Pinpointer item to the loadout system, under the backpack tab.
- Adds the stationloving component
- Adds a pronoun support to the description
- Adds yeet penalty to kiss interaction
- Fixes a missing s
- Refactors kiss interaction

* Spawn Saliith plush on map load

Adds a global variable to load the Saliith plushie on map load.

* Add plushmium penalty to Saliith plushie

Adds a penalty for attempting to use Plushmium on the Saliith plushie, which causes the attacker to be overdosed with Unstable Mutagen, Mindbreaker Toxin, Mute Toxin, Bone Hurting Juice, and Brain Hurting Juice.

* Improve Saliith plushie plushmium checks

Changes the check from ishuman to instead check for usr and iscarbon.

* Custom icons for Saliith plushie pinpointer

Enables the custom sprite for the Saliith plushie pinpointer, and adds associated arrows to the icons file.

* Tiny improvements to Saliith plushie interactions

- Removes unnecessary use of src
- Removes hug message text
2023-01-28 02:13:07 -03:00
Darius
e04e769bf9 Revert non-modular removal of cryptominers
Uncomments the techweb node and machine design for crypto miners.
2023-01-24 15:26:43 -05:00
BongaTheProto
3ae8edf803 Merge remote-tracking branch 'upstream/master' 2023-01-22 01:06:28 -05:00
Darius
3c4f222e40 Disable thirst for robotic species (#291)
Adds TRAIT_NOTHIRST to synthetic lizardperson, synthetic anthropomorph, and IPC.
2023-01-21 20:43:11 -03:00
SandPoot
79c8c61459 Makes skirt peeking into an element (#292) 2023-01-21 19:30:59 -03:00
BongaTheProto
620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPoot
c5987c6c79 More mining ror reskin (#290) 2023-01-21 13:52:00 -03:00
BongaTheProto
368c3a8e16 Merge remote-tracking branch 'upstream/master' 2023-01-18 18:15:56 -05:00
Darius
9ddd495232 Require bluespace core for BSMs (#288)
Updates bluespace miners construction and techweb requirements. Made at the request of SandPoot.

- Added construction requirement for activated bluespace core
- Added techweb requirement for Anomaly Research
- Removed construction requirement for bluespace crystals
2023-01-18 08:14:03 -03:00