cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implements new Dominia Sprites (#8235)

Browse Source
This commit is contained in:
Geeves
2020-02-13 22:58:28 +02:00
committed by GitHub
parent e0995f9019
commit 74f06c77f3
22 changed files with 257 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/client/preference_setup/loadout/loadout_gloves.dm
View File

@@ -24,6 +24,7 @@
gloves["grey gloves"] = /obj/item/clothing/gloves/grey
gloves["rainbow gloves"] = /obj/item/clothing/gloves/rainbow
gloves["black leather gloves"] = /obj/item/clothing/gloves/black_leather
gloves["lyodsuit gloves"] = /obj/item/clothing/gloves/lyodsuit
gear_tweaks += new/datum/gear_tweak/path(gloves)
/datum/gear/gloves/evening

4
code/modules/client/preference_setup/loadout/loadout_shoes.dm
View File

@@ -121,6 +121,10 @@
display_name = "black boots"
path = /obj/item/clothing/shoes/black_boots
/datum/gear/shoes/lyodsuit_boots
display_name = "lyodsuit boots"
path = /obj/item/clothing/shoes/lyodsuit
/datum/gear/shoes/circuitry
display_name = "boots, circuitry (empty)"
path = /obj/item/clothing/shoes/circuitry

11
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -26,6 +26,7 @@
..()
var/jackets = list()
jackets["bomber jacket"] = /obj/item/clothing/suit/storage/toggle/bomber
jackets["dominian bomber jacket"] = /obj/item/clothing/suit/storage/toggle/dominia/bomber
jackets["corporate black jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen
jackets["corporate brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
jackets["black jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket
@@ -237,6 +238,10 @@
path = /obj/item/clothing/suit/security/navyhos
allowed_roles = list("Head of Security")
/datum/gear/suit/dominia_cape
display_name = "dominia cape"
path = /obj/item/clothing/accessory/poncho/dominia_cape
/datum/gear/suit/dominia
display_name = "dominia great coat selection"
description = "A selection of Dominian coats."
@@ -245,11 +250,9 @@
/datum/gear/suit/dominia/New()
..()
var/coat = list()
coat["dominia great coat"] = /obj/item/clothing/suit/storage/toggle/dominia
coat["dominia great coat, alternative"] = /obj/item/clothing/suit/storage/toggle/dominia/alt
coat["dominia cape"] = /obj/item/clothing/suit/storage/dominia
coat["dominia great coat, red"] = /obj/item/clothing/suit/storage/toggle/dominia
coat["dominia great coat, gold"] = /obj/item/clothing/suit/storage/toggle/dominia/gold
coat["dominia great coat, black"] = /obj/item/clothing/suit/storage/toggle/dominia/black
coat["dominia great coat, alternative black"] = /obj/item/clothing/suit/storage/toggle/dominia/black/alt
gear_tweaks += new/datum/gear_tweak/path(coat)
/datum/gear/suit/tcfl

10
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -232,16 +232,18 @@
path = /obj/item/clothing/under/syndicate/tacticool
/datum/gear/uniform/dominia
display_name = "dominia suit selection"
description = "A selection of dominian suits."
display_name = "dominia clothing selection"
description = "A selection of dominian clothing."
path = /obj/item/clothing/under/dominia
/datum/gear/uniform/dominia/New()
..()
var/suit = list()
suit["dominia suit"] = /obj/item/clothing/under/dominia
suit["dominia suit, red"] = /obj/item/clothing/under/dominia
suit["dominia suit, black"] = /obj/item/clothing/under/dominia/black
suit["lyodsuit"] = /obj/item/clothing/under/dom_thermal
suit["dominia sweater"] = /obj/item/clothing/under/dominia/sweater
suit["lyodsuit"] = /obj/item/clothing/under/dominia/lyodsuit
suit["hoodied lyodsuit"] = /obj/item/clothing/under/dominia/lyodsuit/hoodie
gear_tweaks += new/datum/gear_tweak/path(suit)
/datum/gear/uniform/miscellaneous/kimono

225
code/modules/clothing/factions/dominia.dm Normal file
View File

@@ -0,0 +1,225 @@
/obj/item/clothing/mask/lyodsuit
name = "lyodsuit mask"
desc = "A simple mask that forms a part of the Dominian lyodsuit. Rather cozy, if you're warm-blooded."
icon = 'icons/clothing/masks/lyodsuit.dmi'
icon_state = "dom_thermal_mask"
item_state = "dom_thermal_mask"
contained_sprite = TRUE
canremove = FALSE
/obj/item/clothing/gloves/lyodsuit
name = "lyodsuit gloves"
desc = "A pair of thermal gloves, guaranteed to keep hands toasty."
icon = 'icons/clothing/gloves/lyodsuit.dmi'
icon_state = "dom_thermal_gloves"
item_state = "dom_thermal_gloves"
contained_sprite = TRUE
/obj/item/clothing/shoes/lyodsuit
name = "lyodsuit boots"
desc = "A pair of thermal boots, guaranteed to prevent cold feet."
icon = 'icons/clothing/shoes/lyodsuit.dmi'
icon_state = "dom_thermal_boots"
item_state = "dom_thermal_boots"
contained_sprite = TRUE
/obj/item/clothing/accessory/poncho/dominia_cape
name = "dominia cape"
desc = "This is a cape in the style of Dominia nobility. It's the latest fashion across Dominian space."
icon = 'icons/clothing/suits/capes/dominia.dmi'
icon_state = "dominian_cape"
item_state = "dominian_cape"
icon_override = null
contained_sprite = TRUE
/obj/item/clothing/suit/storage/toggle/dominia
name = "dominia great coat"
desc = "This is a great coat in the style of Dominia nobility. It's the latest fashion across Dominian space."
icon = 'icons/clothing/suits/coats/dominia_noble_red.dmi'
icon_state = "dominia_noble_red"
item_state = "dominia_noble_red"
icon_open = "dominia_noble_red_open"
icon_closed = "dominia_noble_red"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/toggle/dominia/gold
icon = 'icons/clothing/suits/coats/dominia_noble_gold.dmi'
icon_state = "dominia_noble_gold"
item_state = "dominia_noble_gold"
icon_open = "dominia_noble_gold_open"
icon_closed = "dominia_noble_gold"
/obj/item/clothing/suit/storage/toggle/dominia/black
icon = 'icons/clothing/suits/coats/dominia_noble_black.dmi'
icon_state = "dominia_noble_black"
item_state = "dominia_noble_black"
icon_open = "dominia_noble_black_open"
icon_closed = "dominia_noble_black"
/obj/item/clothing/suit/storage/toggle/dominia/bomber
name = "dominia bomber jacket"
desc = "This is a bomber jacket of Dominian style."
icon = 'icons/clothing/suits/coats/dominia_bomber.dmi'
icon_state = "dominia_bomber"
item_state = "dominia_bomber"
icon_open = "dominia_bomber_open"
icon_closed = "dominia_bomber"
/obj/item/clothing/under/dominia
name = "dominia suit"
desc = "This is a suit in the style of Dominia nobility. It's the latest fashion across Dominian space."
icon = 'icons/clothing/under/uniforms/dominia_uniform_red.dmi'
icon_state = "dominia_uniform_red"
item_state = "dominia_uniform_red"
contained_sprite = TRUE
rolled_sleeves = FALSE
rolled_down = FALSE
var/has_down_and_sleeves = TRUE
/obj/item/clothing/under/dominia/rollsuit()
set name = "Roll Down Jumpsuit"
set category = "Object"
set src in usr
if(use_check_and_message(usr))
return
if(has_down_and_sleeves == FALSE)
to_chat(usr, span("notice", "You cannot roll down the [src]!"))
return
if((rolled_sleeves == TRUE) && !(rolled_down))
rolled_sleeves = FALSE
if(rolled_down)
body_parts_covered = initial(body_parts_covered)
item_state = "[initial(item_state)]" // REMINDER!: Contained Sprites automatically take out the _un after the spritename, somehow.
to_chat(usr, span("notice", "You roll up your [src]."))
rolled_down = FALSE
else
body_parts_covered &= LOWER_TORSO|LEGS|FEET
item_state = "[initial(item_state)]_d"
to_chat(usr, span("notice", "You roll down your [src]."))
rolled_down = TRUE
update_clothing_icon()
/obj/item/clothing/under/dominia/rollsleeves()
set name = "Roll Up Sleeves"
set category = "Object"
set src in usr
if(use_check_and_message(usr))
return
if(has_down_and_sleeves == FALSE)
to_chat(usr, span("notice", "You cannot roll up your [src]'s sleeves!"))
return
if(rolled_down == TRUE)
to_chat(usr, span("notice", "You must roll up your [src] first!"))
return
if(rolled_sleeves)
body_parts_covered = initial(body_parts_covered)
item_state = "[initial(item_state)]" // REMINDER!: Contained Sprites automatically take out the _un after the spritename, somehow.
to_chat(usr, span("notice", "You roll down your [src]'s sleeves."))
rolled_sleeves = FALSE
else
body_parts_covered &= ~(ARMS|HANDS)
item_state = "[initial(item_state)]_r"
to_chat(usr, span("notice", "You roll up your [src]'s sleeves."))
rolled_sleeves = TRUE
update_clothing_icon()
/obj/item/clothing/under/dominia/black
icon = 'icons/clothing/under/uniforms/dominia_uniform_black.dmi'
icon_state = "dominia_uniform_black"
item_state = "dominia_uniform_black"
/obj/item/clothing/under/dominia/sweater
name = "dominia sweater"
desc = "This is a sweater of Dominian style."
icon = 'icons/clothing/under/uniforms/dominia_sweater.dmi'
icon_state = "dom_sweater"
item_state = "dom_sweater"
/obj/item/clothing/under/dominia/lyodsuit
name = "lyodsuit"
desc = "An imitation Lyodsuit from Dominia. It's lightweight, and high has quality fabric that makes it extremely comfortable to wear."
description_fluff = "This Lyodsuit was created in Dominia. It is fashionable amongst the middle and lower classes of Dominia."
icon = 'icons/clothing/under/uniforms/lyodsuit.dmi'
icon_state = "dom_thermal"
item_state = "dom_thermal"
contained_sprite = TRUE
/obj/item/clothing/under/dominia/lyodsuit/hoodie
name = "hoodied lyodsuit"
desc = "An imitation Lyodsuit from Dominia. It's lightweight, and high has quality fabric that makes it extremely comfortable to wear. This one has a hood mask attached."
icon = 'icons/clothing/under/uniforms/lyodsuit_hoodie.dmi'
icon_state = "dom_thermal_hoodie"
item_state = "dom_thermal_hoodie"
var/obj/item/clothing/mask/lyodsuit/mask
var/hood_raised = FALSE
/obj/item/clothing/under/dominia/lyodsuit/hoodie/Initialize()
. = ..()
create_mask()
/obj/item/clothing/under/dominia/lyodsuit/hoodie/Destroy()
QDEL_NULL(mask)
return ..()
/obj/item/clothing/under/dominia/lyodsuit/hoodie/dropped()
remove_mask()
/obj/item/clothing/under/dominia/lyodsuit/hoodie/on_slotmove()
remove_mask()
/obj/item/clothing/under/dominia/lyodsuit/hoodie/equipped(mob/user, slot)
if(slot != slot_w_uniform)
remove_mask()
..()
/obj/item/clothing/under/dominia/lyodsuit/hoodie/proc/create_mask()
if(!mask)
mask = new /obj/item/clothing/mask/lyodsuit(src)
/obj/item/clothing/under/dominia/lyodsuit/hoodie/proc/remove_mask()
// Mask got nuked. Probably because of RIGs or the like.
create_mask()
if(ishuman(mask.loc))
var/mob/living/carbon/H = mask.loc
H.unEquip(mask, 1)
mask.forceMove(src)
hood_raised = FALSE
/obj/item/clothing/under/dominia/lyodsuit/hoodie/verb/toggle_mask()
set name = "Toggle Lyodsuit Mask"
set category = "Object"
set src in usr
if(use_check_and_message(usr))
return FALSE
// double check to make sure the lyodsuit has its mask
create_mask()
if(!hood_raised)
if(ishuman(loc))
var/mob/living/carbon/human/H = src.loc
if(H.w_uniform != src)
to_chat(H, span("warning", "You must be wearing \the [src] to put up the hood!"))
return
if(H.wear_mask)
to_chat(H, span("warning", "You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(mask, slot_wear_mask, 0, 0, 1)
hood_raised = TRUE
H.update_inv_wear_mask()
else
remove_mask()
/obj/item/clothing/under/dominia/lyodsuit/hoodie/rollsuit()
..()
if(rolled_down == TRUE)
remove_mask()

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

@@ -448,45 +448,13 @@
icon_closed = "trenchcoat_grey"
/obj/item/clothing/suit/storage/toggle/trench/green
name = "green trenchcoat"
desc = "A comfy looking green trenchcoat with fur."
icon_state = "greentrench"
item_state = "greentrench"
icon_open = "greentrench_open"
icon_closed = "greentrench"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/dominia
name = "dominia cape"
desc = "This is a cape in the style of Dominia nobility. It's the latest fashion across Dominian space."
icon_state = "dominian_cape"
item_state = "dominian_cape"
/obj/item/clothing/suit/storage/toggle/dominia
name = "dominia great coat"
desc = "This is a great coat in the style of Dominia nobility. It's the latest fashion across Dominian space."
icon_state = "dominian_noble"
item_state = "dominian_noble"
icon_open = "dominian_noble_open"
icon_closed = "dominian_noble"
/obj/item/clothing/suit/storage/toggle/dominia/alt
icon_state = "dominian_noble2"
item_state = "dominian_noble2"
icon_open = "dominian_noble2_open"
icon_closed = "dominian_noble2"
/obj/item/clothing/suit/storage/toggle/dominia/black
icon_state = "dominian_noble4"
item_state = "dominian_noble4"
icon_open = "dominian_noble4_open"
icon_closed = "dominian_noble4"
/obj/item/clothing/suit/storage/toggle/dominia/black/alt
icon_state = "dominian_noble5"
item_state = "dominian_noble5"
icon_open = "dominian_noble5_open"
icon_closed = "dominian_noble5"
name = "green trenchcoat"
desc = "A comfy looking green trenchcoat with fur."
icon_state = "greentrench"
item_state = "greentrench"
icon_open = "greentrench_open"
icon_closed = "greentrench"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/toggle/greengov
name = "green formal jacket"

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

@@ -581,20 +581,6 @@
item_state = "blue_blazer"
worn_state = "blue_blazer"
/obj/item/clothing/under/dominia
name = "dominia suit"
desc = "This is a suit in the style of Dominia nobility. It's the latest fashion across Dominian space."
icon_state = "domsuit"
/obj/item/clothing/under/dominia/black
icon_state = "domsuit2"
/obj/item/clothing/under/dom_thermal
name = "lyodsuit"
desc = "An imitation Lyodsuit from Dominia. Though it is not able to protect against extreme cold like a true lyodsuit it's lightweight and high quality fabric make it extremely comfortable to wear. \
Fashionable amongst the middle and lower classes of Dominia"
icon_state = "dom_thermal"
//stripper
/obj/item/clothing/under/stripper
body_parts_covered = 0