fixes mod plating being called armor in some places (#65314)

* saucy jack

* wario
This commit is contained in:
Fikou
2022-03-09 01:07:49 -05:00
committed by GitHub
parent 803ca4537d
commit 4c250570ef
4 changed files with 38 additions and 38 deletions
+11 -11
View File
@@ -51,32 +51,32 @@
new /obj/item/mod/core/standard(drop_location())
qdel(src)
/obj/item/mod/construction/armor
/obj/item/mod/construction/plating
name = "MOD external plating"
desc = "External plating used to finish a MOD control unit."
icon_state = "standard-plating"
var/datum/mod_theme/theme = /datum/mod_theme
/obj/item/mod/construction/armor/Initialize(mapload)
/obj/item/mod/construction/plating/Initialize(mapload)
. = ..()
var/datum/mod_theme/used_theme = GLOB.mod_themes[theme]
name = "MOD [used_theme.name] external plating"
desc = "[desc] [used_theme.desc]"
icon_state = "[used_theme.default_skin]-plating"
/obj/item/mod/construction/armor/engineering
/obj/item/mod/construction/plating/engineering
theme = /datum/mod_theme/engineering
/obj/item/mod/construction/armor/atmospheric
/obj/item/mod/construction/plating/atmospheric
theme = /datum/mod_theme/atmospheric
/obj/item/mod/construction/armor/medical
/obj/item/mod/construction/plating/medical
theme = /datum/mod_theme/medical
/obj/item/mod/construction/armor/security
/obj/item/mod/construction/plating/security
theme = /datum/mod_theme/security
/obj/item/mod/construction/armor/cosmohonk
/obj/item/mod/construction/plating/cosmohonk
theme = /datum/mod_theme/cosmohonk
/obj/item/mod/paint
@@ -127,7 +127,7 @@
if(WRENCHED_ASSEMBLY_STEP)
display_text = "The assembly seems <b>loose</b>..."
if(SCREWED_ASSEMBLY_STEP)
display_text = "All it's missing is <b>external armor</b>..."
display_text = "All it's missing is <b>external plating</b>..."
. += span_notice(display_text)
/obj/item/mod/construction/shell/attackby(obj/item/part, mob/user, params)
@@ -232,13 +232,13 @@
balloon_alert(user, "assembly unsecured")
step = BOOTS_STEP
if(SCREWED_ASSEMBLY_STEP)
if(istype(part, /obj/item/mod/construction/armor)) //Construct
var/obj/item/mod/construction/armor/external_armor = part
if(istype(part, /obj/item/mod/construction/plating)) //Construct
var/obj/item/mod/construction/plating/external_plating = part
if(!user.transferItemToLoc(part, src))
return
playsound(src, 'sound/machines/click.ogg', 30, TRUE)
balloon_alert(user, "suit finished")
var/obj/item/mod = new /obj/item/mod/control(drop_location(), external_armor.theme, null, core)
var/obj/item/mod = new /obj/item/mod/control(drop_location(), external_plating.theme, null, core)
core = null
qdel(src)
user.put_in_hands(mod)
@@ -1022,56 +1022,56 @@
build_path = /obj/item/mod/construction/boots
category = list("MOD Construction")
/datum/design/mod_armor
/datum/design/mod_plating
name = "MOD external plating"
desc = "External plating for a MODsuit."
id = "mod_armor_standard"
id = "mod_plating_standard"
build_type = MECHFAB|PROTOLATHE
materials = list(/datum/material/iron = 6000, /datum/material/glass = 3000, /datum/material/plasma = 1000)
construction_time = 15 SECONDS
build_path = /obj/item/mod/construction/armor
build_path = /obj/item/mod/construction/plating
category = list("MOD Construction", "Equipment")
research_icon = 'icons/obj/clothing/modsuit/mod_construction.dmi'
research_icon_state = "standard-plating"
/datum/design/mod_armor/New()
/datum/design/mod_plating/New()
. = ..()
var/obj/item/mod/construction/armor/armor_type = build_path
var/obj/item/mod/construction/plating/armor_type = build_path
var/datum/mod_theme/theme = GLOB.mod_themes[initial(armor_type.theme)]
name = "MOD [theme.name] armor"
name = "MOD [theme.name] plating"
desc = "External plating for a MODsuit. [theme.desc]"
/datum/design/mod_armor/engineering
id = "mod_armor_engineering"
build_path = /obj/item/mod/construction/armor/engineering
/datum/design/mod_plating/engineering
id = "mod_plating_engineering"
build_path = /obj/item/mod/construction/plating/engineering
materials = list(/datum/material/iron = 6000, /datum/material/gold = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
research_icon_state = "engineering-plating"
/datum/design/mod_armor/atmospheric
id = "mod_armor_atmospheric"
build_path = /obj/item/mod/construction/armor/atmospheric
/datum/design/mod_plating/atmospheric
id = "mod_plating_atmospheric"
build_path = /obj/item/mod/construction/plating/atmospheric
materials = list(/datum/material/iron = 6000, /datum/material/titanium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
research_icon_state = "atmospheric-plating"
/datum/design/mod_armor/medical
id = "mod_armor_medical"
build_path = /obj/item/mod/construction/armor/medical
/datum/design/mod_plating/medical
id = "mod_plating_medical"
build_path = /obj/item/mod/construction/plating/medical
materials = list(/datum/material/iron = 6000, /datum/material/silver = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
research_icon_state = "medical-plating"
/datum/design/mod_armor/security
id = "mod_armor_security"
build_path = /obj/item/mod/construction/armor/security
/datum/design/mod_plating/security
id = "mod_plating_security"
build_path = /obj/item/mod/construction/plating/security
materials = list(/datum/material/iron = 6000, /datum/material/uranium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
research_icon_state = "security-plating"
/datum/design/mod_armor/cosmohonk
id = "mod_armor_cosmohonk"
build_path = /obj/item/mod/construction/armor/cosmohonk
/datum/design/mod_plating/cosmohonk
id = "mod_plating_cosmohonk"
build_path = /obj/item/mod/construction/plating/cosmohonk
materials = list(/datum/material/iron = 6000, /datum/material/bananium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
research_icon_state = "cosmohonk-plating"
+6 -6
View File
@@ -124,7 +124,7 @@
"mod_helmet",
"mod_paint_kit",
"mod_shell",
"mod_armor_standard",
"mod_plating_standard",
"mod_storage",
"mod_welding",
"mod_mouthhole",
@@ -1465,7 +1465,7 @@
description = "Engineering suits, for powered engineers."
prereq_ids = list("mod_advanced", "engineering")
design_ids = list(
"mod_armor_engineering",
"mod_plating_engineering",
"mod_visor_meson",
"mod_t_ray",
"mod_magboot",
@@ -1481,7 +1481,7 @@
description = "Advanced Engineering suits, for advanced powered engineers."
prereq_ids = list("mod_engineering", "adv_engi")
design_ids = list(
"mod_armor_atmospheric",
"mod_plating_atmospheric",
"mod_jetpack",
"mod_rad_protection",
"mod_emp_shield",
@@ -1495,7 +1495,7 @@
description = "Medical suits for quick rescue purposes."
prereq_ids = list("mod_advanced", "biotech")
design_ids = list(
"mod_armor_medical",
"mod_plating_medical",
"mod_visor_medhud",
"mod_health_analyzer",
"mod_quick_carry",
@@ -1511,7 +1511,7 @@
description = "Security suits for space crime handling."
prereq_ids = list("mod_advanced", "sec_basic")
design_ids = list(
"mod_armor_security",
"mod_plating_security",
"mod_visor_sechud",
"mod_stealth",
"mod_holster",
@@ -1525,7 +1525,7 @@
description = "Powered suits for protection against low-humor environments."
prereq_ids = list("mod_advanced", "clown")
design_ids = list(
"mod_armor_cosmohonk",
"mod_plating_cosmohonk",
"mod_bikehorn",
"mod_microwave_beam",
"mod_waddle",
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB