diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 3df460522f8..54ffa42b1b0 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -97,11 +97,13 @@ if("Medical") module = new /obj/item/weapon/robot_module/medical(src) hands.icon_state = "medical" - var/icontype = input("Select an icon!", "Robot", null, null) in list("Kent", "Medbot") + var/icontype = input("Select an icon!", "Robot", null, null) in list("Kent", "Medbot", "Surgeon") if(icontype == "Kent") icon_state = "toiletbot" else if(icontype == "Medbot") icon_state = "Medbot" + else if(icontype == "Surgeon") + icon_state = "surgeon" modtype = "Med" if("Security") diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index a563ee9a781..9f3d428c2c5 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -58,9 +58,13 @@ name = "Half-banged Hair" icon_state = "hair_halfbang" + halfbangalt + name = "Half-banged Hair Alt" + icon_state = "hair_halfbang_alt" + kusangi - name = "Kusangi Hair" - icon_state = "hair_kusangi" + name = "Kusanagi Hair" + icon_state = "hair_kusanagi" ponytail name = "Ponytail" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 9861a35defe..d6a42c68fc2 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -2,6 +2,7 @@ name = "laser gun" desc = "a basic weapon designed kill with concentrated energy bolts" icon_state = "laser" + item_state = "laser" fire_sound = 'Laser.ogg' w_class = 3.0 m_amt = 2000 @@ -58,7 +59,7 @@ obj/item/weapon/gun/energy/laser/retro /obj/item/weapon/gun/energy/lasercannon name = "laser cannon" - desc = "A heavy-duty laser cannon." + desc = "With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!" icon_state = "lasercannon" fire_sound = 'lasercannonfire.ogg' origin_tech = "combat=4;materials=3;powerstorage=3" diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 2097f561ada..bec72ed2838 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 7b7048b80e8..f7493bc5167 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 1c73af7f748..046d5343875 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index 21868ffbb43..ca8a8009aa6 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ diff --git a/icons/obj/power_cond_blue.dmi b/icons/obj/power_cond_blue.dmi index c067afc5a20..e224fa549c3 100644 Binary files a/icons/obj/power_cond_blue.dmi and b/icons/obj/power_cond_blue.dmi differ diff --git a/icons/obj/power_cond_green.dmi b/icons/obj/power_cond_green.dmi index 018bc729ed8..c8aa279bc29 100644 Binary files a/icons/obj/power_cond_green.dmi and b/icons/obj/power_cond_green.dmi differ diff --git a/icons/obj/power_cond_yellow.dmi b/icons/obj/power_cond_yellow.dmi index 7f384bf3fd7..7506cc23857 100644 Binary files a/icons/obj/power_cond_yellow.dmi and b/icons/obj/power_cond_yellow.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 49ca0ee39a5..52490699be6 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ