diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index 403b2054870..bf4f68573fa 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -69,18 +69,21 @@ name = "Engineer - Hephaestus" uniform = /obj/item/clothing/under/rank/engineer/heph + head = /obj/item/clothing/head/hardhat/green id = /obj/item/card/id/hephaestus /datum/outfit/job/atmos/hephaestus name = "Atmospheric Technician - Hephaestus" uniform = /obj/item/clothing/under/rank/atmospheric_technician/heph + head = /obj/item/clothing/head/hardhat/green id = /obj/item/card/id/hephaestus /datum/outfit/job/intern_eng/hephaestus name = "Engineering Apprentice - Hephaestus" uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph + head = /obj/item/clothing/head/beret/corporate/heph id = /obj/item/card/id/hephaestus /datum/outfit/job/representative/hephaestus diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index d2a88a86a2c..546e65509c1 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -126,18 +126,21 @@ name = "Engineer - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/zavod + head = /obj/item/clothing/head/hardhat/red id = /obj/item/card/id/zavodskoi /datum/outfit/job/atmos/zavodskoi name = "Atmospheric Technician - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/atmospheric_technician/zavod + head = /obj/item/clothing/head/hardhat/red id = /obj/item/card/id/zavodskoi /datum/outfit/job/intern_eng/zavodskoi name = "Engineering Apprentice - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/apprentice/zavod + head = /obj/item/clothing/head/beret/corporate/zavod id = /obj/item/card/id/zavodskoi /datum/outfit/job/representative/zavodskoi diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 8937bd9bd83..657919032dc 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -279,7 +279,7 @@ /obj/item/xmasgift/large, /obj/item/reagent_containers/food/snacks/pudding, /obj/item/contraband/poster, - /obj/item/clothing/head/hardhat/red/atmos, + /obj/item/clothing/head/hardhat/atmos, /mob/living/bot/cleanbot, /obj/item/device/binoculars, /obj/item/device/camera, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 68b3d925dc7..6b6d146488b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -121,7 +121,7 @@ new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/clothing/accessory/storage/brown_vest(src) new /obj/item/clothing/suit/fire/atmos(src) - new /obj/item/clothing/head/hardhat/red/atmos(src) + new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/device/flashlight(src) new /obj/item/extinguisher(src) new /obj/item/device/radio/headset/headset_eng(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 98e6dccf2f1..8df2c86f572 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -164,18 +164,9 @@ new /obj/item/clothing/under/rank/atmospheric_technician/zavod(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/head/hardhat/red(src) - new /obj/item/clothing/head/hardhat/red(src) - new /obj/item/clothing/head/hardhat/red(src) - new /obj/item/clothing/head/hardhat/dblue(src) - new /obj/item/clothing/head/hardhat/dblue(src) - new /obj/item/clothing/head/hardhat/dblue(src) + new /obj/item/clothing/head/hardhat/green(src) new /obj/item/clothing/head/beret/engineering(src) - new /obj/item/clothing/head/beret/engineering(src) - new /obj/item/clothing/head/beret/engineering(src) - new /obj/item/clothing/head/bandana/atmos(src) - new /obj/item/clothing/head/bandana/atmos(src) new /obj/item/clothing/head/bandana/atmos(src) return @@ -194,13 +185,12 @@ new /obj/item/clothing/shoes/orange(src) new /obj/item/clothing/shoes/orange(src) new /obj/item/clothing/shoes/orange(src) - new /obj/item/clothing/head/hardhat(src) - new /obj/item/clothing/head/hardhat(src) - new /obj/item/clothing/head/hardhat(src) + new /obj/item/clothing/head/hardhat/red(src) + new /obj/item/clothing/head/hardhat/red(src) + new /obj/item/clothing/head/hardhat/green(src) + new /obj/item/clothing/head/hardhat/green(src) new /obj/item/clothing/head/beret/engineering(src) new /obj/item/clothing/head/beret/engineering(src) - new /obj/item/clothing/head/beret/engineering(src) - new /obj/item/clothing/head/bandana/engineering(src) new /obj/item/clothing/head/bandana/engineering(src) new /obj/item/clothing/head/bandana/engineering(src) new /obj/item/clothing/suit/storage/toggle/highvis(src) diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index 74cd5f49330..0a4e4aa51a0 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -167,7 +167,7 @@ STOCK_ITEM_UNCOMMON(violin, 1) new /obj/item/device/violin(L) STOCK_ITEM_UNCOMMON(atmosfiresuit, 2) - new /obj/item/clothing/head/hardhat/red/atmos(L) + new /obj/item/clothing/head/hardhat/atmos(L) new /obj/item/clothing/suit/fire/atmos(L) STOCK_ITEM_UNCOMMON(debugger, 2) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 044ad4d6f0a..256d9940cd2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -137,10 +137,11 @@ /datum/gear/head/hardhat/New() ..() var/list/hardhat = list() - hardhat["hard hat, yellow"] = /obj/item/clothing/head/hardhat - hardhat["hard hat, blue"] = /obj/item/clothing/head/hardhat/dblue - hardhat["hard hat, orange"] = /obj/item/clothing/head/hardhat/orange - hardhat["hard hat, red"] = /obj/item/clothing/head/hardhat/red + hardhat["hard hat, operations yellow"] = /obj/item/clothing/head/hardhat + hardhat["hard hat, command blue"] = /obj/item/clothing/head/hardhat/dblue + hardhat["hard hat, engineering orange"] = /obj/item/clothing/head/hardhat/orange + hardhat["hard hat, zavodskoi red"] = /obj/item/clothing/head/hardhat/red + hardhat["hard hat, hephaestus green"] = /obj/item/clothing/head/hardhat/green gear_tweaks += new /datum/gear_tweak/path(hardhat) /datum/gear/head/hairflower diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 9b9bb25bc06..6bc77f680df 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -1,10 +1,13 @@ /obj/item/clothing/head/hardhat name = "hard hat" desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight." + icon = 'icons/obj/clothing/hats/hardhats.dmi' icon_state = "hardhat_yellow" + item_state = "hardhat_yellow" + light_overlay = "hardhat_light" + contained_sprite = TRUE action_button_name = "Toggle Headlamp" brightness_on = 4 //luminosity when on - light_overlay = "hardhat_light" armor = list( melee = ARMOR_MELEE_RESISTANT, bullet = ARMOR_BALLISTIC_MINOR, @@ -24,24 +27,28 @@ /obj/item/clothing/head/hardhat/orange icon_state = "hardhat_orange" + item_state = "hardhat_orange" /obj/item/clothing/head/hardhat/red - name = "firefighter helmet" icon_state = "hardhat_red" - heat_protection = HEAD - max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + item_state = "hardhat_red" -/obj/item/clothing/head/hardhat/white - desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight. This one looks heat-resistant." - icon_state = "hardhat_white" - heat_protection = HEAD - max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE +/obj/item/clothing/head/hardhat/green + icon_state = "hardhat_green" + item_state = "hardhat_green" /obj/item/clothing/head/hardhat/dblue icon_state = "hardhat_dblue" item_state = "hardhat_dblue" -/obj/item/clothing/head/hardhat/red/atmos +/obj/item/clothing/head/hardhat/white + desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight. This one looks heat-resistant." + icon_state = "hardhat_white" + item_state = "hardhat_white" + heat_protection = HEAD + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + +/obj/item/clothing/head/hardhat/atmos name = "atmospheric firefighter helmet" desc = "An atmospheric firefighter's helmet, able to keep the user protected from heat and fire." max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 15000 @@ -51,6 +58,7 @@ ) icon_state = "atmos_fire" item_state = "atmos_fire" + light_overlay = "atmos_fire" icon_auto_adapt = TRUE icon_supported_species_tags = list("una", "taj") contained_sprite = TRUE @@ -69,13 +77,11 @@ icon = 'icons/clothing/kit/firefighter.dmi' icon_state = "helmet_firefighter" item_state = "helmet_firefighter" - light_overlay = "firefighter_light" sprite_sheets = list( BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/fire.dmi' ) icon_auto_adapt = TRUE icon_supported_species_tags = list("una", "taj") - contained_sprite = TRUE item_flags = THICKMATERIAL | AIRTIGHT max_pressure_protection = FIRESUIT_MAX_PRESSURE min_pressure_protection = FIRESUIT_MIN_PRESSURE diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index e86b481665d..8f709d5d6e5 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -19,7 +19,6 @@ BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/fire.dmi' ) icon_auto_adapt = TRUE - icon_supported_species_tags = list("ada", "gol") contained_sprite = TRUE w_class = ITEMSIZE_LARGE//bulky item gas_transfer_coefficient = 0.90 @@ -56,10 +55,10 @@ w_class = ITEMSIZE_HUGE//Too large to fit in a backpack item_flags = THICKMATERIAL|BLOCK_GAS_SMOKE_EFFECT armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_RESISTANT, + melee = ARMOR_MELEE_VERY_HIGH, + bullet = ARMOR_BALLISTIC_MINOR, + laser = ARMOR_LASER_SMALL, + energy = ARMOR_ENERGY_RESISTANT, bomb = ARMOR_BOMB_SHIELDED ) max_pressure_protection = FIRESUIT_MAX_PRESSURE @@ -85,10 +84,10 @@ permeability_coefficient = 0.01 slowdown = 8 armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MINOR, - laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_RESISTANT, + melee = ARMOR_MELEE_VERY_HIGH, + bullet = ARMOR_BALLISTIC_MINOR, + laser = ARMOR_LASER_SMALL, + energy = ARMOR_ENERGY_RESISTANT, bomb = ARMOR_BOMB_SHIELDED ) siemens_coefficient = 0.1 @@ -217,7 +216,7 @@ allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/device/t_scanner,/obj/item/rfd/construction,/obj/item/material/twohanded/fireaxe,/obj/item/storage/backpack/cell,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas,/obj/item/reagent_containers/hypospray/autoinjector) slowdown = 1.5 armor = list( - bio = ARMOR_BIO_RESISTANT, + bio = ARMOR_BIO_RESISTANT, rad = ARMOR_RAD_SHIELDED ) siemens_coefficient = 0.35 diff --git a/html/changelogs/wezzy_engineer_gaming.yml b/html/changelogs/wezzy_engineer_gaming.yml new file mode 100644 index 00000000000..d4d25d91394 --- /dev/null +++ b/html/changelogs/wezzy_engineer_gaming.yml @@ -0,0 +1,46 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Adds new hardhat, firesuit and firesuit helmet sprites. Ported and modified from /tg/ and Bee." + - tweak: "Red firefighting helmets have been superceded by the Atmos firesuit helmets." + - rscdel : "Golems no longer can wear firesuits. They literally can't wear anything else anyway." + - rscadd: "Zavodskoi and Hephaestus Engineers now spawn with hardhats which match their uniforms." + - rscadd: "New green hardhat! Enjoy Hephaestus green! All other hardhats tweaked to match uniforms!" + - imageadd: "Resprites EMT helmet." \ No newline at end of file diff --git a/icons/clothing/kit/firefighter.dmi b/icons/clothing/kit/firefighter.dmi index a68d418e29b..63e6e1c4105 100644 Binary files a/icons/clothing/kit/firefighter.dmi and b/icons/clothing/kit/firefighter.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 88fe771d607..a064728bc14 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/light_overlays.dmi b/icons/mob/light_overlays.dmi index 917337d1fce..6f214afb00a 100644 Binary files a/icons/mob/light_overlays.dmi and b/icons/mob/light_overlays.dmi differ diff --git a/icons/mob/species/bulwark/fire.dmi b/icons/mob/species/bulwark/fire.dmi index ab89d088dd1..a1c9668856a 100644 Binary files a/icons/mob/species/bulwark/fire.dmi and b/icons/mob/species/bulwark/fire.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ed588d4a42a..1c7ecde546b 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/hats/hardhats.dmi b/icons/obj/clothing/hats/hardhats.dmi new file mode 100644 index 00000000000..ea4127bce59 Binary files /dev/null and b/icons/obj/clothing/hats/hardhats.dmi differ diff --git a/icons/obj/light_overlays.dmi b/icons/obj/light_overlays.dmi index 65235376d1a..1398406a718 100644 Binary files a/icons/obj/light_overlays.dmi and b/icons/obj/light_overlays.dmi differ