From 54bbcff613ab10e3048701c4a72982216a380f1c Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Sun, 15 Jul 2012 23:31:21 +0000 Subject: [PATCH] Bugfixes! Tripled the chance for random events to happen. - Old: 1% every 5 minutes. - New: 3% every 5 minutes. Door bolt clicks are now only heard by people near the door. Fixes Issue 563. Fixed being able to bypass a windoor construction step. Chaplains are no longer forced into christianity and can choose their own religion. Fixes Issue 658 Plant-B-Gone: - It now lists the regents inside when examined. Fixes Issue 656. - Fixed a typo in the description. Antagonists are now logged at round end. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4080 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/hydro.dm | 2 +- code/game/gamemodes/gameticker.dm | 18 +++++++ code/game/jobs/job/civilian_chaplain.dm | 54 +++++++++---------- code/game/machinery/doors/airlock.dm | 6 ++- .../game/objects/items/weapons/hydroponics.dm | 8 ++- code/game/objects/windoor_assembly.dm | 5 +- code/global.dm | 2 +- 7 files changed, 62 insertions(+), 33 deletions(-) diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 036d4688965..122a4aa04d4 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1871,7 +1871,7 @@ // ************************************* /obj/item/weapon/plantbgone // -- Skie - desc = "Kill those pesky weeds!" + desc = "Kill those pesky weeds!" icon = 'hydroponics.dmi' name = "bottle of Plant-B-Gone" icon_state = "plantbgone" diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 7858a671363..22251088db9 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -343,4 +343,22 @@ var/global/datum/controller/gameticker/ticker if (findtext("[handler]","auto_declare_completion_")) call(mode, handler)() + //Print a list of antagonists to the server log + var/list/total_antagonists = list() + //Look into all mobs in world, dead or alive + for(var/mob/M in world) + if(M.mind && M.mind.special_role) //If they have a mind and are an antagonist of some sort... + var/temprole = M.mind.special_role + + if(temprole in total_antagonists) //If the role exists already, add the name to it + total_antagonists[temprole] += ", [M.real_name]([M.ckey])" + else + total_antagonists.Add(temprole) //If the role doesnt exist in the list, create it and add the mob + total_antagonists[temprole] += ": [M.real_name]([M.ckey])" + + //Now print them all into the log! + log_game("Antagonists at round end were...") + for(var/i in total_antagonists) + log_game("[i]s[total_antagonists[i]].") + return 1 diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index b05a875faec..2f4a7d964b2 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -22,35 +22,35 @@ var/religion_name = "Christianity" var/new_religion = copytext(sanitize(input(H, "You are the Chaplain. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)),1,MAX_NAME_LEN) - if ((length(new_religion) == 0) || (new_religion == "Christianity")) + if (!new_religion) new_religion = religion_name - switch(lowertext(new_religion)) - if("christianity") - B.name = pick("The Holy Bible","The Dead Sea Scrolls") - if("satanism") - B.name = "The Unholy Bible" - if("cthulu") - B.name = "The Necronomicon" - if("islam") - B.name = "Quran" - if("scientology") - B.name = pick("The Biography of L. Ron Hubbard","Dianetics") - if("chaos") - B.name = "The Book of Lorgar" - if("imperium") - B.name = "Uplifting Primer" - if("toolboxia") - B.name = "Toolbox Manifesto" - if("homosexuality") - B.name = "Guys Gone Wild" - if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") - B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition") - H.setBrainLoss(100) // starts off retarded as fuck - if("science") - B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") - else - B.name = "The Holy Book of [new_religion]" + switch(lowertext(new_religion)) + if("christianity") + B.name = pick("The Holy Bible","The Dead Sea Scrolls") + if("satanism") + B.name = "The Unholy Bible" + if("cthulu") + B.name = "The Necronomicon" + if("islam") + B.name = "Quran" + if("scientology") + B.name = pick("The Biography of L. Ron Hubbard","Dianetics") + if("chaos") + B.name = "The Book of Lorgar" + if("imperium") + B.name = "Uplifting Primer" + if("toolboxia") + B.name = "Toolbox Manifesto" + if("homosexuality") + B.name = "Guys Gone Wild" + if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") + B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition") + H.setBrainLoss(100) // starts off retarded as fuck + if("science") + B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") + else + B.name = "The Holy Book of [new_religion]" feedback_set_details("religion_name","[new_religion]") spawn(1) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 4e372954832..83d84e5c01b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -362,12 +362,14 @@ About the new airlock wires panel: //raises them if they are down (only if power's on) if(!src.locked) src.locked = 1 - usr << "You hear a click from the bottom of the door." + for(var/mob/M in range(1,src)) + M << "You hear a click from the bottom of the door." src.updateUsrDialog() else if(src.arePowerSystemsOn()) //only can raise bolts if power's on src.locked = 0 - usr << "You hear a click from inside the door." + for(var/mob/M in range(1,src)) + M << "You hear a click from the bottom of the door." src.updateUsrDialog() update_icon() diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 0b97c0a6bc5..7a532e496d3 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -69,8 +69,14 @@ Craftables (Cob pipes, potato batteries, pumpkinheads) /obj/item/weapon/plantbgone/examine() set src in usr - usr << text("\icon[] [] units of Plant-B-Gone left!", src, src.reagents.total_volume) ..() + if(!(usr in view(2)) && usr!=src.loc) return + usr << "\blue The Plant-B-Gone bottle contains:" + if(reagents && reagents.reagent_list.len) + for(var/datum/reagent/R in reagents.reagent_list) + usr << "\blue [R.volume] units of [R.name]" + else + usr << "\blue Nothing." return // Sunflower diff --git a/code/game/objects/windoor_assembly.dm b/code/game/objects/windoor_assembly.dm index 75dbae2a10a..563393efa13 100644 --- a/code/game/objects/windoor_assembly.dm +++ b/code/game/objects/windoor_assembly.dm @@ -179,7 +179,7 @@ obj/structure/windoor_assembly/Del() //Screwdriver to remove airlock electronics. Step 6 undone. else if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, 'Screwdriver.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to install electronics into the airlock assembly.") + user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly.") if(do_after(user, 40)) if(!src) return @@ -196,6 +196,9 @@ obj/structure/windoor_assembly/Del() //Crowbar to complete the assembly, Step 7 complete. else if(istype(W, /obj/item/weapon/crowbar)) + if(!src.electronics) + usr << "\red The assembly is missing electronics." + return usr << browse(null, "window=windoor_access") playsound(src.loc, 'Crowbar.ogg', 100, 1) user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame.") diff --git a/code/global.dm b/code/global.dm index 71bacc5204d..bb5c86e28c6 100644 --- a/code/global.dm +++ b/code/global.dm @@ -44,7 +44,7 @@ var/DIFFMUT = 0 var/skipupdate = 0 /////////////// -var/eventchance = 1 //% per 2 mins +var/eventchance = 3 //% per 5 mins var/event = 0 var/hadevent = 0 var/blobevent = 0