shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.

Browse Source
This commit is contained in:
Ghommie
2019-12-08 09:02:41 +01:00
parent 8bc5580a01
commit 8ec4bdaef5
52 changed files with 336 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/_under.dm
+1 -12
View File
@@ -11,11 +11,10 @@
var/sensor_mode = NO_SENSORS
var/can_adjust = TRUE
var/adjusted = NORMAL_STYLE
var/suit_style = NORMAL_SUIT_STYLE
var/alt_covers_chest = FALSE // for adjusted/rolled-down jumpsuits, FALSE = exposes chest and arms, TRUE = exposes arms only
var/obj/item/clothing/accessory/attached_accessory
var/mutable_appearance/accessory_overlay
mutantrace_variation = MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
mutantrace_variation = STYLE_DIGITIGRADE
/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
. = list()
@@ -49,8 +48,6 @@
if(random_sensor)
//make the sensor mode favor higher levels, except coords.
sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS)
adjusted = NORMAL_STYLE
suit_style = NORMAL_SUIT_STYLE
..()
/obj/item/clothing/under/equipped(mob/user, slot)
@@ -61,14 +58,6 @@
if(!alt_covers_chest)
body_parts_covered |= CHEST
if(mutantrace_variation && ishuman(user))
var/mob/living/carbon/human/H = user
if(DIGITIGRADE in H.dna.species.species_traits)
suit_style = DIGITIGRADE_SUIT_STYLE
else
suit_style = NORMAL_SUIT_STYLE
H.update_inv_w_uniform()
if(attached_accessory && slot != SLOT_HANDS && ishuman(user))
var/mob/living/carbon/human/H = user
attached_accessory.on_uniform_equip(src, user)
code/modules/clothing/under/jobs/civilian.dm
+6 -7
View File
@@ -69,7 +69,6 @@
item_state = "lb_suit"
item_color = "cargo"
body_parts_covered = CHEST|GROIN|ARMS
mutantrace_variation = MUTANTRACE_VARIATION
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/cargotech/skirt
@@ -132,7 +131,7 @@
item_color = "blueclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/rank/greenclown
name = "green clown suit"
@@ -142,7 +141,7 @@
item_color = "greenclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/rank/yellowclown
name = "yellow clown suit"
@@ -152,7 +151,7 @@
item_color = "yellowclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/rank/purpleclown
name = "purple clown suit"
@@ -162,7 +161,7 @@
item_color = "purpleclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/rank/orangeclown
name = "orange clown suit"
@@ -172,7 +171,7 @@
item_color = "orangeclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/rank/rainbowclown
name = "rainbow clown suit"
@@ -182,7 +181,7 @@
item_color = "rainbowclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/rank/clown/Initialize()
. = ..()
code/modules/clothing/under/miscellaneous.dm
+1 -1
View File
@@ -667,7 +667,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
slowdown = 1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
can_adjust = FALSE
strip_delay = 80
var/next_extinguish = 0
code/modules/clothing/under/shorts.dm
-1
View File
@@ -4,7 +4,6 @@
gender = PLURAL
body_parts_covered = GROIN
fitted = NO_FEMALE_UNIFORM
mutantrace_variation = MUTANTRACE_VARIATION
can_adjust = FALSE
/obj/item/clothing/under/shorts/red
code/modules/clothing/under/vg_under.dm
+34 -34
View File
@@ -9,7 +9,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/stripper_green
name = "green stripper outfit"
@@ -19,7 +19,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/wedding/bride_orange
name = "orange wedding dress"
@@ -30,7 +30,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/wedding/bride_purple
name = "purple wedding dress"
@@ -41,7 +41,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/wedding/bride_blue
name = "blue wedding dress"
@@ -52,7 +52,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/wedding/bride_red
name = "red wedding dress"
@@ -63,7 +63,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/wedding/bride_white
name = "white wedding dress"
@@ -74,7 +74,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/mankini
name = "pink mankini"
@@ -84,7 +84,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/*
/obj/item/clothing/under/psysuit
@@ -129,7 +129,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/russobluecamooutfit
name = "russian blue camo"
@@ -140,7 +140,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/stilsuit
name = "stillsuit"
@@ -151,7 +151,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/aviatoruniform
name = "aviator uniform"
@@ -162,7 +162,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/bikersuit
name = "biker's outfit"
@@ -172,7 +172,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/jacketsuit
name = "richard's outfit"
@@ -183,7 +183,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
obj/item/clothing/under/mega
name = "\improper DRN-001 suit"
@@ -194,7 +194,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/proto
name = "The Prototype Suit"
@@ -205,7 +205,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/megax
name = "\improper Maverick Hunter regalia"
@@ -216,7 +216,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/joe
name = "The Sniper Suit"
@@ -227,7 +227,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/roll
name = "\improper DRN-002 Dress"
@@ -238,7 +238,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/gokugidown
name = "turtle hermit undershirt"
@@ -249,7 +249,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/gokugi
name = "turtle hermit outfit"
@@ -260,7 +260,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/doomguy
name = "\improper Doomguy's pants"
@@ -271,7 +271,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/vault13
name = "vault 13 Jumpsuit"
@@ -282,7 +282,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/vault
name = "vault jumpsuit"
@@ -293,7 +293,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/clownpiece
name = "Clownpiece's Pierrot suit"
@@ -304,7 +304,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/cia
name = "casual IAA outfit"
@@ -315,7 +315,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/greaser
name = "greaser outfit"
@@ -325,7 +325,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/greaser/New()
var/greaser_colour = "default"
@@ -344,7 +344,7 @@ obj/item/clothing/under/mega
item_color = "greaser_[greaser_colour]"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/wintercasualwear
@@ -356,7 +356,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/casualwear
name = "spring casualwear"
@@ -367,7 +367,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/keyholesweater
name = "keyhole sweater"
@@ -378,7 +378,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/casualhoodie
name = "casual hoodie"
@@ -389,7 +389,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/casualhoodie/skirt
icon_state = "hoodieskirt"
@@ -397,7 +397,7 @@ obj/item/clothing/under/mega
item_color = "hoodieskirt"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/*
/obj/item/clothing/under/mummy_rags
@@ -432,5 +432,5 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE