Merge pull request #10075 from comma/dev-freeze

Couple hacky fixes
This commit is contained in:
Snapshot
2015-07-09 14:25:56 -07:00
2 changed files with 12 additions and 1 deletions

View File

@@ -7,6 +7,7 @@
var/build_machine_type
var/refund_amt = 2
var/refund_type = /obj/item/stack/material/steel
var/reverse = 0 //if resulting object faces opposite its dir (like light fixtures)
/obj/item/frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/wrench))
@@ -22,7 +23,12 @@
if (get_dist(on_wall,usr)>1)
return
var/ndir = get_dir(on_wall,usr)
var/ndir
if(reverse)
ndir = get_dir(usr,on_wall)
else
ndir = get_dir(on_wall,usr)
if (!(ndir in cardinal))
return
@@ -61,6 +67,7 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "tube-construct-item"
build_machine_type = /obj/machinery/light_construct
reverse = 1
/obj/item/frame/light/small
name = "small light fixture frame"

View File

@@ -176,6 +176,10 @@
user << "<span class='warning'>Plate \the [src] before reinforcing it!</span>"
return
if(flipped)
user << "<span class='warning'>Put \the [src] back in place before reinforcing it!</span>"
return
reinforced = common_material_add(S, user, "reinforc")
if(reinforced)
update_desc()