diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index f4a50551ca..01f92e41d4 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -624,6 +624,15 @@ /obj/machinery/porta_turret/centcom_shuttle/setup() return +/obj/machinery/porta_turret/centcom_shuttle/weak + max_integrity = 120 + integrity_failure = 60 + name = "Old Laser Turret" + desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else." + stun_projectile = /obj/item/projectile/beam/weak + lethal_projectile = /obj/item/projectile/beam/weak + faction = "neutral" + //////////////////////// //Turret Control Panel// //////////////////////// diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 4a5ac2f60d..0e0c7c606e 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -4,7 +4,7 @@ var/list/random_icon_states = list() var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints - var/mergeable_decal = 1 //when two of these are on a same tile or do we need to merge them into just one? + var/mergeable_decal = TRUE //when two of these are on a same tile or do we need to merge them into just one? /obj/effect/decal/cleanable/Initialize(mapload, list/datum/disease/diseases) if (random_icon_states && length(src.random_icon_states) > 0) diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm index 26b5bca1ec..333da7f48a 100644 --- a/code/game/objects/effects/decals/cleanable/aliens.dm +++ b/code/game/objects/effects/decals/cleanable/aliens.dm @@ -20,7 +20,7 @@ icon_state = "xgib1" layer = LOW_OBJ_LAYER random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6") - mergeable_decal = 0 + mergeable_decal = FALSE /obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions) set waitfor = 0 diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index bd01f717da..8861376e07 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -50,7 +50,7 @@ icon_state = "gibbl5" layer = LOW_OBJ_LAYER random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") - mergeable_decal = 0 + mergeable_decal = FALSE /obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases) . = ..() diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 583f63af3a..29d4fca0b9 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -9,7 +9,7 @@ desc = "Ashes to ashes, dust to dust, and into space." icon = 'icons/obj/objects.dmi' icon_state = "ash" - mergeable_decal = 0 + mergeable_decal = FALSE /obj/effect/decal/cleanable/ash/Initialize() . = ..() @@ -67,7 +67,7 @@ gender = NEUTER icon = 'icons/effects/effects.dmi' icon_state = "molten" - mergeable_decal = 0 + mergeable_decal = FALSE /obj/effect/decal/cleanable/molten_object/large name = "big gooey grey mass" @@ -144,7 +144,7 @@ desc = "The shredded remains of what appears to be clothing." icon_state = "shreds" gender = PLURAL - mergeable_decal = 0 + mergeable_decal = FALSE /obj/effect/decal/cleanable/shreds/ex_act(severity, target) if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion. diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index b9d6e36b51..72a8689c75 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -9,7 +9,7 @@ random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7") blood_state = BLOOD_STATE_OIL bloodiness = MAX_SHOE_BLOODINESS - mergeable_decal = 0 + mergeable_decal = FALSE /obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions) set waitfor = 0 diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 3d079d705b..b86c2f4f91 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -3,6 +3,12 @@ gender = PLURAL icon = 'icons/effects/blood.dmi' +/obj/effect/decal/remains/acid_act() + visible_message("[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!") + playsound(src, 'sound/items/welder.ogg', 150, 1) + new /obj/effect/decal/cleanable/greenglow(drop_location()) + qdel(src) + /obj/effect/decal/remains/human desc = "They look like human remains. They have a strange aura about them." icon_state = "remains"