Skip to content

Commit

Permalink
Give bruise packs and ointment a 2 second action bar and removes a ce…
Browse files Browse the repository at this point in the history
…rtain dusty first aid kit from debris (#15482)
  • Loading branch information
unfunnyperson committed Sep 6, 2023
1 parent 3a93ed2 commit 257b3d0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 5 additions & 3 deletions code/obj/item/bruisepack_ointment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,13 @@
user.show_text("You can't seem to find any flesh on this patient.", "red")
return
if (user)
var/self = FALSE
if (M != user)
M.visible_message("<span class='alert'>[user] applies [src] to [M].</span>",)
else
M.visible_message("<span class='alert'>[M] applies [src] to [himself_or_herself(M)].</span>")
self = TRUE
SETUP_GENERIC_ACTIONBAR(user, src, 2 SECONDS, /obj/item/medical/proc/do_use, list(M, user),\
src.icon, src.icon_state, "<span class='alert'>[user] applies [src] to [self ? "[M]" : "[himself_or_herself(M)]"].</span>", null)

proc/do_use(mob/M, mob/user)
if (M != user && ishuman(M) && ishuman(user))
if (M.gender != user.gender)
M.unlock_medal("Oh, Doctor!", 1)
Expand Down
6 changes: 1 addition & 5 deletions maps/z3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -14810,10 +14810,6 @@
},
/turf/simulated/floor/airless/plating/damaged1,
/area/abandonedship)
"blh" = (
/obj/item/storage/firstaid/old,
/turf/simulated/floor/white/grime,
/area/derelict_ai_sat)
"bli" = (
/obj/table/auto,
/obj/item/motherboard{
Expand Down Expand Up @@ -63735,7 +63731,7 @@ amV
amV
biB
biI
blh
aRo
aRo
bmg
aSl
Expand Down

0 comments on commit 257b3d0

Please sign in to comment.