From 7f299ea8a0f8700581814ed854253db359abcd75 Mon Sep 17 00:00:00 2001 From: Repede Date: Fri, 30 Mar 2018 14:20:15 -0400 Subject: [PATCH] Fixing travis warning stuff! --- code/modules/Phorochemistry/phorochemheat.dm | 12 +-- code/modules/Phorochemistry/phororeagent.dm | 82 +++++++++---------- code/modules/reagents/kelshark.dm | 4 +- .../vore/fluffstuff/custom_clothes_yw.dm | 2 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/code/modules/Phorochemistry/phorochemheat.dm b/code/modules/Phorochemistry/phorochemheat.dm index 848a3395b8..486786ccdd 100644 --- a/code/modules/Phorochemistry/phorochemheat.dm +++ b/code/modules/Phorochemistry/phorochemheat.dm @@ -94,19 +94,19 @@ /obj/machinery/bunsen_burner/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/reagent_containers)) if(held_container) - user << "\red You must remove the [held_container] first." + user << "You must remove the [held_container] first." else user.drop_item(src) held_container = W held_container.loc = src - user << "\blue You put the [held_container] onto the [src]." + user << "You put the [held_container] onto the [src]." var/image/I = image("icon"=W, "layer"=FLOAT_LAYER) underlays += I if(heating) spawn(heat_time) try_heating() else - user << "\red You can't put the [W] onto the [src]." + user << "You can't put the [W] onto the [src]." /obj/machinery/bunsen_burner/attack_ai() return @@ -114,15 +114,15 @@ /obj/machinery/bunsen_burner/attack_hand(mob/user as mob) if(held_container) underlays = null - user << "\blue You remove the [held_container] from the [src]." + user << "You remove the [held_container] from the [src]." held_container.loc = src.loc held_container.attack_hand(user) held_container = null else - user << "\red There is nothing on the [src]." + user << "There is nothing on the [src]." /obj/machinery/bunsen_burner/proc/try_heating() - src.visible_message("\blue \icon[src] [src] hisses.") + src.visible_message(" icon[src] [src] hisses.") if(held_container && heating) heated = 1 held_container.reagents.handle_reactions() diff --git a/code/modules/Phorochemistry/phororeagent.dm b/code/modules/Phorochemistry/phororeagent.dm index f69c8f1ec5..883ebd1b83 100644 --- a/code/modules/Phorochemistry/phororeagent.dm +++ b/code/modules/Phorochemistry/phororeagent.dm @@ -138,7 +138,7 @@ var/induromol_code = rand(1, 50) protection.explanation_text = "Protect [love_name] at all costs" M.mind.objectives.Add(protection) var/obj_count = 1 - M << "\blue Your current objectives:" + M << "Your current objectives:" for(var/datum/objective/objective in M.mind.objectives) M << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ @@ -189,7 +189,7 @@ var/induromol_code = rand(1, 50) if(findtext(O.explanation_text, "Protect [love_name] at all costs")) M.mind.objectives.Remove(O) var/obj_count = 1 - M << "\blue Your current objectives:" + M << "Your current objectives:" for(var/datum/objective/objective in M.mind.objectives) M << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ @@ -204,7 +204,7 @@ var/induromol_code = rand(1, 50) if(findtext(O.explanation_text, "Protect [love_name] at all costs")) M.mind.objectives.Remove(O) var/obj_count = 1 - M << "\blue Your current objectives:" + M << "Your current objectives:" for(var/datum/objective/objective in M.mind.objectives) M << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ @@ -221,19 +221,19 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/nasty/touch_mob(var/mob/M, var/volume) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M - H << "\red You are so repulsed by the liquid splashed on you that you feel like puking" + H << "You are so repulsed by the liquid splashed on you that you feel like puking" // H.vomit() not fast enough src = null spawn(0) if(!H.lastpuke) H.lastpuke = 1 - H << "You feel nauseous..." + H << "You feel nauseous..." spawn(10) //1 second until second warning - H << "You feel like you are about to throw up!" + H << "You feel like you are about to throw up!" spawn(20) //and you have 2 more to escape H.Stun(8) - H.visible_message("[H] throws up!","You throw up!") + H.visible_message("[H] throws up!","You throw up!") playsound(H.loc, 'sound/effects/splat.ogg', 50, 1) var/turf/location = H.loc @@ -264,20 +264,20 @@ var/induromol_code = rand(1, 50) src = null for(var/mob/living/carbon/human/H in viewers(T, 7)) if(H == immune) - H << "\blue You are absolutely disgusted, but you hold your stomach contents in." + H << "You are absolutely disgusted, but you hold your stomach contents in." continue - H << "\red You are so disgusted by what looks like spilled vomit you might throw up!" + H << "You are so disgusted by what looks like spilled vomit you might throw up!" // H.vomit() not fast enough spawn(0) if(!H.lastpuke) H.lastpuke = 1 - H << "You feel nauseous..." + H << "You feel nauseous..." spawn(50) //5 seconds until second warning - H << "You feel like you are about to throw up!" + H << "You feel like you are about to throw up!" spawn(50) //and you have 5 more for mad dash to the bucket H.Stun(5) - H.visible_message("[H] throws up!","You throw up!") + H.visible_message("[H] throws up!","You throw up!") playsound(H.loc, 'sound/effects/splat.ogg', 50, 1) var/turf/location = H.loc @@ -292,7 +292,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/nasty/initial_reaction(var/obj/item/weapon/reagent_containers/container, var/turf/T, var/volume, var/message) for(var/mob/living/carbon/human/H in viewers(T, 7)) - H << "\red There is something about the reagent from the telepad you find absolutely repulsive." + H << "There is something about the reagent from the telepad you find absolutely repulsive." H.vomit() return ..() @@ -311,7 +311,7 @@ var/induromol_code = rand(1, 50) if(istype(A, /mob/living)) var/mob/living/M = A M.universal_understand = 0 - M << "\red You no longer feel attuned to the spoken word." + M << "You no longer feel attuned to the spoken word." /datum/reagent/phororeagent/babelizine/on_mob_death(var/mob/M) holder.remove_reagent(src.id, src.volume) @@ -336,7 +336,7 @@ var/induromol_code = rand(1, 50) bone.status &= ~ORGAN_BROKEN // bone.perma_injury = 0 Not sure what Polaris equivalent is or why this was necessary H.visible_message( - "\blue You hear a loud crack as [H.name]'s [bone.name] appears to heal miraculously.") + "You hear a loud crack as [H.name]'s [bone.name] appears to heal miraculously.") holder.remove_reagent(src.id, 12) ..() @@ -404,13 +404,13 @@ var/induromol_code = rand(1, 50) if(istype(M, /mob/living/silicon)) var/mob/living/silicon/S = M S.take_organ_damage(0, volume/2, emp = 1) - S << "\red Some of your systems report damage as a result of the liquid." + S << "Some of your systems report damage as a result of the liquid." else if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.isSynthetic()) H.take_overall_damage(0, volume/2) - H << "\red Some of your systems report damage as a result of the liquid." + H << "Some of your systems report damage as a result of the liquid." //implementation also in power.dm and electrical_field.dm /datum/reagent/phororeagent/mortemol @@ -434,7 +434,7 @@ var/induromol_code = rand(1, 50) C.reagents.add_reagent(id, volume, data) C.rejuvenate() C.rejuvenate() //I like C.rejuvenate() - C.visible_message("\red[C] seems to wake from the dead!") + C.visible_message("[C] seems to wake from the dead!") else C.reagents.add_reagent(id, volume) @@ -449,7 +449,7 @@ var/induromol_code = rand(1, 50) if(data[1]) if(istype(A, /mob)) var/mob/M = A - M << "\red You feel the last traces of chemicals leave your body as you return to death once more..." + M << "You feel the last traces of chemicals leave your body as you return to death once more..." M.death(0) //Reagent giveth, and reagent taketh away @@ -462,7 +462,7 @@ var/induromol_code = rand(1, 50) data[1] = 1 C.rejuvenate() C.rejuvenate() //Necessary to call twice in testing - C.visible_message("\red[C] seems to wake from the dead!") + C.visible_message("[C] seems to wake from the dead!") /datum/reagent/phororeagent/tegoxane id = "tegoxane" @@ -494,14 +494,14 @@ var/induromol_code = rand(1, 50) H.f_style = "Shaved" if(!M.digitalcamo) - M << "\blue Your skin starts to feel strange" + M << "Your skin starts to feel strange" M.digitalcamo = 1 return ..() /datum/reagent/phororeagent/tegoxane/on_remove(var/atom/A) if(istype(A, /mob)) var/mob/M = A - M << "\red Your skin feels normal again" + M << "Your skin feels normal again" M.digitalcamo = 0 M.icon = saved_icon if(istype(M, /mob/living/carbon/human)) @@ -540,7 +540,7 @@ var/induromol_code = rand(1, 50) if(ishuman(M)) var/mob/living/carbon/human/H = M - H.visible_message("[H] throws up!","You throw up!") + H.visible_message("[H] throws up!","You throw up!") playsound(H.loc, 'sound/effects/splat.ogg', 50, 1) var/turf/location = H.loc @@ -574,7 +574,7 @@ var/induromol_code = rand(1, 50) if(eyes.status & ORGAN_ROBOT) return ..() - M << "\blue You blink and your eyes quickly adapt to enhanced function." + M << "You blink and your eyes quickly adapt to enhanced function." M.client.view = 10 return ..() @@ -590,7 +590,7 @@ var/induromol_code = rand(1, 50) if(M.client) M.client.view = 7 - M << "\red After a few blinks, you realize the Oculusosone has worn off." + M << "After a few blinks, you realize the Oculusosone has worn off." return ..() @@ -603,7 +603,7 @@ var/induromol_code = rand(1, 50) //doesn't do anything, I just like people trying to procure a corpse to test it -DrBrock /datum/reagent/phororeagent/destitutionecam/touch_mob(var/mob/M, var/volume) if(M.stat == 2) - usr << "\red Absolutely nothing happens. You feel disappointed." + usr << "Absolutely nothing happens. You feel disappointed." return ..() /datum/reagent/phororeagent/sapoformator @@ -632,7 +632,7 @@ var/induromol_code = rand(1, 50) src = null if(volume >= 25) - usr << "\blue The solution begins to fizzle." + usr << "The solution begins to fizzle." playsound(T, 'sound/effects/bamf.ogg', 50, 1) var/datum/reagents/cleaner = new() cleaner.my_atom = T @@ -666,7 +666,7 @@ var/induromol_code = rand(1, 50) volume -= 20 else - usr << "\red The solution does not appear to have enough mass to react." + usr << "The solution does not appear to have enough mass to react." /datum/reagent/phororeagent/rad_x id = "rad_x" @@ -692,7 +692,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/caloran/on_mob_life(var/mob/living/M as mob, var/alien) if(volume >= 2) if(burn == -1) - M << "\red You feel your skin painfully harden." + M << "You feel your skin painfully harden." M.take_overall_damage(20, 0) burn = M.getFireLoss() else @@ -705,7 +705,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/caloran/on_remove(var/atom/A) if(istype(A, /mob)) var/mob/M = A - M << "\red Your skin returns to normal, no longer desensitized to extreme heat." + M << "Your skin returns to normal, no longer desensitized to extreme heat." return ..() /datum/reagent/phororeagent/the_stuff @@ -718,7 +718,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/the_stuff/on_mob_life(var/mob/living/M as mob, var/alien) if(!init) - M << "\red You start tripping balls." + M << "You start tripping balls." init = 1 var/drugs = list("space_drugs", "serotrotium", "psilocybin", "nuka_cola", "atomicbomb", "hippiesdelight") for(var/drug in drugs) @@ -734,7 +734,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/frioline/on_mob_life(var/mob/living/M as mob, var/alien) if(M.bodytemperature > 310) - M << "\blue You suddenly feel very cold." + M << "You suddenly feel very cold." M.bodytemperature = max(165, M.bodytemperature - 30) return ..() @@ -766,15 +766,15 @@ var/induromol_code = rand(1, 50) var/mob/living/L = M var/burned = L.getFireLoss() > 0 if(burned) - L << "\blue In a strange sensation, you feel some burns stop hurting." + L << "In a strange sensation, you feel some burns stop hurting." L.heal_organ_damage(0, min(15, volume / 4)) if (mFingerprints in L.mutations) if(!burned) - L << "\red Another application of the substance does nothing weird to your hands." + L << "Another application of the substance does nothing weird to your hands." else L.mutations.Add(mFingerprints) - L << "\blue Your fingers feel strange after the substance splashes on your hands." + L << "Your fingers feel strange after the substance splashes on your hands." return ..() /datum/reagent/phororeagent/energized_phoron @@ -888,10 +888,10 @@ var/induromol_code = rand(1, 50) if(world.time - initial_time >= 30) //three second startup lag if(!metabolism) metabolism = 1 - M << "\blue You begin to feel transcendental." + M << "You begin to feel transcendental." if(M.z > 5 || M.z == 2 || M.z < 1) //no centcomm teleport, also not dealing with other unknown sectors - M << "\red You feel the bluespace leave your body on this sector, nothing happens." + M << "You feel the bluespace leave your body on this sector, nothing happens." src = null return @@ -970,7 +970,7 @@ var/induromol_code = rand(1, 50) if(istype(L, /mob/living/carbon/human)) var/mob/living/carbon/human/H = L if(!gaseous_reagent_check(H) && H.stat != 2) //protective clothing and living check - H <<"\red You realize you probably should have worn some safety equipment around dangerous chemicals." + H <<"You realize you probably should have worn some safety equipment around dangerous chemicals." H.death(0) else if(!istype(L, /mob/living/silicon)) L.death(0) @@ -982,7 +982,7 @@ var/induromol_code = rand(1, 50) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(!gaseous_reagent_check(H) && H.stat != 2) //protective clothing and living check - H <<"\red You realize you probably should have worn some safety equipment around dangerous chemicals." + H <<"You realize you probably should have worn some safety equipment around dangerous chemicals." H.death(0) else if(!istype(M, /mob/living/silicon)) M.death(0) @@ -1005,7 +1005,7 @@ var/induromol_code = rand(1, 50) var/obj/item/organ/eyes = H.internal_organs_by_name["eyes"] if(!(eyes.status & ORGAN_ROBOT)) eyes.take_damage(50) - H << "\red The gas stings your eyes like you have never felt before!" + H << "The gas stings your eyes like you have never felt before!" else if(!istype(L, /mob/living/silicon)) L.eye_blind = 500 @@ -1020,7 +1020,7 @@ var/induromol_code = rand(1, 50) var/obj/item/organ/eyes = H.internal_organs_by_name["eyes"] if(!(eyes.status & ORGAN_ROBOT)) eyes.take_damage(50) - H << "\red The gas stings your eyes like you have never felt before!" + H << "The gas stings your eyes like you have never felt before!" else if(!istype(M, /mob/living/silicon)) M.eye_blind = 500 src = null*/ diff --git a/code/modules/reagents/kelshark.dm b/code/modules/reagents/kelshark.dm index 9f3000a1b2..cf7b73426a 100644 --- a/code/modules/reagents/kelshark.dm +++ b/code/modules/reagents/kelshark.dm @@ -19,11 +19,11 @@ datum switch(data["count"]) if(1 to 30) if(prob(9)) M.emote("me",1,"blushes") - if(prob(9)) M << "\red You feel so needy.." + if(prob(9)) M << "You feel so needy.." if (30 to INFINITY) if(prob(3)) M.emote("me",1,"blushes") if(prob(5)) M.say("!moans out lewdly!") - if(prob(9)) M << "\red You can't help but want to touch yourself then and now!" + if(prob(9)) M << "You can't help but want to touch yourself then and now!" data["count"]++ holder.remove_reagent(src.id, 0.2) //..() diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index 2d9dbbf8eb..a18aeba59a 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -864,7 +864,7 @@ //Kita - /obj/item/clothing/suit/storage/seromi/cloak/fluff/kita +/obj/item/clothing/suit/storage/seromi/cloak/fluff/kita name = "Magical Cloak" desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside. It bears magical colors." icon = 'icons/vore/custom_clothes_yw.dmi'