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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-24 00:29:55 -04:00
committed by GitHub
parent 7714b9c393
commit 0872aa5719
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/structures/low_wall.dm
View File

@@ -619,11 +619,6 @@
/obj/effect/low_wall_spawner/eris/rphoron /obj/effect/low_wall_spawner/eris/rphoron
icon_state = "sp_rphoron" icon_state = "sp_rphoron"
<<<<<<< HEAD:code/game/objects/structures/wall_frame.dm
window_type = /obj/structure/window/eris/phoronreinforced
||||||| parent of b4b6da0fc1... Merge pull request #11222 from VOREStation/Arokha/angled_wall_stuff:code/game/objects/structures/wall_frame.dm
window_type = /obj/structure/window/eris/phoronreinforced
=======
window_type = /obj/structure/window/eris/phoronreinforced window_type = /obj/structure/window/eris/phoronreinforced
/obj/effect/low_wall_spawner/eris/reinforced /obj/effect/low_wall_spawner/eris/reinforced
@@ -642,4 +637,3 @@
/obj/effect/low_wall_spawner/eris/reinforced/rphoron /obj/effect/low_wall_spawner/eris/reinforced/rphoron
icon_state = "spr_rphoron" icon_state = "spr_rphoron"
window_type = /obj/structure/window/eris/phoronreinforced window_type = /obj/structure/window/eris/phoronreinforced
>>>>>>> b4b6da0fc1... Merge pull request #11222 from VOREStation/Arokha/angled_wall_stuff:code/game/objects/structures/low_wall.dm