From 048337ed4a624e2815fb6712908ef56f48c17136 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:16:17 +0100 Subject: [PATCH 1/8] fix agent card for modify robot --- code/modules/admin/modify_robot.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index 64f486824d..cbe5f39baa 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -185,8 +185,11 @@ if("select_source") if(source) qdel(source) - source = new /mob/living/silicon/robot(null) var/module_type = robot_modules[params["new_source"]] + if(ispath(module_type, /obj/item/robot_module/robot/syndicate)) + source = new /mob/living/silicon/robot/syndicate(null) + else + source = new /mob/living/silicon/robot(null) source.modtype = params["new_source"] var/obj/item/robot_module/robot/robot_type = new module_type(source) source.sprite_datum = pick(SSrobot_sprites.get_module_sprites(source.modtype, source)) From 6cea41a28ab6a43278fc22bf885e7bc826855a40 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:29:26 +0100 Subject: [PATCH 2/8] . --- code/modules/admin/modify_robot.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index cbe5f39baa..44a76049d2 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -206,6 +206,8 @@ var/obj/item/add_item = locate(params["module"]) if(!add_item) return TRUE + if(istype(add_item, /obj/item/card/id)) + source.idcard = add_item source.module.emag.Remove(add_item) source.module.modules.Remove(add_item) source.module.contents.Remove(add_item) From 7f754506cb6b61d0ec3ad178049aaee8282d0bcc Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:30:25 +0100 Subject: [PATCH 3/8] . --- code/modules/admin/modify_robot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index 44a76049d2..8a0a6da88c 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -206,11 +206,11 @@ var/obj/item/add_item = locate(params["module"]) if(!add_item) return TRUE - if(istype(add_item, /obj/item/card/id)) - source.idcard = add_item source.module.emag.Remove(add_item) source.module.modules.Remove(add_item) source.module.contents.Remove(add_item) + if(istype(add_item, /obj/item/card/id)) + target.idcard = add_item target.module.modules.Add(add_item) target.module.contents.Add(add_item) spawn(0) From 72a4cb241114b6cf6a05122eb2bbe4505c40c823 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:31:22 +0100 Subject: [PATCH 4/8] . --- code/modules/admin/modify_robot.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index 8a0a6da88c..22b44bbe46 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -206,6 +206,8 @@ var/obj/item/add_item = locate(params["module"]) if(!add_item) return TRUE + if(istype(add_item, /obj/item/card/id)) + source.idcard = null source.module.emag.Remove(add_item) source.module.modules.Remove(add_item) source.module.contents.Remove(add_item) From 26759777685b6a1102e88c9a379536b0c8f18f9b Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:32:00 +0100 Subject: [PATCH 5/8] . --- code/modules/admin/modify_robot.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index 22b44bbe46..908a7d1528 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -212,6 +212,8 @@ source.module.modules.Remove(add_item) source.module.contents.Remove(add_item) if(istype(add_item, /obj/item/card/id)) + if(target.idcard) + qdel(target.idcard) target.idcard = add_item target.module.modules.Add(add_item) target.module.contents.Add(add_item) From e310d202877fd05eca4ce8b2ce56cd0750187c21 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:36:43 +0100 Subject: [PATCH 6/8] sane removal --- code/modules/admin/modify_robot.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index 908a7d1528..205743dc04 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -263,6 +263,8 @@ return TRUE if("rem_module") var/obj/item/rem_item = locate(params["module"]) + if(istype(rem_item, /obj/item/card/id)) + target.idcard = new /obj/item/card/id/synthetic(target) target.uneq_all() target.hud_used?.update_robot_modules_display(TRUE) target.module.emag.Remove(rem_item) From 6b185918efb8d1c597e8eb7837b3633102a8801b Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:37:41 +0100 Subject: [PATCH 7/8] - --- code/modules/admin/modify_robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index 205743dc04..9c916e65dd 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -263,7 +263,7 @@ return TRUE if("rem_module") var/obj/item/rem_item = locate(params["module"]) - if(istype(rem_item, /obj/item/card/id)) + if(istype(rem_item, /obj/item/card/id) && target.idcard == rem_item) target.idcard = new /obj/item/card/id/synthetic(target) target.uneq_all() target.hud_used?.update_robot_modules_display(TRUE) From 9b727577f93b0fc11e673a8010b294f4279a8833 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 23 Nov 2024 00:37:58 +0100 Subject: [PATCH 8/8] . --- code/modules/admin/modify_robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index 9c916e65dd..762f00c22f 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -263,7 +263,7 @@ return TRUE if("rem_module") var/obj/item/rem_item = locate(params["module"]) - if(istype(rem_item, /obj/item/card/id) && target.idcard == rem_item) + if(target.idcard == rem_item) target.idcard = new /obj/item/card/id/synthetic(target) target.uneq_all() target.hud_used?.update_robot_modules_display(TRUE)