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() diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 2d9a4b5f809..34a57a0768b 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -155,7 +155,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 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index edf09f6ea85..8d18ed47d03 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -139,19 +139,19 @@ /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 + 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() - new /obj/item/weapon/shard( W.loc ) if(W.reinf) PoolOrNew(/obj/item/stack/rods, W.loc) - - if (W.dir == SOUTHWEST) - new /obj/item/weapon/shard( W.loc ) if(W.reinf) PoolOrNew(/obj/item/stack/rods, W.loc) qdel(A) - - /* * Double-Bladed Energy Swords - Cheridan */ diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index fb9d27f7a57..bf0a5b5ce79 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -259,7 +259,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" siemens_coefficient = 1 diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 8990d309a08..2d088658acd 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -16,13 +16,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 @@ -49,6 +49,7 @@ icon_state = "bush4-1" layer = 3 pass_flags = PASSTABLE + mouse_opacity = 2 var/health = 10 var/max_health = 100