cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Edited Explorer Suit to show racial appendages (#12197)

Browse Source 
* Edited Explorer Suit to show racial appendages

Removed flag on Explorer Suit that hid the tails of non-human species such as lizardpeople or felinid. Also added a secret toggleable option on Explorer Suit Hoods that allows racial hair (i.e. horns) to be shown.

* Added var flags_prot to items and fixed explorer gear not protecting jumpsuit from being set on fire

Items now also have an optional flags_prot variable that essentially acts like flag_inv except it does not prevent the sprite from being rendered. The HIDEJUMPSUIT flag has been moved from flags_inv to flags_prot so it can protect jumpsuits from fire again.
This commit is contained in:
Kaithyl
2021-09-01 09:35:20 -06:00
committed by GitHub
parent 73aec56305
commit bc0048ad93
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/items.dm
View File

@@ -49,6 +49,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
//Since any item can now be a piece of clothing, this has to be put here so all items share it.
var/flags_inv //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc.
var/flags_prot //This flag acts like flags_inv except it allows the items to still be rendered.
var/transparent_protection = NONE //you can see someone's mask through their transparent visor, but you can't reach it
var/interaction_flags_item = INTERACT_ITEM_ATTACK_HAND_PICKUP

23
code/modules/mining/equipment/explorer_gear.dm
View File

@@ -9,7 +9,8 @@
cold_protection = CHEST|GROIN|LEGS|ARMS
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
flags_inv = HIDEGLOVES|HIDESHOES
flags_prot = HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/explorer
armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
@@ -22,10 +23,30 @@
icon_state = "explorer"
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
flags_prot = HIDEHAIR|HIDEFACE
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
resistance_flags = FIRE_PROOF
var/adjusted = NORMAL_STYLE
/obj/item/clothing/head/hooded/explorer/verb/hood_adjust()
set name = "Adjust Hood Style"
set category = null
set src in usr
switch(adjusted)
if(NORMAL_STYLE)
adjusted = ALT_STYLE
to_chat(usr, "<span class='notice'>You adjust the hood to wear it more casually.</span>")
flags_inv &= ~(HIDEHAIR|HIDEFACE)
if(ALT_STYLE)
adjusted = NORMAL_STYLE
to_chat(usr, "<span class='notice'>You adjust the hood back to normal.</span>")
flags_inv |= (HIDEHAIR|HIDEFACE)
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
H.update_hair()
H.update_body()
/obj/item/clothing/suit/hooded/explorer/Initialize()
. = ..()

1
code/modules/mob/inventory.dm
View File

@@ -392,6 +392,7 @@
for(var/obj/item/I in get_equipped_items())
hidden_slots |= I.flags_inv
hidden_slots |= I.flags_prot
if(transparent_protection)
hidden_slots |= I.transparent_protection