Fireaxe door fix; arg order fix

This commit is contained in:
Citinited
2020-03-01 15:57:14 +00:00
parent 04217a1e2c
commit 4aded752be
5 changed files with 24 additions and 24 deletions
+11 -11
View File
@@ -1034,6 +1034,17 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/try_to_crowbar(mob/living/user, obj/item/I) //*scream
if(operating)
return
if(istype(I, /obj/item/twohanded/fireaxe)) //let's make this more specific //FUCK YOU
var/obj/item/twohanded/fireaxe/F = I
if(F.wielded)
spawn(0)
if(density)
open(1)
else
close(1)
else
to_chat(user, "<span class='warning'>You need to be wielding the fire axe to do that!</span>")
return
var/beingcrowbarred = FALSE
if(I.tool_behaviour == TOOL_CROWBAR && I.tool_use_check(user, 0))
beingcrowbarred = TRUE
@@ -1049,17 +1060,6 @@ About the new airlock wires panel:
if(locked)
to_chat(user, "<span class='warning'>The airlock's bolts prevent it from being forced!</span>")
return
if(istype(I, /obj/item/twohanded/fireaxe)) //let's make this more specific //FUCK YOU
var/obj/item/twohanded/fireaxe/F = I
if(F.wielded)
spawn(0)
if(density)
open(1)
else
close(1)
else
to_chat(user, "<span class='warning'>You need to be wielding the fire axe to do that!</span>")
return
else if(!arePowerSystemsOn())
spawn(0)
if(density)
+3 -3
View File
@@ -185,12 +185,12 @@
/obj/machinery/door/proc/unrestricted_side(mob/M) //Allows for specific side of airlocks to be unrestrected (IE, can exit maint freely, but need access to enter)
return get_dir(src, M) & unres_sides
/obj/machinery/door/proc/try_to_crowbar(obj/item/I, mob/user)
/obj/machinery/door/proc/try_to_crowbar(mob/user, obj/item/I)
return
/obj/machinery/door/attackby(obj/item/I, mob/user, params)
if(user.a_intent != INTENT_HARM && istype(I, /obj/item/twohanded/fireaxe))
try_to_crowbar(I, user)
try_to_crowbar(user, I)
return 1
else if(!(I.flags & NOBLUDGEON) && user.a_intent != INTENT_HARM)
try_to_activate_door(user)
@@ -206,7 +206,7 @@
return
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
try_to_crowbar(I, user)
try_to_crowbar(user, I)
/obj/machinery/door/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
. = ..()
+2 -2
View File
@@ -302,9 +302,9 @@
qdel(src)
else
try_to_crowbar(I, user)
try_to_crowbar(user, I)
/obj/machinery/door/window/try_to_crowbar(obj/item/I, mob/user)
/obj/machinery/door/window/try_to_crowbar(mob/user, obj/item/I)
if(!hasPower())
if(density)
open(2)
@@ -535,7 +535,7 @@
if(!istype(target, /obj/machinery/door))//early return if we're not trying to open a door
return
var/obj/machinery/door/D = target //the door we want to open
D.try_to_crowbar(src, chassis.occupant)//use the door's crowbar function
D.try_to_crowbar(chassis.occupant, src)//use the door's crowbar function
if(isliving(target)) //interact with living beings
var/mob/living/M = target
if(chassis.occupant.a_intent == INTENT_HARM)//the patented, medical rescue claw is incapable of doing harm. Worry not.
+7 -7
View File
@@ -273,7 +273,7 @@
icon_state = "intake"
required_mode_to_deconstruct = 1
deconstructs_to = PIPE_DISPOSALS_CHUTE
var/c_mode = 0 //1 = we can deconstruct, 0 means we cannot
var/can_deconstruct = FALSE
/obj/machinery/disposal/deliveryChute/New()
..()
@@ -348,12 +348,12 @@
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
c_mode = !c_mode
to_chat(user, "You [c_mode ? "unfasten": "fasten"] the screws around the power connection.")
can_deconstruct = !can_deconstruct
to_chat(user, "You [can_deconstruct ? "unfasten": "fasten"] the screws around the power connection.")
/obj/machinery/disposal/deliveryChute/welder_act(mob/user, obj/item/I)
. = TRUE
if(!c_mode)
if(!can_deconstruct)
return
if(contents.len > 0)
to_chat(user, "Eject the items first!")
@@ -363,11 +363,11 @@
WELDER_ATTEMPT_FLOOR_SLICE_MESSAGE
if(I.use_tool(src, user, 20, volume = I.tool_volume))
WELDER_FLOOR_SLICE_SUCCESS_MESSAGE
var/obj/structure/disposalconstruct/C = new (src.loc)
var/obj/structure/disposalconstruct/C = new (loc)
C.ptype = deconstructs_to
C.update()
C.anchored = 1
C.density = 1
C.anchored = TRUE
C.density = TRUE
qdel(src)
/obj/item/shippingPackage