diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 933c1f3b089..45ca8eda6b7 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -70,6 +70,11 @@ HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/mining MASK_TYPE = /obj/item/clothing/mask/breath +/obj/machinery/suit_storage_unit/cmo + SUIT_TYPE = /obj/item/clothing/suit/space/rig/medical + HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/medical + MASK_TYPE = /obj/item/clothing/mask/breath + /obj/machinery/suit_storage_unit/New() src.update_icon() if(SUIT_TYPE) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 46561815e44..d9291c1eb83 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -115,7 +115,7 @@ item_state = "seclite" force = 9 // Not as good as a stun baton. brightness_on = 5 // A little better than the standard flashlight. - + hitsound = 'swing_hit' // the desk lamps are a bit special /obj/item/device/flashlight/lamp diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 41c2835cdc5..a58cc64c225 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -133,7 +133,7 @@ /obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete name = "Optical Meson Scanner" - desc = "Used for seeing walls, floors, and stuff through anything." + desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." icon_state = "meson" origin_tech = "magnets=3;syndicate=4" diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 309aa5201ee..a4b8d45ec3a 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -360,29 +360,29 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos -/datum/recipe/human/kabob +/datum/recipe/human/kebab items = list( /obj/item/stack/rods, /obj/item/weapon/reagent_containers/food/snacks/meat/human, /obj/item/weapon/reagent_containers/food/snacks/meat/human, ) - result = /obj/item/weapon/reagent_containers/food/snacks/human/kabob + result = /obj/item/weapon/reagent_containers/food/snacks/human/kebab -/datum/recipe/monkeykabob +/datum/recipe/monkeykebab items = list( /obj/item/stack/rods, /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob + result = /obj/item/weapon/reagent_containers/food/snacks/monkeykebab -/datum/recipe/tofukabob +/datum/recipe/tofukebab items = list( /obj/item/stack/rods, /obj/item/weapon/reagent_containers/food/snacks/tofu, /obj/item/weapon/reagent_containers/food/snacks/tofu, ) - result = /obj/item/weapon/reagent_containers/food/snacks/tofukabob + result = /obj/item/weapon/reagent_containers/food/snacks/tofukebab /datum/recipe/tofubread reagents = list("flour" = 15) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index c510c4294e3..d50203a4bba 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -53,7 +53,7 @@ /obj/item/weapon/gun/energy/crossbow - name = "mini energy-crossbow" + name = "mini energy crossbow" desc = "A weapon favored by many of the syndicates stealth specialists." icon_state = "crossbow" w_class = 2.0 @@ -99,7 +99,7 @@ return /obj/item/weapon/gun/energy/crossbow/largecrossbow - name = "Energy Crossbow" + name = "energy crossbow" desc = "A weapon favored by syndicate infiltration teams." w_class = 4.0 force = 10 diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 6c76f0070ef..a3624b381d9 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -568,7 +568,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) spawn(waittime) src.wait = null update_icon() - playsound(src.loc, 'sound/items/timer.ogg', 30, 1) + playsound(src.loc, 'sound/machines/ping.ogg', 30, 1) /obj/machinery/computer/pandemic/update_icon() if(stat & BROKEN) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 008919924f7..bfb31ad396d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -898,9 +898,9 @@ bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/human/kabob - name = "-kabob" - icon_state = "kabob" +/obj/item/weapon/reagent_containers/food/snacks/human/kebab + name = "-kebab" + icon_state = "kebab" desc = "A human meat, on a stick." trash = /obj/item/stack/rods New() @@ -908,9 +908,9 @@ reagents.add_reagent("nutriment", 8) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/monkeykabob - name = "meat-kabob" - icon_state = "kabob" +/obj/item/weapon/reagent_containers/food/snacks/monkeykebab + name = "meat-kebab" + icon_state = "kebab" desc = "Delicious meat, on a stick." trash = /obj/item/stack/rods New() @@ -918,9 +918,9 @@ reagents.add_reagent("nutriment", 8) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/tofukabob - name = "tofu-kabob" - icon_state = "kabob" +/obj/item/weapon/reagent_containers/food/snacks/tofukebab + name = "tofu-kebab" + icon_state = "kebab" desc = "Vegan meat, on a stick." trash = /obj/item/stack/rods New() diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 1bd703fc284..90f326bf0c3 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 ecb7d310744..214fe844430 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index a4c69ee03c1..95d58deaf68 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ