Commit Graph

315 Commits

Author SHA1 Message Date
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
BongaTheProto
8283abc21a Merge remote-tracking branch 'upstream/master' 2023-01-17 15:53:26 -05:00
Darius
2901f5f1d3 Minor techweb fix for autodoc (#286)
Moves the autodoc from Advanced Surgery to Advanced Surgery Tools, since it cannot be constructed without the items from that node.
2023-01-17 07:58:19 -03:00
zeroisthebiggay
c44a7e4f97 Update examine.dm 2023-01-16 19:17:25 -05:00
BongaTheProto
596ab81dd0 Merge remote-tracking branch 'upstream/master' 2023-01-16 01:06:20 -05:00
SandPoot
8cf9db4faa lack of spess 2023-01-15 18:47:57 -03:00
SandPoot
0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
SandPoot
32159792ad Adds a button to toggle the capability of interacting through clothes (#283)
* here it is

* damn typo
2023-01-14 23:47:25 -03:00
BongaTheProto
606391308f Merge remote-tracking branch 'upstream/master' 2023-01-14 21:18:11 -05:00
SandPoot
0507960150 Does some skirt peeking optimization (#282) 2023-01-14 19:09:20 -03:00
BongaTheProto
86a005b590 Merge remote-tracking branch 'upstream/master' 2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-10 22:50:16 -03:00
BongaTheProto
d6aa3acbd4 Merge remote-tracking branch 'upstream/master' 2023-01-09 17:08:06 -05:00
BongaTheProto
ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05:00
SandPoot
2a772c8482 Adds the commando skin from ror & ror2 to the mining hardsuit (#280)
* first commit with everything

* quick fix and little extra usage!

* the boy

* previous could break

* better head
2023-01-09 18:55:07 -03:00
Darius
912f498825 Fix Adv Toolset sequence break (#277)
Changes the Advanced Toolset Implant techweb entry to also require Alien Engineering and Cybernetic Implants. This prevents obtaining alien tool implants before researching tool implants or alien tools.
2023-01-08 15:37:53 -03:00
SandPoot
d9df554a95 quick fix for the BSMs 2023-01-07 23:24:15 -03:00
BongaTheProto
7e716bb64f Merge branch 'Sandstorm-Station:master' into master 2022-11-30 14:30:18 -05:00
SandPoot
4ddedd118f TGS: Bad topic exchange! 2022-11-30 13:37:48 -03:00
Fabian272
939d0bcfd0 Changes the kinkmate loincloth to have sensors, changes loincloth crafting to have sensored and sensorless versions. 2022-11-07 21:36:42 +01:00
BongaTheProto
36198f2b8c Merge branch 'Sandstorm-Station:master' into master 2022-10-16 17:49:02 -05:00
SandPoot
b854771d79 Lets lizards have ears (#267) 2022-10-16 16:22:06 -03:00
BongaTheProto
ae6a6b70e5 Merge remote-tracking branch 'upstream/master' 2022-10-09 12:57:48 -05:00
SandPoot
92f8d3debc i love invisible conflicts 2022-10-09 11:52:03 -03:00
BongaTheProto
60c3e439dc Merge branch 'Sandstorm-Station:master' into master 2022-09-29 17:04:31 -05:00
memerson1337
123182c8b2 Adds Off-Duty title (#265)
Adds a new Assistant job title
2022-09-29 16:10:00 -03:00
BongaTheProto
054f2aa52d follow-up 2022-09-28 16:08:29 -05:00