cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes several wall issues.

Browse Source
This commit is contained in:
Zuhayr
2015-05-15 13:10:50 +09:30
parent 4f40e92a95
commit 95ea7c110c
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/turfs/simulated/wall_icon.dm
View File

@@ -69,6 +69,7 @@
/turf/simulated/wall/proc/set_material(var/material/newmaterial, var/material/newrmaterial) /turf/simulated/wall/proc/set_material(var/material/newmaterial, var/material/newrmaterial)
material = newmaterial material = newmaterial
reinf_material = newrmaterial reinf_material = newrmaterial
update_material()
check_relatives() check_relatives()
check_relatives(1) check_relatives(1)
@@ -85,7 +86,10 @@
else else
set_wall_state("[material.icon_base]fwall_open") set_wall_state("[material.icon_base]fwall_open")
var/overlay = round(damage / material.integrity * damage_overlays.len) + 1 var/dmg_amt = material.integrity
if(reinf_material)
dmg_amt += reinf_material.integrity
var/overlay = round(damage / dmg_amt * damage_overlays.len) + 1
if(overlay > damage_overlays.len) if(overlay > damage_overlays.len)
overlay = damage_overlays.len overlay = damage_overlays.len
if(density) if(density)
@@ -115,11 +119,11 @@
var/turf/simulated/wall/T = get_step(src, checkdir) var/turf/simulated/wall/T = get_step(src, checkdir)
if(!istype(T) || !T.material) if(!istype(T) || !T.material)
continue continue
if(T.material && can_join_with(T)) if(update_self)
if(update_self) if(can_join_with(T))
junction |= get_dir(src,T) //Not too sure why, but using checkdir just breaks walls. junction |= get_dir(src,T) //Not too sure why, but using checkdir just breaks walls.
else else
T.check_relatives(1) T.check_relatives(1)
if(!isnull(junction)) if(!isnull(junction))
set_wall_state("[material.icon_base][junction]") set_wall_state("[material.icon_base][junction]")
return return

22
code/game/turfs/simulated/walls.dm
View File

@@ -144,15 +144,15 @@ var/list/global/wall_cache = list()
return ..() return ..()
/turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0) /turf/simulated/wall/proc/dismantle_wall(var/devastated, var/explode, var/no_product)
playsound(src, 'sound/items/Welder.ogg', 100, 1) playsound(src, 'sound/items/Welder.ogg', 100, 1)
if(reinf_material) if(!no_product)
reinf_material.place_dismantled_girder(src, reinf_material) if(reinf_material)
reinf_material.place_dismantled_product(src,devastated) reinf_material.place_dismantled_girder(src, reinf_material)
else else
material.place_dismantled_girder(src) material.place_dismantled_girder(src)
material.place_dismantled_product(src,devastated) material.place_dismantled_product(src,devastated)
for(var/obj/O in src.contents) //Eject contents! for(var/obj/O in src.contents) //Eject contents!
if(istype(O,/obj/structure/sign/poster)) if(istype(O,/obj/structure/sign/poster))
@@ -161,6 +161,11 @@ var/list/global/wall_cache = list()
else else
O.loc = src O.loc = src
clear_plants()
material = name_to_material["placeholder"]
reinf_material = null
check_relatives()
ChangeTurf(/turf/simulated/floor/plating) ChangeTurf(/turf/simulated/floor/plating)
/turf/simulated/wall/ex_act(severity) /turf/simulated/wall/ex_act(severity)
@@ -275,6 +280,5 @@ var/list/global/wall_cache = list()
..() ..()
/turf/simulated/wall/Destroy() /turf/simulated/wall/Destroy()
clear_plants() dismantle_wall(null,null,1)
check_relatives()
..() ..()

3
code/modules/materials/materials.dm
View File

@@ -40,6 +40,9 @@ var/list/name_to_material
if(!display_name) if(!display_name)
display_name = name display_name = name
/material/placeholder
name = "placeholder"
/material/proc/place_dismantled_girder(var/turf/target, var/material/reinf_material) /material/proc/place_dismantled_girder(var/turf/target, var/material/reinf_material)
var/obj/structure/girder/G = new(target) var/obj/structure/girder/G = new(target)
if(reinf_material) if(reinf_material)