cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +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/modules/power/singularity/collector.dm
+6 -6
View File
@@ -9,7 +9,7 @@ var/global/list/rad_collectors = list()
density = 1
req_access = list(access_engine_equip)
// use_power = 0
var/obj/item/weapon/tank/plasma/P = null
var/obj/item/tank/plasma/P = null
var/last_power = 0
var/active = 0
var/locked = 0
@@ -53,7 +53,7 @@ var/global/list/rad_collectors = list()
return 1
else if(istype(W, /obj/item/device/analyzer) && P)
atmosanalyzer_scan(P.air_contents, user)
else if(istype(W, /obj/item/weapon/tank/plasma))
else if(istype(W, /obj/item/tank/plasma))
if(!src.anchored)
to_chat(user, "<span class='warning'>The [src] needs to be secured to the floor first.</span>")
return 1
@@ -64,11 +64,11 @@ var/global/list/rad_collectors = list()
src.P = W
W.loc = src
update_icons()
else if(istype(W, /obj/item/weapon/crowbar))
else if(istype(W, /obj/item/crowbar))
if(P && !src.locked)
eject()
return 1
else if(istype(W, /obj/item/weapon/wrench))
else if(istype(W, /obj/item/wrench))
if(P)
to_chat(user, "<span class='notice'>Remove the plasma tank first.</span>")
return 1
@@ -81,7 +81,7 @@ var/global/list/rad_collectors = list()
connect_to_network()
else
disconnect_from_network()
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
else if(istype(W, /obj/item/card/id)||istype(W, /obj/item/device/pda))
if(src.allowed(user))
if(active)
src.locked = !src.locked
@@ -106,7 +106,7 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/proc/eject()
locked = 0
var/obj/item/weapon/tank/plasma/Z = src.P
var/obj/item/tank/plasma/Z = src.P
if(!Z)
return
Z.loc = get_turf(src)
code/modules/power/singularity/emitter.dm
+9 -9
View File
@@ -28,9 +28,9 @@
/obj/machinery/power/emitter/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/emitter(null)
component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
component_parts += new /obj/item/circuitboard/emitter(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
RefreshParts()
/obj/machinery/power/emitter/RefreshParts()
@@ -38,14 +38,14 @@
var/firedelay = 120
var/min_firedelay = 24
var/power_usage = 350
for(var/obj/item/weapon/stock_parts/micro_laser/L in component_parts)
for(var/obj/item/stock_parts/micro_laser/L in component_parts)
max_firedelay -= 20 * L.rating
min_firedelay -= 4 * L.rating
firedelay -= 20 * L.rating
maximum_fire_delay = max_firedelay
minimum_fire_delay = min_firedelay
fire_delay = firedelay
for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
for(var/obj/item/stock_parts/manipulator/M in component_parts)
power_usage -= 50 * M.rating
active_power_usage = power_usage
@@ -230,7 +230,7 @@
update_multitool_menu(user)
return 1
if(istype(W, /obj/item/weapon/wrench))
if(istype(W, /obj/item/wrench))
if(active)
to_chat(user, "Turn off the [src] first.")
return
@@ -253,8 +253,8 @@
to_chat(user, "<span class='warning'>The [src.name] needs to be unwelded from the floor.</span>")
return
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(active)
to_chat(user, "Turn off the [src] first.")
return
@@ -289,7 +289,7 @@
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
return
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(istype(W, /obj/item/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
to_chat(user, "<span class='warning'>The lock seems to be broken</span>")
return
code/modules/power/singularity/field_generator.dm
+3 -3
View File
@@ -80,7 +80,7 @@ field_generator power level display
if(active)
to_chat(user, "<span class='warning'>[src] needs to be off!</span>")
return
else if(istype(W, /obj/item/weapon/wrench))
else if(istype(W, /obj/item/wrench))
switch(state)
if(FG_UNSECURED)
if(isinspace()) return
@@ -100,8 +100,8 @@ field_generator power level display
if(FG_WELDED)
to_chat(user, "<span class='warning'>The [name] needs to be unwelded from the floor!</span>")
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
else if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
switch(state)
if(FG_UNSECURED)
to_chat(user, "<span class='warning'>The [name] needs to be wrenched to the floor!</span>")
code/modules/power/singularity/generator.dm
+1 -1
View File
@@ -21,7 +21,7 @@
if(src) qdel(src)
/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
if(istype(W, /obj/item/wrench))
anchored = !anchored
playsound(src.loc, W.usesound, 75, 1)
if(anchored)
code/modules/power/singularity/singularity.dm
+1 -1
View File
@@ -68,7 +68,7 @@
/obj/singularity/attack_animal(mob/user)
consume(user)
/obj/singularity/attackby(obj/item/weapon/W, mob/user, params)
/obj/singularity/attackby(obj/item/W, mob/user, params)
consume(user)
return 1