From e89a3646767bc5b2fcae5d8d7249d54ea24341c8 Mon Sep 17 00:00:00 2001 From: Aboshedab <58318297+Aboshedab@users.noreply.github.com> Date: Tue, 7 Jan 2020 23:54:10 +0400 Subject: [PATCH] Character set up issues for IPC's bugfix (#7926) As a result of my recent PR. Assigning body types had unforseen changes towards the character set up, namely that bishops had access to hair and that zeng-hu would start with the baseline monitor options. Changes the way bishop restriction for voidsuit/hardsuit usage. 1- Adds bishops as species_restricted for both voidsuits and hardsuits. 2- Does the same for Zeng-Hu, temporarily the human version. 3- Adjusts bodytype accordingly. This originally had code for Zeng-Hu usage of machine version of voidsuit/hardsuit, but as I won't be around for a bit, I'll do the bugfix in two phases as I intend to find a less hackey method of fixing this issue. So it changes Zeng-Hu usage of machine version hardsuit/voidsuit for the time being as human version. --- code/modules/clothing/spacesuits/rig/rig.dm | 2 +- code/modules/clothing/spacesuits/void/void.dm | 4 +- .../species/station/ipc/ipc_subspecies.dm | 3 +- .../Aboshehab - Bugfix for IPC rework.yml | 42 +++++++++++++++++++ 4 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/Aboshehab - Bugfix for IPC rework.yml diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 75c27c3d0df..04ce28208e3 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -87,7 +87,7 @@ var/datum/effect_system/sparks/spark_system var/allowed_module_types = MODULE_GENERAL // All rigs by default should have access to general - var/list/species_restricted = list("Human","Tajara","Unathi", "Skrell", "Machine") + var/list/species_restricted = list("Human","Tajara","Unathi", "Skrell", "Machine", "Bishop Accessory Frame", "Zeng-Hu Mobility Frame") /obj/item/rig/examine() to_chat(usr, "This is \icon[src][src.name].") diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 2bc98c8aab3..6401334734d 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -15,7 +15,7 @@ ) //Species-specific stuff. - species_restricted = list("Human", "Bishop Accessory Frame") + species_restricted = list("Human", "Bishop Accessory Frame", "Zeng-Hu Mobility Frame") sprite_sheets_refit = list( "Unathi" = 'icons/mob/species/unathi/helmet.dmi', "Tajara" = 'icons/mob/species/tajaran/helmet.dmi', @@ -50,7 +50,7 @@ slot_r_hand_str = 'icons/mob/items_righthand.dmi' ) - species_restricted = list("Human", "Skrell", "Bishop Accessory Frame") + species_restricted = list("Human", "Skrell", "Bishop Accessory Frame", "Zeng-Hu Mobility Frame") sprite_sheets_refit = list( "Unathi" = 'icons/mob/species/unathi/suit.dmi', "Tajara" = 'icons/mob/species/tajaran/suit.dmi', diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm index e8f031c98a1..b8e702872bc 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm @@ -387,6 +387,7 @@ /datum/species/machine/zenghu name = "Zeng-Hu Mobility Frame" short_name = "zhf" + bodytype = "Zeng-Hu Mobility Frame" icobase = 'icons/mob/human_races/ipc/r_ind_zenghu.dmi' deform = 'icons/mob/human_races/ipc/r_ind_zenghu.dmi' @@ -432,7 +433,7 @@ /datum/species/machine/bishop name = "Bishop Accessory Frame" short_name = "bcf" - bodytype = "Human" + bodytype = "Bishop Accessory Frame" icobase = 'icons/mob/human_races/ipc/r_ind_bishop.dmi' deform = 'icons/mob/human_races/ipc/r_ind_bishop.dmi' diff --git a/html/changelogs/Aboshehab - Bugfix for IPC rework.yml b/html/changelogs/Aboshehab - Bugfix for IPC rework.yml new file mode 100644 index 00000000000..480fb92c382 --- /dev/null +++ b/html/changelogs/Aboshehab - Bugfix for IPC rework.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Aboshehab + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes character set up issues for IPC's as a result of recent rework." + - tweak: "Change Zeng-Hu capability to use voidsuits and hardsuits machine version to human version until better implementation method is found."