From 531061c278d650dca1245570ddd8ab6ee72a3dcd Mon Sep 17 00:00:00 2001 From: CacheAtWork <133615617+CacheAtWork@users.noreply.github.com> Date: Fri, 30 Jun 2023 03:41:22 +0100 Subject: [PATCH 1/6] Update human.dm --- code/modules/mob/living/carbon/human/human.dm | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d7a786d4d1b..86f74af611d 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -53,6 +53,54 @@ GLOBAL_VAR_INIT(crotch_call_cooldown, 0) AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) RegisterSignal(src, COMSIG_HUMAN_UPDATE_GENITALS, .proc/signal_update_genitals) +/mob/living/carbon/twoman + name = "Unknown" + real_name = "Unknown" + icon = 'icons/mob/human.dmi' + icon_state = "caucasian_m" + appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE + +/mob/living/carbon/human/Initialize() + add_verb(src, /mob/living/proc/mob_sleep) + add_verb(src, /mob/living/proc/lay_down) + add_verb(src, /mob/living/carbon/human/verb/underwear_toggle) + add_verb(src, /mob/living/verb/subtle) + add_verb(src, /mob/living/verb/subtler) + + //initialize dna. for spawned humans; overwritten by other code + create_dna(src) + randomize_human(src) + dna.initialize_dna() + + if(dna.species) + set_species(dna.species.type) + + + AddComponent(/datum/component/personal_crafting) + AddComponent(/datum/component/footstep, FOOTSTEP_MOB_HUMAN, 0.3, 5) + . = ..() + + if(CONFIG_GET(flag/disable_stambuffer)) + enable_intentional_sprint_mode() + + RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, /atom.proc/clean_blood) + GLOB.human_list += src + + var/datum/atom_hud/data/twoman/genital/pornHud = GLOB.huds[GENITAL_PORNHUD] + pornHud.add_to_hud(src) + update_body(TRUE) + +/mob/living/carbon/twoman/ComponentInitialize() + . = ..() + if(!CONFIG_GET(flag/disable_human_mood)) + AddComponent(/datum/component/mood) + AddComponent(/datum/component/combat_mode) + AddElement(/datum/element/flavor_text/carbon, _name = "Flavor Text", _save_key = "flavor_text") + AddElement(/datum/element/flavor_text, "", "Set Pose/Leave OOC Message", "This should be used only for things pertaining to the current round!") + AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) + RegisterSignal(src, COMSIG_HUMAN_UPDATE_GENITALS, .proc/signal_update_genitals) + + /mob/living/carbon/human/Destroy() QDEL_NULL(physiology) GLOB.human_list -= src From c88eecbc2cef09ce64a73bd504177ebbdda061be Mon Sep 17 00:00:00 2001 From: CacheAtWork <133615617+CacheAtWork@users.noreply.github.com> Date: Fri, 30 Jun 2023 03:49:46 +0100 Subject: [PATCH 2/6] Update limbgrower_designs.dm --- .../research/designs/limbgrower_designs.dm | 76 ++++++++++++++++++- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index 7508d59b180..9105655073b 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -34,10 +34,82 @@ build_path = /obj/item/bodypart/r_leg category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno") -/datum/design/armblade +/datum/design/head + name = "Head" + id = "head" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/bodypart/head + category = list("initial","other") + +/datum/design/lungs + name = "Lungs" + id = "lungs" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/organ/lungs + category = list("initial","other") + +/datum/design/liver + name = "Liver" + id = "liver" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/organ/liver + category = list("initial","other") + +/datum/design/heart + name = "Heart" + id = "heart" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/organ/heart + category = list("initial","other") + +/datum/design/appendix + name = "Appendix" + id = "appendix" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/organ/appendix + category = list("initial","other") + +/datum/design/stomach + name = "Stomach" + id = "stomach" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/organ/stomach + category = list("initial","other") + +/datum/design/eyes + name = "Eyes" + id = "eyes" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/organ/eyes + category = list("initial","other") + +/datum/design/ears + name = "Ears" + id = "ears" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/organ/ears + category = list("initial","other") + +/datum/design/tongue + name = "Tongue" + id = "tongue" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 25) + build_path = /obj/item/organ/tongue + category = list("initial","other") + +//*datum/design/armblade name = "Arm Blade" id = "armblade" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 75) build_path = /obj/item/melee/synthetic_arm_blade - category = list("other","emagged") + category = list("other","emagged")*/ From 559caa02c6583a670e5ac59498efa0996d848af7 Mon Sep 17 00:00:00 2001 From: CacheAtWork <133615617+CacheAtWork@users.noreply.github.com> Date: Fri, 30 Jun 2023 03:51:20 +0100 Subject: [PATCH 3/6] Update limbgrower_designs.dm --- code/modules/research/designs/limbgrower_designs.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index 9105655073b..a263e47027c 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -106,10 +106,12 @@ build_path = /obj/item/organ/tongue category = list("initial","other") -//*datum/design/armblade +/* + /datum/design/armblade name = "Arm Blade" id = "armblade" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 75) build_path = /obj/item/melee/synthetic_arm_blade - category = list("other","emagged")*/ + category = list("other","emagged") +*/ From b464ed12af750923fd9479a7ad08b4ac96abaea8 Mon Sep 17 00:00:00 2001 From: CacheAtWork <133615617+CacheAtWork@users.noreply.github.com> Date: Fri, 30 Jun 2023 03:51:46 +0100 Subject: [PATCH 4/6] Update replicapod.dm --- code/modules/hydroponics/grown/replicapod.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index fb0c04346cd..2c77d2ec46e 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -1,6 +1,6 @@ // A very special plant, deserving it's own file. -/* + /obj/item/seeds/replicapod name = "pack of replica pod seeds" @@ -158,4 +158,4 @@ parent.update_tray() return result -*/ + From f2c34f022dbce2f7a71678ee451d8fca81c75332 Mon Sep 17 00:00:00 2001 From: CacheAtWork <133615617+CacheAtWork@users.noreply.github.com> Date: Fri, 30 Jun 2023 03:59:13 +0100 Subject: [PATCH 5/6] Update limbgrower_designs.dm --- code/modules/research/designs/limbgrower_designs.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index a263e47027c..7230d6d8ba1 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -40,7 +40,7 @@ build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 25) build_path = /obj/item/bodypart/head - category = list("initial","other") + category = list("initial","human") /datum/design/lungs name = "Lungs" @@ -106,6 +106,14 @@ build_path = /obj/item/organ/tongue category = list("initial","other") +/datum/design/human + name = "Torso" + id = "torso" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/synthflesh = 300) + build_path = /mob/living/carbon/twoman + category = list("initial","human") + /* /datum/design/armblade name = "Arm Blade" From a4dedf8ecea69e45ba1b3a744431d2729bf880e0 Mon Sep 17 00:00:00 2001 From: CacheAtWork <133615617+CacheAtWork@users.noreply.github.com> Date: Fri, 30 Jun 2023 04:07:05 +0100 Subject: [PATCH 6/6] Update human.dm --- code/modules/mob/living/carbon/human/human.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 86f74af611d..1ea7a0b0919 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -86,8 +86,6 @@ GLOBAL_VAR_INIT(crotch_call_cooldown, 0) RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, /atom.proc/clean_blood) GLOB.human_list += src - var/datum/atom_hud/data/twoman/genital/pornHud = GLOB.huds[GENITAL_PORNHUD] - pornHud.add_to_hud(src) update_body(TRUE) /mob/living/carbon/twoman/ComponentInitialize() @@ -98,7 +96,6 @@ GLOBAL_VAR_INIT(crotch_call_cooldown, 0) AddElement(/datum/element/flavor_text/carbon, _name = "Flavor Text", _save_key = "flavor_text") AddElement(/datum/element/flavor_text, "", "Set Pose/Leave OOC Message", "This should be used only for things pertaining to the current round!") AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) - RegisterSignal(src, COMSIG_HUMAN_UPDATE_GENITALS, .proc/signal_update_genitals) /mob/living/carbon/human/Destroy()