From 69de7b2d98f08a46b889414556036ea071cae2df Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Fri, 1 Feb 2013 22:45:08 +1000 Subject: [PATCH 1/6] added chinsky and myself to game masters Signed-off-by: Cael_Aislinn --- config/admins.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/admins.txt b/config/admins.txt index 4467f45452c..e7a1cb9781d 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -3,7 +3,9 @@ arcalane - Game Admin asanadas - Game Admin bobbehluvspropane - Game Admin cacophony - Game Admin +caelaislinn - Game Master cajoes - Game Admin +chinsky - Game Master cib - Retired Admin compactninja - Retired Admin duntadaman - Game Admin From 2d15506667b51bb5838eb20b25a0fede91ba6ca9 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Fri, 1 Feb 2013 22:46:24 +1000 Subject: [PATCH 2/6] removed extraneous rig slowdowns Signed-off-by: Cael_Aislinn --- code/modules/clothing/spacesuits/rig.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index e812c35baa5..ba900e828f2 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -57,7 +57,6 @@ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE - slowdown = 1.0 //Chief Engineer's rig @@ -71,7 +70,6 @@ icon_state = "rig-white" name = "advanced hardsuit" item_state = "ce_hardsuit" - slowdown = 1.0 //Mining rig @@ -85,7 +83,6 @@ icon_state = "rig-mining" name = "mining hardsuit" item_state = "mining_hardsuit" - slowdown = 1.0 //Syndicate rig @@ -95,7 +92,6 @@ item_state = "syndie_helm" color = "syndi" armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) - slowdown = 1.0 /obj/item/clothing/suit/space/rig/syndi icon_state = "rig-syndi" @@ -122,7 +118,6 @@ slowdown = 1 armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10) allowed = list(/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton) - slowdown = 1.0 //Wizard Rig @@ -143,7 +138,6 @@ unacidable = 1 armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen) - slowdown = 1.0 //Atmos Rig /obj/item/clothing/head/helmet/space/rig/atmos @@ -158,4 +152,3 @@ name = "atmospherics pressure suit" item_state = "atmos_hardsuit" armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0) - slowdown = 1.0 From ae16d818886b8bcd11a10b2e8676ab1803038e5b Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Fri, 1 Feb 2013 22:49:24 +1000 Subject: [PATCH 3/6] fix for blueprint areas randomly disappearing after a while, blueprint areas power not working, blueprint areas lighting being [initially] borked Signed-off-by: Cael_Aislinn --- code/controllers/_DynamicAreaLighting_TG.dm | 11 +++++++++-- code/game/objects/items/blueprints.dm | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/code/controllers/_DynamicAreaLighting_TG.dm b/code/controllers/_DynamicAreaLighting_TG.dm index c8f52ef9365..baed6adaf4f 100644 --- a/code/controllers/_DynamicAreaLighting_TG.dm +++ b/code/controllers/_DynamicAreaLighting_TG.dm @@ -236,18 +236,24 @@ turf/proc/update_lumcount(amount) turf/proc/shift_to_subarea() lighting_changed = 0 - var/area/Area = loc + if(!istype(Area) || !Area.lighting_use_dynamic) return // change the turf's area depending on its brightness // restrict light to valid levels var/light = min(max(round(lighting_lumcount,1),0),lighting_controller.lighting_states) - var/new_tag = "[Area.type]sd_L[light]" + + var/find = findtextEx(Area.tag, "sd_L") + var/new_tag = copytext(Area.tag, 1, find) + new_tag += "sd_L[light]" if(Area.tag!=new_tag) //skip if already in this area + var/area/A = locate(new_tag) // find an appropriate area + if(!A) + A = new Area.type() // create area if it wasn't found // replicate vars for(var/V in Area.vars) @@ -362,6 +368,7 @@ atom return brightness + #undef LIGHTING_MAX_LUMINOSITY #undef LIGHTING_MAX_LUMINOSITY_MOB #undef LIGHTING_LAYER diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 5ce14b361ec..ce9a25b0602 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -130,6 +130,12 @@ move an amendment to the drawing.

A.power_light = 0 A.power_environ = 0 move_turfs_to_area(turfs, A) + + A.always_unpowered = 0 + for(var/turf/T in A.contents) + T.lighting_changed = 1 + lighting_controller.changed_turfs += T + spawn(5) //ma = A.master ? "[A.master]" : "(null)" //world << "DEBUG: create_area(5):
A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]" From a6ae09bccf13f8842dbc8a3ab838b134e29e2beb Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Fri, 1 Feb 2013 22:49:54 +1000 Subject: [PATCH 4/6] fix for some zas runtimes, overrepressurisation after sealing breaches, zones not properly restructuring during some breaches Signed-off-by: Cael_Aislinn --- code/ZAS/ZAS_Zones.dm | 2 +- code/game/turfs/turf.dm | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/code/ZAS/ZAS_Zones.dm b/code/ZAS/ZAS_Zones.dm index 17867abf266..a6d76a91f70 100644 --- a/code/ZAS/ZAS_Zones.dm +++ b/code/ZAS/ZAS_Zones.dm @@ -409,7 +409,7 @@ zone/proc/Rebuild() // var/list/turfs_to_consider = contents.Copy() - while(!sample.CanPass(null, sample, 1.5, 1)) + while(!sample || !sample.CanPass(null, sample, 1.5, 1)) if(sample) turfs_to_consider.Remove(sample) sample = locate() in turfs_to_consider diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 791b6d2c172..315dd7363e5 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -213,12 +213,12 @@ /turf/proc/ReplaceWithFloor(explode=0) var/prior_icon = icon_old var/old_dir = dir - var/aoxy = 0//Holders to assimilate air from nearby turfs + /*var/aoxy = 0//Holders to assimilate air from nearby turfs var/anitro = 0 var/aco = 0 var/atox = 0 var/atemp = 0 - var/turf_count = 0 + var/turf_count = 0*/ var/old_lumcount = lighting_lumcount - initial(lighting_lumcount) var/turf/simulated/floor/W = new /turf/simulated/floor( locate(src.x, src.y, src.z) ) @@ -228,6 +228,7 @@ lighting_controller.changed_turfs += W //////Assimilate Air////// + /* for(var/direction in cardinal)//Only use cardinals to cut down on lag var/turf/T = get_step(src,direction) if(istype(T,/turf/space))//Counted as no air @@ -247,6 +248,7 @@ W.air.carbon_dioxide = (aco/max(turf_count,1)) W.air.toxins = (atox/max(turf_count,1)) W.air.temperature = (atemp/max(turf_count,1))//Trace gases can get bant + */ W.RemoveLattice() W.dir = old_dir @@ -259,12 +261,12 @@ /turf/proc/ReplaceWithPlating() var/prior_icon = icon_old var/old_dir = dir - var/aoxy = 0//Holders to assimilate air from nearby turfs + /*var/aoxy = 0//Holders to assimilate air from nearby turfs var/anitro = 0 var/aco = 0 var/atox = 0 var/atemp = 0 - var/turf_count = 0 + var/turf_count = 0*/ //////Assimilate Air////// var/old_lumcount = lighting_lumcount - initial(lighting_lumcount) @@ -274,6 +276,7 @@ W.lighting_changed = 1 lighting_controller.changed_turfs += W + /* for(var/direction in cardinal) var/turf/T = get_step(src,direction) if(istype(T,/turf/space)) @@ -293,6 +296,7 @@ W.air.carbon_dioxide = (aco/max(turf_count,1)) W.air.toxins = (atox/max(turf_count,1)) W.air.temperature = (atemp/max(turf_count,1)) + */ W.RemoveLattice() W.dir = old_dir @@ -321,6 +325,11 @@ /turf/proc/ReplaceWithSpace() var/old_dir = dir + var/zone/Z + if(src.zone) + Z = src.zone + Z.RemoveTurf(src) + var/old_lumcount = lighting_lumcount - initial(lighting_lumcount) var/turf/space/S = new /turf/space( locate(src.x, src.y, src.z) ) S.lighting_lumcount += old_lumcount @@ -328,6 +337,11 @@ S.lighting_changed = 1 lighting_controller.changed_turfs += S + if(Z) + //Z.AddTurf(S) + for(var/turf/simulated/T in orange(src,1)) + air_master.tiles_to_update.Add(T) + S.dir = old_dir S.levelupdate() return S From 6b5cce1d45006e6f1dacba8ab127e3a6a953b10a Mon Sep 17 00:00:00 2001 From: Mloc Date: Fri, 1 Feb 2013 20:52:20 +0000 Subject: [PATCH 5/6] Hey look, it's 2013! And I'm only a month late! --- LICENSE.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 419cc18b370..5005fcd90f0 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Baystation12 -Copyright (C) 2010-2012 Baystation12 and tgstation13. +Copyright (C) 2010-2013 Baystation12 and tgstation13. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,4 +12,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . \ No newline at end of file +along with this program. If not, see . From 1945427fb9ee83cf02b2f5b5a7aa8d1047f02890 Mon Sep 17 00:00:00 2001 From: Mloc Date: Sat, 2 Feb 2013 16:55:31 +0000 Subject: [PATCH 6/6] not yet. --- config/admins.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/admins.txt b/config/admins.txt index e7a1cb9781d..4467f45452c 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -3,9 +3,7 @@ arcalane - Game Admin asanadas - Game Admin bobbehluvspropane - Game Admin cacophony - Game Admin -caelaislinn - Game Master cajoes - Game Admin -chinsky - Game Master cib - Retired Admin compactninja - Retired Admin duntadaman - Game Admin