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

Conflict Fix

Browse Source
This commit is contained in:
klaasjared
2022-06-30 19:45:03 -04:00
parent ae2a117243
commit e410047ff8
5 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+16
View File
@@ -36,6 +36,22 @@
name = "stack of happy carpet"
type_to_spawn = /obj/item/stack/tile/carpet/happy
/obj/fiftyspawner/brncarpet
name = "stack of brown carpet"
type_to_spawn = /obj/item/stack/tile/carpet/brncarpet
/obj/fiftyspawner/brncarpet
name = "stack of blue carpet"
type_to_spawn = /obj/item/stack/tile/carpet/blucarpet2
/obj/fiftyspawner/brncarpet
name = "stack of green carpet"
type_to_spawn = /obj/item/stack/tile/carpet/greencarpet
/obj/fiftyspawner/brncarpet
name = "stack of purple carpet"
type_to_spawn = /obj/item/stack/tile/carpet/purplecarpet
/obj/fiftyspawner/floor
name = "stack of floor tiles"
type_to_spawn = /obj/item/stack/tile/floor
code/game/objects/items/stacks/tiles/tile_types.dm
+8
View File
@@ -150,6 +150,14 @@
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/oracarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/brncarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/blucarpet2
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/greencarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/purplecarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/floor
name = "floor tile"