Skip to content

Commit

Permalink
add: new sprites for reinforcing explorer suits (#4093)
Browse files Browse the repository at this point in the history
  • Loading branch information
NightDawnFox authored Dec 24, 2023
1 parent 6568cbc commit f694c56
Show file tree
Hide file tree
Showing 22 changed files with 34 additions and 9 deletions.
15 changes: 10 additions & 5 deletions code/game/objects/items/stacks/sheets/leather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,39 +158,44 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
var/static/list/goliath_platable_armor_typecache = typecacheof(list(
/obj/item/clothing/suit/hooded/explorer,
/obj/item/clothing/head/hooded/explorer,
/obj/item/clothing/suit/hooded/pathfinder,
/obj/item/clothing/head/hooded/pathfinder,
/obj/item/clothing/head/helmet/space/plasmaman/mining))
))
var/static/list/goliath_platable_armor_with_icon_typecache = typecacheof(list(
/obj/item/clothing/suit/space/hardsuit/mining,
/obj/item/clothing/head/helmet/space/hardsuit/mining,
/obj/item/clothing/suit/hooded/explorer,
/obj/item/clothing/head/hooded/explorer,
/obj/item/clothing/head/helmet/space/plasmaman/mining,
))
/obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
if(!proximity_flag)
return
if(is_type_in_typecache(target, goliath_platable_armor_typecache) || is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache))
var/obj/item/clothing/C = target
var/datum/armor/current_armor = C.armor

if(current_armor.getRating("melee") < 60)
C.armor = current_armor.setRating(melee_value = min(current_armor.getRating("melee") + 10, 60))
if(is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache))
switch(C.armor.getRating("melee"))
if(40, 50)
C.icon_state = "[initial(C.icon_state)]_reinf"
C.item_color = "mining_reinf"
C.item_color = "[initial(C.icon_state)]_reinf"
if(60)
C.icon_state = "[initial(C.icon_state)]_reinf_full"
C.item_color = "mining_reinf_full"
C.item_color = "[initial(C.icon_state)]_reinf_full"

if(ishuman(C.loc))
var/mob/living/carbon/human/H = C.loc
H.update_inv_head()
H.update_inv_wear_suit()

to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
use(1)
else
to_chat(user, "<span class='warning'>You can't improve [C] any further!</span>")

else if(istype(target, /obj/mecha/working/ripley))
var/obj/mecha/working/ripley/D = target
if(D.hides < 3)
Expand Down
18 changes: 16 additions & 2 deletions code/modules/clothing/spacesuits/plasmamen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
icon = 'icons/obj/clothing/species/plasmaman/hats.dmi'
species_restricted = list("Plasmaman")
sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/helmet.dmi')
var/upgradable = FALSE

/obj/item/clothing/head/helmet/space/plasmaman/New()
..()
Expand Down Expand Up @@ -68,8 +69,20 @@

/obj/item/clothing/head/helmet/space/plasmaman/proc/toggle_light(mob/user)
on = !on
icon_state = "[initial(icon_state)][on ? "-light":""]"
item_state = icon_state
if(upgradable)
switch(armor.getRating("melee"))
if(30)
icon_state = "[initial(icon_state)][on ? "-light":""]"
item_state = icon_state
if(40,50)
icon_state = "[initial(icon_state)]_reinf[on ? "-light":""]"
item_state = icon_state
if(60)
icon_state = "[initial(icon_state)]_reinf_full[on ? "-light":""]"
item_state = icon_state
else
icon_state = "[initial(icon_state)][on ? "-light":""]"
item_state = icon_state

var/mob/living/carbon/human/H = user
if(istype(H))
Expand Down Expand Up @@ -268,6 +281,7 @@
vision_flags = SEE_TURFS
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
upgradable = TRUE

/obj/item/clothing/head/helmet/space/plasmaman/chaplain
name = "chaplain's plasma envirosuit helmet"
Expand Down
5 changes: 3 additions & 2 deletions code/modules/clothing/suits/hood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
. = ..()

/obj/item/clothing/suit/hooded/proc/MakeHood()
item_color = initial(icon_state)
if(!hood)
var/obj/item/clothing/head/hooded/W = new hoodtype(src)
W.suit = src
Expand All @@ -35,7 +36,7 @@
/obj/item/clothing/suit/hooded/proc/RemoveHood()
if(isnull(hood))
return
icon_state = "[initial(icon_state)]"
icon_state = item_color
suit_adjusted = 0
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
Expand Down Expand Up @@ -63,7 +64,7 @@
return
else if(H.equip_to_slot_if_possible(hood, slot_head))
suit_adjusted = 1
icon_state = "[initial(icon_state)]_hood"
icon_state = "[item_color]_hood"
H.update_inv_wear_suit()
for(var/X in actions)
var/datum/action/A = X
Expand Down
5 changes: 5 additions & 0 deletions code/modules/mining/equipment/explorer_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@

sprite_sheets = list(
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/head.dmi',
"Ash Walker" = 'icons/mob/clothing/species/unathi/head.dmi',
"Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/head.dmi',
"Draconid" = 'icons/mob/clothing/species/unathi/head.dmi',
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi',
Expand Down
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/drask/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/grey/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/monkey/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/plasmaman/helmet.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/skrell/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/tajaran/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/tajaran/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/unathi/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/unathi/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vulpkanin/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vulpkanin/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/species/plasmaman/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.

0 comments on commit f694c56

Please sign in to comment.