Commit Graph
116 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
2023-12-16 10:48:35 -05:00
BongaTheProto 5afdd65bdb Revert "followup"
This reverts commit 32b361c846.
2023-12-16 10:48:30 -05:00
BongaTheProto 32b361c846 followup 2023-12-15 18:38:06 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot bfc964b76b do you know the definition of insanity 2023-12-09 20:27:19 -03:00
BongaTheProto cd026aaddb Merge remote-tracking branch 'upstream/master' 2023-10-05 13:38:12 -05:00
SandPoot e46983c7b7 no renaming 2023-10-03 22:37:41 -03:00
SandPoot 90677d70db avoid overriding the upstream code 2023-10-03 22:27:12 -03:00
SandPoot e153f780e5 actually not needed now 2023-10-03 20:57:13 -03:00
SandPoot 62c6b6881d ACTUALLY BAD, IT'S INHERITING FROM THE OTHER LIZARD! 2023-10-02 23:12:50 -03:00
SandPoot db926e7cb1 not needed 2023-10-02 22:58:43 -03:00
SandPoot cd12c202c4 updates, modularizing and generally making the code better 2023-10-02 22:53:21 -03:00
Марк e8c0eaa1c1 Plushies. 2023-10-03 04:04:54 +05:00
BongaTheProto 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05:00
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03:00
Tsurupeta 07034d2ec0 sand 2023-08-08 14:01:15 +03:00
BongaTheProtoandGitHub 8680545f4b Merge branch 'Sandstorm-Station:master' into master 2023-07-29 17:09:12 -05:00
Dexxiol 733523bd0b he make sound, again + resprite 2023-07-29 20:55:34 +03:00
Dexxiol 8b5d6bb5b3 oh god hes here 2023-07-29 19:24:43 +03:00
BongaTheProto 21d13aae28 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:48:49 -05:00
DexxiolandGitHub 558d415bfd Update wirecutters.dm
oopsy daisy, missed a line
2023-07-26 03:13:23 +03:00
Dexxiol 735e82f192 crackhead tools
fun fact, i made this on fungus code (maconha station) so you can say it was ported from mushroom :)
2023-07-26 03:06:15 +03:00
WoolyAypa 078413e553 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-02-11 22:37:34 -03:00
BongaTheProto 7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
SandPoot 734f6a2f5c where the hell is it? 2023-01-29 17:51:04 -03:00
BongaTheProto e8adfea83f Merge remote-tracking branch 'upstream/master' 2023-01-28 19:12:34 -05:00
DariusandGitHub 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
BongaTheProtoandGitHub b0f6f95155 Merge branch 'Sandstorm-Station:master' into master 2023-01-26 16:51:01 -05:00
BongaTheProtoandGitHub 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
WoolyAypa 4cd6975b3b conflictos 2023-01-18 21:27:19 -03:00
BongaTheProto 368c3a8e16 Merge remote-tracking branch 'upstream/master' 2023-01-18 18:15:56 -05:00
DariusandGitHub 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 d8141d260e Merge branch 'master' into pr/600 2023-01-16 02:31:47 -05:00
BongaTheProto 596ab81dd0 Merge remote-tracking branch 'upstream/master' 2023-01-16 01:06:20 -05:00
SandPootandGitHub 0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -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
WoolyAypa b1c288d267 help! 2022-12-12 12:38:18 -03:00
LamkasDev 436be7d869 feat: add strapon fleshlight compability 2022-10-10 22:43:36 +02:00
LamkasDev 0759fc04f2 fix: remove strapon checks for portal panties 2022-09-13 18:30:12 +02:00
LamkasDev fba9cd66de feat: add strapons 2022-09-05 16:34:26 +02:00
Anonymous 7861c5d458 I never asked for this 2022-05-16 23:54:09 +03:00
Jerry Wester 9eba0c6ac8 no more multiple fleshlights linked to underwear 2022-05-12 00:38:25 -06:00
Jerry Wester 359fb50851 fix grammar 2022-05-10 01:48:55 -06:00
Jerry Wester 27b1099590 mossy can be thanked for this commit 2022-05-09 22:37:35 -06:00
Jerry Wester 08f4f0173f remove item interactions, bug fixes, finalization 2022-05-07 21:28:19 -06:00
Jerry Wester 6a92e472bb add sprites (thank you @Moltov#6925), etc. 2022-05-06 22:30:41 -06:00
Jerry Wester fc9f4da591 portal-ception 2022-05-06 12:56:53 -06:00
Jerry Wester cd2c6975c3 fix "mouth" color 2022-05-06 10:31:08 -06:00
Jerry Wester 46ac78099d add mouth target, organize shit 2022-05-06 10:18:08 -06:00