cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4342 from Zuhayr/ihategit

Browse Source 
Multiz changes.
This commit is contained in:
Ccomp5950
2014-01-25 20:24:49 -08:00
parent 6830ebadc9 5709dc2629
commit dfec09ebb2
20 changed files with 129 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/power/cable.dm
View File

@@ -101,10 +101,10 @@
///// Z-Level Stuff
if(src.d1 == 11 || src.d2 == 11)
var/turf/controlerlocation = locate(1, 1, z)
for(var/obj/effect/landmark/zcontroler/controler in controlerlocation)
if(controler.down)
var/turf/below = locate(src.x, src.y, controler.down_target)
var/turf/controllerlocation = locate(1, 1, z)
for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
if(controller.down)
var/turf/below = locate(src.x, src.y, controller.down_target)
for(var/obj/structure/cable/c in below)
if(c.d1 == 12 || c.d2 == 12)
c.Del()

24
code/modules/power/power.dm
View File

@@ -159,14 +159,14 @@
if(T)
. += power_list(T, src, d1, 1)
else if (d1 == 11 || d1 == 12)
var/turf/controlerlocation = locate(1, 1, z)
for(var/obj/effect/landmark/zcontroler/controler in controlerlocation)
if(controler.up && d1 == 12)
T = locate(src.x, src.y, controler.up_target)
var/turf/controllerlocation = locate(1, 1, z)
for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
if(controller.up && d1 == 12)
T = locate(src.x, src.y, controller.up_target)
if(T)
. += power_list(T, src, 11, 1)
if(controler.down && d1 == 11)
T = locate(src.x, src.y, controler.down_target)
if(controller.down && d1 == 11)
T = locate(src.x, src.y, controller.down_target)
if(T)
. += power_list(T, src, 12, 1)
else if(!d1)
@@ -174,14 +174,14 @@
. += power_list(T, src, d1, 1)
if(d2 == 11 || d2 == 12)
var/turf/controlerlocation = locate(1, 1, z)
for(var/obj/effect/landmark/zcontroler/controler in controlerlocation)
if(controler.up && d2 == 12)
T = locate(src.x, src.y, controler.up_target)
var/turf/controllerlocation = locate(1, 1, z)
for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
if(controller.up && d2 == 12)
T = locate(src.x, src.y, controller.up_target)
if(T)
. += power_list(T, src, 11, 1)
if(controler.down && d2 == 11)
T = locate(src.x, src.y, controler.down_target)
if(controller.down && d2 == 11)
T = locate(src.x, src.y, controller.down_target)
if(T)
. += power_list(T, src, 12, 1)
else

2
code/modules/projectiles/targeting.dm
View File

@@ -177,7 +177,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory.
target_locked = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "locked")
update_targeted()
//Adding the buttons to the controler person
//Adding the buttons to the controller person
var/mob/living/T = I.loc
if(T)
if(T.client)

8
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -139,15 +139,15 @@
if(temp)
chemicals.Add(list(list("title" = temp.name, "id" = temp.id, "commands" = list("dispense" = temp.id)))) // list in a list because Byond merges the first list...
data["chemicals"] = chemicals
// update the ui if it exists, returns null if no ui is passed/found
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
if (!ui)
// the ui does not exist, so we'll create a new() one
// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
ui = new(user, src, ui_key, "chem_dispenser.tmpl", ui_title, 380, 650)
// when the ui is first opened this is the data it will use
ui.set_initial_data(data)
ui.set_initial_data(data)
// open the new ui window
ui.open()
@@ -1259,4 +1259,4 @@
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, amount)
if(!O.reagents.total_volume)
remove_object(O)
remove_object(O)

16
code/modules/recycling/disposal.dm
View File

@@ -932,10 +932,10 @@
var/obj/structure/disposalpipe/P
if(nextdir == 12)
var/turf/controlerlocation = locate(1, 1, src.z)
for(var/obj/effect/landmark/zcontroler/controler in controlerlocation)
if(controler.up)
T = locate(src.x, src.y, controler.up_target)
var/turf/controllerlocation = locate(1, 1, src.z)
for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
if(controller.up)
T = locate(src.x, src.y, controller.up_target)
if(!T)
H.loc = src.loc
return
@@ -985,10 +985,10 @@
var/obj/structure/disposalpipe/P
if(nextdir == 11)
var/turf/controlerlocation = locate(1, 1, src.z)
for(var/obj/effect/landmark/zcontroler/controler in controlerlocation)
if(controler.down)
T = locate(src.x, src.y, controler.down_target)
var/turf/controllerlocation = locate(1, 1, src.z)
for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
if(controller.down)
T = locate(src.x, src.y, controller.down_target)
if(!T)
H.loc = src.loc
return