mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-23 03:56:27 +01:00
Merge pull request #708 from TheFurryFeline/TFF-Infinite_Frame_Fixy
Infinite Frame Fixy
This commit is contained in:
@@ -94,10 +94,16 @@
|
||||
user << "You load [W] into [src]."
|
||||
return
|
||||
|
||||
//TFF 3/6/19 - fix infinite frame creation, ported from Cit RP
|
||||
if(default_deconstruction_screwdriver(user, W))
|
||||
return
|
||||
if(default_deconstruction_crowbar(user, W))
|
||||
if(istype(W, /obj/item/weapon/wrench))
|
||||
playsound(src, W.usesound, 100, 1)
|
||||
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure \the [src].</span>")
|
||||
anchored = !anchored
|
||||
return
|
||||
// if(default_deconstruction_crowbar(user, W))
|
||||
// return
|
||||
if(istype(W,/obj/item/weapon/disk/botany))
|
||||
if(loaded_disk)
|
||||
user << "There is already a data disk loaded."
|
||||
|
||||
@@ -293,18 +293,18 @@
|
||||
else
|
||||
usr << "<span class='notice'>You must move an ore box up to the drill before you can unload it.</span>"
|
||||
|
||||
|
||||
//TFF 25/5/19 - fix infinite frame issue
|
||||
/obj/machinery/mining/brace
|
||||
name = "mining drill brace"
|
||||
desc = "A machinery brace for an industrial drill. It looks easily two feet thick."
|
||||
icon_state = "mining_brace"
|
||||
circuit = /obj/item/weapon/circuitboard/miningdrillbrace
|
||||
var/obj/machinery/mining/drill/connected
|
||||
|
||||
/obj/machinery/mining/brace/New()
|
||||
..()
|
||||
|
||||
component_parts = list()
|
||||
component_parts += new /obj/item/weapon/circuitboard/miningdrillbrace(src)
|
||||
|
||||
/obj/machinery/mining/brace/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(connected && connected.active)
|
||||
|
||||
@@ -100,8 +100,10 @@
|
||||
anchored = FALSE
|
||||
density = TRUE
|
||||
|
||||
//TFF 3/6/19 - Port Cit RP fix for infinite frames
|
||||
can_buckle = TRUE
|
||||
buckle_lying = FALSE
|
||||
circuit = /obj/item/weapon/circuitboard/grounding_rod
|
||||
|
||||
/obj/machinery/power/grounding_rod/update_icon()
|
||||
if(panel_open)
|
||||
|
||||
Reference in New Issue
Block a user