diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm index 362efc741c3..f751dddc10b 100644 --- a/code/game/objects/items/fireaxe.dm +++ b/code/game/objects/items/fireaxe.dm @@ -2,6 +2,7 @@ * Fireaxe */ /obj/item/fireaxe // DEM AXES MAN, marker -Agouri + icon = 'icons/obj/weapons/fireaxe.dmi' icon_state = "fireaxe0" base_icon_state = "fireaxe" lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi' @@ -69,10 +70,13 @@ /* * Metal Hydrogen Axe */ -/obj/item/fireaxe/metal_h2_axe // Blatant imitation of the fireaxe, but made out of metallic hydrogen +/obj/item/fireaxe/metal_h2_axe icon_state = "metalh2_axe0" base_icon_state = "metalh2_axe" name = "metallic hydrogen axe" - desc = "A large, menacing axe made of an unknown substance that the eldest atmosians call Metallic Hydrogen. Truly an otherworldly weapon." + desc = "A lightweight crowbar with an extreme sharp fire axe head attached. It trades it's hefty as a weapon by making it easier to carry around when holstered to suits without having to sacrifice your backpack." force_unwielded = 5 - force_wielded = 23 + force_wielded = 15 + demolition_mod = 2 + tool_behaviour = TOOL_CROWBAR + toolspeed = 1 diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 51ccc428996..8e38b94c6f3 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -12,7 +12,20 @@ inhand_icon_state = "apron" blood_overlay_type = "armor" body_parts_covered = CHEST|GROIN - allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/graft, /obj/item/secateurs, /obj/item/geneshears) + allowed = list( + /obj/item/cultivator, + /obj/item/geneshears, + /obj/item/graft, + /obj/item/hatchet, + /obj/item/plant_analyzer, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, + /obj/item/reagent_containers/spray/pestspray, + /obj/item/reagent_containers/spray/plantbgone, + /obj/item/secateurs, + /obj/item/seeds, + /obj/item/storage/bag/plants, + ) species_exception = list(/datum/species/golem) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, FIRE = 0, ACID = 0) @@ -30,7 +43,20 @@ icon_state = "capjacket" inhand_icon_state = "bio_suit" body_parts_covered = CHEST|GROIN|ARMS - allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/cup/glass/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list( + /obj/item/assembly/flash/handheld, + /obj/item/clothing/mask/cigarette, + /obj/item/disk, + /obj/item/lighter, + /obj/item/melee, + /obj/item/reagent_containers/cup/glass/flask, + /obj/item/stamp, + /obj/item/storage/box/matches, + /obj/item/storage/fancy/cigarettes, + /obj/item/storage/lockbox/medal, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + ) //Chef /obj/item/clothing/suit/toggle/chef @@ -42,7 +68,11 @@ inhand_icon_state = "chef" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, FIRE = 0, ACID = 0) body_parts_covered = CHEST|GROIN|ARMS - allowed = list(/obj/item/kitchen, /obj/item/knife/kitchen, /obj/item/storage/bag/tray) + allowed = list( + /obj/item/kitchen, + /obj/item/knife/kitchen, + /obj/item/storage/bag/tray, + ) toggle_noun = "sleeves" species_exception = list(/datum/species/golem) @@ -54,7 +84,11 @@ inhand_icon_state = "apronchef" blood_overlay_type = "armor" body_parts_covered = CHEST|GROIN - allowed = list(/obj/item/kitchen, /obj/item/knife/kitchen, /obj/item/storage/bag/tray) + allowed = list( + /obj/item/kitchen, + /obj/item/knife/kitchen, + /obj/item/storage/bag/tray, + ) //Detective /obj/item/clothing/suit/jacket/det_suit @@ -105,7 +139,15 @@ worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "hazard" blood_overlay_type = "armor" - allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/radio, /obj/item/storage/bag/construction) + allowed = list( + /obj/item/fireaxe/metal_h2_axe, + /obj/item/flashlight, + /obj/item/radio, + /obj/item/storage/bag/construction, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/t_scanner, + ) resistance_flags = NONE species_exception = list(/datum/species/golem) @@ -203,22 +245,22 @@ desc = "A sterile blue surgical apron." icon_state = "surgical" allowed = list( - /obj/item/hemostat, - /obj/item/cautery, - /obj/item/scalpel, - /obj/item/surgical_drapes, - /obj/item/retractor, /obj/item/bonesetter, + /obj/item/cautery, /obj/item/flashlight/pen, /obj/item/healthanalyzer, + /obj/item/hemostat, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, + /obj/item/retractor, + /obj/item/scalpel, + /obj/item/surgical_drapes, /obj/item/storage/pill_bottle, /obj/item/tank/internals/emergency_oxygen, - ) + ) //Curator /obj/item/clothing/suit/jacket/curator @@ -228,7 +270,11 @@ inhand_icon_state = "curator" blood_overlay_type = "coat" body_parts_covered = CHEST|ARMS - allowed = list(/obj/item/tank/internals, /obj/item/melee/curator_whip, /obj/item/storage/bag/books) + allowed = list( + /obj/item/melee/curator_whip, + /obj/item/storage/bag/books, + /obj/item/tank/internals, + ) armor = list(MELEE = 25, BULLET = 10, LASER = 25, ENERGY = 35, BOMB = 0, BIO = 0, FIRE = 0, ACID = 45) cold_protection = CHEST|ARMS heat_protection = CHEST|ARMS diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index ab21f118096..27cd4159499 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -20,7 +20,13 @@ inhand_icon_state = "ro_suit" w_class = WEIGHT_CLASS_BULKY body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/extinguisher, /obj/item/crowbar) + allowed = list( + /obj/item/crowbar, + /obj/item/extinguisher, + /obj/item/flashlight, + /obj/item/fireaxe/metal_h2_axe, + /obj/item/tank/internals, + ) slowdown = 1 armor = list(MELEE = 15, BULLET = 5, LASER = 20, ENERGY = 20, BOMB = 20, BIO = 50, FIRE = 100, ACID = 50) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT @@ -143,7 +149,11 @@ w_class = WEIGHT_CLASS_BULKY clothing_flags = THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/geiger_counter) + allowed = list( + /obj/item/flashlight, + /obj/item/geiger_counter, + /obj/item/tank/internals, + ) slowdown = 1.5 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 60, FIRE = 30, ACID = 30) strip_delay = 60 diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index bcd55a84bbd..d9694b8f4d5 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -365,6 +365,7 @@ allowed = list( /obj/item/analyzer, /obj/item/construction/rcd, + /obj/item/fireaxe/metal_h2_axe, /obj/item/pipe_dispenser, /obj/item/t_scanner, /obj/item/storage/bag/construction, diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 34a49c496e3..e77580d51ea 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -120,10 +120,11 @@ slowdown_inactive = 1.5 slowdown_active = 1 allowed_suit_storage = list( - /obj/item/flashlight, - /obj/item/tank/internals, /obj/item/construction/rcd, + /obj/item/fireaxe/metal_h2_axe, + /obj/item/flashlight, /obj/item/storage/bag/construction, + /obj/item/tank/internals, ) skins = list( "engineering" = list( @@ -168,11 +169,12 @@ slowdown_inactive = 1.5 slowdown_active = 1 allowed_suit_storage = list( - /obj/item/flashlight, - /obj/item/tank/internals, /obj/item/analyzer, - /obj/item/t_scanner, + /obj/item/fireaxe/metal_h2_axe, + /obj/item/flashlight, /obj/item/pipe_dispenser, + /obj/item/t_scanner, + /obj/item/tank/internals, ) skins = list( "atmospheric" = list( @@ -220,14 +222,15 @@ slowdown_active = 0.5 inbuilt_modules = list(/obj/item/mod/module/magboot/advanced) allowed_suit_storage = list( - /obj/item/flashlight, - /obj/item/tank/internals, /obj/item/analyzer, - /obj/item/t_scanner, - /obj/item/pipe_dispenser, /obj/item/construction/rcd, - /obj/item/storage/bag/construction, + /obj/item/fireaxe/metal_h2_axe, + /obj/item/flashlight, /obj/item/melee/baton/telescopic, + /obj/item/pipe_dispenser, + /obj/item/storage/bag/construction, + /obj/item/t_scanner, + /obj/item/tank/internals, ) skins = list( "advanced" = list( diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 007c1012801..8c994017974 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index 3f53b2a11ce..75f62724314 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/inhands/weapons/axes_lefthand.dmi b/icons/mob/inhands/weapons/axes_lefthand.dmi index bccaabc4f8a..14f182a4a52 100644 Binary files a/icons/mob/inhands/weapons/axes_lefthand.dmi and b/icons/mob/inhands/weapons/axes_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/axes_righthand.dmi b/icons/mob/inhands/weapons/axes_righthand.dmi index 269c7892210..a329fbb0b81 100644 Binary files a/icons/mob/inhands/weapons/axes_righthand.dmi and b/icons/mob/inhands/weapons/axes_righthand.dmi differ diff --git a/icons/obj/weapons/fireaxe.dmi b/icons/obj/weapons/fireaxe.dmi new file mode 100644 index 00000000000..b53e28bc824 Binary files /dev/null and b/icons/obj/weapons/fireaxe.dmi differ diff --git a/icons/obj/weapons/items_and_weapons.dmi b/icons/obj/weapons/items_and_weapons.dmi index d94778d110f..7ed6cb9bfa7 100644 Binary files a/icons/obj/weapons/items_and_weapons.dmi and b/icons/obj/weapons/items_and_weapons.dmi differ