Commit Graph

503 Commits

Author SHA1 Message Date
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
BongaTheProto
b0f6f95155 Merge branch 'Sandstorm-Station:master' into master 2023-01-26 16:51:01 -05:00
BongaTheProto
2aa678176e Merge pull request #600 from ShamanSliph/cloth-eater
New Quirk: Clothes Eater and Fixes Insects chewing clothes
2023-01-26 01:39:16 -05:00
SandPoot
7a298f1c7a nothing special 2023-01-26 03:05:52 -03:00
BongaTheProto
fcc10eb9cc Merge remote-tracking branch 'upstream/master' 2023-01-25 18:02:17 -05:00
Darius
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
BongaTheProto
14a5df0c8a Merge branch 'Sandstorm-Station:master' into master 2023-01-25 16:42:25 -05:00
SandPoot
a21f3f75a2 NOT TABLE, STRUCTURE, also living_peeker 2023-01-24 22:10:31 -03:00
SandPoot
d2e08f17ea let's check for structure.climbable instead! 2023-01-24 22:07:15 -03:00
BongaTheProto
9a67937ff7 Merge branch 'Sandstorm-Station:master' into master 2023-01-23 23:08:25 -05:00
SandPoot
da5c66c5b8 bits 2023-01-23 21:20:10 -03:00
BongaTheProto
7fd55c6574 Merge branch 'Sandstorm-Station:master' into master 2023-01-23 17:31:37 -05:00
SandPoot
0c87f5e0f0 different checking method 2023-01-22 23:32:29 -03: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
BongaTheProto
68649df86c optimized some copypasted code (#285)
* less copypaste = good

* fix

* Update lewd_definitions.dm

oops
2023-01-17 07:59:18 -03: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
d8141d260e Merge branch 'master' into pr/600 2023-01-16 02:31:47 -05:00
BongaTheProto
41e15dd097 follow-up
I HOPE this doesn't break stuff
2023-01-16 02:20:22 -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
7edd6a5bd3 Refactor cryptominer processing (#278)
* Refactor cryptominer processing

Squashed version of PR 276, found here:
https://github.com/Sandstorm-Station/Sandstorm-Station-13/pull/276

* Resolve cryptominor refactor regressions

Fixes minor issues caused by reusing older code revisions.
2023-01-08 16:11:12 -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
JimmyDrop
80729c8553 Initial Clothing Pass
Initial pass of edible Clothing. Should cover most cases with some outliers still existing.  In general most important things are protected, such as hard suits, armor, helmets, gasmask, CRBN equipment, and glasses.

Ill give this another pass later to get most of outliers. But for now this should be fine.
2022-12-20 14:51:48 -05:00
BongaTheProto
3666faccf9 Merge remote-tracking branch 'upstream/master' 2022-12-15 01:25:03 -05:00
SandPoot
a102c785e2 Adds an arousal button to the interaction ui (also does some ui "niceing") (#275)
* the entire content

* out of scope but critical.
2022-12-14 20:05:37 -03:00
BongaTheProto
963aeb7e11 Merge remote-tracking branch 'upstream/master' 2022-12-06 21:22:29 -05:00
LemonInTheDark
8eec99b320 Caches GetJobName. Fuck you (#274)
* Caches GetJobName. Fuck you

This code made me deeply upset, WHY IS IT RECURSIVE WHY WHY WHY WHY WHY WHY WHY WHY WHY WHY WHY

* Centcom handling, properly this time

* Empties out real_job_name

* Sets real_job_name up in the right place

* Moves real_job_name to SSjob, uses modularTM

* Yeet

* Removes old code, swaps over to the SSjob list

* dme changes

* indents... comments

Co-authored-by: SandPoot <enric_gabirel@hotmail.com>
2022-12-06 17:09:36 -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
ef6a2bdbc1 Merge branch 'Sandstorm-Station:master' into master 2022-10-20 19:11:47 -05:00