cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +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-25 00:45:22 -04:00
committed by GitHub
parent 3e3d82a363
commit 74079df6e3
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/turfs/flooring/flooring_decals.dm
View File

@@ -1223,7 +1223,6 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/grass_edge/corner
name = "grass edge"
icon_state = "grass_edge_corner"
<<<<<<< HEAD
/obj/effect/floor_decal/plaque/yw
name = "Commerative Plaque"
@@ -1245,8 +1244,6 @@ var/list/floor_decals = list()
icon_state = "gravsnow_edges"
/obj/effect/floor_decal/snow/floor/surround
icon_state = "snow_surround"
||||||| parent of 83534ded9c... Merge pull request #11229 from VOREStation/upstream-merge-8172
=======
//Multi-part Floor Signs
@@ -1271,5 +1268,3 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/arrows
name = "floor arrows"
icon_state = "arrows"
>>>>>>> 83534ded9c... Merge pull request #11229 from VOREStation/upstream-merge-8172