From 09ca808f919aa4d1965163152ecb1e591bc159ce Mon Sep 17 00:00:00 2001 From: AlbertNanotracen Date: Wed, 8 May 2024 21:33:18 -0300 Subject: [PATCH] innitial commit --- .../game/objects/items/stacks/tiles/tile_types.dm | 11 +++++++++-- .../code/game/turfs/open/floor/misc_floor.dm | 8 ++++++++ monkestation/icons/turf/floors.dmi | Bin 0 -> 441 bytes 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 monkestation/icons/turf/floors.dmi diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index dbb29848d779..f029858f4ef3 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -1030,6 +1030,13 @@ inhand_icon_state = "tile-bcircuit" turf_type = /turf/open/floor/circuit merge_type = /obj/item/stack/tile/circuit + // Monkestation Addition Start: They stack, this is better imo than adding a new subtype and leaving this base as unused + tile_reskin_types = list( + /obj/item/stack/tile/circuit, + /obj/item/stack/tile/circuit/green, + /obj/item/stack/tile/circuit/red, + ) + // End Monkestation Addition /obj/item/stack/tile/circuit/green name = "green circuit tile" @@ -1038,7 +1045,7 @@ icon_state = "tile_gcircuit" inhand_icon_state = "tile-gcircuit" turf_type = /turf/open/floor/circuit/green - merge_type = /obj/item/stack/tile/circuit/green + //merge_type = /obj/item/stack/tile/circuit/green Monkestation Edit: merges with all circuit floors /obj/item/stack/tile/circuit/green/anim turf_type = /turf/open/floor/circuit/green/anim @@ -1051,7 +1058,7 @@ icon_state = "tile_rcircuit" inhand_icon_state = "tile-rcircuit" turf_type = /turf/open/floor/circuit/red - merge_type = /obj/item/stack/tile/circuit/red + //merge_type = /obj/item/stack/tile/circuit/red Monkestation Edit: merges with all circuit floors /obj/item/stack/tile/circuit/red/anim turf_type = /turf/open/floor/circuit/red/anim diff --git a/monkestation/code/game/turfs/open/floor/misc_floor.dm b/monkestation/code/game/turfs/open/floor/misc_floor.dm index 994ceea4107b..55ce901676c6 100644 --- a/monkestation/code/game/turfs/open/floor/misc_floor.dm +++ b/monkestation/code/game/turfs/open/floor/misc_floor.dm @@ -1,3 +1,11 @@ +/turf/open/floor/circuit/green/anim/update_icon_state() + icon = on ? 'icons/turf/floors.dmi' : 'monkestation/icons/turf/floors.dmi' + return ..() + +/turf/open/floor/circuit/red/anim/update_icon_state() + icon = on ? 'icons/turf/floors.dmi' : 'monkestation/icons/turf/floors.dmi' + return ..() + /obj/item/stack/tile/sandy_dirt name = "sandy dirt tiles" singular_name = "sandy dirt tile" diff --git a/monkestation/icons/turf/floors.dmi b/monkestation/icons/turf/floors.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1dc76abdf3f4b4f27bf6c45f0d20d740351b773b GIT binary patch literal 441 zcmV;q0Y?6bP)f&c&jczRS=bVOxyV{&P5bZKvH004NLQ&w!&@pbr zAP@!6pEBFy!abJY7C8b1NZyXZE_{nU0tJzvo5D!ulsnFPie!r*p$8vEf&qY!U-RaD z99w&c7`GbD+DL@<-l@e$5mT)+wj+v|N_Io5QRJYI4n2w(YN2WOPK3_9;9Bt~(BT!F z!n8tmzef?~yEw%g5z61m1m0Z2uG{1Dynczd-}*n}{l=>{lgL3J(+(1$R_?<-I}yX$ z`D9Kamt?2Hkwn;qUsyS~gxYd6*(VXhR-)-g5;6Gs?06DkTjfsmBw`9V>V0t{Y$&`~ jNyM#Jvb}wY|M%kw?Kif+0NQ~(00000NkvXXu0mjfa38-b literal 0 HcmV?d00001