Commit Graph

31135 Commits

Author SHA1 Message Date
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
Sym
d4f641e218 Simplifies ID provided name
Makes the name more simple
2023-04-14 00:13:14 -04:00
Sym
d0deed2f28 Fixes bad simple_mob ID design choices
Replaces mobcard for simple_mobs with something we already have, myid. Fixes alot of misc issues caused by mobcard, it should have never existed.
2023-04-14 00:07:34 -04:00
SatinIsle
0e8eecb407 Lipozine Plus
Adds a drug called Lipozine plus, made with lipozine plus diethylamine. Causes both a nutrition drain and a steady drain of actual weight from the person who has drunk it. Drains weight at a rate of 3 lbs per 1u. Does not check for weight loss rate, as it's pretty much a scene tool used to modify weight directly.
2023-04-14 00:29:53 +01:00
kcin2001
5b22668621 Allows Raptor pAI to recolor 'eyes' 2023-04-11 15:17:10 -07:00
Killian
eb357733a5 taurloafs expansion 2023-04-11 10:52:30 +01:00
Killian
222f679dae concussion maul pt4 2023-04-10 13:24:17 +01:00
Killian
f1c168faa2 concussion maul pt3 2023-04-10 07:53:15 +01:00
Casey
7978d83007 Merge pull request #14765 from Runa-Dacino/gmovermapfix
Adjusts sectors to have real_icons
2023-04-09 20:55:09 -04:00
Casey
3d9ddc7263 Merge pull request #14772 from Runa-Dacino/mirafluff
Adds Mira's health services medal
2023-04-09 20:54:36 -04:00
Casey
2013309056 Merge pull request #14770 from Runa-Dacino/ARGlassesToggle
Adds verb to AR glasses to toggle vision planes
2023-04-09 20:54:05 -04:00
Runa Dacino
bfea8cbb1a Makes it specific item rather than just the conduct one 2023-04-09 19:21:26 +02:00
Runa Dacino
bc25bca37b Adds a custom fluff item for Mira 2023-04-09 19:20:30 +02:00
Runa Dacino
c260ed8a0b Adds Mira's health services medal 2023-04-09 18:47:56 +02:00
Runa Dacino
0f13c7f838 Adds verb to AR glasses to toggle vision planes
*Also adds a redefinition of examine()
*This redefinition gives information on examine if HUD should be ON/OFF
*The verb notifies nearby players through a visible_emote that you toggled your HUD
2023-04-08 23:15:11 +02:00
Heroman
4b2a5fb329 Fixes pizza guy visor 2023-04-09 05:40:01 +10:00
Heroman3003
125d3d5824 Merge pull request #14764 from Rykka-Stormheart/shep-dev-markings-port
Selective Markings Port
2023-04-09 05:00:53 +10:00
Runa Dacino
ffe34ae887 Update sectors.dm 2023-04-07 14:32:24 +02:00
Runa Dacino
2f6dc67e42 Adjusts sectors to have real_icons
* Previous implementation relied on icon and icon_state at compile time.
* This prevented GMs from editing icon_state, as it always reverted to defaults when scanned
* GMs can now edit real_icon using var edit->E "Icon" to use non-standard icon_states
* GMs can now edit real_icon_state to choose specific state as a simple text var type edit
* GMs can call a proc called gmtools_update_omobject_vars(setToHidden) with an argument that forces known locations to become unknown again with an arg of "1"
* If GM uses arg of 0, proc simply changes how pilots inside the sector see their own ship by updating real_appearance with real_icon_state
2023-04-07 14:19:43 +02:00
Rykka Stormheart
ac0ee4202c Selective Markings Port
Ports the following markings upstream, plus an emote:
* Maned Wolf Markings
* Head Paint
* Sect Drone Body
* Sect Drone Eyes
* Sect Drone Tail
* Sect Drone Wings

Adds roarbark emote.
2023-04-06 23:01:13 -07:00
Killian
18cf24069b field generators glow 2023-04-07 06:11:10 +01:00
Rykka Stormheart
a103ea9f43 Remove accidental cherrypick mistake 2023-04-06 02:46:25 -07:00
Killian
508c4b13f8 Update tray.dm 2023-04-06 01:27:43 +01:00
Killian
0be76f02df Merge remote-tracking branch 'upstream/master' into kk-canteven 2023-04-06 01:17:15 +01:00
Killian
25992f42d7 Update tray.dm 2023-04-06 01:17:01 +01:00
Rykka Stormheart
b481a2e3f1 Disables Mob Slowdown globally, Changes formula
New formula is `round(rand(1,3) * damage_fatigue_mult * clamp(((rand(2,5) * (h / getMaxHealth())) - rand(0,2)), 1, 5))`
2023-04-04 16:33:07 -07:00
Rykka Stormheart
81b52afc0f small fix oops 2023-04-02 15:39:16 -07:00
Rykka Stormheart
3b4af60d9a Adds support for mobs enraging
Mobs can now INCREASE how fast they move and how fast they attack by injury level if they have injury_enrages set TRUE
2023-04-02 15:38:44 -07:00