mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 20:11:04 +01:00
Fixes taj overheating in their clothes (#11907)
This commit is contained in:
@@ -126,6 +126,7 @@ var/datum/antagonist/wizard/wizards
|
||||
|
||||
obj/item/clothing
|
||||
var/wizard_garb = 0
|
||||
var/no_overheat = FALSE // Checks to see if the clothing is ignored for the purpose of overheating messages.
|
||||
|
||||
// Does this clothing slot count as wizard garb? (Combines a few checks)
|
||||
/proc/is_wiz_garb(var/obj/item/clothing/C)
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
desc_fluff = "Having direct and friendly contact with humanity, The People's Republic of Adhomai has been the most influenced by the spacer fashion. The most known \
|
||||
being the \"assistant jumpsuits\" which directly inspired the design of factory overalls, the plight and low pay of the assistants being close to the hearts of Tajara Hadiist \
|
||||
workers and their Republic."
|
||||
no_overheat = TRUE
|
||||
|
||||
/obj/item/clothing/under/tajaran/fancy
|
||||
name = "fancy uniform"
|
||||
|
||||
@@ -295,7 +295,7 @@
|
||||
for(var/obj/item/clothing/clothes in H)
|
||||
if(H.l_hand == clothes|| H.r_hand == clothes)
|
||||
continue
|
||||
if((clothes.body_parts_covered & UPPER_TORSO) && (clothes.body_parts_covered & LOWER_TORSO))
|
||||
if((clothes.body_parts_covered & UPPER_TORSO) && (clothes.body_parts_covered & LOWER_TORSO) && !clothes.no_overheat)
|
||||
covered = 1
|
||||
break
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
author: TheGreyWolf
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- bugfix: "Taj specific clothing will no longer give the message that they are overheating."
|
||||
Reference in New Issue
Block a user