cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Defibrillator has two 'l's

Browse Source
This commit is contained in:
Erthilo
2014-05-11 16:28:55 +01:00
parent 8e535bd823
commit 5293d73468
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/objects/closets/walllocker.dm
View File

@@ -51,8 +51,8 @@
dir = EAST
/obj/structure/closet/walllocker/defiblocker/
name = "emergency defibrilator locker"
desc = "A wall mounted locker with a handheld defibrilator"
name = "emergency defibrillator locker"
desc = "A wall mounted locker with a handheld defibrillator"
icon = 'icons/obj/closet.dmi'
icon_state = "medical_wall"
icon_opened = "medical_wall_open"
@@ -66,23 +66,23 @@
usr << "<spawn class='notice'>It's empty."
return
else
usr << "<spawn class='notice'>You pull out an emergency defibrilator from \the [src]."
new /obj/item/weapon/melee/defibrilator(src.loc)
usr << "<spawn class='notice'>You pull out an emergency defibrillator from \the [src]."
new /obj/item/weapon/melee/defibrillator(src.loc)
amount = 0
update_icon()
if(!amount)
usr << "<spawn class='notice'>It's empty."
return
if(amount)
usr << "<spawn class='notice'>You take out an emergency defibrilator from \the [src]."
//new /obj/item/weapon/melee/defibrilator(src.loc)
usr.put_in_hands(new /obj/item/weapon/melee/defibrilator())
usr << "<spawn class='notice'>You take out an emergency defibrillator from \the [src]."
//new /obj/item/weapon/melee/defibrillator(src.loc)
usr.put_in_hands(new /obj/item/weapon/melee/defibrillator())
amount = 0
update_icon()
return
/obj/structure/closet/walllocker/defiblocker/attackby(obj/item/weapon/G as obj, mob/user as mob)
if(istype(G, /obj/item/weapon/melee/defibrilator))
if(istype(G, /obj/item/weapon/melee/defibrillator))
if(amount)
usr << "<spawn class='notice'>The locker is full."
return

24
code/game/objects/items/weapons/defib.dm
View File

@@ -1,6 +1,6 @@
/obj/item/weapon/melee/defibrilator
name = "emergency defibrilator"
desc = "A handheld emergency defibrilator, used to bring people back from the brink of death or put them there."
/obj/item/weapon/melee/defibrillator
name = "emergency defibrillator"
desc = "A handheld emergency defibrillator, used to bring people back from the brink of death or put them there."
icon_state = "defib_full"
item_state = "defib"
flags = FPRINT | TABLEPASS
@@ -18,7 +18,7 @@
viewers(user) << "\red <b>[user] is putting the live paddles on \his chest! It looks like \he's trying to commit suicide.</b>"
return (OXYLOSS)
/obj/item/weapon/melee/defibrilator/update_icon()
/obj/item/weapon/melee/defibrillator/update_icon()
if(!status)
if(charges >= 7)
icon_state = "defib_full"
@@ -36,7 +36,7 @@
if(charges <= 3 && charges >= 1)
icon_state = "defibpaddleout_low"
/obj/item/weapon/melee/defibrilator/attack_self(mob/user as mob)
/obj/item/weapon/melee/defibrillator/attack_self(mob/user as mob)
if(status && (M_CLUMSY in user.mutations) && prob(50))
spark_system.attach(user)
spark_system.set_up(5, 0, src)
@@ -58,7 +58,7 @@
user << "<span class='warning'>\The [src] is out of charge.</span>"
add_fingerprint(user)
/obj/item/weapon/melee/defibrilator/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/weapon/melee/defibrillator/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/weapon/card/emag))
var/image/I = image("icon" = "icons/obj/weapons.dmi", "icon_state" = "defib_emag")
@@ -71,7 +71,7 @@
usr << "\blue [W] sets [src]'s safety protocols"
overlays -= I
/obj/item/weapon/melee/defibrilator/attack(mob/M as mob, mob/user as mob)
/obj/item/weapon/melee/defibrillator/attack(mob/M as mob, mob/user as mob)
var/tobehealed
var/threshhold = -config.health_threshold_dead
var/mob/living/carbon/human/H = M
@@ -80,7 +80,7 @@
return
if(status)
if(user.a_intent == "hurt" && emagged)
H.visible_message("<span class='danger'>[M.name] has been touched by the defibrilator paddles by [user]!</span>")
H.visible_message("<span class='danger'>[M.name] has been touched by the defibrillator paddles by [user]!</span>")
if(charges >= 2)
H.Weaken(10)
H.adjustOxyLoss(10)
@@ -98,15 +98,15 @@
status = 0
update_icon()
playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
user.attack_log += "\[[time_stamp()]\]<font color='red'> Defibrilated [H.name] ([H.ckey]) with [src.name]</font>"
H.attack_log += "\[[time_stamp()]\]<font color='orange'> Defibrilated by [user.name] ([user.ckey]) with [src.name]</font>"
log_attack("<font color='red'>[user.name] ([user.ckey]) defibrilated [H.name] ([H.ckey]) with [src.name]</font>" )
user.attack_log += "\[[time_stamp()]\]<font color='red'> Defibrillated [H.name] ([H.ckey]) with [src.name]</font>"
H.attack_log += "\[[time_stamp()]\]<font color='orange'> Defibrillated by [user.name] ([user.ckey]) with [src.name]</font>"
log_attack("<font color='red'>[user.name] ([user.ckey]) defibrillated [H.name] ([H.ckey]) with [src.name]</font>" )
if(!iscarbon(user))
M.LAssailant = null
else
M.LAssailant = user
return
H.visible_message("\blue [user] places the defibrilator paddles on [M.name]'s chest.", "\blue You place the defibrilator paddles on [M.name]'s chest.")
H.visible_message("\blue [user] places the defibrillator paddles on [M.name]'s chest.", "\blue You place the defibrillator paddles on [M.name]'s chest.")
if(do_after(user, 10))
if(H.stat == 2 || H.stat == DEAD)
var/uni = 0