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.") 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..da88e8d667 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 @@ -87,16 +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() - 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,) - +/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