From b5268a00c6dd3ec590bef26135ae0e5e29fd2f1e Mon Sep 17 00:00:00 2001 From: simplysable Date: Sun, 24 Apr 2022 22:35:37 -0700 Subject: [PATCH] Removed Dogborgs This removes all of the dogborg options from the game and the upgrades that are tied to them. (Players can no longer turn into a dogborg) Did someone call for an exterminator? --- .../objects/items/robot/robot_upgrades.dm | 14 +++---- .../mob/living/silicon/robot/robot_modules.dm | 40 ++++++++++--------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 47974b46..c53bc122 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -415,9 +415,9 @@ icon_state = "cyborg_upgrade3" require_module = 1 module_type = list( - /obj/item/robot_module/medical, - /obj/item/robot_module/medihound) - + /obj/item/robot_module/medical) //had to move parantheses to close the list argument not inluding the medhihound here. + // /obj/item/robot_module/medihound //Removes the Medihound hypospray upgrade + var/list/additional_reagents = list() /obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R, user = usr) @@ -502,8 +502,8 @@ icon_state = "cyborg_upgrade3" require_module = 1 module_type = list( - /obj/item/robot_module/medical, - /obj/item/robot_module/medihound) + /obj/item/robot_module/medical) //Had to close list parantheses here to not include medihound + ///obj/item/robot_module/medihound //Removes Medihound surgical processor upgrade /obj/item/borg/upgrade/processor/action(mob/living/silicon/robot/R, user = usr) . = ..() @@ -525,8 +525,8 @@ icon_state = "cyborg_upgrade3" require_module = 1 module_type = list( - /obj/item/robot_module/medical, - /obj/item/robot_module/medihound) + /obj/item/robot_module/medical) //Closed list parantheses again to not include Medihound + ///obj/item/robot_module/medihound /obj/item/borg/upgrade/advhealth/action(mob/living/silicon/robot/R, user = usr) 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 e4f4c11a..be680644 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 @@ -1,3 +1,4 @@ +/* /mob/living/silicon/robot/modules/medihound set_module = /obj/item/robot_module/medihound @@ -9,14 +10,15 @@ /mob/living/silicon/robot/modules/borgi set_module = /obj/item/robot_module/borgi +*/ //I don't know what removing this does but I don't like it (I think this disables turning someone into a dogborg) /mob/living/silicon/robot/proc/get_cit_modules() var/list/modulelist = list() - modulelist["MediHound"] = /obj/item/robot_module/medihound - if(!CONFIG_GET(flag/disable_secborg)) - modulelist["Security K-9"] = /obj/item/robot_module/k9 - modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup - modulelist["Borgi"] = /obj/item/robot_module/borgi + //modulelist["MediHound"] = /obj/item/robot_module/medihound //removes the Medihound Call code + //if(!CONFIG_GET(flag/disable_secborg)) + //modulelist["Security K-9"] = /obj/item/robot_module/k9 //removes Secborg call code? + //modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup //removes the scrubpup call code + //modulelist["Borgi"] = /obj/item/robot_module/borgi //removes the borgi callcode return modulelist /obj/item/robot_module @@ -39,7 +41,7 @@ if(user.incapacitated() || !user.Adjacent(src)) return FALSE return TRUE - +/* /obj/item/robot_module/k9 name = "Security K-9 Unit" basic_modules = list( @@ -103,8 +105,8 @@ special_light_key = "alina" sleeper_overlay = "alinasleeper" return ..() - -/obj/item/robot_module/medihound +*/ //removes Security K9 +/* /obj/item/robot_module/medihound name = "MediHound" basic_modules = list( /obj/item/assembly/flash/cyborg, @@ -178,8 +180,8 @@ special_light_key = "alina" sleeper_overlay = "alinasleeper" return ..() - -/obj/item/robot_module/scrubpup +*/ // Removes the Mediborg Selection code +/* /obj/item/robot_module/scrubpup name = "Scrub Pup" basic_modules = list( /obj/item/assembly/flash/cyborg, @@ -232,8 +234,8 @@ /obj/item/robot_module/scrubpup/do_transform_animation() ..() to_chat(loc,"As tempting as it might be, do not begin binging on important items. Eat your garbage responsibly. People are not included under Garbage.") - -/obj/item/robot_module/borgi +*/ //removes scrubpup module from the game +/* /obj/item/robot_module/borgi name = "Borgi" basic_modules = list( /obj/item/assembly/flash/cyborg, @@ -260,7 +262,7 @@ hat_offset = INFINITY cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' has_snowflake_deadsprite = TRUE - +*/ //removes Borgi from the game /* /obj/item/robot_module/orepup name = "Ore Pup" @@ -567,7 +569,7 @@ "BootyM" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootyengineerM"), "BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootyengineerS") ) - var/list/L = list("Pupdozer" = "pupdozer", "Engihound" = "Engihound") + /*var/list/L = list("Pupdozer" = "pupdozer", "Engihound" = "Engihound") for(var/a in L) var/image/wide = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = L[a]) wide.pixel_x = -16 @@ -575,7 +577,7 @@ if(R.client?.ckey == "nezuli") var/image/bad_snowflake = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "alina-sec") bad_snowflake.pixel_x = -16 - eng_models["Alina"] = bad_snowflake + eng_models["Alina"] = bad_snowflake*/ //removes pupdozer,engihound (this option doesn't work anyways) eng_models = sortList(eng_models) var/eng_borg_icon = show_radial_menu(R, R , eng_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE) if(!eng_borg_icon) @@ -609,22 +611,22 @@ if("Heavy") cyborg_base_icon = "heavyeng" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' - if("Pup Dozer") + /*if("Pup Dozer") cyborg_base_icon = "pupdozer" can_be_pushed = FALSE hat_offset = INFINITY cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' has_snowflake_deadsprite = TRUE dogborg = TRUE - cyborg_pixel_offset = -16 - if("Engihound") + cyborg_pixel_offset = -16*/ //Removes pupdozer display + /*if("Engihound") cyborg_base_icon = "valeeng" can_be_pushed = FALSE cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' has_snowflake_deadsprite = TRUE sleeper_overlay = "valeengsleeper" dogborg = TRUE - cyborg_pixel_offset = -16 + cyborg_pixel_offset = -16 */ //Removes Engihound display if("Alina") cyborg_base_icon = "alina-eng" special_light_key = "alina"