From 229087c2693d179c41b05566f2960c390668c9e6 Mon Sep 17 00:00:00 2001 From: "Github is ok, I guess" Date: Sun, 17 May 2015 10:36:20 +0100 Subject: [PATCH 1/5] Update statistics.dm --- code/defines/procs/statistics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm index 07856d92512..60254577583 100644 --- a/code/defines/procs/statistics.dm +++ b/code/defines/procs/statistics.dm @@ -98,7 +98,7 @@ proc/statistic_cycle() return while(1) sql_poll_population() - sleep(600) + sleep(6000) //This proc is used for feedback. It is executed at round end. proc/sql_commit_feedback() From 77206c6f5f084828ba43e9b716de8111f4960186 Mon Sep 17 00:00:00 2001 From: "Github is ok, I guess" Date: Sun, 17 May 2015 10:36:59 +0100 Subject: [PATCH 2/5] Update gameticker.dm --- code/game/gamemodes/gameticker.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 49b4b4ac985..9144273a18d 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -163,7 +163,6 @@ var/global/datum/controller/gameticker/ticker for(var/obj/multiz/ladder/L in world) L.connect() //Lazy hackfix for ladders. TODO: move this to an actual controller. ~ Z if(config.sql_enabled) - spawn(3000) statistic_cycle() // Polls population totals regularly and stores them in an SQL DB -- TLE return 1 From 3ed1917c3a3b9a16ebaa25a2a141e2ce12af6073 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 18 May 2015 13:21:34 +0930 Subject: [PATCH 3/5] Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. --- code/game/objects/items/weapons/twohanded.dm | 19 ++++++++----------- .../hydroponics/spreading/spreading.dm | 5 +++-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 2ccd78d3616..9a40f301804 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -134,18 +134,15 @@ /obj/item/weapon/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) if(!proximity) return ..() - if(A && wielded && (istype(A,/obj/structure/window) || istype(A,/obj/structure/grille))) //destroys windows and grilles in one hit - if(istype(A,/obj/structure/window)) //should just make a window.Break() proc but couldn't bother with it + if(A && wielded) + if(istype(A,/obj/structure/window)) var/obj/structure/window/W = A - - new /obj/item/weapon/shard( W.loc ) - if(W.reinf) new /obj/item/stack/rods( W.loc) - - if (W.dir == SOUTHWEST) - new /obj/item/weapon/shard( W.loc ) - if(W.reinf) new /obj/item/stack/rods( W.loc) - del(A) - + W.shatter() + else if(istype(A,/obj/structure/grille)) + del(A) + else if(istype(A,/obj/effect/plant)) + var/obj/effect/plant/P = A + P.die_off() /* * Double-Bladed Energy Swords - Cheridan diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index d333d5c794a..968e8227834 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -17,13 +17,13 @@ seed.set_trait(TRAIT_SPREAD,2) // So it will function properly as vines. seed.set_trait(TRAIT_POTENCY,rand(potency_min, potency_max)) // 70-100 potency will help guarantee a wide spread and powerful effects. seed.set_trait(TRAIT_MATURATION,rand(maturation_min, maturation_max)) - + //make vine zero start off fully matured var/obj/effect/plant/vine = new(T,seed) vine.health = vine.max_health vine.mature_time = 0 vine.process() - + message_admins("Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])") /obj/effect/dead_plant @@ -50,6 +50,7 @@ icon_state = "bush4-1" layer = 3 pass_flags = PASSTABLE + mouse_opacity = 1 var/health = 10 var/max_health = 100 From cd9aa7c9af741a1b39272cc031667ce4c0aa3b5f Mon Sep 17 00:00:00 2001 From: Kelenius Date: Mon, 18 May 2015 12:34:03 +0300 Subject: [PATCH 4/5] Fixes mankini typo --- code/modules/clothing/suits/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index bcca81141c6..f21094e4093 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -262,7 +262,7 @@ siemens_coefficient = 1 /obj/item/clothing/under/stripper/mankini - name = "the mankini" + name = "mankini" desc = "No honest man would wear this abomination" icon_state = "mankini" item_color = "mankini" From f72203c6112e0734e9f820efc8ed9407f926d9cc Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 18 May 2015 22:07:00 +0930 Subject: [PATCH 5/5] Set vine mouse opacity to 2. --- code/modules/hydroponics/spreading/spreading.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 968e8227834..8d22fc546de 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -50,7 +50,7 @@ icon_state = "bush4-1" layer = 3 pass_flags = PASSTABLE - mouse_opacity = 1 + mouse_opacity = 2 var/health = 10 var/max_health = 100