From 63c496e79ce5e66902bde705142e3d7caaf5bd07 Mon Sep 17 00:00:00 2001 From: killer653 Date: Sat, 12 Aug 2017 23:49:20 -0400 Subject: [PATCH] FIXES --- code/game/machinery/suit_storage_unit.dm | 4 ++-- code/game/machinery/suit_storage_unit_vr.dm | 2 +- code/modules/mob/living/carbon/human/human_species_vr.dm | 2 +- .../living/carbon/human/species/station/prometheans_vr.dm | 2 +- code/modules/organs/robolimbs_vr.dm | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 1db1c85f2d..b6a699e803 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -588,7 +588,7 @@ //Departments that the cycler can paint suits to look like. var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control") //Species that the suits can be configured to fit. - var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Spider") //VORESTATION EDIT + var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Vasilissan") //VORESTATION EDIT var/target_department var/target_species @@ -753,7 +753,7 @@ //Clear the access reqs, disable the safeties, and open up all paintjobs. user << "You run the sequencer across the interface, corrupting the operating protocols." departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Crowd Control","Emergency Medical Response","^%###^%$") - species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid") //VORESTATION EDIT + species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Vasilissan") //VORESTATION EDIT emagged = 1 safeties = 0 diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index ffbcc8bf5c..9f9e51ff35 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", "Xenomorph Hybrid", "Xenochimera","Spider") //Added xenochimera while I was at it. Someone put in an issue about it. + species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Vasilissan") //Added xenochimera while I was at it. Someone put in an issue about it. diff --git a/code/modules/mob/living/carbon/human/human_species_vr.dm b/code/modules/mob/living/carbon/human/human_species_vr.dm index 77b01c9a34..596de6a1fa 100644 --- a/code/modules/mob/living/carbon/human/human_species_vr.dm +++ b/code/modules/mob/living/carbon/human/human_species_vr.dm @@ -15,4 +15,4 @@ ..(new_loc, "Xenomorph Hybrid") /mob/living/carbon/human/spider/New(var/new_loc) - ..(new_loc, "Spider") \ No newline at end of file + ..(new_loc, "Vasilissan") \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm index 3efa73c4d7..aa4861391e 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm @@ -1,7 +1,7 @@ /datum/species/shapeshifter/promethean min_age = 18 max_age = 80 - valid_transform_species = list("Human", "Unathi", "Tajara", "Skrell", "Diona", "Teshari", "Monkey","Sergal","Akula","Nevrean","Highlander Zorren","Flatland Zorren", "Vulpkanin", "Spider", "Neaera", "Stok", "Farwa") + valid_transform_species = list("Human", "Unathi", "Tajara", "Skrell", "Diona", "Teshari", "Monkey","Sergal","Akula","Nevrean","Highlander Zorren","Flatland Zorren", "Vulpkanin", "Vasilissan", "Neaera", "Stok", "Farwa") heal_rate = 0.2 //They heal .2, along with the natural .2 heal per tick when below the organ natural heal damage threshhold. siemens_coefficient = 1 //Prevents them from being immune to tasers and stun weapons. death_message = "goes limp, their body becoming softer..." diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index bcea52e66a..28058af2e2 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -143,14 +143,14 @@ company = "DSI - Akula" /datum/robolimb/dsi_spider - company = "DSI - Spider" + company = "DSI - Vasilissan" desc = "This limb feels hard and chitinous, realistic design. Seems a little mischievous. By Darkside Incorperated." icon = 'icons/mob/human_races/cyberlimbs/DSISpider/dsi_spider.dmi' blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = 1 includes_tail = 1 - suggested_species = "Spider" + suggested_species = "Vasilissan" /obj/item/weapon/disk/limb/dsi_spider - company = "DSI - Spider" \ No newline at end of file + company = "DSI - Vasilissan" \ No newline at end of file