Skip to content

Commit

Permalink
Merge pull request #162 from BrunoSamoyed/somecustoms
Browse files Browse the repository at this point in the history
Cloak update (part 1)
  • Loading branch information
VoiceInYourHead authored May 4, 2024
2 parents 337db50 + e9a4d8b commit de72957
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 6 deletions.
31 changes: 30 additions & 1 deletion code/modules/fd/clothing/pieces.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,33 @@
. = ..()

if(istype(loc, /obj/item/clothing/suit/space/void/exploration) || istype(loc, /obj/item/clothing/suit/space/void/atmos/alt/sol/expo) )
return overlay_image(accessory_icons[slot], "shoulder_cape_fat", color, RESET_COLOR)
return overlay_image(accessory_icons[slot], "shoulder_cape_fat", color, RESET_COLOR)

/obj/item/clothing/accessory/cloakspace
name = "cloak"
desc = "Durable cloak from SpaceFashion. Resistant to environmental hazards and physical impact. Pleasant to the touch."
icon = 'icons/fd/mob/onmob_accessories.dmi'
icon_state = "colorcloak"

accessory_icons = list(
slot_w_uniform_str = 'icons/fd/mob/onmob_accessories.dmi',
slot_wear_suit_str = 'icons/fd/mob/onmob_accessories.dmi')
item_icons = list(
slot_wear_suit_str = 'icons/fd/mob/onmob_accessories.dmi')

var/fire_resist = T0C+100
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
slot_flags = SLOT_OCLOTHING
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
siemens_coefficient = 0.9
w_class = ITEM_SIZE_NORMAL
slot = ACCESSORY_SLOT_INSIGNIA
slot_flags = SLOT_OCLOTHING

valid_accessory_slots = null

/obj/item/clothing/accessory/cloakspace/get_mob_overlay(mob/user_mob, slot)
. = ..()

if(istype(loc, /obj/item/clothing/suit/space/void/exploration) || istype(loc, /obj/item/clothing/suit/space/void/atmos/alt/sol/expo) )
return overlay_image(accessory_icons[slot], "colorcloak_fat", color, RESET_COLOR)
15 changes: 10 additions & 5 deletions code/modules/fd/loadout/loadout_pieces.dm
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
/datum/gear/clothing/coolscarf
display_name = "Large scarf, colour select"
display_name = "large scarf, colour select"
path = /obj/item/clothing/accessory/scarf/coolscarf
flags = GEAR_HAS_COLOR_SELECTION

/datum/gear/clothing/shemagh
display_name = "Shemagh, colour select"
display_name = "shemagh, colour select"
path = /obj/item/clothing/accessory/scarf/shemagh
flags = GEAR_HAS_COLOR_SELECTION

/datum/gear/clothing/shouldercape
display_name = "Shoulder cape, colour select"
display_name = "shoulder cape, colour select"
path = /obj/item/clothing/accessory/scarf/shouldercape
flags = GEAR_HAS_COLOR_SELECTION

/datum/gear/clothing/belt_chain
display_name = "Metal chain"
path = /obj/item/clothing/accessory/suspenders/beltchain
display_name = "metal chain"
path = /obj/item/clothing/accessory/suspenders/beltchain

datum/gear/clothing/cloakspace
display_name = "cloak, colour select"
path = /obj/item/clothing/accessory/cloakspace
flags = GEAR_HAS_COLOR_SELECTION
Binary file modified icons/fd/mob/onmob_accessories.dmi
Binary file not shown.

0 comments on commit de72957

Please sign in to comment.