cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'showface' into 'Bleeding-Edge'

Browse Source 
Transparent hoods and helmets that don't hide your face no longer hide your glasses or beard

* Beekeeper hood no longer hides your hair, facial hair, glasses, or headset
* Anomaly hood no longer hides your facial hair or glasses

See merge request !128
This commit is contained in:
d3athrow
2015-08-27 08:00:59 +00:00
parent 2d3240bf34 448c7ff035
commit ae5914ec79
6 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/clothing/head/helmet.dm
View File

@@ -6,7 +6,7 @@
item_state = "helmet" item_state = "helmet"
armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0) armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0)
body_parts_covered = HEAD | EYES | EARS body_parts_covered = HEAD | EYES | EARS
flags_inv = HIDEEARS | HIDEEYES | HIDEHAIR flags_inv = HIDEEARS | HIDEEYES | HIDEHEADHAIR
cold_protection = HEAD cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HEAD heat_protection = HEAD
@@ -26,7 +26,7 @@
item_state = "helmet" item_state = "helmet"
flags = FPRINT flags = FPRINT
armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0) armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0)
flags_inv = HIDEEARS|HIDEHAIR flags_inv = HIDEEARS | HIDEHEADHAIR
siemens_coefficient = 0.7 siemens_coefficient = 0.7
eyeprot = 1 eyeprot = 1
@@ -37,7 +37,7 @@
flags = FPRINT flags = FPRINT
item_state = "swat" item_state = "swat"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0) armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR flags_inv = HIDEEARS|HIDEEYES|HIDEHEADHAIR
cold_protection = HEAD cold_protection = HEAD
species_fit = list("Vox") species_fit = list("Vox")
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
@@ -49,6 +49,7 @@
desc = "<i>'Let the battle commence!'</i>" desc = "<i>'Let the battle commence!'</i>"
icon_state = "thunderdome" icon_state = "thunderdome"
flags = FPRINT flags = FPRINT
flags_inv = HIDEEARS | HIDEHEADHAIR
item_state = "thunderdome" item_state = "thunderdome"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
cold_protection = HEAD cold_protection = HEAD

1
code/modules/clothing/spacesuits/syndi.dm
View File

@@ -7,6 +7,7 @@
desc = "Has a tag on it: Totally not property of a hostile corporation, honest!" desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.8 siemens_coefficient = 0.8
flags_inv = HIDEEARS | HIDEHAIR
/obj/item/clothing/suit/space/syndicate /obj/item/clothing/suit/space/syndicate
name = "red space suit" name = "red space suit"

1
code/modules/clothing/suits/bio.dm
View File

@@ -84,6 +84,7 @@
/obj/item/clothing/head/bio_hood/beekeeping /obj/item/clothing/head/bio_hood/beekeeping
name = "beekeeping hood" name = "beekeeping hood"
icon_state = "bio_beekeeping" icon_state = "bio_beekeeping"
flags_inv = null
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 0) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 0)

2
code/modules/research/xenoarchaeology/tools/anomaly_suit.dm
View File

@@ -12,6 +12,7 @@
desc = "A sealed bio hood capable of insulating against exotic alien energies." desc = "A sealed bio hood capable of insulating against exotic alien energies."
icon_state = "engspace_helmet" icon_state = "engspace_helmet"
item_state = "engspace_helmet" item_state = "engspace_helmet"
flags_inv = HIDEEARS | HIDEHEADHAIR
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
/obj/item/clothing/suit/space/anomaly /obj/item/clothing/suit/space/anomaly
@@ -27,4 +28,5 @@
desc = "A pressure resistant excavation hood partially capable of insulating against exotic alien energies." desc = "A pressure resistant excavation hood partially capable of insulating against exotic alien energies."
icon_state = "cespace_helmet" icon_state = "cespace_helmet"
item_state = "cespace_helmet" item_state = "cespace_helmet"
flags_inv = HIDEEARS | HIDEHEADHAIR
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)

4
html/changelogs/DeityLink_128.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Deity Link
delete-after: true
changes:
- tweak: Fixed a few helmets/hoods that were hiding your glasses/beard when they shouldn't.

BIN
icons/pda_icons/pda_minimap_taxi.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB