From 235d32999aa28ddac1f94049e4a8f532da8fe914 Mon Sep 17 00:00:00 2001 From: Duny Date: Wed, 16 Apr 2014 04:32:01 +0200 Subject: [PATCH] Fix borgs not choosing an appareance Locks down cyborgs after they choose a module until they choose an appareance, to prevent standard borgs with security modules and such running around. Conflicts: code/modules/mob/living/silicon/robot/robot.dm --- code/modules/mob/living/silicon/robot/robot.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index adaa87363c5..290b9f914d2 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -142,7 +142,7 @@ var/datum/robot_component/cell_component = components["power cell"] cell_component.wrapped = cell cell_component.installed = 1 - + hud_list[HEALTH_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[STATUS_HUD] = image('icons/mob/hud.dmi', src, "hudhealth100") hud_list[ID_HUD] = image('icons/mob/hud.dmi', src, "hudblank") @@ -151,9 +151,9 @@ hud_list[IMPCHEM_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[IMPTRACK_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank") - - + + playsound(loc, 'sound/voice/liveagain.ogg', 75, 1) @@ -1285,13 +1285,16 @@ icontype = "Custom" triesleft = 0 else + lockcharge = 1 //Locks borg until it select an icon to avoid secborgs running around with a standard sprite icontype = input("Select an icon! [triesleft ? "You have [triesleft] more chances." : "This is your last try."]", "Robot", null, null) in module_sprites if(icontype) icon_state = module_sprites[icontype] + lockcharge = null else src << "Something is badly wrong with the sprite selection. Harass a coder." icon_state = module_sprites[1] + lockcharge = null return overlays -= "eyes"