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

Merge pull request #10112 from Ghommie/Ghommie-cit447

Browse Source 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
This commit is contained in:
Lin
2020-01-10 01:31:20 +00:00
committed by GitHub
parent ee5d6a3d4a 37ce6e9336
commit c4cb06f8f0
70 changed files with 366 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm
+1 -1
View File
@@ -13,7 +13,7 @@
secondary_color = "#FFFFFF"
tertiary_color = "#808080"
/obj/item/clothing/neck/cloak/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
/obj/item/clothing/neck/cloak/polychromic/worn_overlays(isinhands, icon_file, style_flags = NONE) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
. = ..()
if(hasprimary | hassecondary | hastertiary)
if(!isinhands) //prevents the worn sprites from showing up if you're just holding them
modular_citadel/code/modules/clothing/suits/suits.dm
+3 -3
View File
@@ -11,7 +11,7 @@
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
icon_state = "hostrench"
item_state = "hostrench"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
body_parts_covered = CHEST|ARMS|LEGS
/obj/item/clothing/suit/hooded/cloak/david
@@ -20,11 +20,11 @@
desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids"
hoodtype = /obj/item/clothing/head/hooded/cloakhood/david
body_parts_covered = CHEST|GROIN|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/head/hooded/cloakhood/david
name = "red cloak hood"
icon_state = "golhood"
desc = "conceal your face in shame with this nanotrasen brand hood"
flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
modular_citadel/code/modules/clothing/under/trek_under.dm
+3 -8
View File
@@ -14,7 +14,7 @@
desc = "Oooh... right."
icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
force_alternate_icon = TRUE
mutantrace_variation = NONE
item_state = ""
can_adjust = FALSE //to prevent you from "wearing it casually"
@@ -95,10 +95,9 @@
icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
icon_state = "trek_ds9_coat"
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
force_alternate_icon = TRUE
item_state = "trek_ds9_coat"
body_parts_covered = CHEST|GROIN|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
permeability_coefficient = 0.50
allowed = list(
/obj/item/flashlight, /obj/item/analyzer,
@@ -140,11 +139,9 @@
desc = "A uniform jacket from the United Federation. Set phasers to awesome."
icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
force_alternate_icon = TRUE
icon_state = "fedcoat"
item_state = "fedcoat"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
blood_overlay_type = "coat"
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
@@ -207,7 +204,6 @@
desc = "A modern uniform jacket from the United Federation."
icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
force_alternate_icon = TRUE
icon_state = "fedmodern"
item_state = "fedmodern"
body_parts_covered = CHEST|GROIN|ARMS
@@ -240,7 +236,6 @@
icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
icon_state = "fedcapofficer"
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
force_alternate_icon = TRUE
item_state = "fedcapofficer"
//Variants
modular_citadel/code/modules/clothing/under/turtlenecks.dm
+3 -3
View File
@@ -16,7 +16,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
can_adjust = TRUE
alt_covers_chest = TRUE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/structure/closet/secure_closet/CMO/PopulateContents() //This is placed here because it's a very specific addition for a very specific niche
..()
@@ -29,7 +29,7 @@
item_state = "bl_suit"
item_color = "tactifool"
has_sensor = TRUE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
/obj/item/clothing/under/syndicate/tacticool
@@ -47,7 +47,7 @@
can_adjust = TRUE
icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/bb_sweater/black
name = "black sweater"
modular_citadel/code/modules/clothing/under/under.dm
+2 -2
View File
@@ -13,7 +13,7 @@
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "r_suit"
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/rank/captain/femformal
name ="captain's female formal outfit"
@@ -26,4 +26,4 @@
can_adjust = FALSE
sensor_mode = SENSOR_COORDS //it's still a captain's suit nerd
random_sensor = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
modular_citadel/code/modules/custom_loadout/custom_items.dm
+27 -27
View File
@@ -1,7 +1,7 @@
//For custom items.
// Unless there's a digitigrade version make sure you add mutantrace_variation = NO_MUTANTRACE_VARIATION to all clothing/under and shoes - Pooj
// Unless there's a digitigrade version make sure you add mutantrace_variation = NONE to all clothing/under and shoes - Pooj
// Digitigrade stuff is uniform_digi.dmi and digishoes.dmi in icons/mob
/obj/item/custom/ceb_soap
@@ -85,7 +85,7 @@
item_state = "darkcarapace"
blood_overlay_type = "armor"
dog_fashion = /datum/dog_fashion/back
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
@@ -118,7 +118,7 @@
icon_state = "labred"
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "labred"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/suit/toggle/labcoat/labredblack
name = "Black and Red Coat"
@@ -127,7 +127,7 @@
icon_state = "labredblack"
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "labredblack"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/toy/plush/carrot
name = "carrot plushie"
@@ -233,7 +233,7 @@
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "hos-g"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/reagent_containers/food/drinks/flask/russian
name = "russian flask"
@@ -277,14 +277,14 @@
fitted = NO_FEMALE_UNIFORM
alternate_worn_layer = ABOVE_SHOES_LAYER
can_adjust = 0
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/shoes/sneakers/pink
icon = 'icons/obj/custom.dmi'
icon_state = "pink"
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "pink"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/neck/tie/bloodred
name = "Blood Red Tie"
@@ -301,7 +301,7 @@
icon_state = "puffydress"
item_state = "puffydress"
body_parts_covered = CHEST|GROIN|LEGS
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/suit/vermillion
name = "vermillion clothing"
@@ -311,11 +311,11 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/bb_sweater/black/naomi
name = "worn black sweater"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
desc = "A well-loved sweater, showing signs of several cleanings and re-stitchings. And a few stains. Is that cat fur?"
/obj/item/clothing/neck/petcollar/naomi
@@ -345,7 +345,7 @@
icon_state = "rdcoat"
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "rdcoat"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/custom/leechjar
name = "Jar of Leeches"
@@ -379,7 +379,7 @@
desc = "Comfy Lucky Jackboots with the word Luck on them."
item_state = "luckyjack"
icon_state = "luckyjack"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/lunasune
name = "Divine Robes"
@@ -388,7 +388,7 @@
desc = "Heavenly robes of the kitsune Luna Pumpkin,you can feel radiance coming from them."
item_state = "Divine_robes"
icon_state = "Divine_robes"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/leoskimpy
name = "Leon's Skimpy Outfit"
@@ -397,7 +397,7 @@
desc = "A rather skimpy outfit."
item_state = "shark_cloth"
icon_state = "shark_cloth"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/mimeoveralls
name = "Mime's Overalls"
@@ -406,7 +406,7 @@
desc = "A less-than-traditional mime's attire, completed by a set of dorky-looking overalls."
item_state = "moveralls"
icon_state = "moveralls"
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/suit/hooded/cloak/zuliecloak
name = "Project: Zul-E"
@@ -418,7 +418,7 @@
hoodtype = /obj/item/clothing/head/hooded/cloakhood/zuliecloak
body_parts_covered = CHEST|GROIN|ARMS
slot_flags = SLOT_WEAR_SUIT | ITEM_SLOT_NECK //it's a cloak. it's cosmetic. so why the hell not? what could possibly go wrong?
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/head/hooded/cloakhood/zuliecloak
name = "NT Special Issue"
@@ -428,7 +428,7 @@
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
flags_inv = HIDEEARS|HIDEHAIR
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/suit/blackredgold
name = "Multicolor Coat"
@@ -438,7 +438,7 @@
icon_state = "redgoldjacket"
item_state = "redgoldjacket"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/suit/kimono
name = "Blue Kimono"
@@ -448,7 +448,7 @@
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
body_parts_covered = CHEST|GROIN|LEGS|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/suit/commjacket
name = "Dusty Commisar's Cloak"
@@ -458,7 +458,7 @@
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
body_parts_covered = CHEST|GROIN|LEGS|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/under/mw2_russian_para
name = "Russian Paratrooper Jumper"
@@ -467,7 +467,7 @@
item_state = "mw2_russian_para"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/gloves/longblackgloves
name = "Luna's Gauntlets"
@@ -484,7 +484,7 @@
item_state = "trendy_fit"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/head/blueberet
name = "Atmos Beret"
@@ -518,7 +518,7 @@
item_state = "mikubikini"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/suit/mikujacket
name = "starlight singer jacket"
@@ -527,7 +527,7 @@
item_state = "mikujacket"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/head/mikuhair
name = "starlight singer hair"
@@ -536,7 +536,7 @@
item_state = "mikuhair"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
flags_inv = HIDEHAIR
/obj/item/clothing/gloves/mikugloves
@@ -546,7 +546,7 @@
item_state = "mikugloves"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/shoes/sneakers/mikuleggings
name = "starlight singer leggings"
@@ -555,4 +555,4 @@
item_state = "mikuleggings"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
+1 -1
View File
@@ -43,7 +43,7 @@ obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
update_icon()
obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file)
obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file, style_flags = NONE)
. = ..()
if(isinhands)
var/mutable_appearance/body_inhand = mutable_appearance(icon_file, "cxe_body")
modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+1 -1
View File
@@ -99,7 +99,7 @@
. = ..()
. += "<span class='notice'>Alt-click to change firing modes.</span>"
/obj/item/gun/energy/pumpaction/worn_overlays(isinhands, icon_file) //ammo counter for inhands
/obj/item/gun/energy/pumpaction/worn_overlays(isinhands, icon_file, style_flags = NONE) //ammo counter for inhands
. = ..()
var/ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
var/obj/item/ammo_casing/energy/shot = ammo_type[select]