cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes RMCE bugs

Browse Source
This commit is contained in:
Kurfursten
2015-04-27 03:42:11 -05:00
parent 8d0bab08a7
commit f86b84c46a
2 changed files with 28 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/research/designs.dm
View File

@@ -2486,7 +2486,7 @@ k
req_tech = list("magnets"=2, "engineering"=4, "materials"=5, "programming"=3) req_tech = list("magnets"=2, "engineering"=4, "materials"=5, "programming"=3)
build_type = PROTOLATHE build_type = PROTOLATHE
materials = list("$iron" = 500, "$glass" = 1000, "$gold" = 200, "$silver" = 200) materials = list("$iron" = 500, "$glass" = 1000, "$gold" = 200, "$silver" = 200)
build_path = /obj/item/device/component_exchanger build_path = /obj/item/weapon/storage/component_exchanger
///////////////////////////////////////// /////////////////////////////////////////
//////////////////Security/////////////// //////////////////Security///////////////

149
code/modules/research/mechanic/component_exchanger.dm
View File

@@ -2,7 +2,7 @@
//It can load up a maximum of ten machinery modules and can replace machinery modules without even having to rebuild them //It can load up a maximum of ten machinery modules and can replace machinery modules without even having to rebuild them
//Useful if you want to replace a large amount of modules quickly and painlessly //Useful if you want to replace a large amount of modules quickly and painlessly
/obj/item/device/component_exchanger /obj/item/weapon/storage/component_exchanger
name = "rapid machinery component exchanger" name = "rapid machinery component exchanger"
desc = "A tool used to replace machinery components without having to deconstruct them. It can load up to ten components at once" desc = "A tool used to replace machinery components without having to deconstruct them. It can load up to ten components at once"
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
@@ -16,41 +16,31 @@
g_amt = 0 g_amt = 0
w_type = RECYK_ELECTRONIC w_type = RECYK_ELECTRONIC
origin_tech = "magnets=2;engineering=4;materials=5;programming=3" origin_tech = "magnets=2;engineering=4;materials=5;programming=3"
var/list/componentstorage = list()
var/maxcomponents = 20
var/emagged = 0 //So we can emag it for "improved" functionality var/emagged = 0 //So we can emag it for "improved" functionality
//Do a quick check-up of what is loaded allow_quick_gather = 1
/obj/item/device/component_exchanger/attack_self(var/mob/user) use_to_pickup = 1
allow_quick_empty = 1
storage_slots = 21
can_hold = new/list(/obj/item/weapon/stock_parts/)
self_interact_menu(user) /obj/item/weapon/storage/component_exchanger/attackby(var/atom/A, mob/user)
if(istype(A, /obj/item/weapon/storage/bag/gadgets))
/obj/item/device/component_exchanger/attackby(var/atom/A, mob/user)
if(istype(A, /obj/item/weapon/stock_parts))
var/obj/item/weapon/stock_parts/P = A
if(componentstorage.len < maxcomponents) //We have room
user.visible_message("<span class='notice'>[user] slots \a [P] into \the [src]'s component storage</span>", \
"<span class='notice'>You slot \a [P] into \the [src]'s component storage</span>")
user.drop_item(P)
componentstorage += P //Add it to the proper component storage list
playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) //User feedback
else
user << "<span class='warning'>\The [src] is full.</span>"
else if(istype(A, /obj/item/weapon/storage/bag/gadgets))
var/obj/item/weapon/storage/bag/gadgets/G = A var/obj/item/weapon/storage/bag/gadgets/G = A
if(!contents) if(!contents)
user << "<span class='warning'>\The [G] is empty.</span>" user << "<span class='warning'>\The [G] is empty.</span>"
for(var/obj/item/weapon/stock_parts/S in G.contents) for(var/obj/item/weapon/stock_parts/S in G.contents)
if(componentstorage.len < maxcomponents) if(src.contents.len < storage_slots)
componentstorage += S src.contents += S
else else
user << "<span class='notice'>You fill \the [src] to its capacity with \the [G]'s contents.</span>" user << "<span class='notice'>You fill \the [src] to its capacity with \the [G]'s contents.</span>"
return return
user << "<span class='notice'>You fill up \the [src] with \the [G]'s contents.</span>" user << "<span class='notice'>You fill up \the [src] with \the [G]'s contents.</span>"
else
..()
//Redirect the attack only if it's a machine, otherwise don't bother //Redirect the attack only if it's a machine, otherwise don't bother
/obj/item/device/component_exchanger/preattack(var/atom/A, var/mob/user, proximity_flag) /obj/item/weapon/storage/component_exchanger/preattack(var/atom/A, var/mob/user, proximity_flag)
if(!Adjacent(user)) if(!Adjacent(user))
return return
@@ -84,7 +74,7 @@
return return
return return
/obj/item/device/component_exchanger/proc/component_interaction(obj/machinery/M, mob/user) /obj/item/weapon/storage/component_exchanger/proc/component_interaction(obj/machinery/M, mob/user)
if(!Adjacent(user)) //We aren't hugging the machine, so don't bother. This'll prop up often if(!Adjacent(user)) //We aren't hugging the machine, so don't bother. This'll prop up often
user << "<span class='warning'>A blue screen suddenly flashes on \the [src]'s HUD. It appears the critical failure was caused by suddenly yanking it out of \the [M]'s maintenance hatch.</span>" user << "<span class='warning'>A blue screen suddenly flashes on \the [src]'s HUD. It appears the critical failure was caused by suddenly yanking it out of \the [M]'s maintenance hatch.</span>"
@@ -117,17 +107,12 @@
dat += "No components detected. Please ensure the scanning unit is still functional.<BR>" //Shouldn't happen dat += "No components detected. Please ensure the scanning unit is still functional.<BR>" //Shouldn't happen
dat += "<BR><I>Note : You will be returned to the input menu shortly.</I>" dat += "<BR><I>Note : You will be returned to the input menu shortly.</I>"
user.visible_message("<span class='notice'>[user] looks at \the [src]'s HUD as it starts a full data scan on \the [M].</span>", \ user << browse(dat, "window=componentanal") //Send them the data, in a window
"<span class='notice'>You take a closer look at \the [src]'s HUD as it starts data scanning \the [M].</span>") onclose(user, "componentanal")
if(do_after(user, 50)) //Shouldn't be interrupted
user << browse(dat, "window=componentanal") //Send them the data, in a window
onclose(user, "componentanal")
spawn(30) spawn(5)
component_interaction(M, user) component_interaction(M, user)
return return
else
user << "<span class='warning'>A blue screen suddenly flashes on \the [src]'s HUD. It appears the critical failure was caused by suddenly yanking it out of \the [M]'s maintenance hatch.</span>"
if(interactoption == "Replace Component") if(interactoption == "Replace Component")
@@ -140,28 +125,28 @@
return return
//Yes, an istype list. We don't have helpers for this, and this coder is not that sharp //Yes, an istype list. We don't have helpers for this, and this coder is not that sharp
if(istype(P, /obj/item/weapon/stock_parts/capacitor)) if(istype(P, /obj/item/weapon/stock_parts/capacitor))
for(var/obj/item/weapon/stock_parts/capacitor/R in componentstorage) for(var/obj/item/weapon/stock_parts/capacitor/R in src.contents)
if(R.rating > P.rating && P in M.component_parts) //Kind of a hack, but makes sure we don't replace components that already were if(R.rating > P.rating && P in M.component_parts) //Kind of a hack, but makes sure we don't replace components that already were
sleep(10) //One second per component sleep(10) //One second per component
perform_indiv_replace(P, R, M) perform_indiv_replace(P, R, M)
//Do not break in case we find even better //Do not break in case we find even better
if(istype(P, /obj/item/weapon/stock_parts/scanning_module)) if(istype(P, /obj/item/weapon/stock_parts/scanning_module))
for(var/obj/item/weapon/stock_parts/scanning_module/R in componentstorage) for(var/obj/item/weapon/stock_parts/scanning_module/R in src.contents)
if(R.rating > P.rating && P in M.component_parts) if(R.rating > P.rating && P in M.component_parts)
sleep(10) //One second per component sleep(10) //One second per component
perform_indiv_replace(P, R, M) perform_indiv_replace(P, R, M)
if(istype(P, /obj/item/weapon/stock_parts/manipulator)) if(istype(P, /obj/item/weapon/stock_parts/manipulator))
for(var/obj/item/weapon/stock_parts/manipulator/R in componentstorage) for(var/obj/item/weapon/stock_parts/manipulator/R in src.contents)
if(R.rating > P.rating && P in M.component_parts) if(R.rating > P.rating && P in M.component_parts)
sleep(10) //One second per component sleep(10) //One second per component
perform_indiv_replace(P, R, M) perform_indiv_replace(P, R, M)
if(istype(P, /obj/item/weapon/stock_parts/micro_laser)) if(istype(P, /obj/item/weapon/stock_parts/micro_laser))
for(var/obj/item/weapon/stock_parts/micro_laser/R in componentstorage) for(var/obj/item/weapon/stock_parts/micro_laser/R in src.contents)
if(R.rating > P.rating && P in M.component_parts) if(R.rating > P.rating && P in M.component_parts)
sleep(10) //One second per component sleep(10) //One second per component
perform_indiv_replace(P, R, M) perform_indiv_replace(P, R, M)
if(istype(P, /obj/item/weapon/stock_parts/matter_bin)) if(istype(P, /obj/item/weapon/stock_parts/matter_bin))
for(var/obj/item/weapon/stock_parts/matter_bin/R in componentstorage) for(var/obj/item/weapon/stock_parts/matter_bin/R in src.contents)
if(R.rating > P.rating && P in M.component_parts) if(R.rating > P.rating && P in M.component_parts)
sleep(10) //One second per component sleep(10) //One second per component
perform_indiv_replace(P, R, M) perform_indiv_replace(P, R, M)
@@ -175,93 +160,13 @@
component_interaction(M, user) component_interaction(M, user)
//So we don't copy the same thing a thousand fucking times //So we don't copy the same thing a thousand fucking times
/obj/item/device/component_exchanger/proc/perform_indiv_replace(var/obj/item/weapon/stock_parts/P, var/obj/item/weapon/stock_parts/R, var/obj/machinery/M) /obj/item/weapon/storage/component_exchanger/proc/perform_indiv_replace(var/obj/item/weapon/stock_parts/P, var/obj/item/weapon/stock_parts/R, var/obj/machinery/M)
//Move the old part into our component exchanger //Move the old part into our component exchanger
componentstorage += P src.contents += P
M.component_parts -= P M.component_parts -= P
//Move the new part into the machine //Move the new part into the machine
M.component_parts += R M.component_parts += R
componentstorage -= R src.contents -= R
//Update the machine's parts //Update the machine's parts
playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) //User feedback playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) //User feedback
//Option menu if you interact with the component exchanger
/obj/item/device/component_exchanger/proc/self_interact_menu(var/mob/user)
var/self_option = alert("Select desired operation", "RMCE V.12 Ready", "Unload Components", "Scan Loaded Components", "Finish Operation")
if(user.get_active_hand() != src) //Object not in active hand anymore
return
if(self_option == "Finish Operation")
user << "<span class='notice'>A fancy log-out screen appears and \the [src]'s systems shut down.</span>"
return //Done
if(self_option == "Scan Loaded Components")
var/dat
var/ratingpool //Used to give an estimation of the machine's quality rating
dat += "<B>Scanning results for internal component storage :</B><BR><BR>"
if(componentstorage.len)
for(var/obj/item/weapon/stock_parts/P in componentstorage)
dat += "<B>Detected :</B> [P] of effective quality rating [P.rating].<BR>"
ratingpool += P.rating
if(ratingpool)
dat += "<BR>Effective quality rating of machine components : [ratingpool/componentstorage.len].<BR>"
dat += "Currently loaded with [componentstorage.len] out of [maxcomponents] possible components.<BR>"
else
dat += "No components detected. Please check the component container or insert a component for testing.<BR>"
dat += "<BR><I>Note : You will be returned to the input menu shortly.</I>"
user.visible_message("<span class='notice'>[user] looks at \the [src]'s HUD as it starts a full data scan on its component container.</span>", \
"<span class='notice'>You take a closer look at \the [src]'s HUD as it starts data scanning its component container.</span>")
spawn(20)
user << browse(dat, "window=componentanal") //Send them the data, in a window
onclose(usr, "componentanal")
spawn(30)
self_interact_menu(user)
if(self_option == "Unload Components")
var/self_option_second = alert("Select desired operation", "RMCE V.12 Ready", "Unload Component", "Unload All Components")
if(self_option_second == "Unload Component")
if(!componentstorage.len)
user << "<span class='warning'>An error message flashes on \the [src]'s HUD, indicating that its component storage is empty and that it will return to the input menu shortly.</span>"
spawn(30)
self_interact_menu(user)
return
var/obj/item/weapon/stock_parts/componentpick = input("Select a component to be unloaded", "Component Unloading", componentstorage[1]) in componentstorage
componentpick.loc = get_turf(src)
componentstorage -= componentpick
user.visible_message("<span class='notice'>[user] waits as \the [src] drops \a [componentpick] from its component container.</span>", \
"<span class='notice'>You wait as \the [src] drops \a [componentpick] from its component container. A message flashes to indicate it will return to the input menu shortly.</span>")
spawn(30)
self_interact_menu(user)
if(self_option_second == "Unload All Components")
var/confirmalert = alert("Confirm component storage unloading", "RMCE V.12 Warning", "Confirm", "Abort")
if(confirmalert == "Confirm")
if(!componentstorage.len)
user << "<span class='warning'>An error message flashes on \the [src]'s HUD, indicating that its component storage is empty and that it will return to the input menu shortly.</span>"
spawn(30)
self_interact_menu(user)
return
user.visible_message("<span class='notice'>[user] waits as \the [src] starts emptying its component container on the ground.</span>", \
"<span class='notice'>You wait as \the [src] starts emptying its component container. A message flashes to indicate it will return to the input menu shortly after it is finished.</span>")
for(var/obj/item/weapon/stock_parts/P in componentstorage)
spawn(5)
P.loc = get_turf(src)
componentstorage -= P
spawn(30)
self_interact_menu(user)
if(confirmalert == "Abort") //Tad more complex than a return
user << "<span class='notice'>A message flashes on \the [src]'s HUD, stating the component storage unloading has been aborted and that it will return to the input menu shortly.</span>"
spawn(30)
self_interact_menu(user)