Skip to content

Commit

Permalink
Patch 2.2.
Browse files Browse the repository at this point in the history 
del: thermal suit.
override: plush toy loadout datum in LOADOUT_ITEMS module.
add: polychromic cloak as an resomi hooded cloak;
resomi plush added to "plush toy" loadout datum;
resomi undercoats and expeditionary uniforms added to "Xenowear" loadout cat.
  • Loading branch information
@Daeberdir
Daeberdir committed Feb 11, 2024
1 parent a4e89c6 commit e5373d4
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 106 deletions.
27 changes: 27 additions & 0 deletions mods/loadout_items/code/loadout/loadout.dm
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,29 @@
/datum/gear
var/list/allowed_factions //Background factions required to spawn with this item.

/datum/gear/plush_toy
var/list/toy_list = list(
"diona nymph plush" = /obj/item/toy/plushie/nymph
"mouse plush" = /obj/item/toy/plushie/mouse
"kitten plush" = /obj/item/toy/plushie/kitten
"lizard plush" = /obj/item/toy/plushie/lizard
"crow plush" = /obj/item/toy/plushie/crow
"spider plush" = /obj/item/toy/plushie/spider
"farwa plush" = /obj/item/toy/plushie/farwa
"golden carp plush" = /obj/item/toy/plushie/carp_gold
"purple carp plush" = /obj/item/toy/plushie/carp_purple
"pink carp plush" = /obj/item/toy/plushie/carp_pink
"corgi plush" = /obj/item/toy/plushie/corgi
"corgi plush with bow" = /obj/item/toy/plushie/corgi_bow
"deer plush" = /obj/item/toy/plushie/deer
"blue squid plush" = /obj/item/toy/plushie/squid_blue
"orange squid plush" = /obj/item/toy/plushie/squid_orange
)

/datum/gear/plush_toy/New()
gear_tweaks += gear_tweak_free_name(display_name)
gear_tweaks += gear_tweak_free_desc(description)
var/list/completed_list
for(var/plush_name in toy_list)
completed_list[plush_name] = toy_list[plush_name]
gear_tweaks += new /datum/gear_tweak/path(completed_list)
123 changes: 41 additions & 82 deletions mods/resomi/code/clothing/suits.dm
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@

//////////////
////resomi////
//////////////

/obj/item/clothing/suit/storage/toggle/resomicoat
name = "small coat"
icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi'
Expand Down Expand Up @@ -566,29 +561,38 @@
desc = "A soft Resomi cloak made for the Janitor"
icon_state = "tesh_beltcloak_jani"



/obj/item/clothing/suit/storage/hooded/polychromic
name = "polychromic cloak"
desc = "Resomi cloak. Seems to be coated with polychrome paint. There is also a sewn hood. DO NOT MIX WITH EMP!"
//Hooded Resomi cloaks
/obj/item/clothing/suit/storage/hooded/resomi
name = "Hooded Resomi Cloak"
desc = "A soft resomi cloak with an added hood."
icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi'
icon_state = "polychromic"
hoodtype = /obj/item/clothing/head/winterhood/polychromic_hood
action_button_name = "Toggle Hood"
slots = 2
icon_state = "tesh_hcloak_bo"
//item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
//flags_inv = HIDEHOLSTER|HIDETIE
action_button_name = "Toggle Cloak Hood"
hoodtype = /obj/item/clothing/head/resomi/resomi_hood
//allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
species_restricted = list(SPECIES_RESOMI)
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO
sprite_sheets = list(SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi')

/obj/item/clothing/suit/storage/hooded/polychromic/New()
/obj/item/clothing/suit/storage/hooded/resomi/New()
..()
sprite_sheets = list(
SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi'
)
if(pockets)
qdel(pockets)
pockets = new/obj/item/storage/internal/pouch(src, slots*BASE_STORAGE_COST(ITEM_SIZE_SMALL))

/obj/item/clothing/suit/storage/hooded/polychromic/verb/change_color()
/obj/item/clothing/suit/storage/hooded/resomi/on_update_icon()
..()
update_clothing_icon()

/obj/item/clothing/suit/storage/hooded/resomi/polychromic
name = "polychromic cloak"
desc = "Resomi cloak. Seems to be coated with polychrome paint. There is also a sewn hood. DO NOT MIX WITH EMP!"
icon_state = "polychromic"
hoodtype = /obj/item/clothing/head/resomi/resomi_hood/polychromic_hood

/obj/item/clothing/suit/storage/hooded/resomi/polychromic/verb/change_color()
set name = "Change Cloak Color"
set category = "Object"
set desc = "Change the color of the cloak."
Expand All @@ -605,78 +609,18 @@
hood.update_icon()
update_icon()

/obj/item/clothing/suit/storage/hooded/polychromic/on_update_icon()
/obj/item/clothing/suit/storage/hooded/resomi/polychromic/on_update_icon()
..()
update_clothing_icon()
hood.color = color
hood.update_clothing_icon()

/obj/item/clothing/suit/storage/hooded/polychromic/emp_act(severity)
/obj/item/clothing/suit/storage/hooded/resomi/polychromic/emp_act(severity)
color = null
hood.color = null
update_icon()
..()

/obj/item/clothing/head/winterhood/polychromic_hood
name = "hood"
icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi'
icon_state = "polychromic_hood"
species_restricted = list(SPECIES_RESOMI)
desc = "It's hood that covers the head."
flags_inv = BLOCKHAIR | HIDEEARS
body_parts_covered = HEAD

/obj/item/clothing/head/winterhood/polychromic_hood/New()
..()
sprite_sheets = list(
SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi'
)

//Hooded Resomi cloaks
/obj/item/clothing/suit/storage/hooded/resomi
name = "Hooded Resomi Cloak"
desc = "A soft resomi cloak with an added hood."
icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi'
icon_state = "tesh_hcloak_bo"
//item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
//flags_inv = HIDEHOLSTER|HIDETIE
action_button_name = "Toggle Cloak Hood"
hoodtype = /obj/item/clothing/head/resomi/resomi_hood
//allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
species_restricted = list(SPECIES_RESOMI)

/obj/item/clothing/suit/storage/hooded/resomi/New()
..()
sprite_sheets = list(
SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi'
)
if(pockets)
qdel(pockets)
pockets = new/obj/item/storage/internal/pouch(src, slots*BASE_STORAGE_COST(ITEM_SIZE_SMALL))

/obj/item/clothing/suit/storage/hooded/resomi/on_update_icon()
..()
update_clothing_icon()

/obj/item/clothing/head/resomi/resomi_hood
name = "Cloak Hood"
desc = "A hood attached to a resomi cloak."
icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi'
icon_state = "tesh_hcloak_bo_hood"
flags_inv = BLOCKHAIR | HIDEEARS
body_parts_covered = HEAD
species_restricted = list(SPECIES_RESOMI)
sprite_sheets = list(SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi')

/obj/item/clothing/head/resomi/resomi_hood/New()
..()
sprite_sheets = list(
SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi'
)



/obj/item/clothing/suit/storage/hooded/resomi/black_orange
name = "black and orange hooded cloak"
icon_state = "tesh_hcloak_bo"
Expand Down Expand Up @@ -798,6 +742,21 @@
hoodtype = /obj/item/clothing/head/resomi/resomi_hood/brown_grey

//The actual hoods
/obj/item/clothing/head/resomi/resomi_hood
name = "Cloak Hood"
desc = "A hood attached to a resomi cloak."
icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi'
icon_state = "tesh_hcloak_bo_hood"
flags_inv = BLOCKHAIR | HIDEEARS
body_parts_covered = HEAD
species_restricted = list(SPECIES_RESOMI)
sprite_sheets = list(SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi')

/obj/item/clothing/head/resomi/resomi_hood/polychromic_hood
name = "polychromic hood"
icon_state = "polychromic_hood"
desc = "It's hood that covers the head."

/obj/item/clothing/head/resomi/resomi_hood/black_orange
name = "black and orange cloak hood"
icon_state = "tesh_hcloak_bo_hood"
Expand Down
2 changes: 2 additions & 0 deletions mods/resomi/code/clothing/under.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@
species_restricted = list(SPECIES_RESOMI)
sprite_sheets = list(SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_under_resomi.dmi')

/* We don't use this suits in actual build, right?
/obj/item/clothing/under/thermal
name = "thermal suit"
desc = "Gray thermal suit. Nothing interesting."
Expand Down Expand Up @@ -455,3 +456,4 @@
desc = "Looks like very small suit. For children or resomi? This thermal suit is white. "
icon_state = "thermores_2"
item_state = "thermores_2"
*/
67 changes: 43 additions & 24 deletions mods/resomi/code/datum/gear.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,25 @@


/datum/gear/uniform/resomi
display_name = "(Resomi) uniform, sport"
path = /obj/item/clothing/under/resomi/sport
display_name = "(Resomi) uniform, colored"
path = /obj/item/clothing/under/resomi/white
sort_category = "Xenowear"
whitelisted = list(SPECIES_RESOMI)
flags = GEAR_HAS_COLOR_SELECTION


/datum/gear/uniform/resomi/smock
display_name = "(Resomi) smock, standart"
display_name = "(Resomi) uniform, standart"
path = /obj/item/clothing/under/resomi
flags = 0

/datum/gear/uniform/resomi/smock/New()
..()
var/uniform = list()
uniform["rainbow smock"] = /obj/item/clothing/under/resomi/rainbow
uniform["sport uniform"] = /obj/item/clothing/under/resomi/sport
uniform["black utility uniform"] = /obj/item/clothing/under/resomi/utility
uniform["grey utility uniform"] = /obj/item/clothing/under/resomi/utility/black
uniform["engineering smock"] = /obj/item/clothing/under/resomi/yellow
uniform["robotics smock"] = /obj/item/clothing/under/resomi/robotics
uniform["security smock"] = /obj/item/clothing/under/resomi/red
Expand All @@ -31,40 +36,49 @@
gear_tweaks += new/datum/gear_tweak/path(uniform)


/datum/gear/uniform/resomi/color
display_name = "(Resomi) smock, colored"
path = /obj/item/clothing/under/resomi/white
flags = GEAR_HAS_COLOR_SELECTION


/datum/gear/tactical/security_uniforms/resomi
display_name = "(Resomi) smock, Security"
path = /obj/item/clothing/under/resomi/red
sort_category = "Xenowear"
whitelisted = list(SPECIES_RESOMI)
/datum/gear/uniform/resomi/expedition
display_name = "(Resomi) uniform, expeditionary"
path = /obj/item/clothing/under/solgov
flags = 0

/datum/gear/tactical/security_uniforms/resomi/New()
return
/datum/gear/uniform/resomi/expedition/New()
..()
var/uniform = list()
uniform["standart uniform"] = /obj/item/clothing/under/solgov/utility/expeditionary/resomi
uniform["pt smock"] = /obj/item/clothing/under/solgov/pt/expeditionary/resomi
uniform["officer's uniform"] = /obj/item/clothing/under/solgov/utility/expeditionary/officer/resomi
uniform["dress uniform"] = /obj/item/clothing/under/solgov/mildress/expeditionary/resomi
gear_tweaks += new/datum/gear_tweak/path(uniform)


/datum/gear/uniform/resomi/dress
display_name = "(Resomi) dresses selection"
display_name = "(Resomi) uniform, dress"
path = /obj/item/clothing/under/resomi/dress
flags = GEAR_HAS_TYPE_SELECTION


/datum/gear/uniform/resomi/utility
display_name = "(Resomi) uniform, utility"
path = /obj/item/clothing/under/resomi/utility
/datum/gear/uniform/resomi/worksmock
display_name = "(Resomi) uniform, work"
path = /obj/item/clothing/under/resomi/work
flags = GEAR_HAS_TYPE_SELECTION


/datum/gear/uniform/resomi/dark_worksmock
display_name = "(Resomi) uniform, work"
path = /obj/item/clothing/under/resomi/work
/datum/gear/uniform/resomi/undercoat
display_name = "(Resomi) uniform, undercoat"
path = /obj/item/clothing/under/resomi/undercoat
flags = GEAR_HAS_TYPE_SELECTION


/datum/gear/tactical/security_uniforms/resomi
display_name = "(Resomi) uniform, Security"
path = /obj/item/clothing/under/resomi/red
sort_category = "Xenowear"
whitelisted = list(SPECIES_RESOMI)

/datum/gear/tactical/security_uniforms/resomi/New()
return


/datum/gear/eyes/resomi
display_name = "(Resomi) sun lenses"
path = /obj/item/clothing/glasses/sunglasses/lenses
Expand Down Expand Up @@ -155,9 +169,14 @@
sort_category = "Xenowear"
whitelisted = list(SPECIES_RESOMI)

/datum/gear/suit/resomi/coat/New()
/datum/gear/suit/resomi_coat/New()
..()
var/resomi = list()
resomi["black coat"] = /obj/item/clothing/suit/storage/toggle/resomicoat
resomi["white coat"] = /obj/item/clothing/suit/storage/toggle/resomicoat/white
gear_tweaks += new/datum/gear_tweak/path(resomi)


/datum/gear/plush_toy/New()
toy_list["resomi plush"] = /obj/item/toy/plushie/resomi
..()

0 comments on commit e5373d4

Please sign in to comment.