diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index d54a7e615f..450adf5525 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -34,8 +34,11 @@ R.notify_ai(2) R.uneq_all() + R.pixel_x = initial(pixel_x) R.hands.icon_state = "nomod" + R.icon = 'icons/mob/robots.dmi' R.icon_state = "robot" + R.update_icons() qdel(R.module) R.module = null diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 8d1b662080..1e00aa6fbb 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -28,6 +28,12 @@ else if(istype(O,/obj/item/weapon/gun/energy/disabler/cyborg)) disabler = 0 update_icons() + else if(istype(O,/obj/item/weapon/dogborg/sleeper)) + sleeper_g = 0 + sleeper_r = 0 + update_icons() + var/obj/item/weapon/dogborg/sleeper/S = O + S.go_out() if(client) client.screen -= O diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 2fe0366cbb..6be491e46b 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -903,6 +903,23 @@ overlays += "laser" if(disabler == 1) overlays += "disabler" + if(sleeper_g == 1) + overlays += "sleeper_g" + if(sleeper_r == 1) + overlays += "sleeper_r" + + if(stat > 1 && icon_state == "k9") + icon_state = "k9-wreck" + if(stat < 2 && icon_state == "k9-wreck") + icon_state = "k9" + if(stat > 1 && icon_state == "borgi") + icon_state = "borgi-wreck" + if(stat < 2 && icon_state == "borgi-wreck") + icon_state = "borgi" + if(stat > 1 && icon_state == "medihound") + icon_state = "medihound-wreck" + if(stat < 2 && icon_state == "medihound-wreck") + icon_state = "medihound" /mob/living/silicon/robot/proc/installed_modules() if(!module) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 9e266a0558..82cd63c838 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1637,6 +1637,13 @@ icon_state = "lab" //Husky +/datum/sprite_accessory/mam_ears/husky + name = "Husky" + icon_state = "wolf" + hasinner = 1 + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + /datum/sprite_accessory/mam_tails/husky name = "Husky" icon_state = "husky" diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi index 25ffc8e2bb..3164a855e7 100644 Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ