From 1b74dc915f622759468daf4ea73534716bacb182 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Fri, 6 Mar 2020 13:29:47 -0600 Subject: [PATCH 1/3] no flash --- code/modules/mob/living/silicon/robot/robot_modules.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 5baf020d563..51af934b081 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -27,9 +27,10 @@ ..() -/obj/item/robot_module/New() +/obj/item/robot_module/New(loc, should_have_flash = TRUE) ..() - modules += new /obj/item/flash/cyborg(src) + if(should_have_flash) + modules += new /obj/item/flash/cyborg(src) emag = new /obj/item/toy/sword(src) emag.name = "Placeholder Emag Item" @@ -539,7 +540,7 @@ /obj/item/stack/cable_coil/cyborg = 30 ) -/obj/item/robot_module/drone/New() +/obj/item/robot_module/drone/New(loc, should_have_flash = FALSE) ..() modules += new /obj/item/weldingtool/largetank/cyborg(src) modules += new /obj/item/screwdriver/cyborg(src) From 894c326725c9e91448d8d802b65f615a8c04fd6e Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Fri, 6 Mar 2020 20:35:55 -0600 Subject: [PATCH 2/3] add_default_robot_items() --- .../mob/living/silicon/robot/robot_modules.dm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 51af934b081..01f5491fdda 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -27,10 +27,9 @@ ..() -/obj/item/robot_module/New(loc, should_have_flash = TRUE) +/obj/item/robot_module/New() ..() - if(should_have_flash) - modules += new /obj/item/flash/cyborg(src) + add_default_robot_items() emag = new /obj/item/toy/sword(src) emag.name = "Placeholder Emag Item" @@ -39,6 +38,10 @@ QDEL_NULL(emag) return ..() +// By default, all robots will get the items in this proc, unless you override it for you specific module. See: ../robot_module/drone +/obj/item/robot_module/proc/add_default_robot_items() + modules += new /obj/item/flash/cyborg(src) + /obj/item/robot_module/proc/fix_modules() for(var/obj/item/I in modules) I.flags |= NODROP @@ -540,7 +543,7 @@ /obj/item/stack/cable_coil/cyborg = 30 ) -/obj/item/robot_module/drone/New(loc, should_have_flash = FALSE) +/obj/item/robot_module/drone/New() ..() modules += new /obj/item/weldingtool/largetank/cyborg(src) modules += new /obj/item/screwdriver/cyborg(src) @@ -563,6 +566,9 @@ fix_modules() +/obj/item/robot_module/drone/add_default_robot_items() + return + /obj/item/robot_module/drone/respawn_consumable(mob/living/silicon/robot/R) var/obj/item/reagent_containers/spray/cleaner/C = locate() in modules C.reagents.add_reagent("cleaner", 3) From b45a4fc996b396aff9020e05b36f0107efe9f115 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Fri, 6 Mar 2020 20:37:20 -0600 Subject: [PATCH 3/3] spelling --- code/modules/mob/living/silicon/robot/robot_modules.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 01f5491fdda..8b4005beff8 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -38,7 +38,7 @@ QDEL_NULL(emag) return ..() -// By default, all robots will get the items in this proc, unless you override it for you specific module. See: ../robot_module/drone +// By default, all robots will get the items in this proc, unless you override it for your specific module. See: ../robot_module/drone /obj/item/robot_module/proc/add_default_robot_items() modules += new /obj/item/flash/cyborg(src)