mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 09:03:23 +01:00
[FIX] Prevent duplicate cyborg upgrades (#26731)
* Disallows installing duplicate cyborg upgrades. * Prevent duplicate Cyborg modules * Unecessary spacing removed * Update code/game/objects/items/robot/robot_upgrades.dm Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Signed-off-by: Adrer <erwin@lombok.demon.nl> * usr > user * Move nodrop check into do_install * ... Why did I do that? --------- Signed-off-by: Adrer <erwin@lombok.demon.nl> Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
This commit is contained in:
@@ -965,11 +965,9 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
|
||||
else if(!src.module && U.require_module)
|
||||
to_chat(user, "<span class='warning'>The borg must choose a module before it can be upgraded!</span>")
|
||||
else
|
||||
if(!user.drop_item())
|
||||
return
|
||||
if(U.action(src))
|
||||
if(U.action(user, src))
|
||||
user.visible_message("<span class='notice'>[user] applied [U] to [src].</span>", "<span class='notice'>You apply [U] to [src].</span>")
|
||||
U.forceMove(src)
|
||||
|
||||
|
||||
else if(istype(W, /obj/item/mmi_radio_upgrade))
|
||||
if(!opened)
|
||||
|
||||
@@ -291,6 +291,7 @@
|
||||
require_module = TRUE
|
||||
module_type = /obj/item/robot_module/miner
|
||||
usesound = 'sound/items/screwdriver.ogg'
|
||||
allow_duplicate = TRUE
|
||||
var/denied_type = null
|
||||
var/maximum_of_type = 1
|
||||
var/cost = 30
|
||||
@@ -313,12 +314,12 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/borg/upgrade/modkit/action(mob/living/silicon/robot/R)
|
||||
/obj/item/borg/upgrade/modkit/action(mob/user, mob/living/silicon/robot/R)
|
||||
if(!..())
|
||||
return
|
||||
|
||||
for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules)
|
||||
return install(H, usr)
|
||||
return install(H, user)
|
||||
|
||||
/obj/item/borg/upgrade/modkit/proc/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user)
|
||||
. = TRUE
|
||||
|
||||
Reference in New Issue
Block a user