From 8a93c57397c967c4333650d67ed2930b3a25f787 Mon Sep 17 00:00:00 2001 From: eyespy <104491498+eyespy2222@users.noreply.github.com> Date: Tue, 4 Apr 2023 02:01:06 +1000 Subject: [PATCH] stunbatons aren't as harsh (and i moved oily oafs to it's own thing) --- .../chemistry/reagents/dwarverndrinks.dm | 0 .../chemistry/recipes/ROCKANDSTONEdrinks.dm | 0 code/game/objects/items/stunbaton.dm | 6 +- .../food_and_drinks/recipes/drinks_recipes.dm | 8 - .../chemistry/reagents/alcohol_reagents.dm | 14 - tgstation.dme | 250 +----------------- 6 files changed, 6 insertions(+), 272 deletions(-) create mode 100644 GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm create mode 100644 GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm new file mode 100644 index 00000000..e69de29b diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm new file mode 100644 index 00000000..e69de29b diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 3a2b9d57..b79c5516 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -187,8 +187,8 @@ stunpwr *= round(stuncharge/hitcost, 0.1) - L.Knockdown(stunpwr) - L.adjustStaminaLoss(stunpwr*0.1, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented. + //L.Knockdown(stunpwr) GS13 change, makes stunbatons no longer oneshot people -Eye + L.adjustStaminaLoss(stunpwr*0.5, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented. L.apply_effect(EFFECT_STUTTER, stunforce) SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK) if(user) @@ -211,7 +211,7 @@ user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ "You accidentally hit yourself with [src]!") SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK) - user.Knockdown(stunforce*3) + //user.Knockdown(stunforce*3) playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) deductcharge(hitcost) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index d99ee871..db9f7bfa 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -917,11 +917,3 @@ id = /datum/reagent/consumable/orange_creamsicle results = list(/datum/reagent/consumable/orange_creamsicle = 4) required_reagents = list(/datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/orangejuice = 1) - -/datum/chemical_reaction/oily_oafs - name = "Oily oafs" - id = /datum/reagent/consumable/ethanol/oily_oafs - results = list(/datum/reagent/consumable/ethanol/oily_oafs = 2) - required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/cream = 1) - - //b \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 118b66b6..dff2dfc9 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2439,18 +2439,4 @@ datum/reagent/consumable/ethanol/creme_de_coconut taste_description = "viscous cream" glass_desc = "The name is probably exactly what it is." -///GS13 drinks! -/datum/reagent/consumable/ethanol/oily_oafs - name = "Oily oafs" - description = "The oily oaf. while it isn't as strong as some of the other drinks on station, Its buttery aftertaste and affordability make it a staple of any good miner's diet." - color = "#ffc75f" - boozepwr = 30 - taste_description = "rich butter and red sugar" - quality = DRINK_NICE - glass_icon_state = "oily_oafs" - glass_name = "oily oafs" - glass_desc = "The oily oaf. A dwarvern classic beloved by miners around the cosmos." - shot_glass_icon_state = "shotglassbrown" - pH = 4.5 - value = 0.1 diff --git a/tgstation.dme b/tgstation.dme index 1363c2f0..1ca4c7d9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,253 +6,6 @@ // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/research" -#define FILE_DIR "code/modules/research/xenoarch" -#define FILE_DIR "code/modules/research/xenoarch/xenobotany" -#define FILE_DIR "code/modules/research/xenoarch/xenobotany/icons" -#define FILE_DIR "config" -#define FILE_DIR "config/jukebox_music" -#define FILE_DIR "config/jukebox_music/sounds" -#define FILE_DIR "config/title_screens" -#define FILE_DIR "GainStation13" -#define FILE_DIR "GainStation13/icons" -#define FILE_DIR "GainStation13/icons/mob" -#define FILE_DIR "GainStation13/icons/mob/uniforms" -#define FILE_DIR "GainStation13/icons/obj" -#define FILE_DIR "GainStation13/icons/obj/clothing" -#define FILE_DIR "GainStation13/icons/obj/lavaland_demone" -#define FILE_DIR "GainStation13/icons/obj/spells" -#define FILE_DIR "GainStation13/icons/obj/sugarland" -#define FILE_DIR "GainStation13/icons/turf" -#define FILE_DIR "GainStation13/sound" -#define FILE_DIR "GainStation13/sound/voice" -#define FILE_DIR "goon" -#define FILE_DIR "goon/icons" -#define FILE_DIR "goon/icons/obj" -#define FILE_DIR "goon/sound" -#define FILE_DIR "goon/sound/effects" -#define FILE_DIR "goon/sound/machinery" -#define FILE_DIR "html" -#define FILE_DIR "hyperstation" -#define FILE_DIR "hyperstation/icons" -#define FILE_DIR "hyperstation/icons/chat" -#define FILE_DIR "hyperstation/icons/decals" -#define FILE_DIR "hyperstation/icons/effects" -#define FILE_DIR "hyperstation/icons/mob" -#define FILE_DIR "hyperstation/icons/mob/clothes" -#define FILE_DIR "hyperstation/icons/mobs" -#define FILE_DIR "hyperstation/icons/mobs/dancer" -#define FILE_DIR "hyperstation/icons/obj" -#define FILE_DIR "hyperstation/icons/obj/cargo" -#define FILE_DIR "hyperstation/icons/obj/cargo/sweatshop" -#define FILE_DIR "hyperstation/icons/obj/clothing" -#define FILE_DIR "hyperstation/icons/obj/genitals" -#define FILE_DIR "hyperstation/icons/obj/machinery" -#define FILE_DIR "hyperstation/icons/obj/structures" -#define FILE_DIR "hyperstation/sound" -#define FILE_DIR "hyperstation/sound/ambience" -#define FILE_DIR "hyperstation/sound/creatures" -#define FILE_DIR "hyperstation/sound/creatures/mimic" -#define FILE_DIR "hyperstation/sound/effects" -#define FILE_DIR "hyperstation/sound/effects/rbmk" -#define FILE_DIR "hyperstation/sound/effects/ship" -#define FILE_DIR "hyperstation/sound/effects/ship/freespace2" -#define FILE_DIR "hyperstation/sound/effects/ship/reactor" -#define FILE_DIR "hyperstation/sound/halflife" -#define FILE_DIR "hyperstation/sound/machines" -#define FILE_DIR "hyperstation/sound/machines/sm" -#define FILE_DIR "hyperstation/sound/machines/sm/accent" -#define FILE_DIR "hyperstation/sound/machines/sm/accent/normal" -#define FILE_DIR "hyperstation/sound/misc" -#define FILE_DIR "icons" -#define FILE_DIR "icons/ass" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/minimaps" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/actions" -#define FILE_DIR "icons/mob/augmentation" -#define FILE_DIR "icons/mob/inhands" -#define FILE_DIR "icons/mob/inhands/antag" -#define FILE_DIR "icons/mob/inhands/equipment" -#define FILE_DIR "icons/mob/inhands/misc" -#define FILE_DIR "icons/mob/inhands/weapons" -#define FILE_DIR "icons/mob/jungle" -#define FILE_DIR "icons/mob/large-worn-icons" -#define FILE_DIR "icons/mob/large-worn-icons/64x64" -#define FILE_DIR "icons/mob/lavaland" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/atmospherics/components" -#define FILE_DIR "icons/obj/atmospherics/pipes" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/doors/airlocks" -#define FILE_DIR "icons/obj/doors/airlocks/abductor" -#define FILE_DIR "icons/obj/doors/airlocks/centcom" -#define FILE_DIR "icons/obj/doors/airlocks/clockwork" -#define FILE_DIR "icons/obj/doors/airlocks/cult" -#define FILE_DIR "icons/obj/doors/airlocks/cult/runed" -#define FILE_DIR "icons/obj/doors/airlocks/cult/unruned" -#define FILE_DIR "icons/obj/doors/airlocks/external" -#define FILE_DIR "icons/obj/doors/airlocks/glass_large" -#define FILE_DIR "icons/obj/doors/airlocks/hatch" -#define FILE_DIR "icons/obj/doors/airlocks/highsec" -#define FILE_DIR "icons/obj/doors/airlocks/shuttle" -#define FILE_DIR "icons/obj/doors/airlocks/station" -#define FILE_DIR "icons/obj/doors/airlocks/station2" -#define FILE_DIR "icons/obj/doors/airlocks/survival" -#define FILE_DIR "icons/obj/doors/airlocks/vault" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/food" -#define FILE_DIR "icons/obj/guns" -#define FILE_DIR "icons/obj/hydroponics" -#define FILE_DIR "icons/obj/lavaland" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/power_cond" -#define FILE_DIR "icons/obj/smooth_structures" -#define FILE_DIR "icons/obj/smooth_structures/alien" -#define FILE_DIR "icons/obj/tesla_engine" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/program_icons" -#define FILE_DIR "icons/rooms" -#define FILE_DIR "icons/rooms/box" -#define FILE_DIR "icons/stamp_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/turf/floors" -#define FILE_DIR "icons/turf/walls" -#define FILE_DIR "icons/UI_Icons" -#define FILE_DIR "icons/UI_Icons/chat" -#define FILE_DIR "icons/UI_Icons/minesweeper_tiles" -#define FILE_DIR "icons/UI_Icons/Pills" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "modular_citadel" -#define FILE_DIR "modular_citadel/code" -#define FILE_DIR "modular_citadel/code/game" -#define FILE_DIR "modular_citadel/code/game/area" -#define FILE_DIR "modular_citadel/icons" -#define FILE_DIR "modular_citadel/icons/effects" -#define FILE_DIR "modular_citadel/icons/eutactic" -#define FILE_DIR "modular_citadel/icons/eutactic/item" -#define FILE_DIR "modular_citadel/icons/eutactic/mob" -#define FILE_DIR "modular_citadel/icons/lavaknight" -#define FILE_DIR "modular_citadel/icons/lavaknight/item" -#define FILE_DIR "modular_citadel/icons/lavaknight/mob" -#define FILE_DIR "modular_citadel/icons/misc" -#define FILE_DIR "modular_citadel/icons/mob" -#define FILE_DIR "modular_citadel/icons/mob/actions" -#define FILE_DIR "modular_citadel/icons/mob/citadel" -#define FILE_DIR "modular_citadel/icons/mob/citadel_refs" -#define FILE_DIR "modular_citadel/icons/mob/clothing" -#define FILE_DIR "modular_citadel/icons/mob/inhands" -#define FILE_DIR "modular_citadel/icons/obj" -#define FILE_DIR "modular_citadel/icons/obj/clothing" -#define FILE_DIR "modular_citadel/icons/obj/food" -#define FILE_DIR "modular_citadel/icons/obj/genitals" -#define FILE_DIR "modular_citadel/icons/obj/guns" -#define FILE_DIR "modular_citadel/icons/polyclothes" -#define FILE_DIR "modular_citadel/icons/polyclothes/item" -#define FILE_DIR "modular_citadel/icons/polyclothes/mob" -#define FILE_DIR "modular_citadel/icons/ui" -#define FILE_DIR "modular_citadel/sound" -#define FILE_DIR "modular_citadel/sound/misc" -#define FILE_DIR "modular_citadel/sound/voice" -#define FILE_DIR "modular_citadel/sound/weapons" -#define FILE_DIR "nsv13" -#define FILE_DIR "nsv13/icons" -#define FILE_DIR "nsv13/icons/obj" -#define FILE_DIR "nsv13/sound" -#define FILE_DIR "nsv13/sound/effects" -#define FILE_DIR "nsv13/sound/effects/computer" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/alien" -#define FILE_DIR "sound/alien/Effects" -#define FILE_DIR "sound/alien/Voice" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/ambience/antag" -#define FILE_DIR "sound/arcade" -#define FILE_DIR "sound/bloodsucker" -#define FILE_DIR "sound/chatter" -#define FILE_DIR "sound/creatures" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/effects/footstep" -#define FILE_DIR "sound/FermiChem" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/health" -#define FILE_DIR "sound/instruments" -#define FILE_DIR "sound/instruments/accordion" -#define FILE_DIR "sound/instruments/bikehorn" -#define FILE_DIR "sound/instruments/eguitar" -#define FILE_DIR "sound/instruments/glockenspiel" -#define FILE_DIR "sound/instruments/guitar" -#define FILE_DIR "sound/instruments/harmonica" -#define FILE_DIR "sound/instruments/piano" -#define FILE_DIR "sound/instruments/recorder" -#define FILE_DIR "sound/instruments/saxophone" -#define FILE_DIR "sound/instruments/trombone" -#define FILE_DIR "sound/instruments/violin" -#define FILE_DIR "sound/instruments/xylophone" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/items/equip" -#define FILE_DIR "sound/items/geiger" -#define FILE_DIR "sound/items/handling" -#define FILE_DIR "sound/lavaland" -#define FILE_DIR "sound/lewd" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/machines/clockcult" -#define FILE_DIR "sound/machines/fryer" -#define FILE_DIR "sound/machines/generator" -#define FILE_DIR "sound/machines/microwave" -#define FILE_DIR "sound/machines/nuke" -#define FILE_DIR "sound/machines/shower" -#define FILE_DIR "sound/machines/sm" -#define FILE_DIR "sound/magic" -#define FILE_DIR "sound/magic/clockwork" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/music" -#define FILE_DIR "sound/roundend" -#define FILE_DIR "sound/spookoween" -#define FILE_DIR "sound/vehicles" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/beepsky" -#define FILE_DIR "sound/voice/catpeople" -#define FILE_DIR "sound/voice/complionator" -#define FILE_DIR "sound/voice/firebot" -#define FILE_DIR "sound/voice/human" -#define FILE_DIR "sound/voice/medbot" -#define FILE_DIR "sound/voice/scream" -#define FILE_DIR "sound/vore" -#define FILE_DIR "sound/vore/pred" -#define FILE_DIR "sound/vore/prey" -#define FILE_DIR "sound/vox_fem" -#define FILE_DIR "sound/weapons" -#define FILE_DIR "sound/weapons/effects" -#define FILE_DIR "sound/weather" -#define FILE_DIR "sound/weather/ashstorm" -#define FILE_DIR "sound/weather/ashstorm/inside" -#define FILE_DIR "sound/weather/ashstorm/outside" -#define FILE_DIR "sound/weather/oxygenrain" -#define FILE_DIR "sound/weather/oxygenrain/inside" -#define FILE_DIR "sound/weather/oxygenrain/outside" -#define FILE_DIR "tools" -#define FILE_DIR "tools/HumanScissors" -#define FILE_DIR "tools/SS13SmoothingCutter" -#define FILE_DIR "yogstation" -#define FILE_DIR "yogstation/icons" -#define FILE_DIR "yogstation/icons/obj" -#define FILE_DIR "yogstation/icons/obj/clothing" -#define FILE_DIR "yogstation/icons/turf" -#define FILE_DIR "yogstation/sound" -#define FILE_DIR "yogstation/sound/effects" -#define FILE_DIR "yogstation/sound/misc" -#define FILE_DIR "yogstation/sound/voice" // END_FILE_DIR // BEGIN_PREFERENCES @@ -260,6 +13,8 @@ // END_PREFERENCES // BEGIN_INCLUDE +#include "dwarverndrinks.dm" +#include "ROCKANDSTONEdrinks.dm" #include "_maps\_basemap.dm" #include "_maps\map_files\generic\CentCom.dmm" #include "code\_compile_options.dm" @@ -3334,6 +3089,7 @@ #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm" #include "GainStation13\code\modules\research\designs\nutri_designs.dm" #include "GainStation13\code\modules\vending\gatocola.dm" +#include "GainStation13\code\modules\vending\GBBurrito.dm" #include "GainStation13\code\modules\vending\mealdor.dm" #include "GainStation13\code\obj\items\minor_items.dm" #include "GainStation13\code\obj\structure\scale.dm"