Commit Graph

28 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
596ab81dd0 Merge remote-tracking branch 'upstream/master' 2023-01-16 01:06:20 -05:00
SandPoot
0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
BongaTheProto
b074c85078 Updates tea paths for hydration (#261) 2022-07-24 14:30:05 -03:00
BongaTheProto
75189180b4 Update drink_reagents.dm 2022-07-24 12:15:50 -05:00
BongaTheProto
2e8d1a3566 fixes tea 2022-06-04 21:22:42 -05:00
BongaTheProto
6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
BongaTheProto
557fbe7803 back home
this works apparently...?
2022-04-18 21:19:35 -05:00
SandPoot
05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
BongaTheProto
a1a3b3fc93 Merge remote-tracking branch 'upstream/master' 2022-03-20 21:24:52 -05:00
SandPoot
470b02443d Reorganizes code/__DEFINES/sandcode (#236)
* Upload files

* GLOBAL_LIST_INIT() used before being defined
2022-03-20 21:02:45 -03:00
BongaTheProto
8eef5107da Merge branch 'Sandstorm-Station:master' into master 2022-03-04 18:37:53 -06:00
BongaTheProto
a7095a655f Fix (#232) 2022-03-04 21:20:25 -03:00
BongaTheProto
9cc2e75632 Merge branch 'Sandstorm-Station:master' into master 2022-02-05 14:25:25 -05:00
SandPoot
9d82c26c1c bad water 2022-02-05 16:04:49 -03:00
BongaTheProto
fca6400273 Merge branch 'Sandstorm-Station:master' into master 2022-02-04 11:56:50 -05:00
SandPoot
805ff012fc Fix drinks (#225) 2022-02-04 11:20:21 -03:00
BongaTheProto
4e494f5b23 FINISHED (I think)
bellY!!!!!!!
2021-12-12 03:51:05 -05:00
BongaTheProto
46b4e72e4f *huff* almost *huff* there
only reactions left
2021-12-12 01:10:57 -05:00
SandPoot
1b851c4826 Thirst rework (#184) 2021-10-02 22:29:34 -03:00
SandPoot
e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
SandPoot
793435218b Alien parts modularized (#171) 2021-07-05 19:10:22 -03:00
SandPoot
7a2115c5d3 Adds droppers to autolathes and protolathes (#170) 2021-07-03 17:21:12 -03:00
SandPoot
e17dec1980 Doubles hydration gain from liquids (#160) 2021-05-16 14:26:09 -03:00
SandPoot
6f15641f33 Thirst (#151)
* upload files

* upload files

* upload examine.dm

* Update modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
2021-04-03 19:54:56 -03:00
SandPoot
98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03:00
Maksxpl
c8082e1009 Compliance with standards (#134)
* enjoy

* Update shuttles.dm

sowwy

Co-authored-by: Maksxpl <18237380+maksxpl@users.noreply.github.com>
2021-01-19 12:44:08 -03:00