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..6f9e04c5b4b 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -334,7 +334,7 @@ if(!iscarbon(owner) || !owner.species) return - var/icon/eyecon //VOREStation Edit -- holds eye icon to render over markings later. + var/icon/eyecon //Eye color/icon var/should_have_eyes = owner.should_have_organ(O_EYES) @@ -373,7 +373,7 @@ 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]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit + mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) 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"]]"