From 4543b8c8f9a0fa1ed975d98d4a152fa35f7120bc Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sat, 11 Jun 2016 02:30:36 -0400 Subject: [PATCH] LOTS O FIXES --- code/game/machinery/suit_storage_unit_vr.dm | 2 +- .../crates_lockers/closets/egg_vr.dm | 7 +++++++ .../clothing/spacesuits/rig/rig_pieces_vr.dm | 6 ++++-- .../clothing/spacesuits/void/void_vr.dm | 6 ++++-- .../species/station/station_special_vr.dm | 10 +++++----- code/modules/vore/eating/bellymodes_vr.dm | 7 +++++++ icons/obj/egg_vr.dmi | Bin 3171 -> 3589 bytes 7 files changed, 28 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 830d0ab693..5d0926ff1e 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -1,2 +1,2 @@ /obj/machinery/suit_cycler - species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean") \ No newline at end of file + species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenochimera") \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index 7acfaa26de..ddfe55bebd 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -83,6 +83,13 @@ icon_closed = "egg_unique" icon_opened = "egg_unique_open" +/obj/structure/closet/secure_closet/egg/scree + name = "Chimera egg" + desc = "...You don't know what type of creature layed this egg." + icon_state = "egg_scree" + icon_closed = "egg_scree" + icon_opened = "egg_scree_open" + //In case anyone stumbles upon this, MAJOR thanks to Vorrakul and Nightwing. Without them, this wouldn't be a reality. //Also, huge thanks for Ace for helping me through with this and getting me to work at my full potential instead of tapping out early, along with coding advice. //Additionally, huge thanks to the entire Virgo community for giving suggestions about egg TF, the sprites, descriptions, etc etc. Cheers to everyone. Also, you should totally eat Cadence. ~CK diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm index 055e5f0f73..8f933c39eb 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm @@ -9,7 +9,8 @@ "Flatland Zorren" = 'icons/mob/species/fennec/helmet_vr.dmi', "Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi', "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Promethean" = 'icons/mob/species/skrell/helmet.dmi' + "Promethean" = 'icons/mob/species/skrell/helmet.dmi', + "Xenochimera" = 'icons/mob/species/tajaran/helmet.dmi' ) @@ -25,5 +26,6 @@ "Flatland Zorren" = 'icons/mob/species/fennec/suit_vr.dmi', "Highlander Zorren" = 'icons/mob/species/fox/suit_vr.dmi', "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Promethean" = 'icons/mob/species/skrell/suit.dmi' + "Promethean" = 'icons/mob/species/skrell/suit.dmi', + "Xenochimera" = 'icons/mob/species/tajaran/suit.dmi' ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index a54af3f2f1..f8e336190b 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -17,7 +17,8 @@ "Flatland Zorren" = 'icons/mob/species/fennec/helmet_vr.dmi', "Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi', "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Promethean" = 'icons/mob/species/skrell/helmet.dmi' + "Promethean" = 'icons/mob/species/skrell/helmet.dmi', + "Xenochimera" = 'icons/mob/species/tajaran/helmet.dmi' ) sprite_sheets_obj = list( @@ -31,7 +32,8 @@ "Flatland Zorren" = 'icons/obj/clothing/species/fennec/hats.dmi', "Highlander Zorren" = 'icons/obj/clothing/species/fox/hats.dmi', "Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/hats.dmi', - "Promethean" = 'icons/obj/clothing/species/skrell/hats.dmi' + "Promethean" = 'icons/obj/clothing/species/skrell/hats.dmi', + "Xenochimera" = 'icons/obj/clothing/species/tajaran/hats.dmi' ) /obj/item/clothing/suit/space/void diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 93d91a8ce0..9670c67738 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -4,16 +4,16 @@ -/datum/species/chimera //Scree's race. - name = "Chimera" - name_plural = "Chimeras" - icobase = 'icons/mob/human_races/r_tajaran.dmi' //Tajara basis, as it has working skin color. Replace with human when sprites are edited & available. +/datum/species/xenochimera //Scree's race. + name = "Xenochimera" + name_plural = "Xenochimeras" + icobase = 'icons/mob/human_races/r_tajaran.dmi' //Tajara basis, as it has working skin color. deform = 'icons/mob/human_races/r_def_tajaran.dmi' unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite) num_alternate_languages = 2 secondary_langs = list("Sol Common") color_mult = 1 - egg_type = "Sergal" //Placeholder egg. + egg_type = "Scree" //Scree egg. inherent_verbs = list(/mob/living/carbon/human/verb/chimera_revive) min_age = 17 diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 72b07dc18d..8e96045d7d 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -403,6 +403,13 @@ J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P + if("Scree") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + P.forceMove(J) + J.name = "[defined_species] egg" + J.desc = "This egg has a very unique look to it." + internal_contents -= P + else var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) diff --git a/icons/obj/egg_vr.dmi b/icons/obj/egg_vr.dmi index 82640245a27adead03a0977d25da668016ae37e1..12b7691765cb747657b7b2dc02e23ff41c3311b4 100644 GIT binary patch literal 3589 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 P2eLe7YhGn~I{tqE4{8Wh literal 3171 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