From 11fea605879242fb0a5ecfaa27fa71a383f3e2d4 Mon Sep 17 00:00:00 2001 From: Ar3nn Date: Tue, 16 Aug 2016 20:56:11 -0400 Subject: [PATCH 1/6] Properly spawns robot debris --- code/modules/mob/living/carbon/human/death.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index d3606b12b8a..8892f8925dc 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -38,7 +38,7 @@ flick("gibbed-h", animation) hgibs(loc, viruses, dna) else - new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc) + new /obj/effect/decal/cleanable/blood/gibs/robot(loc) var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() @@ -61,7 +61,13 @@ animation.master = src flick("dust-h", animation) - new /obj/effect/decal/remains/human(loc) + if(!isSynthetic()) + new /obj/effect/decal/remains/human(loc) + else + new /obj/effect/decal/cleanable/blood/gibs/robot(loc) + var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() spawn(15) if(animation) qdel(animation) From 45e5e7b83754ba60bb9b9cb08d80b91fe5e037e5 Mon Sep 17 00:00:00 2001 From: Ar3nn Date: Wed, 17 Aug 2016 00:30:25 -0400 Subject: [PATCH 2/6] Come at it from a better angle --- code/game/objects/effects/decals/remains.dm | 24 +++++++++++++++---- code/modules/mob/living/carbon/human/death.dm | 6 ++--- .../living/carbon/human/species/species.dm | 1 + .../living/carbon/human/species/station.dm | 3 +++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index d50d595d3ea..97a8bfc2883 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -1,7 +1,9 @@ +/obj/effect/decal/remains + gender = PLURAL + /obj/effect/decal/remains/human name = "remains" desc = "They look like human remains. They have a strange aura about them." - gender = PLURAL icon = 'icons/effects/blood.dmi' icon_state = "remains" anchored = 1 @@ -9,7 +11,6 @@ /obj/effect/decal/remains/xeno name = "remains" desc = "They look like the remains of something... alien. They have a strange aura about them." - gender = PLURAL icon = 'icons/effects/blood.dmi' icon_state = "remainsxeno" anchored = 1 @@ -17,7 +18,22 @@ /obj/effect/decal/remains/robot name = "remains" desc = "They look like the remains of something mechanical. They have a strange aura about them." - gender = PLURAL icon = 'icons/mob/robots.dmi' icon_state = "remainsrobot" - anchored = 1 \ No newline at end of file + anchored = 1 + +/obj/effect/decal/remains/slime + name = "You shouldn't see this" + desc = "Noooooooooooooooooooooo" + icon = 'icons/effects/blood.dmi' + icon_state = "remains" + anchored = 1 + +/obj/effect/decal/remains/slime/New() + var/datum/reagents/R = new/datum/reagents(5) + var/obj/effect/effect/water/W = new(get_turf(src)) + W.reagents = R + R.my_atom = W + R.add_reagent("water", 5) + R.reaction(get_turf(src)) + qdel(src) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 8892f8925dc..639618659ba 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -61,10 +61,8 @@ animation.master = src flick("dust-h", animation) - if(!isSynthetic()) - new /obj/effect/decal/remains/human(loc) - else - new /obj/effect/decal/cleanable/blood/gibs/robot(loc) + new species.remains_type(get_turf(src)) + if(isSynthetic()) var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index bdb64ba0a98..702212440cd 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -90,6 +90,7 @@ var/blood_color = "#A10808" //Red. var/flesh_color = "#FFC896" //Pink. var/single_gib_type = /obj/effect/decal/cleanable/blood/gibs + var/remains_type = /obj/effect/decal/remains/human //What sort of remains is left behind when the species dusts var/base_color //Used when setting species. //Used in icon caching. diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 6268652f828..0cef74044ce 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -500,6 +500,7 @@ deform = 'icons/mob/human_races/r_slime.dmi' path = /mob/living/carbon/human/slime unarmed_type = /datum/unarmed_attack/punch + remains_type = /obj/effect/decal/remains/slime // More sensitive to the cold cold_level_1 = 280 @@ -730,6 +731,7 @@ unarmed_type = /datum/unarmed_attack/diona //primitive_form = "Nymph" slowdown = 5 + remains_type = /obj/effect/decal/cleanable/ash warning_low_pressure = 50 hazard_low_pressure = -1 @@ -844,6 +846,7 @@ default_language = "Galactic Common" language = "Trinary" unarmed_type = /datum/unarmed_attack/punch + remains_type = /obj/effect/decal/remains/robot eyes = "blank_eyes" brute_mod = 2.5 // 100% * 2.5 * 0.6 (robolimbs) ~= 150% From ff467b984e96c1f44df9fc0d1472683cbb0ea71b Mon Sep 17 00:00:00 2001 From: Ar3nn Date: Wed, 17 Aug 2016 12:26:31 -0400 Subject: [PATCH 3/6] Oops --- code/game/objects/effects/decals/remains.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 97a8bfc2883..1f97590524d 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -30,10 +30,10 @@ anchored = 1 /obj/effect/decal/remains/slime/New() - var/datum/reagents/R = new/datum/reagents(5) - var/obj/effect/effect/water/W = new(get_turf(src)) - W.reagents = R - R.my_atom = W - R.add_reagent("water", 5) - R.reaction(get_turf(src)) - qdel(src) + var/datum/reagents/R = new/datum/reagents(5) + var/obj/effect/effect/water/W = new(get_turf(src)) + W.reagents = R + R.my_atom = W + R.add_reagent("water", 5) + R.reaction(get_turf(src)) + qdel(src) From f702a9feae1989fc18d32ee99f6fd15de6b53b44 Mon Sep 17 00:00:00 2001 From: Ar3nn Date: Wed, 17 Aug 2016 21:10:49 -0400 Subject: [PATCH 4/6] One more refactor --- code/game/objects/effects/decals/remains.dm | 5 +++++ code/modules/mob/living/carbon/human/death.dm | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 1f97590524d..d55be3533b7 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -22,6 +22,11 @@ icon_state = "remainsrobot" anchored = 1 +/obj/effect/decal/remains/robot/New() + var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() + /obj/effect/decal/remains/slime name = "You shouldn't see this" desc = "Noooooooooooooooooooooo" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 639618659ba..4a1a82e7291 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -62,10 +62,6 @@ flick("dust-h", animation) new species.remains_type(get_turf(src)) - if(isSynthetic()) - var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread - s.set_up(3, 1, src) - s.start() spawn(15) if(animation) qdel(animation) From 57b65483f9e069cb31bcd21a12dbbf2f84a1f7c7 Mon Sep 17 00:00:00 2001 From: Ar3nn Date: Wed, 17 Aug 2016 21:40:53 -0400 Subject: [PATCH 5/6] ..() --- code/game/objects/effects/decals/remains.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index d55be3533b7..e02d915d414 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -26,6 +26,7 @@ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() + ..() /obj/effect/decal/remains/slime name = "You shouldn't see this" From b77d200603528cf6655e48e2fa7b4e00bb202037 Mon Sep 17 00:00:00 2001 From: Ar3nn Date: Wed, 17 Aug 2016 21:51:37 -0400 Subject: [PATCH 6/6] ..() the second --- code/game/objects/effects/decals/remains.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index e02d915d414..8835d31c6c2 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -23,10 +23,10 @@ anchored = 1 /obj/effect/decal/remains/robot/New() + ..() var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() - ..() /obj/effect/decal/remains/slime name = "You shouldn't see this" @@ -36,6 +36,7 @@ anchored = 1 /obj/effect/decal/remains/slime/New() + ..() var/datum/reagents/R = new/datum/reagents(5) var/obj/effect/effect/water/W = new(get_turf(src)) W.reagents = R