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

Merge pull request #7599 from Poojawa/override-override

Browse Source 
Digitigrade Uniforms from Oracle
This commit is contained in:
deathride58
2018-09-29 21:30:12 -04:00
committed by GitHub
parent cbbbc616e5 729790f9d3
commit 212187620b
26 changed files with 907 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/inventory.dm
+3 -1
View File
@@ -126,7 +126,9 @@
//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
#define NORMAL_STYLE 0
#define ALT_STYLE 1
#define DIGITIGRADE_STYLE 2
#define NORMAL_SUIT_STYLE 0
#define DIGITIGRADE_SUIT_STYLE 1
//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
#define NO_MUTANTRACE_VARIATION 0
code/game/objects/items.dm
+2 -2
View File
@@ -50,6 +50,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
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/interaction_flags_item = INTERACT_ITEM_ATTACK_HAND_PICKUP
//Citadel Edit for digitigrade stuff
var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
var/item_color = null //this needs deprecating, soonish
@@ -101,8 +103,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/last_force_string_check = 0
var/tip_timer
var/icon_override //CIT CHANGE - adds icon_override var. Will be removed with #4322
var/trigger_guard = TRIGGER_GUARD_NONE
//Grinder vars
code/modules/clothing/clothing.dm
+2 -2
View File
@@ -248,9 +248,8 @@ BLIND // can't see anything
H.update_body()
/obj/item/clothing/under/proc/toggle_jumpsuit_adjust()
if(adjusted == DIGITIGRADE_STYLE)
return
adjusted = !adjusted
if(adjusted)
if(fitted != FEMALE_UNIFORM_TOP)
fitted = NO_FEMALE_UNIFORM
@@ -260,6 +259,7 @@ BLIND // can't see anything
fitted = initial(fitted)
if(!alt_covers_chest)
body_parts_covered |= CHEST
return adjusted
/obj/item/clothing/proc/weldingvisortoggle(mob/user) //proc to toggle welding visors on helmets, masks, goggles, etc.
code/modules/clothing/glasses/vg_glasses.dm
+5 -5
View File
@@ -6,21 +6,21 @@
name = "purple sunglasses"
icon_state = "sun_purple"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi'
/obj/item/clothing/glasses/sunglasses/star
name = "star-shaped sunglasses"
desc = "Novelty sunglasses, both lenses are in the shape of a star."
icon_state = "sun_star"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi'
/obj/item/clothing/glasses/sunglasses/rockstar
name = "red star-shaped sunglasses"
desc = "Novelty sunglasses with a fancy silver frame and two red-tinted star-shaped lenses. You should probably stomp on them and get a pair of normal ones."
icon_state = "sun_star_silver"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi'
/obj/item/clothing/glasses/gglasses
name = "Green Glasses"
@@ -28,7 +28,7 @@
icon_state = "gglasses"
item_state = "gglasses"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi'
/obj/item/clothing/glasses/welding/superior
name = "superior welding goggles"
@@ -36,7 +36,7 @@
icon_state = "rwelding-g"
item_state = "rwelding-g"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi'
actions_types = list(/datum/action/item_action/toggle)
flash_protect = 2
tint = 1
code/modules/clothing/head/cit_hats.dm
+1 -1
View File
@@ -4,4 +4,4 @@
icon = 'modular_citadel/icons/obj/clothing/cit_hats.dmi'
icon_state = "hunter"
item_state = "hunter_worn"
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
code/modules/clothing/head/vg_hats.dm
+21 -21
View File
@@ -12,7 +12,7 @@
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
strip_delay = 80
dog_fashion = null
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/aviatorhelmet
name = "Aviator Helmet"
@@ -21,7 +21,7 @@
item_state = "aviator_helmet"
icon_state = "aviator_helmet"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/biker
name = "Biker's Helmet"
@@ -29,7 +29,7 @@
armor = list(melee = 25, bullet = 15, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0)
icon_state = "biker_helmet"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
/obj/item/clothing/head/helmet/richard
@@ -38,7 +38,7 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
icon_state = "richard"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
/obj/item/clothing/head/helmet/megahelmet
@@ -47,7 +47,7 @@
icon_state = "megahelmet"
item_state = "megahelmet"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
siemens_coefficient = 1
/obj/item/clothing/head/helmet/protohelmet
@@ -56,7 +56,7 @@
icon_state = "protohelmet"
item_state = "protohelmet"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
siemens_coefficient = 1
/obj/item/clothing/head/helmet/megaxhelmet
@@ -65,7 +65,7 @@
icon_state = "megaxhelmet"
item_state = "megaxhelmet"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/joehelmet
name = "Sniper Helmet"
@@ -74,7 +74,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
item_state = "joehelmet"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/doomguy
name = "Doomguy's helmet"
@@ -83,7 +83,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
item_state = "doom"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
armor = list(melee = 50, bullet = 40, laser = 40,energy = 40, bomb = 5, bio = 0, rad = 0)
/obj/item/clothing/head/helmet/neorussian
@@ -92,7 +92,7 @@
icon_state = "nr_helmet"
item_state = "nr_helmet"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/stalhelm
@@ -101,7 +101,7 @@
icon_state = "stalhelm"
item_state = "stalhelm"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/panzer
name = "Panzer Cap"
@@ -109,7 +109,7 @@
icon_state = "panzercap"
item_state = "panzercap"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/naziofficer
name = "Officer Cap"
@@ -117,7 +117,7 @@
icon_state = "officercap"
item_state = "officercap"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/russobluecamohat
@@ -133,7 +133,7 @@
icon_state = "russofurhat"
item_state = "russofurhat"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/squatter_hat
name = "slav squatter hat"
@@ -141,7 +141,7 @@
item_state = "squatter_hat"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
desc = "Cyka blyat."
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/snake
name = "snake head"
@@ -149,7 +149,7 @@
icon_state = "snakehead"
item_state = "snakehead"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/mummy_rags
name = "mummy rags"
@@ -158,7 +158,7 @@
item_state = "mummy"
item_color = "mummy"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
/obj/item/clothing/head/clownpiece
@@ -167,7 +167,7 @@
icon_state = "clownpiece"
item_state = "clownpiece"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/mitre
name = "mitre"
@@ -175,7 +175,7 @@
icon_state = "mitre"
item_state = "mitre"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/tinfoil
name = "tinfoil hat"
@@ -183,7 +183,7 @@
icon_state = "foilhat"
item_state = "paper"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
siemens_coefficient = 2
/obj/item/clothing/head/celtic
@@ -192,4 +192,4 @@
icon_state = "celtic_crown"
item_state = "celtic_crown"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
code/modules/clothing/masks/vg_masks.dm
+3 -3
View File
@@ -3,18 +3,18 @@
desc = "Some pranksters are truly magical."
icon_state = "wizzclown"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/masks.dmi'
/obj/item/clothing/mask/chapmask
name = "venetian mask"
desc = "A plain porcelain mask that covers the entire face. Standard attire for particularly unspeakable religions. The eyes are wide shut."
icon_state = "chapmask"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/masks.dmi'
/obj/item/clothing/mask/neorussian
name = "neo-Russian mask"
desc = "Somehow, it makes you act and look way more polite than usual."
icon_state = "nr_mask"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/masks.dmi'
code/modules/clothing/shoes/_shoes.dm
+3 -3
View File
@@ -17,7 +17,7 @@
//CITADEL EDIT Enables digitigrade shoe styles
var/adjusted = NORMAL_STYLE
var/mutantrace_variation = MUTANTRACE_VARIATION
mutantrace_variation = MUTANTRACE_VARIATION
/obj/item/clothing/shoes/ComponentInitialize()
. = ..()
@@ -62,9 +62,9 @@
if(mutantrace_variation && ishuman(user))
var/mob/living/carbon/human/H = user
if(DIGITIGRADE in H.dna.species.species_traits)
adjusted = DIGITIGRADE_STYLE
adjusted = ALT_STYLE
H.update_inv_shoes()
else if(adjusted == DIGITIGRADE_STYLE)
else if(adjusted == ALT_STYLE)
adjusted = NORMAL_STYLE
H.update_inv_shoes()
code/modules/clothing/shoes/vg_shoes.dm
+34 -17
View File
@@ -5,7 +5,8 @@
icon_state = "leather"
item_color = "leather"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/magboots/deathsquad
desc = "Very expensive and advanced magnetic boots, used only by the elite during extravehicular activity to ensure the user remains safely attached to the vehicle."
@@ -13,112 +14,128 @@
icon_state = "DS-magboots0"
magboot_state = "DS-magboots"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/magboots/atmos
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. These are painted in the colors of an atmospheric technician."
name = "atmospherics magboots"
icon_state = "atmosmagboots0"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
magboot_state = "atmosmagboots"
resistance_flags = FIRE_PROOF
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/simonshoes
name = "Simon's Shoes"
desc = "Simon's Shoes."
icon_state = "simonshoes"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/kneesocks
name = "kneesocks"
desc = "A pair of girly knee-high socks."
icon_state = "kneesock"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/jestershoes
name = "Jester Shoes"
desc = "As worn by the clowns of old."
icon_state = "jestershoes"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/aviatorboots
name = "Aviator Boots"
desc = "Boots suitable for just about any occasion."
icon_state = "aviator_boots"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/libertyshoes
name = "Liberty Shoes"
desc = "Freedom isn't free, neither were these shoes."
icon_state = "libertyshoes"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/megaboots
name = "DRN-001 Boots"
desc = "Large armored boots, very weak to large spikes."
icon_state = "megaboots"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/protoboots
name = "Prototype Boots"
desc = "Functionally identical to the DRN-001 model's boots, but in red."
icon_state = "protoboots"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/megaxboots
name = "Maverick Hunter boots"
desc = "Regardless of how much stronger these boots are than the DRN-001 model's, they're still extremely easy to pierce with a large spike."
icon_state = "megaxboots"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/joeboots
name = "Sniper Boots"
desc = "Nearly identical to the Prototype's boots, except in black."
icon_state = "joeboots"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/doomguy
name = "Doomguy's boots"
desc = "If you look closely, you might see skull fragments still buried in these boots."
icon_state = "doom"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/rottenshoes
name = "rotten shoes"
desc = "These shoes seem perfect for sneaking around."
icon_state = "rottenshoes"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/sandal/slippers
name = "magic slippers"
icon_state = "slippers"
desc = "For the wizard that puts comfort first. Who's going to laugh?"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/slippers_worn
name = "worn bunny slippers"
desc = "Fluffy..."
icon_state = "slippers_worn"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/jackboots/neorussian
name = "neo-Russian boots"
desc = "Tovarish, no one will realize you stepped on a pile of shit if your pair already looks like shit."
icon_state = "nr_boots"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
code/modules/clothing/suits/vg_suits.dm
+12 -12
View File
@@ -8,7 +8,7 @@
armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 60, bio = 30, rad = 20)
siemens_coefficient = 0.5
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/armor/xcomsquaddie/dredd
name = "Judge Armor"
@@ -16,7 +16,7 @@
icon_state = "dredd-suit"
item_state = "dredd-suit"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/armor/xcomarmor
@@ -29,7 +29,7 @@
slowdown = 1
siemens_coefficient = 0.5
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/armor/vest/neorussian
name = "neo-Russian vest"
@@ -37,7 +37,7 @@
icon_state = "nr_vest"
item_state = "nr_vest"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/armor/doomguy
name = "Doomguy's armor"
@@ -48,7 +48,7 @@
slowdown = 0
armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0)
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/kaminacape
@@ -57,7 +57,7 @@
icon_state = "kaminacape"
body_parts_covered = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/officercoat
name = "Officer's Coat"
@@ -80,7 +80,7 @@
allowed = list(/obj/item/gun)
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/doshjacket
name = "Plasterer's Jacket"
@@ -88,7 +88,7 @@
icon_state = "doshjacket"
body_parts_covered = CHEST|GROIN|ARMS
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/maidapron
name = "Apron"
@@ -96,7 +96,7 @@
icon_state = "maidapron"
body_parts_covered = CHEST|GROIN
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/clownpiece
name = "small fairy wings"
@@ -104,14 +104,14 @@
icon_state = "clownpiece"
body_parts_covered = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/clownpiece/flying
name = "small fairy wings"
desc = "Some small and translucid insect-like wings. Looks like these are the real deal!"
icon_state = "clownpiece-fly"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/raincoat
name = "Raincoat"
@@ -119,6 +119,6 @@
icon_state = "raincoat"
body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
code/modules/clothing/under/_under.dm
+4 -2
View File
@@ -11,10 +11,11 @@
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
var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
mutantrace_variation = MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
. = list()
@@ -49,6 +50,7 @@
//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)
@@ -62,7 +64,7 @@
if(mutantrace_variation && ishuman(user))
var/mob/living/carbon/human/H = user
if(DIGITIGRADE in H.dna.species.species_traits)
adjusted = DIGITIGRADE_STYLE
suit_style = DIGITIGRADE_SUIT_STYLE
H.update_inv_w_uniform()
if(attached_accessory && slot != SLOT_HANDS && ishuman(user))
code/modules/clothing/under/jobs/civilian.dm
+8 -2
View File
@@ -75,6 +75,7 @@
item_color = "blueclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/rank/greenclown
name = "green clown suit"
@@ -84,6 +85,7 @@
item_color = "greenclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/rank/yellowclown
name = "yellow clown suit"
@@ -93,6 +95,7 @@
item_color = "yellowclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/rank/purpleclown
name = "purple clown suit"
@@ -102,7 +105,8 @@
item_color = "purpleclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/rank/orangeclown
name = "orange clown suit"
desc = "<i>'ORANGE HONK!'</i>"
@@ -111,7 +115,8 @@
item_color = "orangeclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/rank/rainbowclown
name = "rainbow clown suit"
desc = "<i>'R A I N B O W HONK!'</i>"
@@ -120,6 +125,7 @@
item_color = "rainbowclown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/rank/clown/Initialize()
. = ..()
code/modules/clothing/under/miscellaneous.dm
+3
View File
@@ -709,6 +709,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/drfreeze
name = "doctor freeze's jumpsuit"
@@ -717,6 +718,7 @@
item_state = "drfreeze"
item_color = "drfreeze"
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/lobster
name = "foam lobster suit"
@@ -726,6 +728,7 @@
item_color = "lobster"
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/gondola
name = "gondola hide suit"
code/modules/clothing/under/vg_under.dm
+37 -37
View File
@@ -5,7 +5,7 @@
item_color = "stripper_p"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/stripper_green
@@ -15,7 +15,7 @@
item_color = "stripper_g"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
@@ -27,7 +27,7 @@
item_color = "bride_orange"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/wedding/bride_purple
@@ -38,7 +38,7 @@
item_color = "bride_purple"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/wedding/bride_blue
@@ -49,7 +49,7 @@
item_color = "bride_blue"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/wedding/bride_red
@@ -60,7 +60,7 @@
item_color = "bride_red"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/wedding/bride_white
@@ -71,7 +71,7 @@
item_color = "bride_white"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/mankini
@@ -81,7 +81,7 @@
item_color = "mankini"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/*
/obj/item/clothing/under/psysuit
@@ -92,7 +92,7 @@
item_color = "psysuit"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/officeruniform
@@ -103,7 +103,7 @@
item_color = "officeruniform"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/soldieruniform
@@ -114,7 +114,7 @@
item_color = "soldieruniform"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
*/
/obj/item/clothing/under/squatter_outfit
@@ -125,7 +125,7 @@
item_color = "squatteroutfit"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/russobluecamooutfit
@@ -136,7 +136,7 @@
item_color = "russobluecamo"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/stilsuit
@@ -147,7 +147,7 @@
item_color = "stilsuit"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/aviatoruniform
@@ -158,7 +158,7 @@
item_color = "aviator_uniform"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/bikersuit
@@ -168,7 +168,7 @@
item_color = "biker"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/jacketsuit
@@ -179,7 +179,7 @@
item_color = "jacket"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
obj/item/clothing/under/mega
@@ -190,7 +190,7 @@ obj/item/clothing/under/mega
item_color = "mega"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/proto
@@ -201,7 +201,7 @@ obj/item/clothing/under/mega
item_color = "proto"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/megax
@@ -212,7 +212,7 @@ obj/item/clothing/under/mega
item_color = "megax"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/joe
@@ -223,7 +223,7 @@ obj/item/clothing/under/mega
item_color = "joe"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/roll
@@ -234,7 +234,7 @@ obj/item/clothing/under/mega
item_color = "roll"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/gokugidown
@@ -245,7 +245,7 @@ obj/item/clothing/under/mega
item_color = "gokugidown"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/gokugi
@@ -256,7 +256,7 @@ obj/item/clothing/under/mega
item_color = "gokugi"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/doomguy
@@ -267,7 +267,7 @@ obj/item/clothing/under/mega
item_color = "doom"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/vault13
@@ -278,7 +278,7 @@ obj/item/clothing/under/mega
item_color = "v13-jumpsuit"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/vault
@@ -289,7 +289,7 @@ obj/item/clothing/under/mega
item_color = "v-jumpsuit"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/clownpiece
@@ -300,7 +300,7 @@ obj/item/clothing/under/mega
item_color = "clownpiece"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/cia
@@ -311,7 +311,7 @@ obj/item/clothing/under/mega
item_color = "cia"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/greaser
@@ -321,7 +321,7 @@ obj/item/clothing/under/mega
item_state = "greaser_default"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/greaser/New()
@@ -350,7 +350,7 @@ obj/item/clothing/under/mega
item_color = "shizunewinter"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
@@ -362,7 +362,7 @@ obj/item/clothing/under/mega
item_color = "shizunenormal"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/keyholesweater
@@ -373,7 +373,7 @@ obj/item/clothing/under/mega
item_color = "keyholesweater"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/casualhoodie
@@ -384,7 +384,7 @@ obj/item/clothing/under/mega
item_color = "hoodiejeans"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
@@ -404,7 +404,7 @@ obj/item/clothing/under/mega
can_adjust = 0
has_sensor = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/neorussian
@@ -415,7 +415,7 @@ obj/item/clothing/under/mega
item_color = "nr_uniform"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
*/
/obj/item/clothing/under/rottensuit
@@ -426,4 +426,4 @@ obj/item/clothing/under/mega
item_color = "rottensuit"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
code/modules/mob/living/carbon/human/species.dm
+6 -2
View File
@@ -628,8 +628,12 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(!(DIGITIGRADE in species_traits)) //Someone cut off a digitigrade leg and tacked it on
species_traits += DIGITIGRADE
var/should_be_squished = FALSE
if(H.wear_suit && ((H.wear_suit.flags_inv & HIDEJUMPSUIT) || (H.wear_suit.body_parts_covered & LEGS)) || (H.w_uniform && (H.w_uniform.body_parts_covered & LEGS)))
should_be_squished = TRUE
if(H.wear_suit)
if((H.wear_suit.flags_inv & HIDEJUMPSUIT) || ((H.wear_suit.body_parts_covered & LEGS) && (H.wear_suit.body_parts_covered & FEET)))
should_be_squished = TRUE
if(H.w_uniform && !H.wear_suit)
if(H.w_uniform.mutantrace_variation == NO_MUTANTRACE_VARIATION)
should_be_squished = TRUE
if(O.use_digitigrade == FULL_DIGITIGRADE && should_be_squished)
O.use_digitigrade = SQUISHED_DIGITIGRADE
update_needed = TRUE
code/modules/mob/living/carbon/human/update_icons.dm
+693 -687
View File
File diff suppressed because it is too large Load Diff
code/modules/surgery/bodyparts/helpers.dm
+3 -3
View File
@@ -294,14 +294,14 @@
var/obj/item/clothing/under/U = H.w_uniform
if(U.mutantrace_variation)
if(swap_back)
U.adjusted = NORMAL_STYLE
U.suit_style = NORMAL_SUIT_STYLE
else
U.adjusted = DIGITIGRADE_STYLE
U.suit_style = DIGITIGRADE_SUIT_STYLE
H.update_inv_w_uniform()
if(H.shoes)
var/obj/item/clothing/shoes/S = H.shoes
if(swap_back)
S.adjusted = NORMAL_STYLE
else
S.adjusted = DIGITIGRADE_STYLE
S.adjusted = ALT_STYLE
H.update_inv_shoes()
modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "shock collar"
desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.."
icon = 'modular_citadel/icons/obj/clothing/cit_neck.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/neck.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/neck.dmi'
icon_state = "shockcollar"
item_state = "shockcollar"
body_parts_covered = NECK
modular_citadel/code/modules/clothing/under/polychromic_clothes.dm
+12 -3
View File
@@ -27,6 +27,8 @@
secondary_color = "#FFFFFF"
tertiary_color = "#808080"
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION // because I'm too lazy to port these to digi-compatible and to prove a point from /tg/ whining - Pooj
suit_style = NORMAL_SUIT_STYLE
/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
. = ..()
@@ -63,7 +65,8 @@
item_state = "kilt"
primary_color = "#FFFFFF" //RGB in hexcode
secondary_color = "#F08080"
tertiary_color = "#808080"
hastertiary = FALSE // so it doesn't futz with digilegs
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/polychromic/skirt
name = "polychromic skirt"
@@ -74,6 +77,7 @@
primary_color = "#FFFFFF" //RGB in hexcode
secondary_color = "#F08080"
tertiary_color = "#808080"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/polychromic/shorts
name = "polychromic shorts"
@@ -84,6 +88,7 @@
primary_color = "#353535" //RGB in hexcode
secondary_color = "#808080"
tertiary_color = "#808080"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/polychromic/jumpsuit
name = "polychromic tri-tone jumpsuit"
@@ -116,6 +121,7 @@
primary_color = "#8CC6FF" //RGB in hexcode
secondary_color = "#808080"
tertiary_color = "#FF3535"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/polychromic/femtank
name = "polychromic feminine tank top"
@@ -126,6 +132,7 @@
hastertiary = FALSE
primary_color = "#808080" //RGB in hexcode
secondary_color = "#FF3535"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/polychromic/shortpants/pantsu
name = "polychromic panties"
@@ -136,6 +143,7 @@
hastertiary = FALSE
primary_color = "#FFFFFF" //RGB in hexcode
secondary_color = "#8CC6FF"
body_parts_covered = GROIN
/obj/item/clothing/under/polychromic/bottomless
name = "polychromic bottomless shirt"
@@ -146,7 +154,7 @@
hastertiary = FALSE
primary_color = "#808080" //RGB in hexcode
secondary_color = "#FF3535"
body_parts_covered = CHEST //Because there's no bottom included
body_parts_covered = CHEST|ARMS //Because there's no bottom included
/obj/item/clothing/under/polychromic/shimatank
name = "polychromic tank top"
@@ -156,4 +164,5 @@
item_state = "rainbow"
primary_color = "#808080" //RGB in hexcode
secondary_color = "#FFFFFF"
tertiary_color = "#8CC6FF"
tertiary_color = "#8CC6FF"
body_parts_covered = CHEST|GROIN
modular_citadel/code/modules/clothing/under/trek_under.dm
+6 -5
View File
@@ -12,9 +12,10 @@
name = "Section 31 Uniform"
desc = "Oooh... right."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
item_state = ""
can_adjust = FALSE //to prevent you from "wearing it casually"
mutantrace_variation = NO_MUTANTRACE_VARIATION
//TOS
/obj/item/clothing/under/rank/trek/command
@@ -92,7 +93,7 @@
desc = "The overcoat worn by all officers of the 2380s."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
icon_state = "trek_ds9_coat"
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
item_state = "trek_ds9_coat"
body_parts_covered = CHEST|GROIN|ARMS
permeability_coefficient = 0.50
@@ -136,7 +137,7 @@
desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. Set phasers to awesome."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_state = "fedcoat"
item_state = "fedcoat"
@@ -204,7 +205,7 @@
name = "Modern Federation Uniform Jacket"
desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. Wearing this makes you feel like a competant commander."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_state = "fedmodern"
item_state = "fedmodern"
body_parts_covered = CHEST|GROIN|ARMS
@@ -238,7 +239,7 @@
desc = "An officer's cap that demands discipline from the one who wears it."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
icon_state = "fedcapofficer"
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
item_state = "fedcapofficer_mob"
//Variants
modular_citadel/code/modules/clothing/under/turtlenecks.dm
+7 -4
View File
@@ -16,11 +16,12 @@
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
/obj/structure/closet/secure_closet/CMO/PopulateContents() //This is placed here because it's a very specific addition for a very specific niche
..()
new /obj/item/clothing/under/rank/chief_medical_officer/turtleneck(src)
/obj/item/clothing/under/syndicate/cosmetic
name = "tactitool turtleneck"
desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
@@ -28,11 +29,12 @@
item_state = "bl_suit"
item_color = "tactifool"
has_sensor = TRUE
mutantrace_variation = NO_MUTANTRACE_VARIATION
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
has_sensor = TRUE
// Sweaters are good enough for this category too.
/obj/item/clothing/under/bb_sweater
@@ -44,7 +46,8 @@
body_parts_covered = CHEST|ARMS
can_adjust = 1
icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/bb_sweater/black
name = "black sweater"
modular_citadel/code/modules/clothing/under/under.dm
+8 -4
View File
@@ -10,18 +10,20 @@
desc = "A tactical security skirt for officers complete with Nanotrasen belt buckle."
icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
icon_state = "secskirt"
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "r_suit"
item_color = "secskirt"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/rank/head_of_security/skirt
name = "head of security's skirt"
desc = "A security skirt decorated for those few with the dedication to achieve the position of Head of Security."
icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
icon_state = "hosskirt"
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "gy_suit"
item_color = "hosskirt"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/corporateuniform
name = "corporate uniform"
@@ -31,15 +33,17 @@
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "r_suit"
can_adjust = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/rank/captain/femformal
name ="captain's female formal outfit"
desc = ""
icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
icon_state = "lewdcap"
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "lewdcap"
item_color = "lewdcap"
can_adjust = FALSE
sensor_mode = SENSOR_COORDS //it's still a captain's suit nerd
random_sensor = FALSE
mutantrace_variation = NO_MUTANTRACE_VARIATION
modular_citadel/code/modules/custom_loadout/custom_items.dm
+33 -24
View File
@@ -1,6 +1,9 @@
//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
// Digitigrade stuff is uniform_digi.dmi and digishoes.dmi in modular_citadel/icons/mob
/obj/item/custom/ceb_soap
name = "Cebutris' Soap"
desc = "A generic bar of soap that doesn't really seem to work right."
@@ -23,7 +26,7 @@
desc = "The design on this seems a little too familiar."
icon = 'icons/obj/custom.dmi'
icon_state = "infcloak"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "infcloak"
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN|LEGS|ARMS
@@ -33,7 +36,7 @@
desc = "A soft black collar that seems to stretch to fit whoever wears it."
icon = 'icons/obj/custom.dmi'
icon_state = "infcollar"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "infcollar"
item_color = null
tagname = null
@@ -64,7 +67,7 @@
icon = 'icons/obj/custom.dmi'
icon_state = "zombscarf"
desc = "A fashionable collar"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_color = "zombscarf"
dog_fashion = /datum/dog_fashion/head
@@ -73,7 +76,7 @@
desc = "An oddly special looking coat."
icon = 'icons/obj/custom.dmi'
icon_state = "labred"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "labred"
/obj/item/clothing/suit/toggle/labcoat/labredblack
@@ -81,7 +84,7 @@
desc = "An oddly special looking coat."
icon = 'icons/obj/custom.dmi'
icon_state = "labredblack"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "labredblack"
/obj/item/toy/plush/carrot
@@ -99,7 +102,7 @@
name = "carrot cloak"
desc = "A cloak in the shape and color of a carrot!"
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
icon_state = "carrotcloak"
item_state = "carrotcloak"
w_class = WEIGHT_CLASS_SMALL
@@ -111,7 +114,7 @@
icon = 'icons/obj/custom.dmi'
icon_state = "satchel_carrot"
item_state = "satchel_carrot"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
/obj/item/storage/backpack/satchel/carrot/Initialize()
. = ..()
@@ -134,7 +137,7 @@
icon = 'icons/obj/custom.dmi'
icon_state = "festive"
item_state = "festive"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN|LEGS|ARMS
@@ -142,7 +145,7 @@
name = "Alboroto Rosa mask"
icon = 'icons/obj/custom.dmi'
icon_state = "lucharzigfie"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "lucharzigfie"
/obj/item/clothing/head/hardhat/reindeer/fluff
@@ -185,7 +188,7 @@
desc = "You would swear this was in your nightmares after eating too many veggies."
icon = 'icons/obj/custom.dmi'
icon_state = "hos-g"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "hos-g"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
@@ -201,7 +204,7 @@
desc = "Smells like reactor four."
icon = 'icons/obj/custom.dmi'
item_state = "stalker"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
icon_state = "stalker"
/obj/item/reagent_containers/food/drinks/flask/steel
@@ -216,7 +219,7 @@
desc = "It's a collar..."
icon = 'icons/obj/custom.dmi'
icon_state = "petcollar-stripe"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "petcollar-stripe"
tagname = null
@@ -225,34 +228,37 @@
desc = "Just looking at this makes you want to sing."
icon = 'icons/obj/custom.dmi'
icon_state = "singer"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "singer"
item_color = "singer"
fitted = NO_FEMALE_UNIFORM
alternate_worn_layer = ABOVE_SHOES_LAYER
can_adjust = 0
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/sneakers/pink
icon = 'icons/obj/custom.dmi'
icon_state = "pink"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "pink"
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/neck/tie/bloodred
name = "Blood Red Tie"
desc = "A neosilk clip-on tie. This one has a black S on the tipping and looks rather unique."
icon = 'icons/obj/custom.dmi'
icon_state = "bloodredtie"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
/obj/item/clothing/suit/puffydress
name = "Puffy Dress"
desc = "A formal puffy black and red Victorian dress."
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
icon_state = "puffydress"
item_state = "puffydress"
body_parts_covered = CHEST|GROIN|LEGS
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/vermillion
name = "vermillion clothing"
@@ -261,7 +267,8 @@
item_state = "vermillion"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/bb_sweater/black/naomi
name = "worn black sweater"
@@ -300,7 +307,7 @@
name = "Kiara's Sabre"
desc = "This blade looks as dangerous as its owner."
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
icon_state = "darksabre"
item_state = "darksabre"
lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
@@ -313,7 +320,7 @@
name = "Ornate Sheathe"
desc = "An ornate and rather sinister looking sabre sheathe."
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
icon_state = "darksheath"
item_state = "darksheath"
w_class = WEIGHT_CLASS_BULKY
@@ -332,7 +339,7 @@
name = "Dark Armor"
desc = "A dark, non-functional piece of armor sporting a red and black finish."
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
icon_state = "darkcarapace"
item_state = "darkcarapace"
blood_overlay_type = "armor"
@@ -345,7 +352,7 @@
desc = "This cloak doesn't seem too special."
icon = 'icons/obj/custom.dmi'
icon_state = "wintergreencloak"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "wintergreencloak"
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN|LEGS|ARMS
@@ -361,7 +368,7 @@
desc = "An oddly special looking coat."
icon = 'icons/obj/custom.dmi'
icon_state = "rdcoat"
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "rdcoat"
/obj/item/custom/leechjar
@@ -393,15 +400,17 @@
/obj/item/clothing/shoes/lucky
name = "Lucky Jackboots"
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
desc = "Comfy Lucky Jackboots with the word Luck on them."
item_state = "luckyjack"
icon_state = "luckyjack"
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/lunasune
name = "Divine Robes"
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
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
modular_citadel/icons/mob/uniform_digi.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 258 KiB

modular_citadel/icons/polyclothes/item/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

modular_citadel/icons/polyclothes/mob/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB