mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 08:36:00 +01:00
Ghom
0b0c5ea91e
## About The Pull Request Extends the part of the crafting unit test that ensures consistency between the total mats of the components of a recipe (or rather, the result of said recipe) and a generic instance of the same type as its result, previously only implemented on food recipes. ## Why It's Good For The Game This ensures a degree of consistency with the material composition of various objects in the game. I couldn't do it in the original PR as that one was too big already and it took months to get it merged, and have the relative bugs fixed. Currently a WIP as I slowly deal with the unit test reports. ## Changelog 🆑 refactor: Follow-up to the crafting/material refactor from months ago. All objects crafted with stacks now inherit their mat composition (not necessarily the effects and color) by default, while previously only a few things like chair, sinks and toilets did. Report any object looking or behaving weirdly as a result. fix: The material composition of ammo boxes is no longer a 1/10 of what it's supposed to be. It was a shitty hack to make it harder to recycle empty ammo boxes. Instead, they lose materials as they're emptied now. /🆑
248 lines
8.5 KiB
Plaintext
248 lines
8.5 KiB
Plaintext
/****************Explorer's Suit and Mask****************/
|
|
/obj/item/clothing/suit/hooded/explorer
|
|
name = "explorer suit"
|
|
desc = "An armoured suit for exploring harsh environments."
|
|
icon_state = "explorer"
|
|
icon = 'icons/obj/clothing/suits/utility.dmi'
|
|
worn_icon = 'icons/mob/clothing/suits/utility.dmi'
|
|
inhand_icon_state = null
|
|
supports_variations_flags = CLOTHING_DIGITIGRADE_MASK
|
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
|
cold_protection = CHEST|GROIN|LEGS|ARMS
|
|
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
|
|
heat_protection = CHEST|GROIN|LEGS|ARMS
|
|
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
|
|
hoodtype = /obj/item/clothing/head/hooded/explorer
|
|
armor_type = /datum/armor/hooded_explorer
|
|
resistance_flags = FIRE_PROOF
|
|
|
|
/obj/item/clothing/suit/hooded/explorer/get_general_color(icon/base_icon)
|
|
return "#796755"
|
|
|
|
/datum/armor/hooded_explorer
|
|
melee = 30
|
|
bullet = 10
|
|
laser = 10
|
|
energy = 20
|
|
bomb = 50
|
|
fire = 50
|
|
acid = 50
|
|
wound = 10
|
|
|
|
/obj/item/clothing/head/hooded/explorer
|
|
name = "explorer hood"
|
|
desc = "An armoured hood for exploring harsh environments."
|
|
icon = 'icons/obj/clothing/head/utility.dmi'
|
|
worn_icon = 'icons/mob/clothing/head/utility.dmi'
|
|
icon_state = "explorer"
|
|
body_parts_covered = HEAD
|
|
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
|
|
cold_protection = HEAD
|
|
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
|
|
heat_protection = HEAD
|
|
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
|
|
armor_type = /datum/armor/hooded_explorer
|
|
resistance_flags = FIRE_PROOF
|
|
|
|
/obj/item/clothing/suit/hooded/explorer/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/armor_plate)
|
|
allowed = GLOB.mining_suit_allowed
|
|
|
|
/obj/item/clothing/head/hooded/explorer/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/armor_plate)
|
|
|
|
/obj/item/clothing/mask/gas/explorer
|
|
name = "explorer gas mask"
|
|
desc = "A military-grade gas mask that can be connected to an air supply."
|
|
icon_state = "gas_mining"
|
|
inhand_icon_state = "explorer_gasmask"
|
|
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
|
|
visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
|
|
visor_flags_inv = HIDEFACIALHAIR
|
|
visor_flags_cover = MASKCOVERSMOUTH
|
|
actions_types = list(/datum/action/item_action/adjust)
|
|
armor_type = /datum/armor/gas_explorer
|
|
resistance_flags = FIRE_PROOF
|
|
|
|
/datum/armor/gas_explorer
|
|
melee = 10
|
|
bullet = 5
|
|
laser = 5
|
|
energy = 5
|
|
bio = 50
|
|
fire = 20
|
|
acid = 40
|
|
wound = 5
|
|
|
|
/obj/item/clothing/mask/gas/explorer/plasmaman
|
|
starting_filter_type = /obj/item/gas_filter/plasmaman
|
|
|
|
/obj/item/clothing/mask/gas/explorer/attack_self(mob/user)
|
|
adjust_visor(user)
|
|
|
|
/obj/item/clothing/mask/gas/explorer/visor_toggling()
|
|
. = ..()
|
|
// adjusted = out of the way = smaller = can fit in boxes
|
|
update_weight_class(up ? WEIGHT_CLASS_SMALL : WEIGHT_CLASS_NORMAL)
|
|
|
|
/obj/item/clothing/mask/gas/explorer/update_icon_state()
|
|
. = ..()
|
|
inhand_icon_state = "[initial(inhand_icon_state)][up ? "_up" : ""]"
|
|
|
|
/obj/item/clothing/mask/gas/explorer/examine(mob/user)
|
|
. = ..()
|
|
if(up || w_class == WEIGHT_CLASS_SMALL)
|
|
return
|
|
. += span_notice("You could fit this into a box if you adjusted it.")
|
|
|
|
/obj/item/clothing/mask/gas/explorer/folded
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
|
|
/obj/item/clothing/mask/gas/explorer/folded/Initialize(mapload)
|
|
. = ..()
|
|
visor_toggling()
|
|
|
|
/obj/item/clothing/suit/hooded/cloak
|
|
icon = 'icons/obj/clothing/suits/armor.dmi'
|
|
worn_icon = 'icons/mob/clothing/suits/armor.dmi'
|
|
|
|
/obj/item/clothing/suit/hooded/cloak/goliath
|
|
name = "goliath cloak"
|
|
desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits."
|
|
icon_state = "goliath_cloak"
|
|
alternate_worn_layer = NECK_LAYER
|
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
|
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
|
cold_protection = CHEST|GROIN|LEGS|ARMS
|
|
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
|
|
heat_protection = CHEST|GROIN|LEGS|ARMS
|
|
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
|
|
resistance_flags = FIRE_PROOF
|
|
armor_type = /datum/armor/hooded_goliath
|
|
hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath
|
|
|
|
/obj/item/clothing/suit/hooded/cloak/goliath/Initialize(mapload)
|
|
. = ..()
|
|
allowed = GLOB.mining_suit_allowed
|
|
|
|
/datum/armor/hooded_goliath
|
|
melee = 60
|
|
bullet = 10
|
|
laser = 10
|
|
energy = 20
|
|
bomb = 50
|
|
fire = 50
|
|
acid = 50
|
|
wound = 10
|
|
|
|
/obj/item/clothing/suit/hooded/cloak/goliath/click_alt(mob/user)
|
|
if(!iscarbon(user))
|
|
return NONE
|
|
var/mob/living/carbon/char = user
|
|
if((char.get_item_by_slot(ITEM_SLOT_NECK) == src) || (char.get_item_by_slot(ITEM_SLOT_OCLOTHING) == src))
|
|
to_chat(user, span_warning("You can't adjust [src] while wearing it!"))
|
|
return CLICK_ACTION_BLOCKING
|
|
if(!user.is_holding(src))
|
|
to_chat(user, span_warning("You must be holding [src] in order to adjust it!"))
|
|
return CLICK_ACTION_BLOCKING
|
|
if(slot_flags & ITEM_SLOT_OCLOTHING)
|
|
slot_flags = ITEM_SLOT_NECK
|
|
cold_protection = null
|
|
heat_protection = null
|
|
set_armor(/datum/armor/none)
|
|
user.visible_message(span_notice("[user] adjusts their [src] for ceremonial use."), span_notice("You adjust your [src] for ceremonial use."))
|
|
else
|
|
slot_flags = initial(slot_flags)
|
|
cold_protection = initial(cold_protection)
|
|
heat_protection = initial(heat_protection)
|
|
set_armor(initial(armor_type))
|
|
user.visible_message(span_notice("[user] adjusts their [src] for defensive use."), span_notice("You adjust your [src] for defensive use."))
|
|
return CLICK_ACTION_SUCCESS
|
|
|
|
/obj/item/clothing/head/hooded/cloakhood/goliath
|
|
name = "goliath cloak hood"
|
|
icon = 'icons/obj/clothing/head/helmet.dmi'
|
|
worn_icon = 'icons/mob/clothing/head/helmet.dmi'
|
|
icon_state = "golhood"
|
|
desc = "A protective & concealing hood."
|
|
armor_type = /datum/armor/hooded_goliath
|
|
body_parts_covered = HEAD
|
|
cold_protection = HEAD
|
|
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
|
|
heat_protection = HEAD
|
|
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
|
|
clothing_flags = SNUG_FIT
|
|
flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
|
|
transparent_protection = HIDEMASK
|
|
resistance_flags = FIRE_PROOF
|
|
|
|
/obj/item/clothing/head/hooded/cloakhood/goliath/Initialize(mapload)
|
|
. = ..()
|
|
|
|
/obj/item/clothing/suit/armor/bone
|
|
name = "bone armor"
|
|
desc = "A tribal armor plate, crafted from animal bone."
|
|
icon_state = "bonearmor"
|
|
inhand_icon_state = null
|
|
blood_overlay_type = "armor"
|
|
armor_type = /datum/armor/hooded_explorer
|
|
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS
|
|
cold_protection = CHEST|GROIN|LEGS|ARMS
|
|
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
|
|
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS
|
|
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
|
|
resistance_flags = FIRE_PROOF
|
|
custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 6)
|
|
|
|
/obj/item/clothing/suit/armor/bone/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/armor_plate, upgrade_item = /obj/item/clothing/accessory/talisman)
|
|
allowed = GLOB.mining_suit_allowed
|
|
|
|
/obj/item/clothing/head/helmet/skull
|
|
name = "skull helmet"
|
|
desc = "An intimidating tribal helmet, it doesn't look very comfortable."
|
|
icon_state = "skull"
|
|
inhand_icon_state = null
|
|
strip_delay = 10 SECONDS
|
|
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT
|
|
flags_cover = HEADCOVERSEYES
|
|
cold_protection = HEAD
|
|
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
|
|
heat_protection = HEAD
|
|
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
|
|
armor_type = /datum/armor/hooded_explorer
|
|
resistance_flags = FIRE_PROOF
|
|
custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 4)
|
|
|
|
/obj/item/clothing/head/helmet/skull/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/armor_plate, upgrade_item = /obj/item/clothing/accessory/talisman)
|
|
|
|
/obj/item/clothing/suit/hooded/explorer/syndicate
|
|
name = "syndicate explorer suit"
|
|
desc = "An armoured suit for exploring harsh environments, dyed in the sinister red and black of the Syndicate. This one seems better armored than the ones Nanotrasen gives out."
|
|
icon_state = "explorer_syndicate"
|
|
icon = 'icons/obj/clothing/suits/utility.dmi'
|
|
worn_icon = 'icons/mob/clothing/suits/utility.dmi'
|
|
hoodtype = /obj/item/clothing/head/hooded/explorer/syndicate
|
|
armor_type = /datum/armor/hooded_explorer_syndicate
|
|
|
|
/datum/armor/hooded_explorer_syndicate
|
|
melee = 30
|
|
bullet = 15
|
|
laser = 25
|
|
energy = 35
|
|
bomb = 50
|
|
fire = 60
|
|
acid = 60
|
|
wound = 10
|
|
|
|
/obj/item/clothing/head/hooded/explorer/syndicate
|
|
name = "syndicate explorer hood"
|
|
desc = "An armoured hood for exploring harsh environments."
|
|
icon_state = "explorer_syndicate"
|
|
armor_type = /datum/armor/hooded_explorer_syndicate
|