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

clothing

Browse Source
This commit is contained in:
Metis
2024-09-18 01:04:49 -04:00
parent d4e8c61e92
commit 24de9f5e4d
21 changed files with 45 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/clothing/haydee_suit.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Haydee Helmet"
desc = "A strange helmet. Offers little to no protection."
icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
alternate_worn_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
mob_overlay_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
icon_state = "haydee_helmet"
item_state = "item_haydee_helmet"
armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 25, "acid" = 25)
GainStation13/code/clothing/suits.dm
+7 -7
View File
@@ -5,7 +5,7 @@
name = "GATO letterman jacket"
desc = "A GATO themed letterman jacket. Perfect for repping your pride in the company as you violently murder russian mobsters"
icon = 'GainStation13/icons/mob/suits.dmi'
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
icon_state = "letterman_gato"
item_state = "letterman_gato"
mutantrace_variation = NONE
@@ -14,7 +14,7 @@
name = "Elegant Carapace"
desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
icon = 'GainStation13/icons/mob/suits.dmi'
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
icon_state = "cc_carapace"
item_state = "cc_carapace"
mutantrace_variation = NONE
@@ -23,7 +23,7 @@
name = "CC-GT Carapace"
desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
icon = 'GainStation13/icons/mob/suits.dmi'
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
icon_state = "gato_carapace"
item_state = "gato_carapace"
mutantrace_variation = NONE
@@ -32,7 +32,7 @@
name = "Hellcat Overcoat"
desc = "Badass. Seems to be specifically made for some CentComm Commander."
icon = 'GainStation13/icons/mob/suits.dmi'
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
icon_state = "hellcat_overcoat"
item_state = "hellcat_overcoat"
mutantrace_variation = NONE
@@ -41,7 +41,7 @@
name = "CC Parade Jacket"
desc = "This elegant and highly protective parade jacket seems to have been made into color purple."
icon = 'GainStation13/icons/mob/suits.dmi'
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
icon_state = "paradejacket_black"
item_state = "paradejacket_black"
mutantrace_variation = NONE
@@ -50,7 +50,7 @@
name = "CC Parade Jacket"
desc = "This elegant and highly protective parade jacket seems to have been made into color purple."
icon = 'GainStation13/icons/mob/suits.dmi'
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
icon_state = "paradejacket_purple"
item_state = "paradejacket_purple"
mutantrace_variation = NONE
@@ -59,7 +59,7 @@
name = "GATO Hardsuit"
desc = "Exclusive variant of a hardsuit, primarily reserved for CC GATO personnel."
icon = 'GainStation13/icons/mob/suits.dmi'
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
icon_state = "gato_hardsuit"
item_state = "gato_hardsuit"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/alert/gato
GainStation13/code/modules/clothing/under/jobs/clothing.dm
-3
View File
@@ -1,3 +0,0 @@
/obj/item/clothing
/// Where do we want to grab the file from? use this for GS13 specific clothing.
var/icon/alternate_worn_icon
GainStation13/code/modules/vending/mealdor.dm
-1
View File
@@ -39,7 +39,6 @@
/obj/item/clothing/head/chefhat = 5,
/obj/item/reagent_containers/food/snacks/cookie = 10,
/obj/item/reagent_containers/food/snacks/salad/fruit = 15,
/obj/item/reagent_containers/food/snacks/salad = 20,
/obj/item/reagent_containers/food/snacks/blueberry_gum = 5
)
premium = list(
_maps/map_files/Mining/Lavaland_Lower.dmm
+1 -12
View File
@@ -11460,17 +11460,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
"LP" = (
/obj/machinery/porta_turret/aux_base{
dir = 5;
icon_state = "standard_broken";
obj_integrity = 20;
stat = 1
},
/turf/open/floor/plasteel/grimy{
icon_state = "engine"
},
/area/xenoarch/nothinghere)
"LR" = (
/obj/effect/turf_decal{
dir = 4
@@ -74679,7 +74668,7 @@ nx
ph
Sa
Mb
LP
rf
nx
St
FE
code/modules/mob/living/carbon/human/species.dm
+1 -1
View File
@@ -1557,7 +1557,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
// fatConversionRate is functionally useless. It seems under normal curcumstances, each tick only processes, at most, 1 nutrition anyway. reducing the value has no effect.
var/fatConversionRate = 100 //GS13 what percentage of the excess nutrition should go to fat (total nutrition to transfer can't be under 1)
var/nutritionThatBecomesFat = max((H.nutrition - NUTRITION_LEVEL_FULL)*(fatConversionRate / 100),1)
H.nutrition -= nutritionThatBecomesFat
H.adjust_nutrition(-nutritionThatBecomesFat)
H.adjust_fatness(nutritionThatBecomesFat, FATTENING_TYPE_FOOD)
if(H.fullness > FULLNESS_LEVEL_EMPTY)//GS13 stomach-emptying routine
var/ticksToEmptyStomach = 20 // GS13 how many ticks it takes to decrease the fullness by 1
hyperstation/code/datums/elements/holder_micro.dm
+1 -1
View File
@@ -93,7 +93,7 @@
if(_can_head_override)
can_head = _can_head_override
if(alt_worn)
alternate_worn_icon = alt_worn
mob_overlay_icon = alt_worn
if(_worn_state)
item_state = _worn_state
icon_state = _worn_state
hyperstation/code/modules/antagonists/wendigo/mob/update_icons.dm
+3 -3
View File
@@ -114,7 +114,7 @@
if(hud_used.inventory_shown)
client.screen += ears
overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.alternate_worn_icon) ? ears.alternate_worn_icon : 'icons/mob/ears.dmi'))
overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.mob_overlay_icon) ? ears.mob_overlay_icon : 'icons/mob/ears.dmi'))
var/mutable_appearance/ears_overlay = overlays_standing[EARS_LAYER]
switch(dir)
if(NORTH)
@@ -146,7 +146,7 @@
if(!t_state)
t_state = belt.icon_state
overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.alternate_worn_icon) ? belt.alternate_worn_icon : 'icons/mob/belt.dmi'))
overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.mob_overlay_icon) ? belt.mob_overlay_icon : 'icons/mob/belt.dmi'))
var/mutable_appearance/belt_overlay = overlays_standing[BELT_LAYER]
switch(dir)
if(NORTH)
@@ -287,7 +287,7 @@
//HEAD
/mob/living/carbon/wendigo/update_inv_head()
remove_overlay(HEAD_LAYER)
if(head)
head.screen_loc = ui_head
if(client && hud_used && hud_used.hud_shown)
hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm
+5 -5
View File
@@ -5,25 +5,25 @@
icon_state = "polygar"
item_color = "polygar"
item_state = "polygar"
alternate_worn_icon = 'hyperstation/icons/mob/eyes.dmi' //Because, as it appears, the item itself is normally not directly aware of its worn overlays, so this is about the easiest way, without adding a new var.
mob_overlay_icon = 'hyperstation/icons/mob/eyes.dmi' //Because, as it appears, the item itself is normally not directly aware of its worn overlays, so this is about the easiest way, without adding a new var.
hasprimary = TRUE
primary_color = "#0c0c0c"
vision_correction = 1
/obj/item/clothing/glasses/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/glasses/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE mob_overlay_icon
. = ..()
if(hasprimary | hassecondary | hastertiary)
if(!isinhands) //prevents the worn sprites from showing up if you're just holding them
if(hasprimary) //checks if overlays are enabled
var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection
var/mutable_appearance/primary_worn = mutable_appearance(mob_overlay_icon, "[item_color]-primary") //automagical sprite selection
primary_worn.color = primary_color //colors the overlay
. += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite.
if(hassecondary)
var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary")
var/mutable_appearance/secondary_worn = mutable_appearance(mob_overlay_icon, "[item_color]-secondary")
secondary_worn.color = secondary_color
. += secondary_worn
if(hastertiary)
var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary")
var/mutable_appearance/tertiary_worn = mutable_appearance(mob_overlay_icon, "[item_color]-tertiary")
tertiary_worn.color = tertiary_color
. += tertiary_worn
hyperstation/code/modules/clothing/gloves.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "guncaster"
item_state = "guncaster"
icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/gloves.dmi'
item_color = null //So they don't wash.
transfer_prints = TRUE
strip_delay = 40
hyperstation/code/modules/clothing/head.dm
+1 -1
View File
@@ -4,5 +4,5 @@
icon_state = "maid_head"
item_state = "maid_head"
icon = 'hyperstation/icons/obj/clothing/head.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/head.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/head.dmi'
mutantrace_variation = NONE
hyperstation/code/modules/clothing/suits/misc.dm
+2 -2
View File
@@ -5,7 +5,7 @@
item_state = "kaminacape"
body_parts_covered = 0
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
mutantrace_variation = NONE
/obj/item/clothing/suit/gcvest
@@ -14,7 +14,7 @@
icon_state = "guncaster"
item_state = "guncaster"
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
mutantrace_variation = NONE
/obj/item/clothing/suit/gcvest/alt
hyperstation/code/modules/clothing/under/under.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "lumberjack outfit"
desc = "I am a lumberjack and I am ok, I sleep all night and I work all day."
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
icon_state = "lumberjack"
item_state = "lumberjack"
can_adjust = FALSE
hyperstation/code/obj/ZaoCorp/hat.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "zaohat"
item_state = "helmet"
item_color = "zaohat"
alternate_worn_icon = 'hyperstation/icons/mobs/head.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/head.dmi'
armor = list("melee" = 40, "bullet" = 40, "laser" = 10,"energy" = 20, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 60)
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
hyperstation/code/obj/ZaoCorp/suit.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "zaocoat"
item_state = "zaocoat"
item_color = "zaocoat"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
togglename = "zipper"
body_parts_covered = CHEST|ARMS|LEGS
cold_protection = CHEST|GROIN|LEGS|ARMS
hyperstation/code/obj/ZaoCorp/uniform.dm
+1 -1
View File
@@ -5,4 +5,4 @@
icon_state = "zaounder"
item_state = "zaounder"
item_color = "zaounder"
alternate_worn_icon = 'hyperstation/icons/mobs/uniforms.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/uniforms.dmi'
hyperstation/code/obj/ZaoCorp/visor.dm
+1 -1
View File
@@ -8,7 +8,7 @@
tint = 1
flags_cover = GLASSESCOVERSEYES
visor_flags_cover = GLASSESCOVERSEYES
alternate_worn_icon = 'hyperstation/icons/mobs/eyes.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/eyes.dmi'
hud_type = DATA_HUD_SECURITY_ADVANCED
actions_types = list(/datum/action/item_action/switch_hud)
glass_colour_type = /datum/client_colour/glass_colour/lightyellow
hyperstation/code/obj/condom.dm
+1 -1
View File
@@ -75,7 +75,7 @@ obj/item/condom/update_icon()
name = "condom"
icon = 'hyperstation/icons/obj/condom.dmi'
desc = "Looks like someone had abit of some fun!"
alternate_worn_icon = 'hyperstation/icons/obj/clothing/head.dmi'
mob_overlay_icon = 'hyperstation/icons/obj/clothing/head.dmi'
icon_state = "b_condom_out"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 5, "rad" = 0, "fire" = 0, "acid" = 0)
hyperstation/code/obj/kinkyclothes.dm
+9 -9
View File
@@ -4,7 +4,7 @@
icon_state = "latex"
item_state = "latex"
icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/gloves.dmi'
mutantrace_variation = NONE
price = 5
@@ -21,7 +21,7 @@
icon_state = "dominatrix"
item_state = "dominatrix"
icon = 'hyperstation/icons/obj/clothing/head.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/head.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/head.dmi'
mutantrace_variation = NONE
/obj/item/clothing/shoes/highheels
@@ -30,7 +30,7 @@
icon_state = "highheels"
item_state = "highheels"
icon = 'hyperstation/icons/obj/clothing/shoes.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/feet.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/feet.dmi'
/obj/item/clothing/shoes/highheels/Initialize(mapload)
@@ -63,7 +63,7 @@ obj/item/clothing/neck/stole/black
icon_state = "fluffy"
item_state = "fluffy"
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
body_parts_covered = CHEST|LEGS|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
mutantrace_variation = NONE
@@ -73,7 +73,7 @@ obj/item/clothing/neck/stole/black
desc = "A tight fitting jumpsuit made of latex."
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
icon_state = "latex"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
item_state = "r_suit"
can_adjust = FALSE
@@ -82,7 +82,7 @@ obj/item/clothing/neck/stole/black
desc = "A tight fitting outfit made of latex, that covers the wearers torso."
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
icon_state = "latexhalf"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
item_state = "r_suit"
can_adjust = FALSE
mutantrace_variation = NONE
@@ -93,7 +93,7 @@ obj/item/clothing/neck/stole/black
desc = "A very revealing nurse's outfit. Not very sanitary. Does it even count as clothing?"
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
icon_state = "sexynursesuit"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
item_state = "r_suit"
can_adjust = FALSE
mutantrace_variation = NONE
@@ -103,7 +103,7 @@ obj/item/clothing/neck/stole/black
desc = "A stylish yet revealing dress uniform worn in extravagent black and gold, worthy of those who sit around and watch cameras all day in an office."
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
icon_state = "ccdress"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
item_state = "r_suit"
can_adjust = FALSE
//We will never know why CC can make their skimpy outfits tough as nails
@@ -119,7 +119,7 @@ obj/item/clothing/neck/stole/black
desc = "This black and gold beauty does not help paperwork get done, it seems."
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
icon_state = "ccdressvk"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
item_state = "r_suit"
can_adjust = FALSE
//We will never know why CC can make their skimpy outfits tough as nails
hyperstation/code/obj/rewards.dm
+6 -6
View File
@@ -22,14 +22,14 @@
icon_state = "shackles"
item_state = "shackles"
icon = 'hyperstation/icons/mobs/rewards.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/rewards.dmi'
mutantrace_variation = NONE
/obj/item/clothing/suit/luwethtrench
name = "Syndicate Commander's Coat"
desc = "A sinister looking black and red jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer. A rather strange brooch is pinned to the coat, displaying a unique range of lustrous brass cracks through the deep blacks of it’s hammered finish."
icon = 'hyperstation/icons/obj/clothing/rewards.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/rewards.dmi'
body_parts_covered = CHEST|GROIN|ARMS|LEGS
icon_state = "luwethtrench"
item_state = "luwethtrench"
@@ -93,14 +93,14 @@
name = "crystalline shards"
icon = 'hyperstation/icons/obj/rewards.dmi'
desc = "A handful of blue crystals. They look like they came from some sort of cave."
alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/rewards.dmi'
icon_state = "crystalline"
/obj/item/clothing/mask/keaton
name = "keaton mask"
desc = "A mask made to look like the mythical Keaton."
icon = 'hyperstation/icons/obj/rewards.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/rewards.dmi'
icon_state = "keaton"
flags_inv = HIDEFACE|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
@@ -120,7 +120,7 @@
name = "Fleet Commander's Beret"
desc = "A beret bearing a worn golden symbol that stikes fear in the hearts of many. It smells faintly of plasma and gunpowder."
icon = 'hyperstation/icons/obj/clothing/rewards.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/rewards.dmi'
icon_state = "commissar_beret"
item_state = "commissar_beret"
@@ -136,7 +136,7 @@
name = "Fleet Commander's Sabre"
desc = "An elegant weapon, similar in design to the Captain's Sabre, but with a syndicate twist."
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mob_overlay_icon = 'icons/mob/custom_w.dmi'
icon_state = "darksabre"
item_state = "darksabre"
force = 5
hyperstation/code/obj/stargate_clothing.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "A simples tunic."
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
icon_state = "tunic"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
item_state = "r_suit"
can_adjust = FALSE
mutantrace_variation = NONE