Commit Graph

53388 Commits

Author SHA1 Message Date
Changelogs
160b21ebfb Automatic changelog compile [ci skip] 2023-01-30 19:22:49 +00:00
SPLURT Bot
b5f845c7ca Automatic changelog generation for PR #722 [ci skip] 2023-01-30 19:21:10 +00:00
BongaTheProto
d6dea0524e Merge pull request #722 from Moribun/Quick-Fix
Shakey Shakey my Tail is Snakey
2023-01-30 14:19:30 -05:00
BongaTheProto
96703f76bc Modularize 2023-01-29 12:37:39 -05:00
Moribun
ec97ed015d stuff added
*ported tail from my server of the nightstalker variety

*unfucked zombo's not being able to get blood back

*made vault suit digigrade compatible
2023-01-29 07:24:12 -06:00
BongaTheProto
81050fd509 Update tgstation.dme 2023-01-28 19:13:29 -05:00
BongaTheProto
e8adfea83f Merge remote-tracking branch 'upstream/master' 2023-01-28 19:12:34 -05:00
Sandstorm Bot
021dda2bfd Automatic changelog compile [ci skip] 2023-01-28 05:14:58 +00:00
Sandstorm Bot
1cf551a2c7 Automatic changelog generation for PR #294 [ci skip] 2023-01-28 05:13:59 +00: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
Sandstorm Bot
fc3c6d8251 Automatic changelog compile [ci skip] 2023-01-28 00:41:28 +00:00
Sandstorm Bot
e2346eb1ab Automatic changelog generation for PR #295 [ci skip] 2023-01-28 00:40:08 +00:00
SandPoot
1ac8d9715a Underwear ui sprites! (#295)
* sprites!

* this is not right.
2023-01-27 21:39:17 -03:00
Changelogs
80815a12c8 Automatic changelog compile [ci skip] 2023-01-27 21:30:48 +00:00
SPLURT Bot
c16d477c5e Automatic changelog generation for PR #721 [ci skip] 2023-01-27 21:29:00 +00:00
BongaTheProto
37d56709ea Merge pull request #721 from AshTheDerg/patch-3
Patch 3
2023-01-27 16:27:32 -05:00
AshTheDerg
221283c313 Borg Shaker Fix 2023-01-27 15:12:54 -05:00
AshTheDerg
df98398060 Borg Shaker Fix 2023-01-27 14:00:50 -05:00
AshTheDerg
b3a4d968ba More Shaker Fix 2023-01-27 13:35:20 -05:00
AshTheDerg
8f6bb6b0d0 Borg Shaker Fix
I fix it!
2023-01-27 13:24:45 -05:00
AshTheDerg
6e67b60d6e Borg Shaker Fix
I fix it.
2023-01-27 13:23:25 -05:00
AshTheDerg
e7e8b422b4 Bork Shaker fix
I broked it.
2023-01-27 13:22:23 -05:00
AshTheDerg
4f4108d934 Merge branch 'SPLURT-Station:master' into patch-3 2023-01-27 13:17:09 -05:00
AshTheDerg
ce762c376c Fix broken beer shaker
I broke the beer shaker. This SHOULD fix it.
2023-01-27 04:37:59 -05:00
Changelogs
3a2878f851 Automatic changelog compile [ci skip] 2023-01-27 04:32:45 +00:00
SPLURT Bot
6da183ea7e Automatic changelog generation for PR #718 [ci skip] 2023-01-27 04:31:04 +00:00
BongaTheProto
7207f6fb74 Merge pull request #718 from AshTheDerg/patch-3
Borg Beer Shaker drink add
2023-01-26 23:29:20 -05:00
SandPoot
fbbd71079d good 2023-01-26 19:34:29 -03:00
BongaTheProto
b0f6f95155 Merge branch 'Sandstorm-Station:master' into master 2023-01-26 16:51:01 -05:00
Changelogs
ba9e47b088 Automatic changelog compile [ci skip] 2023-01-26 21:48:29 +00:00
SPLURT Bot
cc06955601 Automatic changelog generation for PR #713 [ci skip] 2023-01-26 21:46:53 +00:00
BongaTheProto
e3d35f46aa Merge pull request #713 from Kush1Push1/splurt_pilot
Pilot and pilot jaw body markings
2023-01-26 16:45:35 -05:00
Changelogs
288843bf20 Automatic changelog compile [ci skip] 2023-01-26 06:42:22 +00:00
SPLURT Bot
e52ae7da33 Automatic changelog generation for PR #600 [ci skip] 2023-01-26 06:40:51 +00: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
AshTheDerg
e0f9978a11 Borg Beer Shaker additions 2023-01-26 01:10:01 -05:00
SandPoot
7a298f1c7a nothing special 2023-01-26 03:05:52 -03:00
AshTheDerg
a2df6d6143 Borg Beer Shaker drink add
Adds some extra drinks to the Borg Beer Shaker
2023-01-26 00:59:34 -05:00
BongaTheProto
4bba867c36 Merge pull request #712 from Kush1Push1/splurt_beak
Corvid beak
2023-01-25 22:47:11 -05:00
Changelogs
a8a4dccc8f Automatic changelog compile [ci skip] 2023-01-25 23:19:29 +00:00
SPLURT Bot
6bf98d0e3f Automatic changelog generation for PR #703 [ci skip] 2023-01-25 23:18:04 +00:00
BongaTheProto
4b502c8e17 Merge pull request #703 from LeDrascol/techweb-move-rack
Move Research Rack to Biological Technology
2023-01-25 18:16:43 -05:00
Changelogs
e61df6ab2c Automatic changelog compile [ci skip] 2023-01-25 23:05:42 +00:00
SPLURT Bot
31a59205eb Automatic changelog generation for PR #716 [ci skip] 2023-01-25 23:04:14 +00:00
BongaTheProto
2bb3832f37 Merge pull request #716 from LeDrascol/remove-dnc
Remove redundant use of quirk DNC
2023-01-25 18:02:51 -05:00
BongaTheProto
fcc10eb9cc Merge remote-tracking branch 'upstream/master' 2023-01-25 18:02:17 -05:00
Sandstorm Bot
779eae1e27 Automatic changelog compile [ci skip] 2023-01-25 21:50:04 +00:00
Sandstorm Bot
4a493640b2 Automatic changelog generation for PR #293 [ci skip] 2023-01-25 21:48:59 +00: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