Skip to content

Commit 6584089

Browse files
authored
Fixed Firesuits lacking sprites for tajara and unathi. (#20777)
Fixes #15812 Firesuit sprites taken directly from Paradise Station (ParadiseSS13/Paradise#26671). However, my own modifications were needed for the emissive sprites, the helmet sprites, and the atmospheric technician sprites. ### Asset Licenses The following assets that **have not** been created by myself are included in this PR: | Path | Original Author | License | | --- | --- | --- | | icons/clothing/kit/firefighter.dmi | [ElorgRHG](https://github.com/ElorgRHG) (Paradise Station) | CC-BY-SA 3.0 |
1 parent 2abbeb8 commit 6584089

File tree

4 files changed

+89
-8
lines changed

4 files changed

+89
-8
lines changed

code/modules/clothing/head/hardhat.dm

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,23 @@
6565
min_pressure_protection = FIRESUIT_MIN_PRESSURE
6666
heat_protection = HEAD
6767

68+
///Initial name of the fire helmet's emissive overlay. Will be changed based on [icon_supported_species_tags], above
69+
var/initial_emissive_state = "atmos_fire_emissive"
70+
///Special variable to handle the fire helmet's emissive overlay
71+
var/emissive_state
72+
73+
/obj/item/clothing/head/hardhat/atmos/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
74+
var/image/I = ..()
75+
emissive_state = initial_emissive_state
76+
if(icon_auto_adapt)
77+
if(H && length(icon_supported_species_tags))
78+
if(H.species.short_name in icon_supported_species_tags)
79+
emissive_state = "[H.species.short_name]_[initial_emissive_state]"
80+
if(slot == slot_head_str)
81+
var/image/emissive_overlay = emissive_appearance(mob_icon, emissive_state, alpha = src.alpha)
82+
I.AddOverlays(emissive_overlay)
83+
return I
84+
6885
/obj/item/clothing/head/hardhat/paramedic
6986
name = "medical helmet"
7087
desc = "A polymer helmet worn by paramedics throughout human space to protect their heads. This one comes with an attached flashlight and has green crosses on the sides."

code/modules/clothing/suits/utility.dm

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,20 @@
3535
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
3636
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
3737

38+
///Initial name of the firesuit's emissive overlay. Will be changed based on [icon_supported_species_tags], above
39+
var/initial_emissive_state = "firesuit_emissive"
40+
///Special variable to handle the firesuit's emissive overlay
41+
var/emissive_state
42+
3843
/obj/item/clothing/suit/fire/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
3944
var/image/I = ..()
45+
emissive_state = initial_emissive_state
46+
if(icon_auto_adapt)
47+
if(H && length(icon_supported_species_tags))
48+
if(H.species.short_name in icon_supported_species_tags)
49+
emissive_state = "[H.species.short_name]_[initial_emissive_state]"
4050
if(slot == slot_wear_suit_str)
41-
var/image/emissive_overlay = emissive_appearance(mob_icon, "firesuit-emissive", alpha = src.alpha)
51+
var/image/emissive_overlay = emissive_appearance(mob_icon, emissive_state, alpha = src.alpha)
4252
I.AddOverlays(emissive_overlay)
4353
return I
4454

@@ -52,13 +62,7 @@
5262
sprite_sheets = list(
5363
BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/fire.dmi'
5464
)
55-
56-
/obj/item/clothing/suit/fire/atmos/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
57-
var/image/I = ..()
58-
if(slot == slot_wear_suit_str)
59-
var/image/emissive_overlay = emissive_appearance(mob_icon, "atmos_firesuit-emissive", alpha = src.alpha)
60-
I.AddOverlays(emissive_overlay)
61-
return I
65+
initial_emissive_state = "atmos_firesuit_emissive"
6266

6367
/*
6468
* Bomb protection
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
################################
2+
# Example Changelog File
3+
#
4+
# 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.
5+
#
6+
# 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.)
7+
# When it is, any changes listed below will disappear.
8+
#
9+
# Valid Prefixes:
10+
# bugfix
11+
# - (fixes bugs)
12+
# wip
13+
# - (work in progress)
14+
# qol
15+
# - (quality of life)
16+
# soundadd
17+
# - (adds a sound)
18+
# sounddel
19+
# - (removes a sound)
20+
# rscadd
21+
# - (adds a feature)
22+
# rscdel
23+
# - (removes a feature)
24+
# imageadd
25+
# - (adds an image or sprite)
26+
# imagedel
27+
# - (removes an image or sprite)
28+
# spellcheck
29+
# - (fixes spelling or grammar)
30+
# experiment
31+
# - (experimental change)
32+
# balance
33+
# - (balance changes)
34+
# code_imp
35+
# - (misc internal code change)
36+
# refactor
37+
# - (refactors code)
38+
# config
39+
# - (makes a change to the config files)
40+
# admin
41+
# - (makes changes to administrator tools)
42+
# server
43+
# - (miscellaneous changes to server)
44+
#################################
45+
46+
# Your name.
47+
author: GeneralCamo
48+
49+
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
50+
delete-after: True
51+
52+
# Any changes you've made. See valid prefix list above.
53+
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
54+
# SCREW THIS UP AND IT WON'T WORK.
55+
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
56+
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
57+
changes:
58+
- bugfix: "Firesuits (including Atmos Firesuits) no longer lack on-mob icons for tajara and unathi."
59+
- rscadd: "Atmospheric technician fire helmets now include an emissive layer."
60+
- code_imp: "Refactored the firesuit emissive code to be more generic (to potentially allow custom variants later)."

icons/clothing/kit/firefighter.dmi

9.73 KB
Binary file not shown.

0 commit comments

Comments
 (0)