mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-11 18:22:14 +00:00
[MIRROR] fixes mod plating being called armor in some places [MDB IGNORE] (#11975)
* fixes mod plating being called armor in some places (#65314) * saucy jack * wario * fixes mod plating being called armor in some places Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
This commit is contained in:
@@ -51,32 +51,32 @@
|
|||||||
new /obj/item/mod/core/standard(drop_location())
|
new /obj/item/mod/core/standard(drop_location())
|
||||||
qdel(src)
|
qdel(src)
|
||||||
|
|
||||||
/obj/item/mod/construction/armor
|
/obj/item/mod/construction/plating
|
||||||
name = "MOD external plating"
|
name = "MOD external plating"
|
||||||
desc = "External plating used to finish a MOD control unit."
|
desc = "External plating used to finish a MOD control unit."
|
||||||
icon_state = "standard-plating"
|
icon_state = "standard-plating"
|
||||||
var/datum/mod_theme/theme = /datum/mod_theme
|
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]
|
var/datum/mod_theme/used_theme = GLOB.mod_themes[theme]
|
||||||
name = "MOD [used_theme.name] external plating"
|
name = "MOD [used_theme.name] external plating"
|
||||||
desc = "[desc] [used_theme.desc]"
|
desc = "[desc] [used_theme.desc]"
|
||||||
icon_state = "[used_theme.default_skin]-plating"
|
icon_state = "[used_theme.default_skin]-plating"
|
||||||
|
|
||||||
/obj/item/mod/construction/armor/engineering
|
/obj/item/mod/construction/plating/engineering
|
||||||
theme = /datum/mod_theme/engineering
|
theme = /datum/mod_theme/engineering
|
||||||
|
|
||||||
/obj/item/mod/construction/armor/atmospheric
|
/obj/item/mod/construction/plating/atmospheric
|
||||||
theme = /datum/mod_theme/atmospheric
|
theme = /datum/mod_theme/atmospheric
|
||||||
|
|
||||||
/obj/item/mod/construction/armor/medical
|
/obj/item/mod/construction/plating/medical
|
||||||
theme = /datum/mod_theme/medical
|
theme = /datum/mod_theme/medical
|
||||||
|
|
||||||
/obj/item/mod/construction/armor/security
|
/obj/item/mod/construction/plating/security
|
||||||
theme = /datum/mod_theme/security
|
theme = /datum/mod_theme/security
|
||||||
|
|
||||||
/obj/item/mod/construction/armor/cosmohonk
|
/obj/item/mod/construction/plating/cosmohonk
|
||||||
theme = /datum/mod_theme/cosmohonk
|
theme = /datum/mod_theme/cosmohonk
|
||||||
|
|
||||||
/obj/item/mod/paint
|
/obj/item/mod/paint
|
||||||
@@ -127,7 +127,7 @@
|
|||||||
if(WRENCHED_ASSEMBLY_STEP)
|
if(WRENCHED_ASSEMBLY_STEP)
|
||||||
display_text = "The assembly seems <b>loose</b>..."
|
display_text = "The assembly seems <b>loose</b>..."
|
||||||
if(SCREWED_ASSEMBLY_STEP)
|
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)
|
. += span_notice(display_text)
|
||||||
|
|
||||||
/obj/item/mod/construction/shell/attackby(obj/item/part, mob/user, params)
|
/obj/item/mod/construction/shell/attackby(obj/item/part, mob/user, params)
|
||||||
@@ -232,13 +232,13 @@
|
|||||||
balloon_alert(user, "assembly unsecured")
|
balloon_alert(user, "assembly unsecured")
|
||||||
step = BOOTS_STEP
|
step = BOOTS_STEP
|
||||||
if(SCREWED_ASSEMBLY_STEP)
|
if(SCREWED_ASSEMBLY_STEP)
|
||||||
if(istype(part, /obj/item/mod/construction/armor)) //Construct
|
if(istype(part, /obj/item/mod/construction/plating)) //Construct
|
||||||
var/obj/item/mod/construction/armor/external_armor = part
|
var/obj/item/mod/construction/plating/external_plating = part
|
||||||
if(!user.transferItemToLoc(part, src))
|
if(!user.transferItemToLoc(part, src))
|
||||||
return
|
return
|
||||||
playsound(src, 'sound/machines/click.ogg', 30, TRUE)
|
playsound(src, 'sound/machines/click.ogg', 30, TRUE)
|
||||||
balloon_alert(user, "suit finished")
|
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
|
core = null
|
||||||
qdel(src)
|
qdel(src)
|
||||||
user.put_in_hands(mod)
|
user.put_in_hands(mod)
|
||||||
|
|||||||
@@ -1025,56 +1025,56 @@
|
|||||||
build_path = /obj/item/mod/construction/boots
|
build_path = /obj/item/mod/construction/boots
|
||||||
category = list("MOD Construction")
|
category = list("MOD Construction")
|
||||||
|
|
||||||
/datum/design/mod_armor
|
/datum/design/mod_plating
|
||||||
name = "MOD external plating"
|
name = "MOD external plating"
|
||||||
desc = "External plating for a MODsuit."
|
desc = "External plating for a MODsuit."
|
||||||
id = "mod_armor_standard"
|
id = "mod_plating_standard"
|
||||||
build_type = MECHFAB|PROTOLATHE
|
build_type = MECHFAB|PROTOLATHE
|
||||||
materials = list(/datum/material/iron = 6000, /datum/material/glass = 3000, /datum/material/plasma = 1000)
|
materials = list(/datum/material/iron = 6000, /datum/material/glass = 3000, /datum/material/plasma = 1000)
|
||||||
construction_time = 15 SECONDS
|
construction_time = 15 SECONDS
|
||||||
build_path = /obj/item/mod/construction/armor
|
build_path = /obj/item/mod/construction/plating
|
||||||
category = list("MOD Construction", "Equipment")
|
category = list("MOD Construction", "Equipment")
|
||||||
research_icon = 'icons/obj/clothing/modsuit/mod_construction.dmi'
|
research_icon = 'icons/obj/clothing/modsuit/mod_construction.dmi'
|
||||||
research_icon_state = "standard-plating"
|
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)]
|
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]"
|
desc = "External plating for a MODsuit. [theme.desc]"
|
||||||
|
|
||||||
/datum/design/mod_armor/engineering
|
/datum/design/mod_plating/engineering
|
||||||
id = "mod_armor_engineering"
|
id = "mod_plating_engineering"
|
||||||
build_path = /obj/item/mod/construction/armor/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)
|
materials = list(/datum/material/iron = 6000, /datum/material/gold = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
|
||||||
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
|
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
|
||||||
research_icon_state = "engineering-plating"
|
research_icon_state = "engineering-plating"
|
||||||
|
|
||||||
/datum/design/mod_armor/atmospheric
|
/datum/design/mod_plating/atmospheric
|
||||||
id = "mod_armor_atmospheric"
|
id = "mod_plating_atmospheric"
|
||||||
build_path = /obj/item/mod/construction/armor/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)
|
materials = list(/datum/material/iron = 6000, /datum/material/titanium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
|
||||||
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
|
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
|
||||||
research_icon_state = "atmospheric-plating"
|
research_icon_state = "atmospheric-plating"
|
||||||
|
|
||||||
/datum/design/mod_armor/medical
|
/datum/design/mod_plating/medical
|
||||||
id = "mod_armor_medical"
|
id = "mod_plating_medical"
|
||||||
build_path = /obj/item/mod/construction/armor/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)
|
materials = list(/datum/material/iron = 6000, /datum/material/silver = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
|
||||||
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
|
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
|
||||||
research_icon_state = "medical-plating"
|
research_icon_state = "medical-plating"
|
||||||
|
|
||||||
/datum/design/mod_armor/security
|
/datum/design/mod_plating/security
|
||||||
id = "mod_armor_security"
|
id = "mod_plating_security"
|
||||||
build_path = /obj/item/mod/construction/armor/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)
|
materials = list(/datum/material/iron = 6000, /datum/material/uranium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
|
||||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||||
research_icon_state = "security-plating"
|
research_icon_state = "security-plating"
|
||||||
|
|
||||||
/datum/design/mod_armor/cosmohonk
|
/datum/design/mod_plating/cosmohonk
|
||||||
id = "mod_armor_cosmohonk"
|
id = "mod_plating_cosmohonk"
|
||||||
build_path = /obj/item/mod/construction/armor/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)
|
materials = list(/datum/material/iron = 6000, /datum/material/bananium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000)
|
||||||
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
|
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
|
||||||
research_icon_state = "cosmohonk-plating"
|
research_icon_state = "cosmohonk-plating"
|
||||||
|
|||||||
@@ -128,7 +128,7 @@
|
|||||||
"mod_helmet",
|
"mod_helmet",
|
||||||
"mod_paint_kit",
|
"mod_paint_kit",
|
||||||
"mod_shell",
|
"mod_shell",
|
||||||
"mod_armor_standard",
|
"mod_plating_standard",
|
||||||
"mod_storage",
|
"mod_storage",
|
||||||
"mod_welding",
|
"mod_welding",
|
||||||
"mod_mouthhole",
|
"mod_mouthhole",
|
||||||
@@ -1540,7 +1540,7 @@
|
|||||||
description = "Engineering suits, for powered engineers."
|
description = "Engineering suits, for powered engineers."
|
||||||
prereq_ids = list("mod_advanced", "engineering")
|
prereq_ids = list("mod_advanced", "engineering")
|
||||||
design_ids = list(
|
design_ids = list(
|
||||||
"mod_armor_engineering",
|
"mod_plating_engineering",
|
||||||
"mod_visor_meson",
|
"mod_visor_meson",
|
||||||
"mod_t_ray",
|
"mod_t_ray",
|
||||||
"mod_magboot",
|
"mod_magboot",
|
||||||
@@ -1556,7 +1556,7 @@
|
|||||||
description = "Advanced Engineering suits, for advanced powered engineers."
|
description = "Advanced Engineering suits, for advanced powered engineers."
|
||||||
prereq_ids = list("mod_engineering", "adv_engi")
|
prereq_ids = list("mod_engineering", "adv_engi")
|
||||||
design_ids = list(
|
design_ids = list(
|
||||||
"mod_armor_atmospheric",
|
"mod_plating_atmospheric",
|
||||||
"mod_jetpack",
|
"mod_jetpack",
|
||||||
"mod_rad_protection",
|
"mod_rad_protection",
|
||||||
"mod_emp_shield",
|
"mod_emp_shield",
|
||||||
@@ -1570,7 +1570,7 @@
|
|||||||
description = "Medical suits for quick rescue purposes."
|
description = "Medical suits for quick rescue purposes."
|
||||||
prereq_ids = list("mod_advanced", "biotech")
|
prereq_ids = list("mod_advanced", "biotech")
|
||||||
design_ids = list(
|
design_ids = list(
|
||||||
"mod_armor_medical",
|
"mod_plating_medical",
|
||||||
"mod_visor_medhud",
|
"mod_visor_medhud",
|
||||||
"mod_health_analyzer",
|
"mod_health_analyzer",
|
||||||
"mod_quick_carry",
|
"mod_quick_carry",
|
||||||
@@ -1586,7 +1586,7 @@
|
|||||||
description = "Security suits for space crime handling."
|
description = "Security suits for space crime handling."
|
||||||
prereq_ids = list("mod_advanced", "sec_basic")
|
prereq_ids = list("mod_advanced", "sec_basic")
|
||||||
design_ids = list(
|
design_ids = list(
|
||||||
"mod_armor_security",
|
"mod_plating_security",
|
||||||
"mod_visor_sechud",
|
"mod_visor_sechud",
|
||||||
"mod_stealth",
|
"mod_stealth",
|
||||||
"mod_holster",
|
"mod_holster",
|
||||||
@@ -1600,7 +1600,7 @@
|
|||||||
description = "Powered suits for protection against low-humor environments."
|
description = "Powered suits for protection against low-humor environments."
|
||||||
prereq_ids = list("mod_advanced", "clown")
|
prereq_ids = list("mod_advanced", "clown")
|
||||||
design_ids = list(
|
design_ids = list(
|
||||||
"mod_armor_cosmohonk",
|
"mod_plating_cosmohonk",
|
||||||
"mod_bikehorn",
|
"mod_bikehorn",
|
||||||
"mod_microwave_beam",
|
"mod_microwave_beam",
|
||||||
"mod_waddle",
|
"mod_waddle",
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.5 KiB |
Reference in New Issue
Block a user