diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm index 8fcbd9e0e75..cb64b01e788 100644 --- a/code/__defines/items_clothing.dm +++ b/code/__defines/items_clothing.dm @@ -23,13 +23,13 @@ #define SLOT_HOLSTER 0x8000 //16th bit - higher than this will overflow // Flags bitmasks. -#define NOBLUDGEON 0x1 // When an item has this it produces no "X has been hit by Y with Z" message with the default handler. +#define NOBLUDGEON 0x1 // When an item has this it produces no "X has been hit by Y with Z" message with the default handler. #define CONDUCT 0x2 // Conducts electricity. (metal etc.) #define ON_BORDER 0x4 // Item has priority to check when entering or leaving. #define NOBLOODY 0x8 // Used for items if they don't want to get a blood overlay. -#define OPENCONTAINER 0x10 // Is an open container for chemistry purposes. -#define PHORONGUARD 0x20 // Does not get contaminated by phoron. -#define NOREACT 0x40 // Reagents don't react inside this container. +#define OPENCONTAINER 0x10 // Is an open container for chemistry purposes. +#define PHORONGUARD 0x20 // Does not get contaminated by phoron. +#define NOREACT 0x40 // Reagents don't react inside this container. #define PROXMOVE 0x80 // Does this object require proximity checking in Enter()? //Flags for items (equipment) diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm index 77034489cd5..d4fc9eec327 100644 --- a/code/datums/trading/weaponry.dm +++ b/code/datums/trading/weaponry.dm @@ -30,7 +30,6 @@ /obj/item/weapon/gun/projectile/automatic/x9 = TRADER_THIS_TYPE, /obj/item/ammo_magazine/c45m = TRADER_ALL, /obj/item/ammo_magazine/c45m/empty = TRADER_BLACKLIST, - /obj/item/ammo_magazine/shotgun = TRADER_ALL, /obj/item/ammo_magazine/t40 = TRADER_ALL, /obj/item/ammo_magazine/t40/empty = TRADER_BLACKLIST, /obj/item/ammo_magazine/c38 = TRADER_ALL, diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index e8df832dd8d..a1b33719728 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1320,10 +1320,10 @@ About the new airlock wires panel: electrified_until = 0 //if we lost power open 'er up if(insecure) - open(1) + INVOKE_ASYNC(src, /obj/machinery/door/.proc/open, 1) securitylock = 1 else if(securitylock) - close(1) + INVOKE_ASYNC(src, /obj/machinery/door/.proc/close, 1) securitylock = 0 update_icon() diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index f980f8b20ee..65bdad2479a 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -176,10 +176,10 @@ if(src.operating || (stat & BROKEN)) return if(stat & NOPOWER) - force_close() + INVOKE_ASYNC(src, /obj/machinery/door/blast/.proc/force_close) securitylock = 1 else if(securitylock) - force_open() + INVOKE_ASYNC(src, /obj/machinery/door/blast/.proc/force_open) securitylock = 0 diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 62a2511916f..de3a5a72054 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -512,7 +512,7 @@ categories &= ~CAT_COIN if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf)))) - if ((href_list["vend"]) && (src.vend_ready) && (!currently_vending)) + if (text2num(href_list["vend"]) && (src.vend_ready) && (!currently_vending)) if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH usr << "Access denied." //Unless emagged of course flick(icon_deny,src) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index feaa6708307..f7356af2e0c 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -282,6 +282,10 @@ force = 3 agonyforce = 60 +/obj/item/weapon/melee/baton/slime/Initialize() + bcell = new/obj/item/weapon/cell/high(src) + . = ..() + /obj/item/weapon/melee/baton/slime/update_icon() icon_state = initial(icon_state) item_state = initial(item_state) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 4ff094261e1..ecf436541c5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -30,7 +30,7 @@ new /obj/item/weapon/storage/toolbox/mechanical(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/glasses/meson/aviator(src) + new /obj/item/clothing/glasses/meson/aviator(src) new /obj/item/device/multitool(src) new /obj/item/device/flash(src) new /obj/item/taperoll/engineering(src) @@ -124,7 +124,7 @@ new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson(src) - new /obj/item/clothing/glasses/meson/aviator(src) + new /obj/item/clothing/glasses/meson/aviator(src) new /obj/item/weapon/cartridge/engineering(src) new /obj/item/taperoll/engineering(src) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 547e0145f70..8b33aa6333e 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -43,21 +43,6 @@ wet_amount += amount - var/max_wetness = 10 //About 100 units per tile - if(wet_amount > max_wetness) - var/stored_wet = wet_amount - max_wetness - wet_amount -= max_wetness - var/wet_per_tile = stored_wet * 0.25 - for(var/d in cardinal) - var/turf/simulated/target = get_step(src,d) - if(src.CanPass(null, target, 0, 0) && target.CanPass(null, src, 0, 0)) - if(target.wet_amount) - var/edited_value = round(wet_per_tile * 0.5) //Prevent infinite loops - target.wet_floor(apply_type,edited_value) - wet_amount += edited_value - else - target.wet_floor(apply_type,wet_per_tile) - unwet_timer = addtimer(CALLBACK(src, .proc/unwet_floor), 120 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE) /turf/simulated/proc/unwet_floor() diff --git a/code/modules/cargo/bounties/slime.dm b/code/modules/cargo/bounties/slime.dm index bbe2bd449a3..d2d66fd3607 100644 --- a/code/modules/cargo/bounties/slime.dm +++ b/code/modules/cargo/bounties/slime.dm @@ -33,7 +33,3 @@ /datum/bounty/item/slime/adamantine name = "Adamantine Slime Extract" wanted_types = list(/obj/item/slime_extract/adamantine) - -/datum/bounty/item/slime/rainbow - name = "Rainbow Slime Extract" - wanted_types = list(/obj/item/slime_extract/rainbow) diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index b3213a538ea..2f0ebbf0cf3 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -1096,7 +1096,7 @@ var/list/global/random_stock_large = list( if("chempack") var/total = rand(2,6) var/list/chems = SSchemistry.chemical_reagents.Copy() - var/list/exclusion = list("drink", "reagent", "adminordrazine", "beer2", "azoth", "elixir_life", "liquid_fire", "philosopher_stone", "undead_ichor") + var/list/exclusion = list("drink", "reagent", "adminordrazine", "beer2", "azoth", "elixir_life", "liquid_fire", "philosopher_stone", "undead_ichor", "love", "shapesand", "usolve", "sglue", "black_matter") chems -= exclusion for (var/i=0,i\The [user] scans \the [target] with \the [src].", "You scan \the [target] with \the [src].") - - if(istype(target,/obj/item/weapon/gun/custom_ka)) playsound(src, 'sound/machines/ping.ogg', 10, 1) diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index e62a7c2d0e9..c817046cf81 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -235,7 +235,7 @@ fruit = list("nifberries" = 1) reagents = list("spacespice" = 1) items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough + /obj/item/weapon/reagent_containers/food/snacks/flatbread ) result = /obj/item/weapon/reagent_containers/food/snacks/tajaran_bread reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 6e63528b6e5..22920017d6b 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -304,6 +304,7 @@ /mob/living/simple_animal/penguin name = "penguin" desc = "A king of the icy regions." + icon = 'icons/mob/penguins.dmi' icon_state = "penguin" icon_living = "penguin" icon_dead = "penguin_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm index d641cb8c09c..ae0191eb016 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm @@ -105,6 +105,7 @@ var/list/loot = list() var/ore_message = 0 var/target_ore + var/ore_count = 0 /mob/living/simple_animal/hostile/retaliate/minedrone/Initialize() . = ..() @@ -113,9 +114,19 @@ loot += pick(/obj/item/weapon/ore/silver, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/diamond) i-- +/mob/living/simple_animal/hostile/retaliate/minedrone/death() + ..(null,"is smashed into pieces!") + var/T = get_turf(src) + new /obj/effect/gibspawner/robot(T) + spark(T, 3, alldirs) + for(var/obj/item/weapon/ore/O in loot) + O.forceMove(src.loc) + qdel(src) + /mob/living/simple_animal/hostile/retaliate/minedrone/Life() ..() - FindOre() + if(ore_count<20) + FindOre() /mob/living/simple_animal/hostile/retaliate/minedrone/proc/FindOre() if(!enemies.len) @@ -125,6 +136,7 @@ for(var/obj/item/weapon/ore/O in oview(1,src)) O.forceMove(src) loot += O + ore_count ++ if(target_ore == O) target_ore = null if(!ore_message) @@ -145,15 +157,6 @@ rapid = 0 break -/mob/living/simple_animal/hostile/retaliate/minedrone/death() - ..(null,"is smashed into pieces!") - var/T = get_turf(src) - new /obj/effect/gibspawner/robot(T) - spark(T, 3, alldirs) - for(var/obj/item/weapon/ore/O in loot) - O.forceMove(src.loc) - qdel(src) - /mob/living/simple_animal/hostile/retaliate/minedrone/adjustToxLoss(var/damage) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 6ce7d2e14a9..95ddb33d35b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -109,10 +109,10 @@ // self_message (optional) is what the src mob sees e.g. "You do something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!" -/mob/visible_message(var/message, var/self_message, var/blind_message) +/mob/visible_message(var/message, var/self_message, var/blind_message, var/range = world.view) var/list/messageturfs = list()//List of turfs we broadcast to. var/list/messagemobs = list()//List of living mobs nearby who can hear it, and distant ghosts who've chosen to hear it - for (var/turf in view(world.view, get_turf(src))) + for (var/turf in view(range, get_turf(src))) messageturfs += turf for(var/A in player_list) diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 3dfee5b4cc5..3edf4c1097e 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -323,46 +323,6 @@ caliber = ".45" max_ammo = 50 -//shotguns boxes things from old code - -/obj/item/ammo_magazine/shotgun - name = "ammunition box (slug)" - icon_state = "lethalshellshot_box" - origin_tech = list(TECH_COMBAT = 2) - ammo_type = /obj/item/ammo_casing/shotgun - max_ammo = 8 - caliber = "shotgun" - matter = list("metal" = 2880) - -/obj/item/ammo_magazine/shotgun/shell - name = "ammunition box (shell)" - icon_state = "lethalslug_box" - ammo_type = /obj/item/ammo_casing/shotgun/pellet - -/obj/item/ammo_magazine/shotgun/stun - name = "ammunition box (stun shells)" - icon_state = "stunshot_box" - ammo_type = /obj/item/ammo_casing/shotgun/stunshell - matter = list(DEFAULT_WALL_MATERIAL = 2880, "glass" = 5760) - -/obj/item/ammo_magazine/shotgun/beanbag - name = "ammunition box (beanbag shells)" - icon_state = "beanshot_box" - ammo_type = /obj/item/ammo_casing/shotgun/beanbag - matter = list(DEFAULT_WALL_MATERIAL = 1440) - -/obj/item/ammo_magazine/shotgun/incendiary - name = "ammunition box (incendiary shells)" - icon_state = "incendiaryshot_box" - ammo_type = /obj/item/ammo_casing/shotgun/incendiary - matter = list(DEFAULT_WALL_MATERIAL = 3600) - -/obj/item/ammo_magazine/shotgun/emp - name = "ammunition box (haywire shells)" - icon_state = "empshot_box" - ammo_type = /obj/item/ammo_casing/shotgun/emp - matter = list(DEFAULT_WALL_MATERIAL = 3600, "uranium" = 1600) - /obj/item/ammo_magazine/caps name = "speed loader (caps)" icon_state = "T38" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 114f289523d..d3d0fbf42e5 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -182,7 +182,7 @@ var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.remove_air(T:air:total_moles) - lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, 0) + lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, T0C) lowertemp.react() T.assume_air(lowertemp) qdel(hotspot) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 4e9042e95c0..37f45828174 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -451,15 +451,15 @@ scannable = 1 taste_description = "bitterness" unaffected_species = IS_MACHINE - var/last_taste_time = -100 + var/last_taste_time = -10000 /datum/reagent/hyronalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_DIONA) - if(last_taste_time + 500 < world.time) // Not to spam message + if(last_taste_time + 950 < world.time) // Not to spam message to_chat(M, "Your body withers as you feel a searing pain throughout.") last_taste_time = world.time - metabolism = REM * 0.33 - M.adjustToxLoss(30 * removed) // Tested numbers myself + metabolism = REM * 0.22 + M.adjustToxLoss(45 * removed) // Tested numbers myself else M.apply_radiation(-30 * removed) @@ -474,15 +474,15 @@ scannable = 1 taste_description = "bitterness" unaffected_species = IS_MACHINE - var/last_taste_time = -100 + var/last_taste_time = -10000 /datum/reagent/arithrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_DIONA) - if(last_taste_time + 250 < world.time) // Not to spam message + if(last_taste_time + 450 < world.time) // Not to spam message to_chat(M, "Your body withers as you feel a searing pain throughout.") last_taste_time = world.time - metabolism = REM * 0.33 - M.adjustToxLoss(120 * removed) // Tested numbers myself + metabolism = REM * 0.195 + M.adjustToxLoss(115 * removed) // Tested numbers myself else M.apply_radiation(-70 * removed) M.adjustToxLoss(-10 * removed) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 43643604bea..7722f34cf0d 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -277,7 +277,7 @@ var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.return_air() - lowertemp.temperature = max(min(lowertemp.temperature-2000, lowertemp.temperature / 2), 0) + lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, T0C) lowertemp.react() qdel(hotspot) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 1c7a04c3e35..11d6ecf6969 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -64,15 +64,16 @@ return if(is_type_in_list(target,can_be_placed_into)) return - if(standard_splash_mob(user, target)) - return if(standard_feed_mob(user,target)) return + if(standard_splash_mob(user, target)) + return if(standard_pour_into(user, target)) return if(standard_splash_obj(user, target)) return + /obj/item/weapon/reagent_containers/proc/reagentlist() // For attack logs if(reagents) return reagents.get_reagents() @@ -106,12 +107,13 @@ reagents.splash(target, reagents.total_volume) return -/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack +// This goes into afterattack +/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) if(!istype(target)) return if(user.a_intent != I_HURT) - return + return 0 if(!reagents || !reagents.total_volume) user << "[src] is empty." @@ -148,9 +150,13 @@ playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1) /obj/item/weapon/reagent_containers/proc/standard_feed_mob(var/mob/user, var/mob/target) // This goes into attack + if(!istype(target)) return 0 + if(user.a_intent == I_HURT) + return 0 + if(!reagents || !reagents.total_volume) user << "\The [src] is empty." return 1 diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index adbdfda9f1a..fd6b4f92b5d 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -15,20 +15,6 @@ center_of_mass = list("x"=16, "y"=6) volume = 50 -/obj/item/weapon/reagent_containers/food/condiment/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - return - -/obj/item/weapon/reagent_containers/food/condiment/attack_self(var/mob/user as mob) - return - -/obj/item/weapon/reagent_containers/food/condiment/attack(var/mob/M as mob, var/mob/user as mob, var/def_zone) - if(standard_feed_mob(user, M)) - return - -/obj/item/weapon/reagent_containers/food/condiment/afterattack(var/obj/target, var/mob/user, var/proximity) - if(!proximity) - return - /obj/item/weapon/reagent_containers/food/condiment/self_feed_message(var/mob/user) user << "You swallow some of contents of \the [src]." diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 3f82160641d..920f8221388 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -36,6 +36,9 @@ if (nutriment_amt) reagents.add_reagent(nutriment_type, nutriment_amt, nutriment_desc) +/obj/item/weapon/reagent_containers/food/snacks/standard_splash_mob(var/mob/user, var/mob/target) + return 1 //Returning 1 will cancel everything else in a long line of things it should do. + /obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/eater, var/mob/feeder = null) if(!reagents.total_volume) eater.visible_message("[eater] finishes eating \the [src].","You finish eating \the [src].") @@ -57,7 +60,7 @@ /obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user as mob) return -/obj/item/weapon/reagent_containers/food/snacks/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/reagent_containers/food/snacks/afterattack(mob/M as mob, mob/user as mob, def_zone) if(!reagents.total_volume) user << "None of [src] left!" qdel(src) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index dcf97311313..468b4bc0423 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -44,6 +44,8 @@ var/trans = reagents.trans_to_mob(M, amount_per_transfer_from_this, CHEM_BLOOD) admin_inject_log(user, M, src, contained, trans) to_chat(user,"[trans] units injected. [reagents.total_volume] units remaining in \the [src].") + + update_icon() return @@ -65,7 +67,6 @@ ..() if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled. flags &= ~OPENCONTAINER - update_icon() return /obj/item/weapon/reagent_containers/hypospray/autoinjector/update_icon() diff --git a/code/modules/reagents/reagent_containers/inhaler.dm b/code/modules/reagents/reagent_containers/inhaler.dm index 4024a0727af..9ed09ba24b1 100644 --- a/code/modules/reagents/reagent_containers/inhaler.dm +++ b/code/modules/reagents/reagent_containers/inhaler.dm @@ -66,13 +66,14 @@ playsound(src.loc, 'sound/items/stimpack.ogg', 50, 1) to_chat(user,"[trans] units injected. [reagents.total_volume] units remaining in \the [src].") + update_icon() + return /obj/item/weapon/reagent_containers/inhaler/attack(mob/M as mob, mob/user as mob) ..() if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled. flags &= ~OPENCONTAINER - update_icon() return /obj/item/weapon/reagent_containers/inhaler/update_icon() diff --git a/code/modules/vueui/ui.dm b/code/modules/vueui/ui.dm index ea9e8b6b1fd..b971c7ae610 100644 --- a/code/modules/vueui/ui.dm +++ b/code/modules/vueui/ui.dm @@ -126,7 +126,7 @@ main ui datum.
- + Javascript file has failed to load. Click here to force load resources
[debugtxt]