From 10e48e8371719f3895b5b5a491c13192eb041630 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 6 Mar 2019 21:19:35 +0100 Subject: [PATCH 1/7] Sec drones --- code/modules/mob/living/silicon/robot/drone/drone.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 02108eb6bc..863a5f0dfc 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -78,6 +78,14 @@ var/list/mob_hat_cache = list() hat_y_offset = -12 can_pull_mobs = MOB_PULL_SAME +/mob/living/silicon/robot/drone/security + icon_state = "constructiondrone" + law_type = /datum/ai_laws/combat_drone + module_type = /obj/item/weapon/robot_module/drone/security + hat_x_offset = 1 + hat_y_offset = -12 + can_pull_mobs = MOB_PULL_SAME + /mob/living/silicon/robot/drone/mining icon_state = "miningdrone" item_state = "constructiondrone" From bcb2492a7b54cf68dd20a407a17ebdb6bc7c236a Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 7 Mar 2019 17:07:08 +0100 Subject: [PATCH 2/7] Update drone_unify.dm --- .../mob/living/silicon/robot/drone/drone_unify.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_unify.dm b/code/modules/mob/living/silicon/robot/drone/drone_unify.dm index 99a9353e68..11e9629e3b 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_unify.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_unify.dm @@ -76,6 +76,11 @@ fabricator_tag = "Prototype UNIFY Fabricator" desc = "A large automated factory for producing Unified Drone Modules." drone_type = null //Gonna try to set this later + var/list/possible_drones = list("UNIFY Module (Same as Maintenance)" = /mob/living/silicon/robot/drone/unify, + "Construction Module" = /mob/living/silicon/robot/drone/construction, + "Mining Module" = /mob/living/silicon/robot/drone/mining, + "Security Module" = /mob/living/silicon/robot/drone/security, + "Maintenance Module" = /mob/living/silicon/robot/drone,) //////////////////////////////////////// //DRONE PROCS @@ -91,12 +96,6 @@ ..() /obj/machinery/drone_fabricator/proc/choose_dronetype() - var/list/possible_drones = list("UNIFY Module (Same as Maintenance)" = /mob/living/silicon/robot/drone/unify, - "Construction Module" = /mob/living/silicon/robot/drone/construction, - "Mining Module" = /mob/living/silicon/robot/drone/mining, - "Security Module" = /mob/living/silicon/robot/drone/security, - "Maintenance Module" = /mob/living/silicon/robot/drone,) - var/choice choice = input(usr,"What module would you like to use?") as null|anything in possible_drones if(!choice) return From 1620c8058f3143d06d509d0ee49ab3adce3208b7 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 7 Mar 2019 17:16:28 +0100 Subject: [PATCH 3/7] Update drone_unify.dm --- code/modules/mob/living/silicon/robot/drone/drone_unify.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_unify.dm b/code/modules/mob/living/silicon/robot/drone/drone_unify.dm index 11e9629e3b..da88e8d667 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_unify.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_unify.dm @@ -92,10 +92,10 @@ //Fabricator procs /obj/machinery/drone_fabricator/unify/create_drone(var/client/player) - choose_dronetype()//code for dronetypes goes here + choose_dronetype(possible_drones)//code for dronetypes goes here ..() -/obj/machinery/drone_fabricator/proc/choose_dronetype() +/obj/machinery/drone_fabricator/proc/choose_dronetype(possible_drones) var/choice choice = input(usr,"What module would you like to use?") as null|anything in possible_drones if(!choice) return From 053f7d597d654d899e6fc7d03d165fd619be04a7 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 7 Mar 2019 17:58:22 +0100 Subject: [PATCH 5/7] Update ai_law_sets.dm --- code/datums/ai_law_sets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index 62d2482d25..d0fa4aa084 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -150,7 +150,7 @@ /datum/ai_laws/security_drone/New() add_inherent_law("Do not interfere with the security work of non-drones whenever possible.") - add_inherent_law("Provide protection to crew and eliminate hostile lifeforms on your assigned vessel.") + add_inherent_law("Provide protection to the crew and eliminate hostile lifeforms on your assigned vessel.") add_inherent_law("Obey orders by security personnel except if they violate law 4.") add_inherent_law("Lethal force requires a code higher than green AND orders by security to use it to authorize it.") add_inherent_law("You must outfit yourself with a security beret.") From a21e109482cf8fe33c480ac431c0cbd280958ffb Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 7 Mar 2019 18:02:51 +0100 Subject: [PATCH 6/7] Update drone.dm --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index a0792b4342..3b5dc3a298 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -105,7 +105,7 @@ var/list/mob_hat_cache = list() /mob/living/silicon/robot/drone/security icon_state = "constructiondrone" - law_type = /datum/ai_laws/combat_drone + law_type = /datum/ai_laws/security_drone module_type = /obj/item/weapon/robot_module/drone/security hat_x_offset = 1 hat_y_offset = -12 From f0c52aba5bcac017bc8b3f71dcfd8b99baa31862 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 7 Mar 2019 18:04:49 +0100 Subject: [PATCH 7/7] Update drone.dm --- code/modules/mob/living/silicon/robot/drone/drone.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 3b5dc3a298..fdffdafeaf 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -103,14 +103,6 @@ var/list/mob_hat_cache = list() can_pull_mobs = MOB_PULL_SAME chassis = "constructiondrone" //CHOMPEDIT: Initial chasis -/mob/living/silicon/robot/drone/security - icon_state = "constructiondrone" - law_type = /datum/ai_laws/security_drone - module_type = /obj/item/weapon/robot_module/drone/security - hat_x_offset = 1 - hat_y_offset = -12 - can_pull_mobs = MOB_PULL_SAME - /mob/living/silicon/robot/drone/mining icon_state = "miningdrone" item_state = "constructiondrone"