cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-17 18:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
This commit is contained in:
Erthilo
2013-09-02 23:32:33 +01:00
parent 33e17c6925 4cb945d921
commit 3b61ba850f
146 changed files with 287 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ZAS/Debug.dm
+4 -4
View File
@@ -69,10 +69,10 @@ zone/proc/DebugDisplay(client/client)
var/list/current_zone_images = list()
for(var/turf/T in contents)
current_zone_images += image('debug_group.dmi', T, null, TURF_LAYER)
current_zone_images += image('icons/misc/debug_group.dmi', T, null, TURF_LAYER)
for(var/turf/space/S in unsimulated_tiles)
current_zone_images += image('debug_space.dmi', S, null, TURF_LAYER)
current_zone_images += image('icons/misc/debug_space.dmi', S, null, TURF_LAYER)
client << "<u>Zone Air Contents</u>"
client << "Oxygen: [air.oxygen]"
@@ -89,8 +89,8 @@ zone/proc/DebugDisplay(client/client)
for(var/connection/C in connections)
client << "\ref[C] [C.A] --> [C.B] [(C.indirect?"Open":"Closed")]"
current_zone_images += image('debug_connect.dmi', C.A, null, TURF_LAYER)
current_zone_images += image('debug_connect.dmi', C.B, null, TURF_LAYER)
current_zone_images += image('icons/misc/debug_connect.dmi', C.A, null, TURF_LAYER)
current_zone_images += image('icons/misc/debug_connect.dmi', C.B, null, TURF_LAYER)
client << "Connected Zones:"
for(var/zone/zone in connected_zones)
code/ZAS/Fire.dm
+1 -1
View File
@@ -51,7 +51,7 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
//luminosity = 3
icon = 'fire.dmi'
icon = 'icons/effects/fire.dmi'
icon_state = "1"
layer = TURF_LAYER
code/ZAS/ZAS_Turfs.dm
+1 -1
View File
@@ -51,7 +51,7 @@
var/siding_icon_state = return_siding_icon_state()
if(siding_icon_state)
overlays += image('floors.dmi',siding_icon_state)
overlays += image('icons/turf/floors.dmi',siding_icon_state)
var/datum/gas_mixture/model = return_air()
switch(model.graphic)
if(1)