Port Eris random items

This commit is contained in:
Aronai Sieyes
2021-06-28 13:28:41 -04:00
parent 4207b8567a
commit ca9132b9cd
4 changed files with 9 additions and 4 deletions
@@ -1,7 +1,7 @@
/obj/item/weapon/extinguisher
name = "fire extinguisher"
desc = "A traditional red fire extinguisher."
icon = 'icons/obj/items_vr.dmi' //VOREStation Edit
icon = 'icons/obj/items.dmi'
icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg'
@@ -21,6 +21,7 @@
var/last_use = 1.0
var/safety = 1
var/sprite_name = "fire_extinguisher"
var/rand_overlays = 6
/obj/item/weapon/extinguisher/mini
name = "fire extinguisher"
@@ -34,16 +35,20 @@
max_water = 150
spray_particles = 3
sprite_name = "miniFE"
rand_overlays = 0
/obj/item/weapon/extinguisher/Initialize()
create_reagents(max_water)
reagents.add_reagent("firefoam", max_water) //VOREStation Edit
reagents.add_reagent("firefoam", max_water)
if(rand_overlays)
var/choice = rand(1,rand_overlays)
add_overlay("[item_state]O[choice]")
. = ..()
/obj/item/weapon/extinguisher/examine(mob/user)
. = ..()
if(get_dist(user, src) == 0)
. += "[src] has [src.reagents.total_volume] units of foam left!" //VOREStation Edit - Foam not water
. += "[src] has [src.reagents.total_volume] units of foam left!"
/obj/item/weapon/extinguisher/attack_self(mob/user as mob)
safety = !safety
@@ -72,7 +77,7 @@
/obj/item/weapon/extinguisher/afterattack(var/atom/target, var/mob/user, var/flag)
//TODO; Add support for reagents in water.
if( istype(target, /obj/structure/reagent_dispensers) && flag) //VOREStation Edit
if( istype(target, /obj/structure/reagent_dispensers) && flag)
var/obj/o = target
var/amount = o.reagents.trans_to_obj(src, 50)
to_chat(user, "<span class='notice'>You fill [src] with [amount] units of the contents of [target].</span>")
Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB