diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm index a0dbe3a0..878f80d3 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -210,7 +210,6 @@ cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' has_snowflake_deadsprite = TRUE cyborg_pixel_offset = -16 - /obj/item/robot_module/miner/do_transform_animation() var/mob/living/silicon/robot/R = loc R.cut_overlays() @@ -222,7 +221,7 @@ /obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Heavy", "Sleek", "Marina", "Droid", "Eyebot") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Heavy", "Sleek", "Marina", "Droid", "Eyebot", "BFemale", "BMale") if(!borg_icon) return FALSE switch(borg_icon) @@ -244,11 +243,19 @@ if("Heavy") cyborg_base_icon = "heavymed" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BFemale") + cyborg_base_icon = "bootymedical" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootymedicalM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/janitor/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/list/janimodels = list("Default", "Sleek", "Marina", "Can", "Heavy") + var/list/janimodels = list("Default", "Sleek", "Marina", "Can", "Heavy", "BFemale", "BMale") var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in janimodels if(!borg_icon) return FALSE @@ -267,11 +274,19 @@ if("Heavy") cyborg_base_icon = "heavyres" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BFemale") + cyborg_base_icon = "bootyjanitor" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootyjanitorM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/peacekeeper/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Spider") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Spider", "BFemale", "BMale") if(!borg_icon) return FALSE switch(borg_icon) @@ -280,11 +295,19 @@ if("Spider") cyborg_base_icon = "whitespider" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BFemale") + cyborg_base_icon = "bootypeace" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootypeaceM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/security/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Heavy", "Sleek", "Can", "Marina", "Spider") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Heavy", "Sleek", "Can", "Marina", "Spider", "BFemale", "BMale") if(!borg_icon) return FALSE switch(borg_icon) @@ -309,11 +332,19 @@ if("Heavy") cyborg_base_icon = "heavysec" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BFemale") + cyborg_base_icon = "bootysecurity" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootysecurityM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/butler/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Waitress", "Heavy", "Sleek", "Butler", "Tophat", "Kent", "Bro") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Waitress", "Heavy", "Sleek", "Butler", "Tophat", "Kent", "Bro", "BFemale", "BMale") if(!borg_icon) return FALSE switch(borg_icon) @@ -339,11 +370,19 @@ cyborg_base_icon = "heavyserv" special_light_key = "heavyserv" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BFemale") + cyborg_base_icon = "bootyservice" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootyserviceM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer") + var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer", "BFemale", "BMale") if(R.client && R.client.ckey in list("nezuli")) engymodels += "Alina" var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in engymodels @@ -395,11 +434,19 @@ has_snowflake_deadsprite = TRUE dogborg = TRUE cyborg_pixel_offset = -16 + if("BFemale") + cyborg_base_icon = "bootyengineer" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootyengineerM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module) var/mob/living/silicon/robot/R = loc - var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid") + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid", "BFemale", "BMale") if(!borg_icon) return FALSE switch(borg_icon) @@ -427,4 +474,48 @@ if("Heavy") cyborg_base_icon = "heavymin" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + if("BFemale") + cyborg_base_icon = "bootyminer" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootyminerM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + return ..() + +/obj/item/robot_module/standard/be_transformed_to(obj/item/robot_module/old_module) + var/mob/living/silicon/robot/R = loc + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Standard", "BFemale", "BMale" ) + if(!borg_icon) + return FALSE + switch(borg_icon) + if("Standard") + cyborg_base_icon = "standard" + if("BFemale") + cyborg_base_icon = "bootystandard" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootystandardM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + return ..() + +/obj/item/robot_module/clown/be_transformed_to(obj/item/robot_module/old_module) + var/mob/living/silicon/robot/R = loc + var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Standard", "BFemale", "BMale" ) + if(!borg_icon) + return FALSE + switch(borg_icon) + if("Standard") + cyborg_base_icon = "clown" + if("BFemale") + cyborg_base_icon = "bootyclown" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 + if("BMale") + cyborg_base_icon = "bootyclownM" + cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' + hat_offset = 3 return ..()