Commit Graph

526 Commits

Author SHA1 Message Date
BongaTheProto
0a48421882 Merge branch 'Sandstorm-Station:master' into master 2023-02-12 16:13:29 -05:00
SandPoot
e1c9fdaf00 fucking fix that mosley annoys me about 2023-02-12 18:03:41 -03:00
BongaTheProto
73abec3913 Merge remote-tracking branch 'upstream/master' 2023-02-11 22:21:31 -05:00
BongaTheProto
ee9800f843 Update holder_micro.dm 2023-02-11 22:20:47 -05:00
SandPoot
0fa94f6edc size peeking, both standing on table, message 2023-02-11 23:55:46 -03:00
BongaTheProto
929f5399aa followup 2023-02-11 21:34:18 -05:00
BongaTheProto
a65cd6c96b Merge remote-tracking branch 'upstream/master' 2023-02-11 21:26:36 -05:00
BongaTheProto
ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -05:00
SandPoot
243e7ea02f safety i guess, people are afraid that someone is SOMEHOW gonna manage to open their menu without being admin 2023-02-11 21:54:20 -03:00
SandPoot
117919fe2b Componentizes Interaction menu + prepares it for screentips by adding a shortcut (#301)
* files

* let's just use our own parent

* necessary

* two istypes on a row
2023-02-11 14:39:29 -03:00
BongaTheProto
d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05:00
SandPoot
65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
BongaTheProto
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
8f46cd88c9 Merge pull request #715 from LeDrascol/revert-cryptominer-removal
Revert non-modular removal of cryptominers
2023-02-03 18:18:31 -05:00
BongaTheProto
86a1bb06b0 Merge remote-tracking branch 'upstream/master' 2023-02-02 18:56:02 -05:00
Darius
2ae20de930 Port estrous quirks from SPLURT (#298)
* Port estrous quirks from SPLURT

This commit ports quirks related to the animal breeding cycle from the downstream server SPLURT.

* Add null check for ashwalker round_season

Adds a null value check for round_id in ashwalker estrous code to prevent possible runtime issues.
2023-02-02 20:29:18 -03:00
BongaTheProto
7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
Darius
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
SandPoot
b1fc4ebaef prisoners allowed, roundstart 2023-01-29 16:43:39 -03:00
BongaTheProto
e8adfea83f Merge remote-tracking branch 'upstream/master' 2023-01-28 19:12:34 -05: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
BongaTheProto
b0f6f95155 Merge branch 'Sandstorm-Station:master' into master 2023-01-26 16:51:01 -05:00
BongaTheProto
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
BongaTheProto
fcc10eb9cc Merge remote-tracking branch 'upstream/master' 2023-01-25 18:02:17 -05:00
Darius
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
BongaTheProto
14a5df0c8a Merge branch 'Sandstorm-Station:master' into master 2023-01-25 16:42:25 -05:00
SandPoot
a21f3f75a2 NOT TABLE, STRUCTURE, also living_peeker 2023-01-24 22:10:31 -03:00
SandPoot
d2e08f17ea let's check for structure.climbable instead! 2023-01-24 22:07:15 -03:00
Darius
e04e769bf9 Revert non-modular removal of cryptominers
Uncomments the techweb node and machine design for crypto miners.
2023-01-24 15:26:43 -05:00
BongaTheProto
9a67937ff7 Merge branch 'Sandstorm-Station:master' into master 2023-01-23 23:08:25 -05:00
SandPoot
da5c66c5b8 bits 2023-01-23 21:20:10 -03:00
BongaTheProto
7fd55c6574 Merge branch 'Sandstorm-Station:master' into master 2023-01-23 17:31:37 -05:00
SandPoot
0c87f5e0f0 different checking method 2023-01-22 23:32:29 -03:00
BongaTheProto
3ae8edf803 Merge remote-tracking branch 'upstream/master' 2023-01-22 01:06:28 -05:00
Darius
3c4f222e40 Disable thirst for robotic species (#291)
Adds TRAIT_NOTHIRST to synthetic lizardperson, synthetic anthropomorph, and IPC.
2023-01-21 20:43:11 -03:00
SandPoot
79c8c61459 Makes skirt peeking into an element (#292) 2023-01-21 19:30:59 -03:00
BongaTheProto
620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPoot
c5987c6c79 More mining ror reskin (#290) 2023-01-21 13:52:00 -03:00
BongaTheProto
368c3a8e16 Merge remote-tracking branch 'upstream/master' 2023-01-18 18:15:56 -05:00
Darius
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
8283abc21a Merge remote-tracking branch 'upstream/master' 2023-01-17 15:53:26 -05:00
BongaTheProto
68649df86c optimized some copypasted code (#285)
* less copypaste = good

* fix

* Update lewd_definitions.dm

oops
2023-01-17 07:59:18 -03:00
Darius
2901f5f1d3 Minor techweb fix for autodoc (#286)
Moves the autodoc from Advanced Surgery to Advanced Surgery Tools, since it cannot be constructed without the items from that node.
2023-01-17 07:58:19 -03:00
zeroisthebiggay
c44a7e4f97 Update examine.dm 2023-01-16 19:17:25 -05:00
BongaTheProto
d8141d260e Merge branch 'master' into pr/600 2023-01-16 02:31:47 -05:00
BongaTheProto
41e15dd097 follow-up
I HOPE this doesn't break stuff
2023-01-16 02:20:22 -05:00