From 5de7a29ca4db6228edbb0c340d78cdc74a358f5b Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 21 Oct 2016 01:00:59 -0400 Subject: [PATCH] Tweaks to restore a few VS things --- code/game/jobs/job/science.dm | 4 ++-- code/game/machinery/suit_storage_unit.dm | 4 ++-- code/modules/mob/living/simple_animal/simple_animal.dm | 5 ++++- code/modules/organs/blood.dm | 6 ++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 7cfc8b8580..fc042128b7 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -15,11 +15,11 @@ access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, access_tox_storage, access_teleporter, access_sec_doors, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, - access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch) + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva) //VOREStation Edit minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, access_tox_storage, access_teleporter, access_sec_doors, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, - access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch) + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva) //VOREStation Edit alt_titles = list("Research Supervisor") minimum_character_age = 25 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 17109aabfe..fe8ec2166b 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") + var/species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid") //VORESTATION EDIT var/target_department var/target_species @@ -752,7 +752,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") + species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid") //VORESTATION EDIT emagged = 1 safeties = 0 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index ae9622d305..c77c0049d3 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -309,6 +309,8 @@ M.do_attack_animation(src) if(I_HURT) + if(M.loc == src) //VOREStation Add (prevents attacking from inside mobs) + return adjustBruteLoss(harm_intent_damage) M.visible_message("\red [M] [response_harm] \the [src]") M.do_attack_animation(src) @@ -340,7 +342,8 @@ O.attack(src, user, user.zone_sel.selecting) /mob/living/simple_animal/hit_with_weapon(obj/item/O, mob/living/user, var/effective_force, var/hit_zone) - + if (user.loc == src) //VOREStation Edit (prevents hitting animals from inside with weapons) + return 1 visible_message("\The [src] has been attacked with \the [O] by [user].") if(O.force <= resistance) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 12accd6dd4..ee99d843c7 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -288,6 +288,12 @@ proc/blood_incompatible(donor,receiver,donor_species,receiver_species) proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large) + //Vorestation Edit Start - We're not going to splatter at all because we're in something and that's silly. + if(istype(source,/atom/movable)) + var/atom/movable/A = source + if(!isturf(A.loc)) + return + //VOREStation Edit End var/obj/effect/decal/cleanable/blood/B var/decal_type = /obj/effect/decal/cleanable/blood/splatter var/turf/T = get_turf(target)