Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Engineering sprite update #21009

Merged
merged 10 commits into from
Dec 12, 2023
2 changes: 1 addition & 1 deletion code/game/objects/items/extinguisher.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
name = "advanced fire extinguisher"
desc = "Used to stop thermonuclear fires from spreading inside your engine."
icon_state = "foam_extinguisher0"
//item_state = "foam_extinguisher" needs sprite
item_state = "foam_extinguisher"
max_water = 150
chem_amount = 1
w_class = WEIGHT_CLASS_NORMAL
Expand Down
14 changes: 7 additions & 7 deletions code/modules/clothing/spacesuits/hardsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -262,22 +262,22 @@

//Elder_Atmosian's hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/elder_atmosian
name = "Elder Atmosian Hardsuit Helmet"
name = "Elder Atmosian Firefighter Helmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has thermal shielding. This one is made with the toughest and rarest materials available to man."
icon_state = "hardsuit0-flight"
item_state = "flighthelmet"
hardsuit_type = "flight"
icon_state = "hardsuit0-metalh2"
item_state = "hardhat0_atmos"
hardsuit_type = "metalh2"
armor = list(MELEE = 40, BULLET = 35, LASER = 25, ENERGY = 30, BOMB = 100, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, WOUND = 20, ELECTRIC = 100)
heat_protection = HEAD //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_1 = RAD_PROTECT_CONTENTS_1

/obj/item/clothing/suit/space/hardsuit/elder_atmosian
name = "Elder Atmosian Hardsuit"
name = "Elder Atmosian Firesuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has thermal shielding. This one is made with the toughest and rarest materials available to man."
icon_state = "flightsuit"
item_state = "flightsuit"
icon_state = "metalh2_firesuit"
item_state = "firesuit_atmos"
armor = list(MELEE = 40, BULLET = 35, LASER = 25, ENERGY = 30, BOMB = 100, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, WOUND = 20, ELECTRIC = 100)
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
Expand Down
1 change: 1 addition & 0 deletions code/modules/research/stock_parts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
name = "bluespace rapid part exchange device"
desc = "A version of the RPED that allows for the replacement of parts and scanning from a distance, along with a higher capacity for parts."
icon_state = "BS_RPED"
item_state = "BS_RPED"
w_class = WEIGHT_CLASS_NORMAL
works_from_distance = TRUE
pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/pshoom.ogg'
Expand Down
Binary file modified icons/mob/clothing/feet/feet.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/hands/hands.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/head/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit/suit.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/equipment/tools_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/equipment/tools_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/items_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/items_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/misc/devices_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/misc/devices_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/axes_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/axes_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/device.dmi
Binary file not shown.
Binary file modified icons/obj/tools.dmi
Binary file not shown.
Binary file modified icons/obj/wallmounts.dmi
Binary file not shown.
Binary file modified yogstation/icons/mob/clothing/head/head.dmi
Binary file not shown.
Binary file modified yogstation/icons/mob/clothing/suit/suit.dmi
Binary file not shown.
Binary file modified yogstation/icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified yogstation/icons/obj/clothing/suits.dmi
Binary file not shown.
Loading