cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes All Weapons

Browse Source
This commit is contained in:
Fox McCloud
2018-04-15 16:25:56 -04:00
parent 8b576c4d42
commit 5c4aa9b3fd
1100 changed files with 17642 additions and 17666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/atmospherics.dm
+2 -2
View File
@@ -158,8 +158,8 @@ Pipelines + Other Objects -> Pipe network
P.other_atmosmch -= src
//(De)construction
/obj/machinery/atmospherics/attackby(obj/item/weapon/W, mob/user)
if(can_unwrench && istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/attackby(obj/item/W, mob/user)
if(can_unwrench && istype(W, /obj/item/wrench))
var/turf/T = get_turf(src)
if(level == 1 && isturf(T) && T.intact)
to_chat(user, "<span class='danger'>You must remove the plating first.</span>")
code/ATMOSPHERICS/components/binary_devices/circulator.dm
+1 -1
View File
@@ -100,7 +100,7 @@
else
return "South"
/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/W as obj, mob/user as mob, params)
if(ismultitool(W))
if(side_inverted == 0)
side_inverted = 1
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+2 -2
View File
@@ -182,8 +182,8 @@
update_icon()
SSnanoui.update_uis(src)
/obj/machinery/atmospherics/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params)
if(!istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/binary/passive_gate/attackby(obj/item/W, mob/user, params)
if(!istype(W, /obj/item/wrench))
return ..()
if(on)
to_chat(user, "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>")
code/ATMOSPHERICS/components/binary_devices/pump.dm
+2 -2
View File
@@ -208,8 +208,8 @@ Thus, the two variables affect pump operation are set in New():
if(old_stat != stat)
update_icon()
/obj/machinery/atmospherics/binary/pump/attackby(obj/item/weapon/W, mob/user, params)
if(!istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/binary/pump/attackby(obj/item/W, mob/user, params)
if(!istype(W, /obj/item/wrench))
return ..()
if(!(stat & NOPOWER) && on)
to_chat(user, "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>")
code/ATMOSPHERICS/components/binary_devices/valve.dm
+1 -1
View File
@@ -140,7 +140,7 @@
if(open)
close()
/obj/machinery/atmospherics/binary/valve/digital/attackby(var/obj/item/weapon/W as obj, var/mob/user)
/obj/machinery/atmospherics/binary/valve/digital/attackby(var/obj/item/W as obj, var/mob/user)
if(istype(W, /obj/item/device/multitool))
update_multitool_menu(user)
return 1
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+2 -2
View File
@@ -198,8 +198,8 @@ Thus, the two variables affect pump operation are set in New():
if(old_stat != stat)
update_icon()
/obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params)
if(!istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/W, mob/user, params)
if(!istype(W, /obj/item/wrench))
return ..()
if(!(stat & NOPOWER) && on)
to_chat(user, "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>")
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+2 -2
View File
@@ -94,8 +94,8 @@
if(old_stat != stat)
update_icon()
/obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
if(!istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/omni/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
if(!istype(W, /obj/item/wrench))
return ..()
if(can_unwrench)
code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
+2 -2
View File
@@ -172,11 +172,11 @@
</ul>
"}
/obj/machinery/atmospherics/unary/outlet_injector/attackby(obj/item/weapon/W, mob/user)
/obj/machinery/atmospherics/unary/outlet_injector/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/device/multitool))
interact(user)
return 1
if(istype(W, /obj/item/weapon/wrench))
if(istype(W, /obj/item/wrench))
if(!(stat & NOPOWER) && on)
to_chat(user, "<span class='danger'>You cannot unwrench this [src], turn if off first.</span>")
return 1
code/ATMOSPHERICS/components/unary_devices/portables_connector.dm
+2 -2
View File
@@ -34,8 +34,8 @@
return 0
parent.update = 1
/obj/machinery/atmospherics/unary/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
if(istype(W, /obj/item/weapon/wrench))
/obj/machinery/atmospherics/unary/portables_connector/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
if(istype(W, /obj/item/wrench))
if(connected_device)
to_chat(user, "<span class='danger'>You cannot unwrench this [src], detach [connected_device] first.</span>")
return 1
code/ATMOSPHERICS/components/unary_devices/tank.dm
+1 -1
View File
@@ -17,7 +17,7 @@
return
add_underlay(T, node, dir)
/obj/machinery/atmospherics/unary/tank/attackby(obj/item/weapon/W, mob/user, params)
/obj/machinery/atmospherics/unary/tank/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/analyzer))
atmosanalyzer_scan(air_contents, user)
return
code/ATMOSPHERICS/components/unary_devices/unary_base.dm
+1 -1
View File
@@ -36,7 +36,7 @@
update_icon()
update_underlays()
/obj/machinery/atmospherics/unary/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W)
/obj/machinery/atmospherics/unary/default_change_direction_wrench(mob/user, obj/item/wrench/W)
if(..())
initialize_directions = dir
if(node)
code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
+6 -6
View File
@@ -321,8 +321,8 @@
return !welded
/obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0,user))
to_chat(user, "<span class='notice'>Now welding the vent.</span>")
if(do_after(user, 20 * WT.toolspeed, target = src))
@@ -342,7 +342,7 @@
else
to_chat(user, "<span class='notice'>You need more welding fuel to complete this task.</span>")
return 1
if(istype(W, /obj/item/weapon/screwdriver))
if(istype(W, /obj/item/screwdriver))
if(!welded)
if(open)
to_chat(user, "<span class='notice'>Now closing the vent.</span>")
@@ -357,7 +357,7 @@
open = 1
user.visible_message("[user] screwdrivers the vent open.", "You screwdriver the vent open.", "You hear a screwdriver.")
return
if(istype(W, /obj/item/weapon/paper))
if(istype(W, /obj/item/paper))
if(!welded)
if(open)
user.drop_item(W)
@@ -370,7 +370,7 @@
if(istype(W, /obj/item/device/multitool))
update_multitool_menu(user)
return 1
if(istype(W, /obj/item/weapon/wrench))
if(istype(W, /obj/item/wrench))
if(!(stat & NOPOWER) && on)
to_chat(user, "<span class='danger'>You cannot unwrench this [src], turn it off first.</span>")
return 1
@@ -380,7 +380,7 @@
/obj/machinery/atmospherics/unary/vent_pump/attack_hand()
if(!welded)
if(open)
for(var/obj/item/weapon/W in src)
for(var/obj/item/W in src)
W.forceMove(get_turf(src))
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+4 -4
View File
@@ -372,9 +372,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/can_crawl_through()
return !welded
/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0,user))
to_chat(user, "<span class='notice'>Now welding the scrubber.</span>")
if(do_after(user, 20 * WT.toolspeed, target = src))
@@ -397,7 +397,7 @@
if(istype(W, /obj/item/device/multitool))
update_multitool_menu(user)
return 1
if(istype(W, /obj/item/weapon/wrench))
if(istype(W, /obj/item/wrench))
if(!(stat & NOPOWER) && on)
to_chat(user, "<span class='danger'>You cannot unwrench this [src], turn it off first.</span>")
return 1
code/ATMOSPHERICS/pipes/pipe.dm
+1 -1
View File
@@ -36,7 +36,7 @@
qdel(parent)
parent = null
/obj/machinery/atmospherics/pipe/attackby(obj/item/weapon/W, mob/user, params)
/obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/analyzer))
atmosanalyzer_scan(parent.air, user)
return