diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index c8b08ec64c5..5acecff26ee 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -174,6 +174,17 @@ "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") return (BRUTELOSS) +/obj/item/weapon/kitchenknife/combat + name = "combat knife" + force = 15.0 + throwforce = 10.0 + origin_tech = "materials=2;combat=2" + desc = "A razor sharp knife, built from advanced alloys, designed for quick, melee killing. Also not half bad as a kitchen knife." + slot_flags = SLOT_BELT + icon = 'icons/obj/weapons.dmi' + icon_state = "combatknife" + + /obj/item/weapon/kitchenknife/ritual name = "ritual knife" desc = "The unearthly energies that once powered this blade are now dormant." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 044bebc1fa8..3473a0e8596 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -372,19 +372,29 @@ _color = "swim_red" siemens_coefficient = 1 -/obj/item/clothing/suit/mercy_hoodie +/obj/item/clothing/suit/storage/mercy_hoodie name = "Mercy Robe" - desc = "Pure white robes, that have an aura of kindness and mercy" + desc = " A soft white robe made of a synthetic fiber that provides improved protection against biohazards. Possessing multiple overlapping layers, yet light enough to allow complete freedom of movement, it denotes its wearer as a master physician." icon_state = "mercy_hoodie" item_state = "mercy_hoodie" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - allowed = list(/obj/item/weapon/storage/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen) + w_class = 4//bulky item + gas_transfer_coefficient = 0.01 + permeability_coefficient = 0.01 + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen) + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL + siemens_coefficient = 0.9 /obj/item/clothing/head/mercy_hood name = "Mercy Hood" - desc = "A pure white hood." + desc = "A soft white hood made of a synthetic fiber that provides improved protection against biohazards. Its elegant design allows a clear field of vision." icon_state = "mercy_hood" item_state = "mercy_hood" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR + permeability_coefficient = 0.01 + flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES siemens_coefficient = 0.9 - loose = 2 \ No newline at end of file + loose = 7 \ No newline at end of file diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 9396888504d..315f70be0b3 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ