From 2dd19581b8a09a92f2d36fcb0d0eadc08193ba5d Mon Sep 17 00:00:00 2001 From: nmajask Date: Thu, 9 Dec 2021 19:05:02 -0500 Subject: [PATCH 1/3] changes the things --- _maps/_basemap.dm | 2 +- .../YogStation.dmm => YogsBox/YogsBox.dmm} | 0 _maps/yogsbox.dm | 1 + _maps/{yogstation.json => yogsbox.json} | 6 +- _maps/yogstation.dm | 1 - code/modules/surgery/organs/tails.dm | 174 +++++++++--------- 6 files changed, 92 insertions(+), 92 deletions(-) rename _maps/map_files/{YogStation/YogStation.dmm => YogsBox/YogsBox.dmm} (100%) create mode 100644 _maps/yogsbox.dm rename _maps/{yogstation.json => yogsbox.json} (59%) delete mode 100644 _maps/yogstation.dm diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index 735c244e7d76..e8d555890ca9 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -8,7 +8,7 @@ #include "map_files\mining\Icemoon.dmm" #include "map_files\mining\IcemoonUnderground.dmm" #include "map_files\debug\runtimestation.dmm" - #include "map_files\YogStation\Yogstation.dmm" + #include "map_files\YogsBox\Yogsbox.dmm" #include "map_files\YogsMeta\YogsMeta.dmm" #include "map_files\YogsDelta\YogsDelta.dmm" #include "map_files\EclipseStation\EclipseStation.dmm" diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogsBox/YogsBox.dmm similarity index 100% rename from _maps/map_files/YogStation/YogStation.dmm rename to _maps/map_files/YogsBox/YogsBox.dmm diff --git a/_maps/yogsbox.dm b/_maps/yogsbox.dm new file mode 100644 index 000000000000..bfadc4075710 --- /dev/null +++ b/_maps/yogsbox.dm @@ -0,0 +1 @@ +#define FORCE_MAP "_maps/yogsbox.json" diff --git a/_maps/yogstation.json b/_maps/yogsbox.json similarity index 59% rename from _maps/yogstation.json rename to _maps/yogsbox.json index c5e735881a9f..a2b3344b911e 100644 --- a/_maps/yogstation.json +++ b/_maps/yogsbox.json @@ -1,7 +1,7 @@ { - "map_name": "YogStation", - "map_path": "map_files/YogStation", - "map_file": "YogStation.dmm", + "map_name": "YogsBox", + "map_path": "map_files/YogsBox", + "map_file": "YogsBox.dmm", "shuttles": { "cargo": "cargo_box", "ferry": "ferry_fancy", diff --git a/_maps/yogstation.dm b/_maps/yogstation.dm deleted file mode 100644 index 040cec03d858..000000000000 --- a/_maps/yogstation.dm +++ /dev/null @@ -1 +0,0 @@ -#define FORCE_MAP "_maps/yogstation.json" \ No newline at end of file diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm index 149d15941549..782947f9936b 100644 --- a/code/modules/surgery/organs/tails.dm +++ b/code/modules/surgery/organs/tails.dm @@ -1,87 +1,87 @@ -// Note: tails only work in humans. They use human-specific parameters and rely on human code for displaying. - -/obj/item/organ/tail - name = "tail" - desc = "A severed tail. What did you cut this off of?" - icon_state = "severedtail" - zone = BODY_ZONE_PRECISE_GROIN - slot = ORGAN_SLOT_TAIL - var/tail_type = "None" - -/obj/item/organ/tail/Remove(mob/living/carbon/human/H, special = 0) - ..() - if(H && H.dna && H.dna.species) - H.dna.species.stop_wagging_tail(H) - -/obj/item/organ/tail/cat - name = "cat tail" - desc = "A severed cat tail. Who's wagging now?" - tail_type = "Cat" - -/obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) - ..() - if(istype(H)) - if(!("tail_human" in H.dna.species.mutant_bodyparts)) - H.dna.species.mutant_bodyparts |= "tail_human" - H.dna.features["tail_human"] = tail_type - H.update_body() - -/obj/item/organ/tail/cat/Remove(mob/living/carbon/human/H, special = 0) - ..() - if(istype(H)) - H.dna.features["tail_human"] = "None" - H.dna.species.mutant_bodyparts -= "tail_human" - color = H.hair_color - H.update_body() - -/obj/item/organ/tail/lizard - name = "lizard tail" - desc = "A severed lizard tail. Somewhere, no doubt, a lizard hater is very pleased with themselves." - icon_state = "severedlizardtail" //yogs - so the tail uses the correct sprites - color = "#116611" - tail_type = "Smooth" - var/spines = "None" - -/obj/item/organ/tail/lizard/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) - ..() - if(istype(H)) - // Checks here are necessary so it wouldn't overwrite the tail of a lizard it spawned in - if(!("tail_lizard" in H.dna.species.mutant_bodyparts)) - H.dna.features["tail_lizard"] = tail_type - H.dna.species.mutant_bodyparts |= "tail_lizard" - - if(!("spines" in H.dna.species.mutant_bodyparts)) - H.dna.features["spines"] = spines - H.dna.species.mutant_bodyparts |= "spines" - H.update_body() - -/obj/item/organ/tail/lizard/Remove(mob/living/carbon/human/H, special = 0) - ..() - if(istype(H)) - H.dna.species.mutant_bodyparts -= "tail_lizard" - H.dna.species.mutant_bodyparts -= "spines" - color = "#" + H.dna.features["mcolor"] - tail_type = H.dna.features["tail_lizard"] - spines = H.dna.features["spines"] - H.update_body() - -/obj/item/organ/tail/polysmorph - name = "polysmorph tail" - desc = "A severed polysmorph tail." - icon_state = "severedpolytail" //yogs - so the tail uses the correct sprites - tail_type = "Polys" - -/obj/item/organ/tail/polysmorph/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = FALSE) - ..() - if(istype(H)) - if(!("tail_polysmorph" in H.dna.species.mutant_bodyparts)) - H.dna.features["tail_polysmorph"] = tail_type - H.dna.species.mutant_bodyparts |= "tail_polysmorph" - H.update_body() - -/obj/item/organ/tail/polysmorph/Remove(mob/living/carbon/human/H, special = 0) - ..() - if(istype(H)) - H.dna.species.mutant_bodyparts -= "tail_polysmorph" - tail_type = H.dna.features["tail_polysmorph"] - H.update_body() +// Note: tails only work in humans. They use human-specific parameters and rely on human code for displaying. + +/obj/item/organ/tail + name = "tail" + desc = "A severed tail. What did you cut this off of?" + icon_state = "severedtail" + zone = BODY_ZONE_PRECISE_GROIN + slot = ORGAN_SLOT_TAIL + var/tail_type = "None" + +/obj/item/organ/tail/Remove(mob/living/carbon/human/H, special = 0) + ..() + if(H && H.dna && H.dna.species) + H.dna.species.stop_wagging_tail(H) + +/obj/item/organ/tail/cat + name = "cat tail" + desc = "A severed cat tail. Who's wagging now?" + tail_type = "Cat" + +/obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) + ..() + if(istype(H)) + if(!("tail_human" in H.dna.species.mutant_bodyparts)) + H.dna.species.mutant_bodyparts |= "tail_human" + H.dna.features["tail_human"] = tail_type + H.update_body() + +/obj/item/organ/tail/cat/Remove(mob/living/carbon/human/H, special = 0) + ..() + if(istype(H)) + H.dna.features["tail_human"] = "None" + H.dna.species.mutant_bodyparts -= "tail_human" + color = H.hair_color + H.update_body() + +/obj/item/organ/tail/lizard + name = "lizard tail" + desc = "A severed lizard tail. Somewhere, no doubt, a lizard hater is very pleased with themselves." + icon_state = "severedlizardtail" //yogs - so the tail uses the correct sprites + color = "#116611" + tail_type = "Smooth" + var/spines = "None" + +/obj/item/organ/tail/lizard/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) + ..() + if(istype(H)) + // Checks here are necessary so it wouldn't overwrite the tail of a lizard it spawned in + if(!("tail_lizard" in H.dna.species.mutant_bodyparts)) + H.dna.features["tail_lizard"] = tail_type + H.dna.species.mutant_bodyparts |= "tail_lizard" + + if(!("spines" in H.dna.species.mutant_bodyparts)) + H.dna.features["spines"] = spines + H.dna.species.mutant_bodyparts |= "spines" + H.update_body() + +/obj/item/organ/tail/lizard/Remove(mob/living/carbon/human/H, special = 0) + ..() + if(istype(H)) + H.dna.species.mutant_bodyparts -= "tail_lizard" + H.dna.species.mutant_bodyparts -= "spines" + color = "#" + H.dna.features["mcolor"] + tail_type = H.dna.features["tail_lizard"] + spines = H.dna.features["spines"] + H.update_body() + +/obj/item/organ/tail/polysmorph + name = "polysmorph tail" + desc = "A severed polysmorph tail." + icon_state = "severedpolytail" //yogs - so the tail uses the correct sprites + tail_type = "Polys" + +/obj/item/organ/tail/polysmorph/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = FALSE) + ..() + if(istype(H)) + if(!("tail_polysmorph" in H.dna.species.mutant_bodyparts)) + H.dna.features["tail_polysmorph"] = tail_type + H.dna.species.mutant_bodyparts |= "tail_polysmorph" + H.update_body() + +/obj/item/organ/tail/polysmorph/Remove(mob/living/carbon/human/H, special = 0) + ..() + if(istype(H)) + H.dna.species.mutant_bodyparts -= "tail_polysmorph" + tail_type = H.dna.features["tail_polysmorph"] + H.update_body() From 9892ab62a5422bc3a78db9c9d247d6eac162468f Mon Sep 17 00:00:00 2001 From: nmajask Date: Fri, 10 Dec 2021 10:47:26 -0500 Subject: [PATCH 2/3] Ah, this is a thing too Forgot about this --- code/datums/map_config.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 596ca1d035c5..1722dbaf2bff 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -5,7 +5,7 @@ /datum/map_config // Metadata - var/config_filename = "_maps/yogstation.json" + var/config_filename = "_maps/yogsbox.json" var/defaulted = TRUE // set to FALSE by LoadConfig() succeeding // Config from maps.txt var/config_max_users = 0 @@ -14,9 +14,9 @@ var/votable = FALSE // Config actually from the JSON - should default to Box - var/map_name = "YogStation" - var/map_path = "map_files/YogStation" - var/map_file = "YogStation.dmm" + var/map_name = "YogsBox" + var/map_path = "map_files/YogBox" + var/map_file = "YogBox.dmm" var/traits = null var/space_ruin_levels = 7 From 8bde52cd3c498bc35f0ff8785b9530bacbdd0d4d Mon Sep 17 00:00:00 2001 From: nmajask Date: Fri, 10 Dec 2021 11:08:02 -0500 Subject: [PATCH 3/3] Forgot a S its YogsBox, not YogBox --- code/datums/map_config.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 1722dbaf2bff..91fa09a002cb 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -15,8 +15,8 @@ // Config actually from the JSON - should default to Box var/map_name = "YogsBox" - var/map_path = "map_files/YogBox" - var/map_file = "YogBox.dmm" + var/map_path = "map_files/YogsBox" + var/map_file = "YogsBox.dmm" var/traits = null var/space_ruin_levels = 7