Skip to content

Commit

Permalink
New medkit, bandaid and adv medkit sprites **UPDATED** + Morgue slabs…
Browse files Browse the repository at this point in the history
…, NT/Serb kits (#8379)

* Yes.

* Yes(1)

* yeah

* a

* guh?

* Update

* Update stationobjs.dmi

* Update stationobjs.dmi

* Update hypospray.dm

* Fixes

* Fixes (2)

* Fixes (3)

* Old

* fix

* Box
  • Loading branch information
githubuser4141 authored Dec 8, 2023
1 parent 5c9e722 commit cd1250a
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/game/objects/items/devices/device.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
/obj/item/device/MouseDrop(over_object)
if((loc == usr) && suitable_cell && istype(over_object, /obj/screen/inventory/hand) && eject_item(cell, usr))
cell = null
update_icon()
return
. = ..()

Expand Down
10 changes: 9 additions & 1 deletion code/game/objects/items/stacks/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
rarity_value = 5
spawn_tags = SPAWN_TAG_MEDICINE_COMMON

/obj/item/stack/medical/bruise_pack/update_icon()
icon_state = "[initial(icon_state)][amount]"
..()

/obj/item/stack/medical/bruise_pack/attack(mob/living/carbon/M, mob/living/user)
if(..())
return 1
Expand Down Expand Up @@ -218,13 +222,17 @@
desc = "Used to treat those nasty burns."
gender = PLURAL
singular_name = "ointment"
icon_state = "ointment"
icon_state = "ointment5"
heal_burn = 4
origin_tech = list(TECH_BIO = 1)
preloaded_reagents = list("silicon" = 4, "carbon" = 8)
rarity_value = 5
spawn_tags = SPAWN_TAG_MEDICINE_COMMON

/obj/item/stack/medical/bruise_pack/update_icon()
icon_state = "[initial(icon_state)][amount]"
..()

/obj/item/stack/medical/ointment/attack(mob/living/carbon/M, mob/living/user)
if(..())
return 1
Expand Down
9 changes: 7 additions & 2 deletions code/modules/reagents/reagent_containers/hypospray.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
volume = 5
preloaded_reagents = list("inaprovaline" = 5)
spawn_blacklisted = TRUE
var/image/filling_overlay

/obj/item/reagent_containers/hypospray/autoinjector/on_reagent_change()
..()
Expand All @@ -107,11 +108,15 @@
cut_overlays()
if(reagents && reagents.total_volume > 0)
icon_state = initial(icon_state)
var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "autoinjector")
filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "autoinjector")
filling_overlay.color = reagents.get_color()
add_overlay(filling_overlay)
else
icon_state = "[initial(icon_state)]0"
if(reagents && reagents.total_volume <= 0)
filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "autoinjector0")
filling_overlay.color = reagents.get_color()
add_overlay(filling_overlay)
icon_state = "[initial(icon_state)]0"

// TRADE
/obj/item/reagent_containers/hypospray/autoinjector/antitoxin
Expand Down
Binary file modified icons/mob/hud.dmi
Binary file not shown.
Binary file modified icons/obj/device.dmi
Binary file not shown.
Binary file modified icons/obj/reagentfillings.dmi
Binary file not shown.
Binary file modified icons/obj/stack/items.dmi
Binary file not shown.
Binary file modified icons/obj/stationobjs.dmi
Binary file not shown.
Binary file modified icons/obj/storage.dmi
Binary file not shown.
Binary file modified icons/obj/storage/deferred.dmi
Binary file not shown.
Binary file modified icons/obj/syringe.dmi
Binary file not shown.

0 comments on commit cd1250a

Please sign in to comment.