From 6c9a6264cfdc0a961446351b5cd71780890a2ebd Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Tue, 17 May 2016 20:03:45 -0400 Subject: [PATCH] Gateway Icon Change + Fitness Center (#95) * Shhh don't mind this. * More gateway changes, also adds fitness room Also gives the ability for some FBPs to have tails (we can sprite the tails later, it defaults to off) * Issue #30 - Added icons and code for vore animals. Also tweaked to be more in line with current codebase. * Fix to leading space in alien.dm * Makes Labyrinth.dmm compile and load in map editor. (#90) Could use some work still though. --- code/game/machinery/cryopod_vr.dm | 23 + code/game/mecha/mech_fabricator.dm | 3 +- code/modules/organs/robolimbs_vr.dm | 11 +- .../vore/appearance/update_icons_vr.dm | 9 + .../mob/human_races/cyberlimbs/kitsuhana.dmi | Bin 0 -> 2528 bytes maps/virgo-1.dmm | 16581 ++++++++-------- vorestation.dme | 1 + 7 files changed, 8329 insertions(+), 8299 deletions(-) create mode 100644 code/game/machinery/cryopod_vr.dm create mode 100644 icons/mob/human_races/cyberlimbs/kitsuhana.dmi diff --git a/code/game/machinery/cryopod_vr.dm b/code/game/machinery/cryopod_vr.dm new file mode 100644 index 0000000000..be97c15958 --- /dev/null +++ b/code/game/machinery/cryopod_vr.dm @@ -0,0 +1,23 @@ +//Overrides! + +/obj/machinery/cryopod/robot/door/gateway + name = "public teleporter" + desc = "The short-range teleporter you might've came in from. You could leave easily using this." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "tele0" + base_icon_state = "tele0" + occupied_icon_state = "tele1" + on_store_message = "has departed via short-range teleport." + on_enter_occupant_message = "The teleporter activates, and you step into the swirling portal." + +/obj/machinery/computer/cryopod/gateway + name = "teleport oversight console" + desc = "An interface between visitors and the teleport oversight systems tasked with keeping track of all visitors who enter or exit from the teleporters." + +/obj/machinery/cryopod/robot/door/dorms + desc = "A small elevator that goes down to the residential district." + on_enter_occupant_message = "The elevator door closes slowly, ready to bring you down to the residential district." + +/obj/machinery/computer/cryopod/dorms + name = "residential oversight console" + desc = "An interface between visitors and the residential oversight systems tasked with keeping track of all visitors in the residential district." \ No newline at end of file diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 425b959d31..e2573a9661 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -103,7 +103,8 @@ var/list/T = list() for(var/A in all_robolimbs) var/datum/robolimb/R = all_robolimbs[A] - T += list(list("id" = A, "company" = R.company)) + if(!R.unavailable_to_produce) //VOREStation Edit + T += list(list("id" = A, "company" = R.company)) data["manufacturers"] = T data["manufacturer"] = manufacturer data["materials"] = get_materials() diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index a2a839ed1b..f0547fc49c 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -1,2 +1,11 @@ /datum/robolimb - var/unavailable_to_produce //Makes robolimbs not listed in exosuit fabs. AKA you have to varedit them on or spawn them. + var/unavailable_to_produce //Makes robolimbs not listed in exosuit fabs. AKA you have to varedit them on or spawn them. + var/includes_tail //Cyberlimbs dmi includes a tail sprite to wear. + +/datum/robolimb/kitsuhana + company = "Kitsuhana" + desc = "This limb seems rather vulpine and fuzzy, with realistic-feeling flesh." + icon = 'icons/mob/human_races/cyberlimbs/kitsuhana.dmi' + includes_tail = 1 + unavailable_to_produce = 1 + //unavailable_at_chargen = 1 \ No newline at end of file diff --git a/code/modules/vore/appearance/update_icons_vr.dm b/code/modules/vore/appearance/update_icons_vr.dm index 9b263ba3c5..993a8fcc86 100644 --- a/code/modules/vore/appearance/update_icons_vr.dm +++ b/code/modules/vore/appearance/update_icons_vr.dm @@ -14,6 +14,15 @@ /mob/living/carbon/human/proc/get_tail_image() + //If you are FBP with tail style + if(full_prosthetic && ("groin" in organs_by_name) && organs_by_name["groin"]) + var/obj/item/organ/external/groin/G = organs_by_name["groin"] + var/datum/robolimb/R = all_robolimbs[G.model] + if(R.includes_tail) + var/icon/tail_s = new/icon("icon" = R.icon, "icon_state" = "tail") + return image(tail_s) + + //If you have a custom tail selected if(tail_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL && !isTaurTail(tail_style))) var/icon/tail_s = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.icon_state) if(tail_style.do_colouration) diff --git a/icons/mob/human_races/cyberlimbs/kitsuhana.dmi b/icons/mob/human_races/cyberlimbs/kitsuhana.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1baf03bba042413173f97c5ebc932da33fcb6db5 GIT binary patch literal 2528 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