shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380

Browse Source 
[MIRROR] Refactors and fixes RPEDs
This commit is contained in:
deathride58
2018-04-29 22:45:28 +00:00
committed by GitHub
parent e66e348d5c ab8355968c
commit 6f13d2c2e9
41 changed files with 50 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+1 -1
View File
@@ -298,7 +298,7 @@
var/reagentlist = pretty_string_from_reagent_list(I.reagents.reagent_list)
log_game("[key_name(user)] added an [I] to cyro containing [reagentlist]")
return
if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-off", "pod-off", I) || exchange_parts(user, I)) \
if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-off", "pod-off", I)) \
|| default_change_direction_wrench(user, I) \
|| default_pry_open(I) \
|| default_deconstruction_crowbar(I))
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
-2
View File
@@ -80,8 +80,6 @@
return
if(default_deconstruction_crowbar(I))
return
if(exchange_parts(user, I))
return
return ..()
/obj/machinery/atmospherics/components/unary/thermomachine/default_change_direction_wrench(mob/user, obj/item/I)
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
-2
View File
@@ -89,8 +89,6 @@ God bless America.
return
if(default_unfasten_wrench(user, I))
return
else if(exchange_parts(user, I))
return
else if(default_deconstruction_screwdriver(user, "fryer_off", "fryer_off" ,I)) //where's the open maint panel icon?!
return
else
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+1 -4
View File
@@ -99,10 +99,7 @@
/obj/machinery/gibber/attackby(obj/item/P, mob/user, params)
if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", P))
return
else if(exchange_parts(user, P))
return
else if(default_pry_open(P))
return
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
-2
View File
@@ -50,8 +50,6 @@
return
if(default_unfasten_wrench(user, O))
return
if(exchange_parts(user, O))
return
if(default_deconstruction_crowbar(O))
return
code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
-3
View File
@@ -29,9 +29,6 @@
if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O))
return
if(exchange_parts(user, O))
return
if(default_pry_open(O))
return
code/modules/food_and_drinks/kitchen_machinery/processor.dm
-3
View File
@@ -46,9 +46,6 @@
if(default_deconstruction_screwdriver(user, "processor", "processor1", O))
return
if(exchange_parts(user, O))
return
if(default_pry_open(O))
return
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
-3
View File
@@ -55,9 +55,6 @@
if(default_deconstruction_screwdriver(user, "smartfridge_open", "smartfridge", O))
return
if(exchange_parts(user, O))
return
if(default_pry_open(O))
return
code/modules/hydroponics/biogenerator.dm
-3
View File
@@ -83,9 +83,6 @@
update_icon()
return
if(exchange_parts(user, O))
return
if(default_deconstruction_crowbar(O))
return
code/modules/hydroponics/gene_modder.dm
-2
View File
@@ -69,8 +69,6 @@
if(default_deconstruction_screwdriver(user, "dnamod", "dnamod", I))
update_icon()
return
if(exchange_parts(user, I))
return
if(default_deconstruction_crowbar(I))
return
if(iscyborg(user))
code/modules/hydroponics/hydroponics.dm
-3
View File
@@ -59,9 +59,6 @@
if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I))
return
if(exchange_parts(user, I))
return
if(default_pry_open(I))
return
code/modules/hydroponics/seed_extractor.dm
-3
View File
@@ -62,9 +62,6 @@
if(default_deconstruction_screwdriver(user, "sextractor_open", "sextractor", O))
return
if(exchange_parts(user, O))
return
if(default_pry_open(O))
return
code/modules/mining/machine_redemption.dm
-2
View File
@@ -148,8 +148,6 @@
send_console_message()
/obj/machinery/mineral/ore_redemption/attackby(obj/item/W, mob/user, params)
if(exchange_parts(user, W))
return
GET_COMPONENT(materials, /datum/component/material_container)
if(default_pry_open(W))
materials.retrieve_all()
code/modules/power/port_gen.dm
-3
View File
@@ -173,9 +173,6 @@
return
else if(!active)
if(exchange_parts(user, O))
return
if(istype(O, /obj/item/wrench))
if(!anchored && !isinspace())
code/modules/power/rtg.dm
+1 -3
View File
@@ -38,9 +38,7 @@
power_gen = initial(power_gen) * part_level
/obj/machinery/power/rtg/attackby(obj/item/I, mob/user, params)
if(exchange_parts(user, I))
return
else if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-open", initial(icon_state), I))
if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-open", initial(icon_state), I))
return
else if(default_deconstruction_crowbar(I))
return
code/modules/power/singularity/emitter.dm
-3
View File
@@ -291,9 +291,6 @@
wires.interact(user)
return
else if(exchange_parts(user, I))
return
return ..()
/obj/machinery/power/emitter/emag_act(mob/user)
code/modules/power/smes.dm
-4
View File
@@ -98,10 +98,6 @@
update_icon()
return
//exchanging parts using the RPE
if(exchange_parts(user, I))
return
//building and linking a terminal
if(istype(I, /obj/item/stack/cable_coil))
var/dir = get_dir(user,src)
code/modules/power/tesla/coil.dm
-6
View File
@@ -56,9 +56,6 @@
if(default_deconstruction_screwdriver(user, "coil_open[anchored]", "coil[anchored]", W))
return
if(exchange_parts(user, W))
return
if(default_unfasten_wrench(user, W))
return
@@ -169,9 +166,6 @@
if(default_deconstruction_screwdriver(user, "grounding_rod_open[anchored]", "grounding_rod[anchored]", W))
return
if(exchange_parts(user, W))
return
if(default_unfasten_wrench(user, W))
return
code/modules/power/turbine.dm
-6
View File
@@ -112,9 +112,6 @@
stat |= BROKEN
return
if(exchange_parts(user, I))
return
default_deconstruction_crowbar(I)
/obj/machinery/power/compressor/process()
@@ -243,9 +240,6 @@
stat |= BROKEN
return
if(exchange_parts(user, I))
return
default_deconstruction_crowbar(I)
/obj/machinery/power/turbine/ui_interact(mob/user)
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
-3
View File
@@ -292,9 +292,6 @@ obj/machinery/chem_dispenser/proc/work_animation()
update_icon()
return
if(exchange_parts(user, I))
return
if(default_deconstruction_crowbar(I))
return
if(istype(I, /obj/item/reagent_containers) && !(I.flags_1 & ABSTRACT_1) && I.is_open_container())
code/modules/reagents/chemistry/machinery/chem_heater.dm
-3
View File
@@ -60,9 +60,6 @@
if(default_deconstruction_screwdriver(user, "mixer0b", "mixer0b", I))
return
if(exchange_parts(user, I))
return
if(default_deconstruction_crowbar(I))
return
code/modules/reagents/chemistry/machinery/chem_master.dm
-2
View File
@@ -79,8 +79,6 @@
if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", I))
return
else if(exchange_parts(user, I))
return
else if(default_deconstruction_crowbar(I))
return
code/modules/research/rdmachines.dm
-2
View File
@@ -43,8 +43,6 @@
if(linked_console)
disconnect_console()
return
if(exchange_parts(user, O))
return
if(default_deconstruction_crowbar(O))
return
if(is_refillable() && O.is_drainable())
code/modules/research/stock_parts.dm
+13 -2
View File
@@ -14,13 +14,24 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
var/pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/rped.ogg'
var/alt_sound = null
/obj/item/storage/part_replacer/afterattack(obj/machinery/T, mob/living/carbon/human/user, flag, params)
/obj/item/storage/part_replacer/pre_attack(obj/machinery/T, mob/living/user, params)
if(!istype(T) || !T.component_parts)
return ..()
if(works_from_distance || user.Adjacent(T))
if(user.Adjacent(T)) // no TK upgrading.
if(works_from_distance)
user.Beam(T, icon_state = "rped_upgrade", time = 5)
T.exchange_parts(user, src)
return FALSE
return ..()
/obj/item/storage/part_replacer/afterattack(obj/machinery/T, mob/living/user, adjacent, params)
if(adjacent || !istype(T) || !T.component_parts)
return ..()
if(works_from_distance)
user.Beam(T, icon_state = "rped_upgrade", time = 5)
T.exchange_parts(user, src)
return
return ..()
/obj/item/storage/part_replacer/proc/play_rped_sound()
//Plays the sound for RPED exhanging or installing parts.