mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 23:17:28 +01:00
TG: Fixes guns some. Can't shoot yourself as easily anymore. You can now aim at
body parts with your gun. I think the reason you couldn't before was just the failure to pass the def_zone up to the parent, not sure if that was intensional or not. Revision: r3554 Author: VivianFoxfoot
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
var/quick_create_object_html = null
|
||||
var/pathtext = null
|
||||
|
||||
pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") in list("/obj","/obj/structure","/obj/item","/obj/machinery")
|
||||
pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/machinery")
|
||||
|
||||
var path = text2path(pathtext)
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ emp_act
|
||||
if(check_shields(P.damage, "the [P.name]"))
|
||||
P.on_hit(src, 2)
|
||||
return 2
|
||||
return (..())
|
||||
return (..(P , def_zone))
|
||||
|
||||
|
||||
/mob/living/carbon/human/getarmor(var/def_zone, var/type)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/obj/item/weapon/gun
|
||||
name = "\improper Gun"
|
||||
name = "gun"
|
||||
desc = "Its a gun. It's pretty terrible, though."
|
||||
icon = 'gun.dmi'
|
||||
icon_state = "detective"
|
||||
|
||||
Reference in New Issue
Block a user