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

New RIG suit, apron, xeno suit, and fire suit sprites #8515

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
6 changes: 6 additions & 0 deletions code/modules/clothing/spacesuits/rig/rig.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
var/glove_type = /obj/item/clothing/gloves/rig
var/cell_type = /obj/item/cell/large/high
var/air_type = /obj/item/tank/oxygen
///What the worn icon state should be when the RIG is offline; not at all suits have one, so it's optional
var/offline_icon = ""

//Component/device holders.
var/obj/item/tank/air_supply // Air tank, if any.
Expand Down Expand Up @@ -553,6 +555,10 @@
return 'icons/mob/rig_back.dmi'

/obj/item/rig/update_icon(var/update_mob_icon)
if(offline_icon)
item_state = active ? initial(icon_state) : offline_icon
wearer?.update_inv_back()

if(installed_modules.len)
for(var/obj/item/rig_module/module in installed_modules)
if(module.suit_overlay && !module.suit_overlay_mob_only)
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/spacesuits/rig/suits/combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
suit_type = "hazard hardsuit"
desc = "A Security hardsuit designed for prolonged EVA in dangerous environments."
icon_state = "hazard_rig"
offline_icon = "hazard_rig_off"
armor = list(
melee = 12,
bullet = 9,
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/spacesuits/rig/suits/station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
suit_type = "industrial hardsuit"
desc = "A heavy, powerful rig used by construction crews and mining corporations. The soft plating can protect the wearer from unexpected hazards, but is not reliable in prolonged combat."
icon_state = "engineering_rig"
offline_icon = "engineering_rig_off"
price_tag = 350
armor = list(
melee = 10,
Expand Down Expand Up @@ -78,6 +79,7 @@
suit_type = "EVA hardsuit"
desc = "A light rig for repairs and maintenance to the outside of habitats and vessels."
icon_state = "eva_rig"
offline_icon = "eva_rig_off"
armor = list(
melee = 9,
bullet = 3,
Expand Down Expand Up @@ -238,6 +240,7 @@ Technomancer RIG
suit_type = "hazmat hardsuit"
desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it."
icon_state = "science_rig"
offline_icon = "science_rig_off"
spawn_tags = SPAWN_TAG_RIG_HAZMAT
rarity_value = 25
price_tag = 350
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
accessories += logo
logo.has_suit = src
loc = src
switch(logo_type) // All of the following names associated with some group of people, thus capitalized
switch(logo_type) // All of the following names associated with some group of people, thus capitalized
if("punk_over_valentinos")
name = "Valentinos jacket"
if("punk_over_samurai")
Expand Down Expand Up @@ -620,4 +620,4 @@
icon_state = "puffycoatred"
item_state = "puffycoatred"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
siemens_coefficient = 0.7
siemens_coefficient = 0.7
Binary file modified icons/inventory/feet/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/feet/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/hands/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/hands/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/head/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/head/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/mob_fem.dmi
Binary file not shown.
Binary file modified icons/mob/rig_back.dmi
Binary file not shown.
Binary file modified icons/obj/rig_modules.dmi
Binary file not shown.
Loading