mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 21:27:01 +01:00
[MIRROR] Begin clickcode attack_self fix (#12173)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
063cf6cf48
commit
3cac28f9ad
@@ -7,6 +7,9 @@
|
||||
w_class = ITEMSIZE_HUGE
|
||||
|
||||
/obj/item/contraband/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
var/contraband = pick(
|
||||
/obj/item/reagent_containers/glass/beaker/vial/macrocillin,
|
||||
/obj/item/reagent_containers/glass/beaker/vial/microcillin,
|
||||
|
||||
@@ -17,9 +17,6 @@
|
||||
usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
return
|
||||
|
||||
/obj/item/mindbinder/attack_self(mob/living/user)
|
||||
return
|
||||
|
||||
/obj/item/mindbinder/proc/toggle_self_bind()
|
||||
if(possessed_voice.len == 1)
|
||||
to_chat(usr,span_warning("The device beeps a warning that there is already a mind loaded!"))
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
/obj/item/gunbox/sec_officer
|
||||
name = "lethal armament box"
|
||||
desc = "A secure box containing a non-lethal sidearm."
|
||||
variant_gunbox = TRUE
|
||||
|
||||
/obj/item/gunbox/sec_officer/attack_self(mob/living/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
var/list/options = list()
|
||||
options["Laser Pistol"] = list(/obj/item/gun/energy/gun, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon)
|
||||
options["Normal Pistol"] = list(/obj/item/gun/projectile/pistol, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact)
|
||||
|
||||
Reference in New Issue
Block a user