Commit Graph

31162 Commits

Author SHA1 Message Date
Killian
b2c5fc43f6 tgui input lock 2023-05-12 14:09:12 +01:00
VerySoft
9865838150 That's a thing people will probably do 2023-05-11 13:42:15 -04:00
Casey
0d33bccbee Merge pull request #14845 from SatinIsle/raptor-jobs
More Raptor Borg Modules
2023-05-11 13:23:49 -04:00
Casey
3eb844bcf3 Merge pull request #14843 from ReoDaProtovali/AniNomAbility
Move animal nom verb to abilities tab
2023-05-11 13:23:10 -04:00
Casey
3596f94516 Merge pull request #14842 from KillianKirilenko/kk-coyotesuit
CSC Industrial Voidsuit
2023-05-11 13:22:55 -04:00
VerySoft
5d61c3c52f Adds weaken and stun 2023-05-11 13:12:03 -04:00
VerySoft
f7d8cf029c Adds mob forgiveness
Makes it so that if you rest while being attacked by a retaliate mob, they may decide to stop attacking you.

They will forgive you if their health is full, if they cannot eat you, and if they are otherwise not hostile. If they CAN eat you, then their behavior will be as normal, they will proceed to eat you.

At the moment this applies to all retaliate mobs, but a variable `forgive_resting` is in place for in case we want some mobs to not be so forgiving, be it normally or through adminbus.
2023-05-10 20:47:10 -04:00
SatinIsle
0d907fdb91 More Raptor Borg Modules
Adds the following raptor borg modules:
Traumahound
Custodial Hound
Construction Hound
Service Hound (includes a V-4000 version that has a dumb tophat waistcoat and monocle on request.)
Supply Hound

Tested and seems to work fine!
2023-05-10 00:45:05 +01:00
Killian
682c4259f3 Merge remote-tracking branch 'upstream/master' into kk-coyotesuit 2023-05-08 14:08:14 +01:00
Killian
e0c1979c45 industrial action 2023-05-08 13:40:00 +01:00
Rick4242
2f53adbbf7 Extra body markings package
Adds multiple versions of the body toning and body gloss markings to apply to individual body parts to be more friendly with different sprite and/or species styles.
2023-05-07 04:58:01 -05:00
Killian
0857ff5654 Update mining_drone.dm 2023-05-06 11:16:51 +01:00
Heroman3003
ec9b750523 Merge pull request #14836 from Runa-Dacino/ARGlassesToggle
Removes the visible emote from toggling AR hud to bring in-line with …
2023-05-06 18:02:50 +10:00
Killian
fc9c2732de friendlier tesla components 2023-05-06 08:28:27 +01:00
Runa Dacino
3b103aca85 Removes the visible emote from toggling AR hud to bring in-line with other toggles
The advantage brought by informing people around the user is significantly diminished by it being potentially spammy and distracting.
I'd initially added it as a "well, knowing if someone got sec/medhud on you is potentially important", but it's not really relevant for our own usecase.
Plus, you still got the examine panel so it's not nearly enough of a big deal to justify the visible emote
2023-05-05 14:31:36 +02:00
Heroman3003
05966af4e9 Merge pull request #14832 from KillianKirilenko/kk-deduplication
Reagent Cleanup
2023-05-05 11:26:18 +10:00
TankTheBirb
ee37571001 Adds more sprites for character creation
wip desc
2023-05-04 20:44:18 -04:00
ReoDaProtovali
660a6484c4 Move animal nom verb to abilities tab
Simply moves the animal nom verb to the abilities tab, rather than the IC, as it's more fitting there as an active ability
2023-05-02 19:01:19 -05:00
Killian
7e9f973516 reagent cleanup 2023-05-01 22:43:57 +01:00
Heroman
9336775b3f Modern wrapped coat adjustment 2023-05-01 14:15:46 +10:00
Heroman3003
47d0f998d9 Merge pull request #14823 from SatinIsle/Striped-Clown-Uniform-Set
Added striped dungarees and tiny tophat
2023-05-01 10:57:32 +10:00
Heroman3003
8d5e25a2c1 Merge pull request #14827 from TankTheBirb/like-this-to-die-instantly
Make synth medicines tell medical you are dying
2023-05-01 10:56:43 +10:00
Heroman
32e5b31259 Adds tacopacks too 2023-05-01 10:38:54 +10:00
TankTheBirb
aff49d174a Make synth medicines tell medical you are dying
I just stole the code from the organic ones tbh but somehow it works so I'm happy with that. Doesn't impact balance aside from letting medical know that they can do SAR things and to maybe make science get a roboticist from somewhere.
2023-04-28 20:28:14 -04:00
SatinIsle
db4cacf933 Added striped dungarees and tiny tophat
As requested by Gwen Beedell, who had commissioned them, I've added the striped dungarees and tiny tophat to the loadout.

I can easily restrict these to clown only if requested, and add them to lockers/vending machines.
2023-04-28 11:15:24 +01:00
Heroman
ffa7b9d3d9 Adds altevian ramenpacks 2023-04-28 15:21:31 +10:00
Victor Zisthus
8cdfd59069 Altevian Clothing Fix
Fixes the job based clothing of Altevians not having the minor stat buffs of their humanoid counterparts clothing options.

Hydroponics and Janitorial are the only other job suits that offer any bonuses, but Altevians don't have any specific special suits for those jobs; I can't fix what does not exist!
2023-04-25 20:34:44 -04:00
Heroman3003
592c6ae435 Merge pull request #14814 from KillianKirilenko/kk-shottedgun
Shotgun Tweak
2023-04-24 06:50:35 +10:00
Killian
274dbcd7e0 shotgun tweak 2023-04-22 10:04:18 +01:00
Heroman3003
da8a583936 Merge pull request #14812 from KillianKirilenko/kk-ionbeams
Ion Beam Redux
2023-04-22 15:41:25 +10:00
Killian
68acecf26b ion beam redux 2023-04-21 18:33:37 +01:00
SatinIsle
272b98c260 Actual Chocolate in donuts
Puts the actual chocolate reagent in the chocolate named donuts, mostly so that they trigger chocolate allergies but also taste right.

Partially resolves: https://github.com/VOREStation/VOREStation/issues/14810
But that issue also lists a problem with displaying traits, which I have not looked into.
2023-04-21 00:45:10 +01:00
Heroman3003
5765d6b7c2 Merge pull request #14808 from Heroman3003/zaprat
Zaprat markings
2023-04-20 16:14:59 +10:00
Heroman3003
326496ce71 Merge pull request #14806 from ReoDaProtovali/master
One-way conveyor switches
2023-04-20 16:14:39 +10:00
Heroman
73ae4e432d Zaprat parts 2023-04-20 16:03:01 +10:00
SatinIsle
81a0d80614 Chocolate Allergy
Adds a neutral trait for an allergy to chocolate.
Adds ALLERGEN_CHOCOLATE tag to a number of food/drink reagents, such as coco, chocolate, chocolate milk.

Tested and it seems to work fine with the foods that I tested (chocolate bar, hot chocolate and a few others).
2023-04-19 19:24:38 +01:00
ReoDaProtovali
b7a490bee6 Update conveyor2.dm 2023-04-19 13:21:45 -05:00
ReoDaProtovali
9df47b9a0b One-way conveyor switches
Makes it possible to make one-way switches that are not limited to being mapper only, inspired by other codebases that do similar things (TG and Yogs I know do this.)

You can make a switch into a one-way (or make a one-way back into a two-way) by wrenching it with it's service panel open.

The original one-way lever is changed to use the new system as well, so maps dont need to remove the levers or anything. Aside one which for some reason was a var-edited one-way switch to be reverse only?? I commented out the var-edit so it wouldn't error.
2023-04-18 16:56:05 -05:00
Wulf
f619c8a5dd Adds FerretDook.ogg and the emote dook
Adds a ferret dooking emote.
2023-04-16 16:34:12 -05:00
Heroman3003
e86b6cdfa7 Merge pull request #14789 from SatinIsle/Lipozine-Plus
Lipozine Plus
2023-04-16 09:16:21 +10:00
SatinIsle
a55ef3a8ce Removed Lipozine Plus
I had accidentally left a copy of Lipozine Plus in from when I changed it to lipozilase. Removed that redundant copy.
2023-04-15 14:03:49 +01:00
SatinIsle
6a51cf9908 Lipostipo now drains nutrition
Lipostipo now drains nutrition at the same rate as lipozilase, simulating turning energy into fat.
2023-04-15 13:59:50 +01:00
Killian
db02d0257e Update food_drinks.dm 2023-04-15 11:52:34 +01:00
Heroman3003
d382a92b9d Update simple_mob.dm 2023-04-15 08:40:44 +10:00
Heroman3003
8fa311a895 Merge branch 'master' into shep-dev-simplemob-injury 2023-04-15 08:38:41 +10:00
Heroman3003
64b8a41055 Merge pull request #14767 from KillianKirilenko/kk-shockmaul
Concussion Maul
2023-04-15 08:37:48 +10:00
Heroman3003
ea195721df Merge pull request #14790 from MisterGrimm/miscfixesandchanges
Fixes simple_mob ID giving system
2023-04-15 08:37:26 +10:00
SatinIsle
9a95dc8a19 Lipostipo and name change
Adds another drug called lipostipo, which increases your weight without adding nutrition. Made using lipozine, nutriment and fluorine. Essentially acts as a reverse of the other drug, adding 3lbs per 1u, same overdose. Max of 500lbs.

Also changes the name of Lipozine Plus to Lipozilase, on account of it still sounding fantasy, it cleaving away fat and being fun to say. Lipostipo comes from the latin for "stuffing full", so stuffing full of fat and is equally fun to say.

Both changes tested locally and work fine.
2023-04-14 10:38:58 +01:00
Heroman3003
272043a540 Merge pull request #14781 from KillianKirilenko/kk-wolfloaf
Taurloafs Expansion
2023-04-14 15:32:41 +10:00
Heroman3003
657ee05f13 Merge pull request #14756 from Rykka-Stormheart/shep-dev-auto-lang-prefs
Preferred Language + Autohiss Default Options
2023-04-14 15:30:49 +10:00