From 5a8ccc6c5460c01ac454f23d98564a15f31f82c3 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 31 Aug 2017 13:13:45 -0300 Subject: [PATCH] Fixes medical resident spawn and other things (#3383) Fixes medical residents spawning at the odin at round start Fixes medical residents being unable to get medical huds via loadout Fixes #3370 Fixes mechas not using the paint kit skins when destroyed --- code/game/mecha/mecha.dm | 1 + code/modules/client/preference_setup/loadout/loadout_eyes.dm | 4 ++-- code/modules/mob/living/silicon/robot/robot_modules.dm | 2 +- maps/aurora/aurora-4_mainlevel.dmm | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index cbceabfd014..8d2fb27392b 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -152,6 +152,7 @@ if(wreckage) var/obj/effect/decal/mecha_wreckage/WR = new wreckage(loc) + WR.icon_state = "[icon_state]-broken" for(var/obj/item/mecha_parts/mecha_equipment/E in equipment) if(E.salvageable && prob(30)) WR.crowbar_salvage += E diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 19d87364699..6d6e7cd12bc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -28,7 +28,7 @@ /datum/gear/eyes/sciencegoggles display_name = "science Goggles" path = /obj/item/clothing/glasses/science - + /datum/gear/eyes/mesonprescription display_name = "meson goggles, prescription" path = /obj/item/clothing/glasses/meson/prescription @@ -42,7 +42,7 @@ /datum/gear/eyes/medical display_name = "medical HUD" path = /obj/item/clothing/glasses/hud/health - allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Nursing Intern") + allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Medical Resident") /datum/gear/eyes/shades display_name = "sunglasses, fat" diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 6d4f57eda17..673785b0d14 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -613,7 +613,7 @@ var/global/list/robot_modules = list( "Kent" = "toiletbot", "Bro" = "brobot", "Rich" = "maximillion", - "Basic" = "robotserv", + "Basic" = "robotServ", "Drone - Service" = "drone-service", "Drone - Hydro" = "drone-hydro", "Classic" = "service2", diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 6c4f407e62c..36f3b58821b 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -41323,13 +41323,13 @@ dir = 10 }, /obj/effect/landmark/start{ - name = "Nursing Intern" + name = "Medical Resident" }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "btj" = ( /obj/effect/landmark/start{ - name = "Nursing Intern" + name = "Medical Resident" }, /turf/simulated/floor/tiled/white, /area/medical/medbay2)