From 740d10d3fcf09d23bbe12a8c0757d081daecb323 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 18 Dec 2015 10:52:56 +1030 Subject: [PATCH 1/3] Fixes colour issues. --- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 6df3b3c1f46..ba83cde275f 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -491,7 +491,7 @@ var/global/list/damage_icon_parts = list() //need to append _s to the icon state for legacy compatibility var/image/standing = image(icon = under_icon, icon_state = "[under_state]_s") - standing.color = under.color + standing.color = w_uniform.color //apply blood overlay if(w_uniform.blood_DNA) From 28919269eefa93bba6ef21d60f57bb6db1c02ce1 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Wed, 16 Dec 2015 12:57:05 +0100 Subject: [PATCH 2/3] Prevents blob from growing over asteroid walls --- code/modules/blob/blob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index 72ee0daee6f..ee7f89d5256 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -54,7 +54,7 @@ update_icon() /obj/effect/blob/proc/expand(var/turf/T) - if(istype(T, /turf/unsimulated/) || istype(T, /turf/space)) + if(istype(T, /turf/unsimulated/) || istype(T, /turf/space) || (istype(T, /turf/simulated/mineral) && T.density)) return if(istype(T, /turf/simulated/wall)) var/turf/simulated/wall/SW = T From 79f15fca01ab8c5d6138aa0f48885c36e2edcc31 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Fri, 18 Dec 2015 09:33:14 +0100 Subject: [PATCH 3/3] Compilation fixes due to issues caused by merging https://github.com/Baystation12/Baystation12/pull/11617. --- code/game/area/Space Station 13 areas.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index c8c85f66eee..782dd181083 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -158,7 +158,6 @@ area/space/atmosalert() /area/shuttle/escape name = "\improper Emergency Shuttle" flags = RAD_SHIELDED - music = "music/escape.ogg" /area/shuttle/escape/station name = "\improper Emergency Shuttle Station" @@ -174,7 +173,6 @@ area/space/atmosalert() /area/shuttle/escape_pod1 name = "\improper Escape Pod One" - music = "music/escape.ogg" flags = RAD_SHIELDED /area/shuttle/escape_pod1/station @@ -188,7 +186,6 @@ area/space/atmosalert() /area/shuttle/escape_pod2 name = "\improper Escape Pod Two" - music = "music/escape.ogg" flags = RAD_SHIELDED /area/shuttle/escape_pod2/station @@ -202,7 +199,6 @@ area/space/atmosalert() /area/shuttle/escape_pod3 name = "\improper Escape Pod Three" - music = "music/escape.ogg" flags = RAD_SHIELDED /area/shuttle/escape_pod3/station @@ -216,7 +212,6 @@ area/space/atmosalert() /area/shuttle/escape_pod5 //Pod 4 was lost to meteors name = "\improper Escape Pod Five" - music = "music/escape.ogg" flags = RAD_SHIELDED /area/shuttle/escape_pod5/station