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

Fix vox bald hairstyle + Adds some missing vox clothing sprites (mostly from paradise) (#34140)

Browse Source 
* aqua

* cia

* clown

* fix clown and update species_fit

* meme skirt

* remove shoes from captain tunic

* animated captains visor

* ditto

* firesuit!

* thunderdome armor

* better bombsuit (para)

* white secoff uniform

* fix

* CEboots + atmos boots + syndie boots

* clown+clown psyche, one missing laceup

* better clown shoes (paradise)

* color shoes, leather shoes, roman shoes, slippers, sandals

paradise again

* tweak cowboy boots slightly

* better winterboots

* ninja and rainbow shoes

* better BTC bartender

* kneesock

* fingerless gloves

* Update hair_styles.dmi

* sexymime, orange suit, rainbow suit, white suit

* fixes

* Update uniform.dmi

* remove nun shoes

* carapace feet coverings, make hands visible

* caparmor feet

* captunic and nun suit shoes

* tweak that just a bit

* Revert "captunic and nun suit shoes"

This reverts commit ec65ff4ded.

* Revert "caparmor feet"

This reverts commit 8af5b9e76c.

* Revert "carapace feet coverings, make hands visible"

This reverts commit 77ca7e0000.

* fix again

* set overrides

* LOTS OF COSTUMES

* helmets

* fix jester colors AND LOTS OF HATS

* the rest of it

* garrison

* headsets

* bio

* radiation

* Update suit.dmi

* tweaks and fixes

* Update gasmask.dm

* bandanas

* vampire coat

* armored trenchcoat

* pirate cap

* Update suit.dmi
This commit is contained in:
gurfan
2023-03-12 00:06:26 -06:00
committed by GitHub
parent ba551b476b
commit 04d88c3374
38 changed files with 116 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
View File

@@ -1411,7 +1411,7 @@ var/list/arcane_tomes = list()
name = "magus helm"
icon_state = "magus"
item_state = "magus"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
desc = "A helm."
flags = FPRINT
body_parts_covered = FULL_HEAD|BEARD

1
code/datums/gamemode/role/ninja.dm
View File

@@ -774,6 +774,7 @@ Suit and assorted
permeability_coefficient = 0.01
mag_slow = NO_SLOWDOWN
clothing_flags = NOSLIP | MAGPULSE
species_fit = list(VOX_SHAPED)
/obj/item/clothing/shoes/ninja/redsun
name = "sundowner boots"

2
code/game/objects/items/devices/radio/headset.dm
View File

@@ -3,7 +3,7 @@
desc = "An updated, modular intercom that fits over the head. Takes encryption keys."
icon_state = "headset"
item_state = "headset"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
starting_materials = list(MAT_IRON = 75)
w_type = RECYK_ELECTRONIC
melt_temperature = MELTPOINT_PLASTIC

3
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -740,7 +740,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
icon_state = "pipe"
slot_flags = SLOT_MASK
overlay_on = "pipelit"
species_fit = list(GREY_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
smoketime = 100
/obj/item/clothing/mask/cigarette/pipe/light(var/flavor_text = "[usr] lights the [name].")
@@ -806,6 +806,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters."
icon_state = "cobpipe"
smoketime = 400
species_fit = list(VOX_SHAPED)
/////////////////
//CHEAP LIGHTER//

8
code/modules/clothing/glasses/glasses.dm
View File

@@ -207,7 +207,7 @@ var/list/science_goggles_wearers = list()
name = "eyepatch"
desc = "Yarr."
icon_state = "eyepatch0"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
item_state = "eyepatch0"
min_harm_label = 0
var/flipped = FALSE
@@ -215,7 +215,7 @@ var/list/science_goggles_wearers = list()
/obj/item/clothing/glasses/eyepatch/attack_self(mob/user)
flipped = !flipped
icon_state = "eyepatch[flipped]"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
item_state = "eyepatch[flipped]"
to_chat(user, "You flip \the [src] to your [flipped ? "left" : "right"] eye.")
@@ -541,7 +541,7 @@ var/list/science_goggles_wearers = list()
desc = "Thermals in the shape of glasses."
icon_state = "thermal"
item_state = "glasses"
species_fit = list(GREY_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
origin_tech = Tc_MAGNETS + "=3"
vision_flags = SEE_MOBS
see_invisible = SEE_INVISIBLE_MINIMUM
@@ -575,7 +575,7 @@ var/list/science_goggles_wearers = list()
name = "Thermonocle"
desc = "A monocle thermal."
icon_state = "thermoncle"
species_fit = list(GREY_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
flags = 0 //doesn't protect eyes because it's a monocle, duh
min_harm_label = 3
harm_label_examine = list("<span class='info'>A tiny label is on the lens.</span>","<span class='warning'>A label covers the lens!</span>")

2
code/modules/clothing/glasses/hud.dm
View File

@@ -136,7 +136,7 @@
/obj/item/clothing/glasses/hud/diagnostic
name = "diagnostic HUD"
icon_state = "diagnostichud"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
desc = "A heads-up display that displays diagnostic information for compatible cyborgs and exosuits."
/obj/item/clothing/glasses/hud/diagnostic/prescription

1
code/modules/clothing/gloves/miscellaneous.dm
View File

@@ -207,6 +207,7 @@
desc = "For these tense combat situations when you just have to pick your nose."
icon_state = "nr_fgloves"
item_state = "nr_fgloves"
species_fit = list(VOX_SHAPED)
//Like powerfist from fallout, but NUCLEAR. It throws people back and adds 50 damage every 15 seconds. Also it irradiates you
/obj/item/clothing/gloves/powerfist

2
code/modules/clothing/head/beanies.dm
View File

@@ -4,7 +4,7 @@
name = "white beanie"
desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads."
icon_state = "beanie" //Default white
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
clothing_flags = COLORS_OVERLAY
/obj/item/clothing/head/beanie/black

2
code/modules/clothing/head/collectable.dm
View File

@@ -5,7 +5,7 @@
/obj/item/clothing/head/collectable
name = "collectable hat"
desc = "A rare collectable hat."
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/head/collectable/petehat
name = "ultra rare Pete's hat!"

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

@@ -115,7 +115,7 @@
name = "gladiator helmet"
desc = "Ave, Imperator, morituri te salutant."
icon_state = "gladiator"
species_fit = list(INSECT_SHAPED, GREY_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED, GREY_SHAPED)
flags = FPRINT
item_state = "gladiator"
siemens_coefficient = 1
@@ -126,7 +126,7 @@
armor = list(melee = 20, bullet = 0, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0)
icon_state = "roman"
item_state = "roman"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
body_parts_covered = HEAD|EARS|MASKHEADHAIR
/obj/item/clothing/head/helmet/roman/legionaire

11
code/modules/clothing/head/jobs.dm
View File

@@ -57,7 +57,7 @@
body_parts_covered = HEAD|EARS
heat_conductivity = HELMET_HEAT_CONDUCTIVITY
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
siemens_coefficient = 0.8
/obj/item/clothing/head/HoS/NoiseDampening()
@@ -129,7 +129,7 @@
item_state = "hopcap"
icon_state = "hopcap"
body_parts_covered = HEAD
species_fit = list(GREY_SHAPED,VOX_SHAPED, INSECT_SHAPED)
species_fit = list(GREY_SHAPED, VOX_SHAPED, INSECT_SHAPED)
//Chaplain
/obj/item/clothing/head/chaplain_hood
@@ -170,7 +170,7 @@
name = "security beret"
desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
icon_state = "beret_badge"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/head/beret/officer
name = "formal security officer beret"
@@ -183,14 +183,14 @@
desc = "A red peaked cap, with a corporate logo on it."
icon_state = "peaked"
item_state = "peaked"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/head/garrison
name = "garrison cap"
desc = "A squat garrison cap, for officers made of sterner stuff."
icon_state = "garrison"
item_state = "garrison"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/head/cowboy/sec
name = "deputy hat"
@@ -242,6 +242,7 @@
name = "dress shoes"
desc = "They appear impeccably polished."
icon_state = "laceups"
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/head/beret/engineering
name = "engineering beret"

16
code/modules/clothing/head/misc.dm
View File

@@ -159,7 +159,7 @@
desc = "It's a green bandana with some fine nanotech lining."
icon_state = "greenbandana"
item_state = "greenbandana"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
flags = FPRINT
/obj/item/clothing/head/beret/highlander
@@ -346,7 +346,7 @@
desc = "Eeeee~heheheheheheh!"
icon_state = "witch"
item_state = "witch"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
body_parts_covered = EARS|HEAD|HIDEHEADHAIR
siemens_coefficient = 2.0
@@ -356,7 +356,7 @@
icon_state = "chickenhead"
item_state = "chickenhead"
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
body_parts_covered = FULL_HEAD|BEARD|HIDEHAIR
siemens_coefficient = 2.0
@@ -374,7 +374,7 @@
desc = "Not as fuzzy as the real thing."
icon_state = "bearpelt"
item_state = "bearpelt"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
body_parts_covered = EARS|HEAD|HIDEHEADHAIR
siemens_coefficient = 2.0
@@ -503,7 +503,7 @@
desc = "A hat fit for a fool."
icon_state = "jesterhat"
item_state = "jesterhat"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
flags = FPRINT
/obj/item/clothing/head/libertyhat
@@ -549,7 +549,7 @@
desc = "You wear this around your head."
icon_state = "headband"
item_state = "headband"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/metalgear.dmi', "right_hand" = 'icons/mob/in-hand/right/metalgear.dmi')
/obj/item/clothing/head/cowboy
@@ -557,7 +557,7 @@
desc = "Perfect for the closet botanist."
icon_state = "cowboy"
item_state = "cowboy"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
armor = list(melee = 0, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/head/cowboy/dimma
@@ -690,7 +690,7 @@
desc = "Welcome to the rice fields, motherfucker."
icon_state = "rice_hat"
item_state = "rice_hat"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/head/rice_hat/ronin
name = "roningasa"

2
code/modules/clothing/head/misc_special.dm
View File

@@ -124,7 +124,7 @@
flags = HIDEHEADHAIR
body_parts_covered = EARS|HEAD
heat_conductivity = SNOWGEAR_HEAT_CONDUCTIVITY
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
var/initial_icon_state = initial(icon_state)

4
code/modules/clothing/masks/gasmask.dm
View File

@@ -172,7 +172,7 @@
icon_state = "fake-moustache"
w_class = W_CLASS_TINY
actions_types = list(/datum/action/item_action/toggle_voicechanger)
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
@@ -344,7 +344,7 @@
name = "HECU gas mask"
desc = "An ancient gas mask with the letters HECU stamped on the side. Comes with a shouting-activated voice modulator that slowly recharges."
icon_state = "hecu"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
can_flip = 0
canstage = 0
ignore_flip = 1

3
code/modules/clothing/masks/miscellaneous.dm
View File

@@ -55,6 +55,7 @@
flags = FPRINT
body_parts_covered = BEARD
hides_identity = HIDES_IDENTITY_ALWAYS
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
//scarves (fit in in mask slot)
/obj/item/clothing/mask/scarf
@@ -179,7 +180,7 @@
/obj/item/clothing/mask/bandana/red
name = "red bandana"
icon_state = "bandred"
species_fit = list(INSECT_SHAPED, GREY_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED, GREY_SHAPED)
/obj/item/clothing/mask/joy
name = "joy mask"

13
code/modules/clothing/shoes/colour.dm
View File

@@ -43,32 +43,32 @@
name = "blue shoes"
icon_state = "blue"
_color = "blue"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/green
name = "green shoes"
icon_state = "green"
_color = "green"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/yellow
name = "yellow shoes"
icon_state = "yellow"
_color = "yellow"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/purple
name = "purple shoes"
icon_state = "purple"
_color = "purple"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/red
name = "red shoes"
desc = "Stylish red shoes."
icon_state = "red"
_color = "red"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/red/redcoat
_color = "redcoat" //Exists for washing machines. Is not different from normal shoes in any way.
@@ -86,13 +86,14 @@
desc = "A sturdy pair of leather shoes."
icon_state = "leather"
_color = "leather"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/rainbow
name = "rainbow shoes"
desc = "Very gay shoes."
icon_state = "rain_bow"
_color = "rainbow"
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/orange
name = "orange shoes"

2
code/modules/clothing/shoes/magboots.dm
View File

@@ -150,6 +150,7 @@
icon_state = "CE-magboots0"
base_state = "CE-magboots"
mag_slow = MAGBOOTS_SLOWDOWN_LOW
species_fit = list(VOX_SHAPED)
//Atmos techies die angry
/obj/item/clothing/shoes/magboots/atmos
@@ -157,6 +158,7 @@
name = "atmospherics magboots"
icon_state = "atmosmagboots0"
base_state = "atmosmagboots"
species_fit = list(VOX_SHAPED)
//Paramedic
/obj/item/clothing/shoes/magboots/para

13
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -111,6 +111,7 @@
desc = "A pair of rather plain, wooden sandals."
name = "sandals"
icon_state = "wizard"
species_fit = list(VOX_SHAPED)
wizard_garb = 1
@@ -118,6 +119,7 @@
name = "magic slippers"
icon_state = "slippers"
desc = "For the wizard that puts comfort first. Who's going to laugh?"
species_fit = list(VOX_SHAPED)
/obj/item/clothing/shoes/sandal/marisa
desc = "A pair of magic, black shoes."
@@ -127,7 +129,7 @@
/obj/item/clothing/shoes/sandal/marisa/leather
icon_state = "laceups"
item_state = "laceups"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/galoshes
name = "galoshes"
@@ -153,7 +155,7 @@
icon_state = "clown"
item_state = "clown_shoes"
_color = "clown"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
footprint_type = /obj/effect/decal/cleanable/blood/tracks/footprints/clown
step_sound = "clownstep"
@@ -358,6 +360,7 @@
desc = "No snake in these boots."
icon_state = "cowboy"
item_state = "cowboy"
species_fit = list(VOX_SHAPED)
/obj/item/clothing/shoes/jackboots/steeltoe
name = "steel-toed boots"
@@ -391,12 +394,14 @@
desc = "Fluffy!"
icon_state = "slippers"
item_state = "slippers"
species_fit = list(VOX_SHAPED)
/obj/item/clothing/shoes/slippers_worn
name = "worn bunny slippers"
desc = "Fluffy..."
icon_state = "slippers_worn"
item_state = "slippers_worn"
species_fit = list(VOX_SHAPED)
/obj/item/clothing/shoes/laceup
name = "laceup shoes"
@@ -415,6 +420,7 @@
desc = "Sandals with buckled leather straps on it."
icon_state = "roman"
item_state = "roman"
species_fit = list(VOX_SHAPED)
/obj/item/clothing/shoes/simonshoes
name = "Simon's Shoes"
@@ -428,7 +434,7 @@
desc = "A pair of girly knee-high socks."
icon_state = "kneesock"
item_state = "kneesock"
species_fit = list(INSECT_SHAPED)
species_fit = list(INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/shoes/kneesocks/attackby(obj/item/weapon/W, mob/user)
..()
@@ -602,6 +608,7 @@
item_state = "clownshoespsyche"
_color = "clownshoespsyche"
footprint_type = /obj/effect/decal/cleanable/blood/tracks/footprints/clown
species_fit = list(VOX_SHAPED)
step_sound = "clownstep"

2
code/modules/clothing/spacesuits/alien.dm
View File

@@ -152,6 +152,7 @@
icon_state = "vox-carapace"
item_state = "vox-carapace"
desc = "An armored, segmented carapace with glowing purple lights. It looks pretty run-down."
body_parts_visible_override = HANDS|FEET
/obj/item/clothing/head/helmet/space/vox/stealth
name = "alien stealth helmet"
@@ -284,6 +285,7 @@
icon_state = "vox-carapace"
item_state = "vox-carapace"
desc = "An armored, segmented carapace with glowing purple lights. It looks like someone stripped most of the armor off."
body_parts_visible_override = HANDS|FEET
/obj/item/clothing/head/helmet/space/vox/civ/trader/carapace //carapace helmet
name = "alien visor"

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

@@ -389,6 +389,7 @@
/obj/item/clothing/suit/armor/tdome
body_parts_covered = ARMS|LEGS|FULL_TORSO|FEET|HANDS
species_fit = list(VOX_SHAPED)
/obj/item/clothing/suit/armor/tdome/red
name = "Thunderdome suit (red)"

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

@@ -11,7 +11,7 @@
body_parts_visible_override = EYES|BEARD
siemens_coefficient = 0.9
sterility = 100
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
autoignition_temperature = AUTOIGNITION_PROTECTIVE
/obj/item/clothing/suit/bio_suit
@@ -19,7 +19,7 @@
desc = "A suit that protects against biological contamination."
icon_state = "bio"
item_state = "bio_suit"
species_fit = list(INSECT_SHAPED, GREY_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED, GREY_SHAPED)
w_class = W_CLASS_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01

23
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -450,6 +450,7 @@ var/list/tag_suits_list = list()
icon_state = "highlanderkilt"
item_state = "highlanderkilt"
clothing_flags = ONESIZEFITSALL
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
wizard_garb = 1 //required for the spell in the highlander syndicate bundle
/obj/item/clothing/suit/cardborg
@@ -568,6 +569,7 @@ var/list/tag_suits_list = list()
_color = "mankini"
siemens_coefficient = 1
body_parts_covered = 0
species_fit = list(VOX_SHAPED)
/obj/item/clothing/suit/xenos
name = "xenos suit"
@@ -590,7 +592,7 @@ var/list/tag_suits_list = list()
icon_state = "swim_black"
_color = "swim_black"
siemens_coefficient = 1
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/swimsuit/blue
name = "blue swimsuit"
@@ -598,7 +600,7 @@ var/list/tag_suits_list = list()
icon_state = "swim_blue"
_color = "swim_blue"
siemens_coefficient = 1
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/swimsuit/purple
name = "purple swimsuit"
@@ -606,7 +608,7 @@ var/list/tag_suits_list = list()
icon_state = "swim_purp"
_color = "swim_purp"
siemens_coefficient = 1
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/swimsuit/green
name = "green swimsuit"
@@ -614,7 +616,7 @@ var/list/tag_suits_list = list()
icon_state = "swim_green"
_color = "swim_green"
siemens_coefficient = 1
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/swimsuit/red
name = "red swimsuit"
@@ -622,7 +624,7 @@ var/list/tag_suits_list = list()
icon_state = "swim_red"
_color = "swim_red"
siemens_coefficient = 1
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/suit/simonjacket
name = "Simon's Jacket"
@@ -732,16 +734,7 @@ var/list/tag_suits_list = list()
blood_overlay_type = "coat"
cant_hold = list(/obj/item/weapon/nullrod, /obj/item/weapon/storage/bible)
armor = list(melee = 30, bullet = 20, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/suit/storage/draculacoat
name = "Vampire Coat"
desc = "What is a man? A miserable little pile of secrets."
icon_state = "draculacoat"
blood_overlay_type = "coat"
cant_hold = list(/obj/item/weapon/nullrod, /obj/item/weapon/storage/bible)
armor = list(melee = 30, bullet = 20, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/suit/storage/draculacoat_fake
name = "Vampire Costume"

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

@@ -25,6 +25,7 @@
pressure_resistance = 3 * ONE_ATMOSPHERE
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
autoignition_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_fit = list(VOX_SHAPED)
/obj/item/clothing/suit/fire/firefighter
icon_state = "firesuit"

2
code/modules/clothing/suits/wiz_robe.dm
View File

@@ -161,7 +161,7 @@
desc = "Heavy, royal purple robes threaded with psychic amplifiers and weird, bulbous lenses. Do not machine wash."
icon_state = "psyamp"
item_state = "psyamp"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/suit/wizrobe/fake
name = "wizard robe"

14
code/modules/clothing/under/color.dm
View File

@@ -4,7 +4,7 @@
item_state = "bl_suit"
_color = "black"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED,VOX_SHAPED, INSECT_SHAPED)
species_fit = list(GREY_SHAPED, VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/color/blackf
name = "feminine black jumpsuit"
@@ -13,7 +13,7 @@
item_state = "bl_suit"
_color = "blackf"
flags = FPRINT
species_fit = list(GREY_SHAPED,VOX_SHAPED, INSECT_SHAPED)
species_fit = list(GREY_SHAPED, VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/color/blue
name = "blue jumpsuit"
@@ -21,7 +21,7 @@
item_state = "b_suit"
_color = "blue"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED,VOX_SHAPED, INSECT_SHAPED)
species_fit = list(GREY_SHAPED, VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/color/green
name = "green jumpsuit"
@@ -29,7 +29,7 @@
item_state = "g_suit"
_color = "green"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED,VOX_SHAPED, INSECT_SHAPED)
species_fit = list(GREY_SHAPED, VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
@@ -46,7 +46,7 @@
item_state = "o_suit"
_color = "orange"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/color/prisoner
name = "prison jumpsuit"
@@ -81,7 +81,7 @@
item_state = "w_suit"
_color = "white"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/color/yellow
name = "yellow jumpsuit"
@@ -111,7 +111,7 @@
icon_state = "aqua"
_color = "aqua"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/purple
name = "purple jumpsuit"

2
code/modules/clothing/under/jobs/civilian.dm
View File

@@ -83,7 +83,7 @@
item_state = "clown"
_color = "clown"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/rank/head_of_personnel

4
code/modules/clothing/under/jobs/security.dm
View File

@@ -145,7 +145,7 @@
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
clothing_flags = ONESIZEFITSALL
siemens_coefficient = 0.9
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(GREY_SHAPED, INSECT_SHAPED, VOX_SHAPED)
/obj/item/clothing/under/rank/collar
name = "security officer's uniform"
@@ -241,7 +241,7 @@
item_state = "jensencoat"
clothing_flags = ONESIZEFITSALL
siemens_coefficient = 0.6
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/suit/armor/hos/sundowner
name = "armoured greatcoat"

71
code/modules/clothing/under/miscellaneous.dm
View File

@@ -20,6 +20,7 @@
icon_state = "captain_fly"
item_state = "captain_fly"
_color = "captain_fly"
species_fit = list(VOX_SHAPED)
/obj/item/clothing/under/scratch
name = "white suit"
@@ -27,7 +28,7 @@
icon_state = "scratch"
item_state = "scratch"
_color = "scratch"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/sl_suit
desc = "It's a very amish looking suit."
@@ -35,7 +36,7 @@
icon_state = "detective_noir"
_color = "sl_suit"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/sl_suit/armored
desc = "It's a very amish looking suit. This one has a tag. It says \"Gorlex\" in cursive."
@@ -49,7 +50,7 @@
item_state = "waiter"
_color = "waiter"
flags = FPRINT
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/rank/mailman
name = "mailman's jumpsuit"
@@ -57,7 +58,7 @@
icon_state = "mailman"
item_state = "b_suit"
_color = "mailman"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/sexyclown
name = "sexy-clown suit"
@@ -65,7 +66,7 @@
icon_state = "sexyclown"
item_state = "sexyclown"
_color = "sexyclown"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/lola
name = "fighting clown suit"
@@ -81,7 +82,7 @@
icon_state = "vice"
item_state = "gy_suit"
_color = "vice"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/rank/centcom_officer
desc = "It's a jumpsuit worn by CentCom Officers."
@@ -131,7 +132,7 @@
icon_state = "owl"
_color = "owl"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/johnny
name = "johnny~~ jumpsuit"
@@ -146,7 +147,7 @@
icon_state = "rainbow"
item_state = "rainbow"
_color = "rainbow"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/cloud
name = "cloud"
@@ -160,6 +161,7 @@
icon_state = "psysuit"
item_state = "psysuit"
_color = "psysuit"
species_fit = list(VOX_SHAPED)
/obj/item/clothing/under/gimmick/rank/captain/suit
name = "captain's suit"
@@ -167,7 +169,7 @@
icon_state = "green_suit"
item_state = "dg_suit"
_color = "green_suit"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
name = "head of personnel's suit"
@@ -184,7 +186,7 @@
item_state = "bl_suit"
_color = "black_suit"
clothing_flags = ONESIZEFITSALL
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/suit_jacket/really_black
name = "executive suit"
@@ -192,7 +194,7 @@
icon_state = "really_black_suit"
item_state = "bl_suit"
_color = "black_suit"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/suit_jacket/female
name = "executive suit"
@@ -200,7 +202,7 @@
icon_state = "black_suit_fem"
item_state = "black_suit_fem"
_color = "black_suit_fem"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/suit_jacket/red
name = "red suit"
@@ -225,7 +227,7 @@
item_state = "schoolgirl"
_color = "schoolgirl"
body_parts_covered = FULL_TORSO|ARMS
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/overalls
name = "laborer's overalls"
@@ -234,7 +236,7 @@
item_state = "lb_suit"
_color = "overalls"
gender = PLURAL
species_fit = list(GREY_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/pirate
name = "pirate outfit"
@@ -258,6 +260,7 @@
icon_state = "redcoat"
item_state = "redcoat"
_color = "redcoat"
species_fit = list(VOX_SHAPED)
/obj/item/clothing/under/kilt
name = "kilt"
@@ -265,7 +268,7 @@
icon_state = "kilt"
item_state = "kilt"
_color = "kilt"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/sexymime
name = "sexy mime outfit"
@@ -273,7 +276,7 @@
icon_state = "sexymime"
item_state = "sexymime"
_color = "sexymime"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/gladiator
name = "gladiator uniform"
@@ -282,7 +285,7 @@
item_state = "gladiator"
_color = "gladiator"
body_parts_covered = LOWER_TORSO|ARM_LEFT|HAND_LEFT
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
//dress
@@ -294,28 +297,28 @@
desc = "A small black dress with blue flames print on it."
icon_state = "dress_fire"
_color = "dress_fire"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/dress/dress_green
name = "green dress"
desc = "A simple, tight fitting green dress."
icon_state = "dress_green"
_color = "dress_green"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/dress/dress_orange
name = "orange dress"
desc = "A fancy orange gown for those who like to show leg."
icon_state = "dress_orange"
_color = "dress_orange"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/dress/dress_pink
name = "pink dress"
desc = "A simple, tight fitting pink dress."
icon_state = "dress_pink"
_color = "dress_pink"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/dress/dress_yellow
name = "yellow dress"
@@ -329,7 +332,7 @@
desc = "A old western inspired gown for the girl who likes to drink."
icon_state = "dress_saloon"
_color = "dress_saloon"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/dress/dress_rd
name = "research director dress uniform"
@@ -364,21 +367,21 @@
desc = "A preppy blue skirt with a white blouse."
icon_state = "plaid_blue"
_color = "plaid_blue"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/dress/plaid_red
name = "red plaid skirt"
desc = "A preppy red skirt with a white blouse."
icon_state = "plaid_red"
_color = "plaid_red"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/dress/plaid_purple
name = "blue purple skirt"
desc = "A preppy purple skirt with a white blouse."
icon_state = "plaid_purple"
_color = "plaid_purple"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
//wedding stuff
@@ -390,21 +393,21 @@
desc = "A big and puffy orange dress."
icon_state = "bride_orange"
_color = "bride_orange"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/wedding/bride_purple
name = "purple wedding dress"
desc = "A big and puffy purple dress."
icon_state = "bride_purple"
_color = "bride_purple"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/wedding/bride_blue
name = "blue wedding dress"
desc = "A big and puffy blue dress."
icon_state = "bride_blue"
_color = "bride_blue"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/wedding/bride_red
name = "red wedding dress"
@@ -418,7 +421,7 @@
desc = "A white wedding gown made from the finest silk."
icon_state = "bride_white"
_color = "bride_white"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/sundress
name = "sundress"
@@ -427,7 +430,7 @@
item_state = "sundress"
_color = "sundress"
body_parts_covered = FULL_TORSO
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/roman
name = "roman armor"
@@ -436,7 +439,7 @@
_color = "roman"
item_state = "armor"
armor = list(melee = 25, bullet = 0, laser = 25, energy = 10, bomb = 10, bio = 0, rad = 0)
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/simonpants
name = "Simon's Pants"
@@ -491,7 +494,7 @@
icon_state = "jester"
item_state = "jester"
_color = "jester"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/stilsuit
name = "stillsuit"
@@ -660,7 +663,7 @@
icon_state = "cia"
item_state = "cia"
_color = "cia"
species_fit = list(INSECT_SHAPED)
species_fit = list(VOX_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/greaser
name = "Greaser Outfit"
@@ -869,7 +872,7 @@
icon_state = "tourist"
item_state = "g_suit"
_color = "tourist"
species_fit = list(GREY_SHAPED, INSECT_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED, INSECT_SHAPED)
/obj/item/clothing/under/varsity
name = "varsity jacket"

2
code/modules/trader/crates/alcatrazfour.dm
View File

@@ -263,7 +263,7 @@ var/global/list/alcatraz_stuff = list(
armor = list(melee = 10, bullet = 10, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
clothing_flags = ONESIZEFITSALL
siemens_coefficient = 0.9
species_fit = list(GREY_SHAPED) //Unlike normal skirts this is not VOX_SHAPED
species_fit = list(GREY_SHAPED, VOX_SHAPED)
body_parts_covered = FULL_TORSO|ARMS
autoignition_temperature = AUTOIGNITION_PROTECTIVE

BIN
icons/mob/hair_styles.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 164 KiB

BIN
icons/mob/species/vox/ears.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 842 B

BIN
icons/mob/species/vox/eyes.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
icons/mob/species/vox/gloves.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
icons/mob/species/vox/head.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 87 KiB

BIN
icons/mob/species/vox/masks.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
icons/mob/species/vox/shoes.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
icons/mob/species/vox/suit.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 157 KiB

After

Width:  |  Height:  |  Size: 178 KiB

BIN
icons/mob/species/vox/uniform.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 163 KiB