67 Commits
Author SHA1 Message Date
SandPoot 7a7f949de4 this was bugging me 2026-02-08 23:37:45 -03:00
SandPoot 8e01485ff5 oh no, we want to go to C rather 2024-03-30 23:24:39 -03:00
SandPoot 30e4caff28 i think this was the intention? 2024-03-30 23:18:38 -03:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPootandGitHub 419f3b5ac8 Merge pull request #367 from DetectiveEnotsky/patch-1
Allows you to pick your character for certain ghost roles
2024-01-19 22:01:03 -03:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot 2cefedd316 push 2024-01-16 16:54:53 -03:00
SandPoot 53c3850688 forgot it was overwritten i fucking hate skyrat 2024-01-08 14:35:59 -03:00
SandPoot be37603291 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-23 13:28:41 -03:00
SandPoot bfc964b76b do you know the definition of insanity 2023-12-09 20:27:19 -03:00
SandPoot 9dcb996901 additional 2023-11-04 01:11:52 -03:00
SandPoot 3bb6783438 content 2023-11-03 21:17:22 -03: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
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03: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
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
SandPoot 15d52e5b15 update content 2023-06-20 15:39:24 -03: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
SandPoot 734f6a2f5c where the hell is it? 2023-01-29 17:51:04 -03: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
SandPoot 7a298f1c7a nothing special 2023-01-26 03:05:52 -03: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
SandPootandGitHub 0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
SandPoot 1b62569d2b handle signals correctly 2022-04-27 17:51:58 -03:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -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
SandPootandGitHub 84b0692962 Makes a bunch of our stuff use balloon_alert() (#228) 2022-02-10 22:50:27 -03:00
SandPoot d46990f902 Finishing the strip menu 2021-12-31 14:26:32 -03:00
SandPoot 9a633b5395 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-31 14:07:43 -03:00
SandPoot 0b2b73381f size stuff 2021-12-22 15:22:25 -03:00
SandPootandGitHub 7b34851794 Adds functionality to dressers once again (#209) 2021-12-11 16:52:48 -03:00
BongaTheProtoandGitHub c3068fc135 "Small" climax revamp (#203) 2021-12-07 10:57:35 -03:00
BongaTheProtoandGitHub a3fe975d2c FIxes vapes for snouts (#204) 2021-12-06 22:32:36 -03:00
9370f6423c Craftable brass plant and suits. (#197)
* craftable plant and suits

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update sheet_types.dm

* Update modular_sand/code/game/objects/structures/fauna.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update modular_sand/code/game/objects/structures/fauna.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update modular_sand/code/game/objects/structures/fauna.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2021-11-19 15:21:37 -03:00
SandPoot 34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
SandPoot 377a5da6d6 yeah... wrong. 2021-11-03 18:54:51 -03:00
SandPootandGitHub e467d24d0b Update fleshlight.dm 2021-11-03 17:43:38 -03:00
SandPootandGitHub f753617a0b Updates some lewd stuff (#189) 2021-11-03 13:59:02 -03:00
SandPootandGitHub 983fc006a3 Makes interactions generation into a subsystem (#188)
* Upload files

* Update interactions.dm
2021-11-01 00:27:07 -03:00
SandPoot f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00