From 1536b98caaa183dfe07d81784a81fa1dad402d6a Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 18 Mar 2021 04:50:37 -0400 Subject: [PATCH 1/2] Fixes Global and Fixes Eyes --- code/__defines/sound.dm | 2 +- code/game/jobs/job_controller.dm | 2 +- .../structures/crates_lockers/__closets.dm | 2 +- code/modules/organs/subtypes/standard.dm | 26 +++++++++++++++++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/code/__defines/sound.dm b/code/__defines/sound.dm index fcdb53edd67..7db8a2f7608 100644 --- a/code/__defines/sound.dm +++ b/code/__defines/sound.dm @@ -112,7 +112,7 @@ 'sound/ambience/generic/generic2.ogg',\ 'sound/ambience/generic/generic3.ogg'\ ) -// 'sound/ambience/generic/generic4.ogg'\ // VOREStation Edit: Comment out entry 4 as this doesn't fit on Virgo, and we have our own weather system. +// 'sound/ambience/generic/generic4.ogg'\ // Sounds of PA announcements, presumably involving shuttles? #define AMBIENCE_ARRIVALS list(\ diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 96dfbd31834..a439200b638 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -680,7 +680,7 @@ var/global/datum/controller/occupations/job_master to_chat(C, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.") var/spawning = pick(latejoin) .["turf"] = get_turf(spawning) - .["msg"] = "will arrive at the station shortly" //VOREStation Edit - Grammar but mostly 'shuttle' reference removal, and this also applies to notified spawn-character verb use + .["msg"] = "will arrive at the station shortly" else if(!fail_deadly) var/spawning = pick(latejoin) .["turf"] = get_turf(spawning) diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 4e18d87207b..64c865604e4 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -46,7 +46,7 @@ starts_with = null if(!opened) // if closed, any item at the crate's loc is put in the contents - if(istype(loc, /mob/living)) return //VOREStation Edit - No collecting mob organs if spawned inside mob + if(istype(loc, /mob/living)) return var/obj/item/I for(I in loc) if(I.density || I.anchored || I == src) continue diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 9dc249167be..a06251f2a9b 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -271,7 +271,10 @@ var/eye_icon_location = 'icons/mob/human_face.dmi' force = 3 throwforce = 7 +<<<<<<< HEAD var/eyes_over_markings = FALSE //VOREStation edit +======= +>>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) /obj/item/organ/external/head/Initialize() if(config.allow_headgibs) @@ -334,7 +337,11 @@ if(!iscarbon(owner) || !owner.species) return +<<<<<<< HEAD var/icon/eyecon //VOREStation Edit -- holds eye icon to render over markings later. +======= + var/icon/eyecon +>>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) //Eye color/icon var/should_have_eyes = owner.should_have_organ(O_EYES) @@ -351,6 +358,7 @@ //They're gone! else eyes_icon.Blend(rgb(128,0,0), ICON_ADD) +<<<<<<< HEAD //We have weird other-sorts of eyes (as we're not supposed to have eye organ, but we have HAS_EYE_COLOR species) else eyes_icon.Blend(rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes), ICON_ADD) @@ -363,6 +371,17 @@ mob_icon.Blend(eyes_icon, ICON_OVERLAY) icon_cache_key += "[eye_icon]" +======= + + //We have weird other-sorts of eyes (as we're not supposed to have eye organ, but we have HAS_EYE_COLOR species) + else + eyes_icon.Blend(rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes), ICON_ADD) + + add_overlay(eyes_icon) + mob_icon.Blend(eyes_icon, ICON_OVERLAY) + icon_cache_key += "[eye_icon]" + +>>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) //Lip color/icon if(owner.lip_style && (species && (species.appearance_flags & HAS_LIPS))) var/icon/lip_icon = new/icon('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s") @@ -373,16 +392,23 @@ for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") +<<<<<<< HEAD mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit +======= + mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) +>>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" +<<<<<<< HEAD if(eyes_over_markings && eyecon) //VOREStation edit -- toggle to render eyes above markings. add_overlay(eyecon) mob_icon.Blend(eyecon, ICON_OVERLAY) icon_cache_key += "[eye_icon]" +======= +>>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) add_overlay(get_hair_icon()) return mob_icon From dec2a5551fbd1e3e62d1bbf665dfc9b46adf6e98 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 18 Mar 2021 10:26:04 -0400 Subject: [PATCH 2/2] Update standard.dm --- code/modules/organs/subtypes/standard.dm | 26 ------------------------ 1 file changed, 26 deletions(-) diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index a06251f2a9b..6f9e04c5b4b 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -271,10 +271,7 @@ var/eye_icon_location = 'icons/mob/human_face.dmi' force = 3 throwforce = 7 -<<<<<<< HEAD var/eyes_over_markings = FALSE //VOREStation edit -======= ->>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) /obj/item/organ/external/head/Initialize() if(config.allow_headgibs) @@ -337,11 +334,7 @@ if(!iscarbon(owner) || !owner.species) return -<<<<<<< HEAD - var/icon/eyecon //VOREStation Edit -- holds eye icon to render over markings later. -======= var/icon/eyecon ->>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) //Eye color/icon var/should_have_eyes = owner.should_have_organ(O_EYES) @@ -358,7 +351,6 @@ //They're gone! else eyes_icon.Blend(rgb(128,0,0), ICON_ADD) -<<<<<<< HEAD //We have weird other-sorts of eyes (as we're not supposed to have eye organ, but we have HAS_EYE_COLOR species) else eyes_icon.Blend(rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes), ICON_ADD) @@ -371,17 +363,6 @@ mob_icon.Blend(eyes_icon, ICON_OVERLAY) icon_cache_key += "[eye_icon]" -======= - - //We have weird other-sorts of eyes (as we're not supposed to have eye organ, but we have HAS_EYE_COLOR species) - else - eyes_icon.Blend(rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes), ICON_ADD) - - add_overlay(eyes_icon) - mob_icon.Blend(eyes_icon, ICON_OVERLAY) - icon_cache_key += "[eye_icon]" - ->>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) //Lip color/icon if(owner.lip_style && (species && (species.appearance_flags & HAS_LIPS))) var/icon/lip_icon = new/icon('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s") @@ -392,23 +373,16 @@ for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") -<<<<<<< HEAD - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit -======= mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) ->>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" -<<<<<<< HEAD if(eyes_over_markings && eyecon) //VOREStation edit -- toggle to render eyes above markings. add_overlay(eyecon) mob_icon.Blend(eyecon, ICON_OVERLAY) icon_cache_key += "[eye_icon]" -======= ->>>>>>> e4962d9... Fixes Global and Fixes Eyes (#7976) add_overlay(get_hair_icon()) return mob_icon