93 Commits
Author SHA1 Message Date
SandPoot 7a7f949de4 this was bugging me 2026-02-08 23:37:45 -03:00
SandPoot a1905591f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-24 23:49:10 -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 d5d2f9d490 oops 2023-09-20 23:17:58 -03:00
SandPoot 0c74675338 feedback 2023-09-20 23:15:03 -03:00
SandPoot 46dda80a44 😃 2023-09-20 23:05:01 -03: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
DariusandGitHub f802a53c27 Cryptominer account setting tweaks (#304)
This commit makes changes to how cryptominers handle changing accounts.

The following is changed:
- Added interaction time for linking new account
- Added more text balloons
- Added fail messages for linking and resetting
- Added radio notice when linking a standard cryptominer
- Added more visible chat messages
- Added interaction logging
- - Only displays if the previous account was Cargo
- Updated descriptions for standard and Syndicate cryptominer
- Update description to only display added information while in range
2023-02-19 04:03:06 -03:00
DariusandGitHub 05983a0c21 TETRIS machine rewards refactor (#300)
* Grant science points for TETRIS machine

This commit updates the T.E.T.R.I.S. arcade machine to grant science points based on the score achieved in the game, if the player was employed as a scientist or research director.

* Tetris machine overhaul

This commit makes the following changes to TETRIS
- Adds a one minute cooldown for rewards
- Sanitize input for score
- Limit max score to 100,000
- Limit max prizes to 5
- Limit max research points to 10,000
- Warn admins if score exceeds set threshold
- Check ID card access instead of mind job
- Display separate messages for score and scientist points
- Display different message if no reward is vended
- Undefine defined defines

* Add TETRIS to Sandstorm balance config

Adds configuration values to the TETRIS arcade machine based on the previously used defines.
Adds new configuration for producing science points and max number of prizes.

* Use defines for TETRIS cooldowns

Converts the TETRIS machine world time cooldowns to use defines instead of direct definitions.

* Remove redundant TETRIS variables

Removes redundant icon, icon_state, and light_color variables from the TETRIS arcade machine.
2023-02-14 19:08:37 -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
DariusandGitHub eb0b27889b Add Sandstorm balance config (#279)
* Add Sandstorm balance config

Allows changing settings for the Cryptominer, Autodoc, and Bluespace Miner.

* Update server config with real-time values

Sandstorm balance configurations have been updated to read values in real time whenever possible.

Values are now set using defines, and any that could not use them have been disabled.

A new configuration has been added to control when the bluespace mining machine can produce bluespace crystals.

* Fixes a critical cryptominer issue

Fixes a tremendous coding oversight that added two additional whitespace characters to the cryptominer machine file.

* Fix incorrect config value for BSMs

Fixes a mistaken definition for BLUESPACE_MINER_CRYSTAL_TIER pointing to a previously used value.

* Undefine balance config defines

Adds an undefine statement for all balance config value defines.

* Properly undefine definitions

Fixes incorrect term usage for undefining a value.
2023-01-29 22:29:33 -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 893a63cd11 [PORT] New quirk: DNC Order (#293)
* Port DNC quirt

Ports the do-not-clone quirk from SPLURT. This change is not modular.

- Added a fix for cloning heads and brains
- Removed flavor text implications that the order was voluntary
- Quirk renamed from `DNC` to `DNC Order`
- Trait renamed from `TRAIT_NO_CLONE` to `TRAIT_DNC_ORDER`

* Modularize cloning machine DNC check

Moves the code for DNC Order quirk check in the cloning machine into modular space, and removes it from base code.
2023-01-25 18:47:49 -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
DariusandGitHub 7edd6a5bd3 Refactor cryptominer processing (#278)
* Refactor cryptominer processing

Squashed version of PR 276, found here:
https://github.com/Sandstorm-Station/Sandstorm-Station-13/pull/276

* Resolve cryptominor refactor regressions

Fixes minor issues caused by reusing older code revisions.
2023-01-08 16:11:12 -03:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
SandPoot 606d50715b just quickly makes the machine say the correct acc 2022-08-15 23:19:23 -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 5a6a6deff3 Update mecha.dm 2022-04-09 14:07:02 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -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