Commit Graph
117 Commits
Author SHA1 Message Date
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
BongaTheProto 148ae75649 Merge remote-tracking branch 'upstream/master' into upstream-update 2023-06-21 18:49:14 -05:00
SandPoot 15d52e5b15 update content 2023-06-20 15:39:24 -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
BongaTheProtoandGitHub b89ee792bf Merge branch 'Sandstorm-Station:master' into master 2023-02-06 16:56:04 -05:00
SandPoot b3205ad065 Don't lie 2023-02-06 01:23:31 -03:00
SandPoot f5ee10717a He finally resprited his own work, after 20 months 2023-02-06 01:21:05 -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
Jerry Wester c1a70740a0 no more butts, only anuses. anuses? ani? 2022-05-05 22:34:13 -06:00
Jerry Wester 24da462693 you can put your dick in it, but in reverse 2022-05-05 12:47:40 -06:00
BongaTheProtoandGitHub 587051c249 Merge branch 'Sandstorm-Station:master' into master 2022-04-27 16:13:35 -05:00
SandPoot 1b62569d2b handle signals correctly 2022-04-27 17:51:58 -03:00
BongaTheProto e91d947881 for fuck's sake 2022-04-18 22:25:45 -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 ddd36b40cf Merge part 2
Yeah this should fix everything with the update
2022-02-27 14:39:07 -05:00
BongaTheProto 54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00