Commit Graph

17 Commits

Author SHA1 Message Date
SandPoot
65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03: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
SandPoot
0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
SandPoot
07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
SandPoot
45580ae0e2 unused 2022-03-04 13:33:32 -03:00
SandPoot
1275e0b11c a bit wrong 2022-03-04 13:21:15 -03:00
SandPoot
fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot
3bbe8d199c emergency merge 2022-02-05 00:48:43 -03:00
SandPoot
b661a86b93 Adds some hella cool clothing (#223) 2022-01-30 21:13:44 -03:00
SandPoot
0d819461e8 Makes handmirrors and give an actual purpose to electric razors (#173) 2021-07-08 15:05:51 -03:00
SandPoot
04ea151153 Adds Loincloths (#159) 2021-05-04 13:22:10 -03:00
SandPoot
80b2785350 Fixes T.E.T.R.I.S (#158) 2021-04-29 19:26:31 -03:00
SandPoot
e38f302b79 Rings can now be placed on gloves. (#144)
* upload files

* stupid maps
2021-03-01 19:20:40 -03:00
SandPoot
e33b171693 some troubleshooting and making sure people can open pref menus, and a list containing a null is very bad. 2021-02-17 20:50:20 -03:00
SandPoot
9a6dbc2141 Additional languages rework (#143)
* upload files

* upload files
2021-02-17 16:23:58 -03:00
SandPoot
28e87a5db5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-28 21:57:36 -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