From e20e769614f5cf5c2d89f1d3303a4eaf276becde Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Fri, 11 May 2012 03:33:43 +0000 Subject: [PATCH] - Added QualityVan's fix for large glass windows not requiring 2 glass pieces. - Took 'Evolve Greater Changeling' off the Evolution menu. It still exists, it's just hidden until it's finished (i.e. gets a sprite) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3575 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/changeling/modularchangling.dm | 10 +++++----- code/game/objects/stacks/glass.dm | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index a0422ae9e2f..22bd2ab14ae 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -41,14 +41,14 @@ var/list/obj/effect/proc_holder/power/powerinstances = list() verbpath = /client/proc/changeling_lesser_form - +/* /obj/effect/proc_holder/power/changeling_greater_form name = "Greater Form" desc = "We become the pinnicle of evolution. We will show the humans what happens when they leave their isle of ignorance." - genomecost = 30 + genomecost = 250 verbpath = /client/proc/changeling_greater_form - +*/ /obj/effect/proc_holder/power/fakedeath name = "Fake Death" desc = "We fake our death while we heal." @@ -92,7 +92,7 @@ var/list/obj/effect/proc_holder/power/powerinstances = list() /obj/effect/proc_holder/power/silence_sting name = "Silence Sting" desc = "We silently sting a human, completely silencing them for a short time." - helptext = "Does not provide a warning to a victim that they've been stung, until they try to speak and can't." // Man, fuck javascript. ' == ' + helptext = "Does not provide a warning to a victim that they have been stung, until they try to speak and can not." genomecost = 2 allowduringlesserform = 1 @@ -190,7 +190,7 @@ var/list/obj/effect/proc_holder/power/powerinstances = list() /obj/effect/proc_holder/power/LSDSting name = "Hallucination Sting" desc = "We evolve the ability to sting a target with a powerful hallunicationary chemical." - helptext = "The target does not notice they've been stung. The effect occurs after 30 to 60 seconds." + helptext = "The target does not notice they have been stung. The effect occurs after 30 to 60 seconds." genomecost = 3 verbpath = /client/proc/changeling_lsdsting diff --git a/code/game/objects/stacks/glass.dm b/code/game/objects/stacks/glass.dm index b6962995cfd..932f04309a7 100644 --- a/code/game/objects/stacks/glass.dm +++ b/code/game/objects/stacks/glass.dm @@ -83,6 +83,9 @@ SHARDS if("full (2 sheets)") if(!src) return 1 if(src.loc != user) return 1 + if(src.amount < 2) + user << "\red You need more glass to do that." + return 1 if(locate(/obj/structure/window) in user.loc) user << "\red There is a window in the way." return 1 @@ -142,6 +145,9 @@ SHARDS if("full (2 sheets)") if(!src) return 1 if(src.loc != user) return 1 + if(src.amount < 2) + user << "\red You need more glass to do that." + return 1 if(locate(/obj/structure/window) in user.loc) user << "\red There is a window in the way." return 1