diff --git a/GainStation13/code/game/plushes.dm b/GainStation13/code/game/plushes.dm index 1fb8e73715..d4360f85f9 100644 --- a/GainStation13/code/game/plushes.dm +++ b/GainStation13/code/game/plushes.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/plushes.dmi' /obj/item/toy/plush/gs13/metha - name = "Magical Captain plush/gs13ie" + name = "Magical Captain plushie" desc = "A NEW GATO TOY FROM GATO CORPORATION, FEEL THE MAGIC OF THIS COOL TOY!" icon_state = "metha" attack_verb = list("fattened","Metha'd", "Brigged") @@ -45,24 +45,29 @@ squeak_override = list('modular_citadel/sound/voice/weh.ogg' = 1) /obj/item/toy/plush/gs13/kinichi - desc = "A silly looking plush/gs13ie of an adorable lizard janitor. His smile is heartwarming to look at." + desc = "A silly looking plushie of an adorable lizard janitor. His smile is heartwarming to look at." icon_state = "kinichi" attack_verb = list("hissed","squished", "hugged") /obj/item/toy/plush/gs13/lgo - desc = "An attempt to market one of cleaning machines from the local market, in the form of a purchasable plush/gs13ie." + desc = "An attempt to market one of cleaning machines from the local market, in the form of a purchasable plushie." icon_state = "lgo" attack_verb = list("gronkled","beeped", "brushed") /obj/item/toy/plush/gs13/oliver - desc = "A plush/gs13 of a silly shark with a stylish bandanna." + desc = "A plush of a silly shark with a stylish bandanna." icon_state = "oliver" attack_verb = list("chomped", "bit") /obj/item/toy/plush/gs13/chloe - desc = "A plush/gs13 of a chunky red-haired botanist." + desc = "A plush of a chunky red-haired botanist." icon_state = "chloe" attack_verb = list("squished", "hugged", "smushed") /obj/item/toy/plush/gs13/mammal/fox icon_state = "fox" + +/obj/item/toy/plush/gs13/delta + desc = "A plush of a chunky greaseball." + icon_state = "delta" + attack_verb = list("squished", "hugged", "smushed") diff --git a/GainStation13/code/game/turfs/closed.dm b/GainStation13/code/game/turfs/closed.dm index 1863f20fb1..d552cd6dd0 100644 --- a/GainStation13/code/game/turfs/closed.dm +++ b/GainStation13/code/game/turfs/closed.dm @@ -16,12 +16,12 @@ /turf/closed/indestructible/candy name = "Candy wall" desc = "Despite being made out of mere candy, this wall is harder than stone!" - icon = 'Gainstation13/icons/turf/wall_candy.dmi' + icon = 'Gainstation13/icons/turf/walls/wall_candy.dmi' icon_state = "candywall" /turf/closed/indestructible/chocolate name = "Chocolate wall" desc = "Somehow, it doesn't melt at all..." - icon = 'Gainstation13/icons/turf/wall_candy.dmi' + icon = 'Gainstation13/icons/turf/walls/wall_candy.dmi' icon_state = "choco_wall1" diff --git a/GainStation13/icons/obj/plushes.dmi b/GainStation13/icons/obj/plushes.dmi index 82d46c8de7..e520771105 100644 Binary files a/GainStation13/icons/obj/plushes.dmi and b/GainStation13/icons/obj/plushes.dmi differ diff --git a/GainStation13/icons/turf/floors.dmi b/GainStation13/icons/turf/floors.dmi index ada1ec22f1..3d3ccbfa3b 100644 Binary files a/GainStation13/icons/turf/floors.dmi and b/GainStation13/icons/turf/floors.dmi differ diff --git a/GainStation13/icons/turf/walls/abductor_wall.dmi b/GainStation13/icons/turf/walls/abductor_wall.dmi new file mode 100644 index 0000000000..d1d8954bfb Binary files /dev/null and b/GainStation13/icons/turf/walls/abductor_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/bananium_wall.dmi b/GainStation13/icons/turf/walls/bananium_wall.dmi new file mode 100644 index 0000000000..4ef442ff2a Binary files /dev/null and b/GainStation13/icons/turf/walls/bananium_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/boss_wall.dmi b/GainStation13/icons/turf/walls/boss_wall.dmi new file mode 100644 index 0000000000..a197aac8ce Binary files /dev/null and b/GainStation13/icons/turf/walls/boss_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/clockwork_wall.dmi b/GainStation13/icons/turf/walls/clockwork_wall.dmi new file mode 100644 index 0000000000..8263e901d0 Binary files /dev/null and b/GainStation13/icons/turf/walls/clockwork_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/cult_wall.dmi b/GainStation13/icons/turf/walls/cult_wall.dmi new file mode 100644 index 0000000000..5239f7b1e0 Binary files /dev/null and b/GainStation13/icons/turf/walls/cult_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/diamond_wall.dmi b/GainStation13/icons/turf/walls/diamond_wall.dmi new file mode 100644 index 0000000000..664e1c4ef9 Binary files /dev/null and b/GainStation13/icons/turf/walls/diamond_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/gmushroom_wall.dmi b/GainStation13/icons/turf/walls/gmushroom_wall.dmi new file mode 100644 index 0000000000..2776bdf01e Binary files /dev/null and b/GainStation13/icons/turf/walls/gmushroom_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/gold_wall.dmi b/GainStation13/icons/turf/walls/gold_wall.dmi new file mode 100644 index 0000000000..0985cc69d8 Binary files /dev/null and b/GainStation13/icons/turf/walls/gold_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/hierophant_wall.dmi b/GainStation13/icons/turf/walls/hierophant_wall.dmi new file mode 100644 index 0000000000..8963db4e99 Binary files /dev/null and b/GainStation13/icons/turf/walls/hierophant_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/hierophant_wall_temp.dmi b/GainStation13/icons/turf/walls/hierophant_wall_temp.dmi new file mode 100644 index 0000000000..9f0d4b8d23 Binary files /dev/null and b/GainStation13/icons/turf/walls/hierophant_wall_temp.dmi differ diff --git a/GainStation13/icons/turf/walls/icedmetal_wall.dmi b/GainStation13/icons/turf/walls/icedmetal_wall.dmi new file mode 100644 index 0000000000..1782b9809b Binary files /dev/null and b/GainStation13/icons/turf/walls/icedmetal_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/icerock_wall.dmi b/GainStation13/icons/turf/walls/icerock_wall.dmi new file mode 100644 index 0000000000..4e2afc67d6 Binary files /dev/null and b/GainStation13/icons/turf/walls/icerock_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/iron_wall.dmi b/GainStation13/icons/turf/walls/iron_wall.dmi new file mode 100644 index 0000000000..467ba1ca96 Binary files /dev/null and b/GainStation13/icons/turf/walls/iron_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/mountain_wall.dmi b/GainStation13/icons/turf/walls/mountain_wall.dmi new file mode 100644 index 0000000000..8b90de8647 Binary files /dev/null and b/GainStation13/icons/turf/walls/mountain_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/plasma_wall.dmi b/GainStation13/icons/turf/walls/plasma_wall.dmi new file mode 100644 index 0000000000..586ad8eb9d Binary files /dev/null and b/GainStation13/icons/turf/walls/plasma_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/plastitanium_wall.dmi b/GainStation13/icons/turf/walls/plastitanium_wall.dmi new file mode 100644 index 0000000000..01dfdd1234 Binary files /dev/null and b/GainStation13/icons/turf/walls/plastitanium_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/plaswood_wall.dmi b/GainStation13/icons/turf/walls/plaswood_wall.dmi new file mode 100644 index 0000000000..92c19a0509 Binary files /dev/null and b/GainStation13/icons/turf/walls/plaswood_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/reinforced_wall.dmi b/GainStation13/icons/turf/walls/reinforced_wall.dmi new file mode 100644 index 0000000000..5fd9a851ec Binary files /dev/null and b/GainStation13/icons/turf/walls/reinforced_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/riveted.dmi b/GainStation13/icons/turf/walls/riveted.dmi new file mode 100644 index 0000000000..466f40633e Binary files /dev/null and b/GainStation13/icons/turf/walls/riveted.dmi differ diff --git a/GainStation13/icons/turf/walls/rock_wall.dmi b/GainStation13/icons/turf/walls/rock_wall.dmi new file mode 100644 index 0000000000..c07657149a Binary files /dev/null and b/GainStation13/icons/turf/walls/rock_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/rusty_reinforced_wall.dmi b/GainStation13/icons/turf/walls/rusty_reinforced_wall.dmi new file mode 100644 index 0000000000..17081d3801 Binary files /dev/null and b/GainStation13/icons/turf/walls/rusty_reinforced_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/rusty_wall.dmi b/GainStation13/icons/turf/walls/rusty_wall.dmi new file mode 100644 index 0000000000..1bd26b9d60 Binary files /dev/null and b/GainStation13/icons/turf/walls/rusty_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/sandstone_wall.dmi b/GainStation13/icons/turf/walls/sandstone_wall.dmi new file mode 100644 index 0000000000..3eac01e96b Binary files /dev/null and b/GainStation13/icons/turf/walls/sandstone_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/shadoww_wall.dmi b/GainStation13/icons/turf/walls/shadoww_wall.dmi new file mode 100644 index 0000000000..fac0e1cc7a Binary files /dev/null and b/GainStation13/icons/turf/walls/shadoww_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/shuttle_wall.dmi b/GainStation13/icons/turf/walls/shuttle_wall.dmi new file mode 100644 index 0000000000..2e9dd3923b Binary files /dev/null and b/GainStation13/icons/turf/walls/shuttle_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/silver_wall.dmi b/GainStation13/icons/turf/walls/silver_wall.dmi new file mode 100644 index 0000000000..c164243a2e Binary files /dev/null and b/GainStation13/icons/turf/walls/silver_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/snow_wall.dmi b/GainStation13/icons/turf/walls/snow_wall.dmi new file mode 100644 index 0000000000..dfcf459f2a Binary files /dev/null and b/GainStation13/icons/turf/walls/snow_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/survival_pod_walls.dmi b/GainStation13/icons/turf/walls/survival_pod_walls.dmi new file mode 100644 index 0000000000..4608c938bc Binary files /dev/null and b/GainStation13/icons/turf/walls/survival_pod_walls.dmi differ diff --git a/GainStation13/icons/turf/walls/uranium_wall.dmi b/GainStation13/icons/turf/walls/uranium_wall.dmi new file mode 100644 index 0000000000..a617733c1c Binary files /dev/null and b/GainStation13/icons/turf/walls/uranium_wall.dmi differ diff --git a/GainStation13/icons/turf/walls/wall.dmi b/GainStation13/icons/turf/walls/wall.dmi new file mode 100644 index 0000000000..15522af6d7 Binary files /dev/null and b/GainStation13/icons/turf/walls/wall.dmi differ diff --git a/GainStation13/icons/turf/wall_candy.dmi b/GainStation13/icons/turf/walls/wall_candy.dmi similarity index 100% rename from GainStation13/icons/turf/wall_candy.dmi rename to GainStation13/icons/turf/walls/wall_candy.dmi diff --git a/GainStation13/icons/turf/walls/walls.dmi b/GainStation13/icons/turf/walls/walls.dmi new file mode 100644 index 0000000000..0df70e9e38 Binary files /dev/null and b/GainStation13/icons/turf/walls/walls.dmi differ diff --git a/GainStation13/icons/turf/walls/wood_wall.dmi b/GainStation13/icons/turf/walls/wood_wall.dmi new file mode 100644 index 0000000000..a2fe12cfb0 Binary files /dev/null and b/GainStation13/icons/turf/walls/wood_wall.dmi differ diff --git a/GainStation13/icons/turf/walls_candy.dmi b/GainStation13/icons/turf/walls_candy.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/GainStation13/icons/turf/walls_candy.dmi and /dev/null differ diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 184e242dec..938a6adfb6 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -1,11 +1,13 @@ /* * False Walls */ + +//GS13: Most of these walls have icon paths changed to GS13 folders /obj/structure/falsewall name = "wall" desc = "A huge chunk of metal used to separate rooms." anchored = TRUE - icon = 'icons/turf/walls/wall.dmi' + icon = 'GainStation13/icons/turf/walls/wall.dmi' icon_state = "wall" plane = WALL_PLANE layer = LOW_OBJ_LAYER @@ -147,7 +149,7 @@ /obj/structure/falsewall/reinforced name = "reinforced wall" desc = "A huge chunk of reinforced metal used to separate rooms." - icon = 'icons/turf/walls/reinforced_wall.dmi' + icon = 'GainStation13/icons/turf/walls/reinforced_wall.dmi' icon_state = "r_wall" walltype = /turf/closed/wall/r_wall mineral = /obj/item/stack/sheet/plasteel @@ -168,7 +170,7 @@ /obj/structure/falsewall/uranium name = "uranium wall" desc = "A wall with uranium plating. This is probably a bad idea." - icon = 'icons/turf/walls/uranium_wall.dmi' + icon = 'GainStation13/icons/turf/walls/uranium_wall.dmi' icon_state = "uranium" mineral = /obj/item/stack/sheet/mineral/uranium walltype = /turf/closed/wall/mineral/uranium @@ -202,7 +204,7 @@ /obj/structure/falsewall/gold name = "gold wall" desc = "A wall with gold plating. Swag!" - icon = 'icons/turf/walls/gold_wall.dmi' + icon = 'GainStation13/icons/turf/walls/gold_wall.dmi' icon_state = "gold" mineral = /obj/item/stack/sheet/mineral/gold walltype = /turf/closed/wall/mineral/gold @@ -211,7 +213,7 @@ /obj/structure/falsewall/silver name = "silver wall" desc = "A wall with silver plating. Shiny." - icon = 'icons/turf/walls/silver_wall.dmi' + icon = 'GainStation13/icons/turf/walls/silver_wall.dmi' icon_state = "silver" mineral = /obj/item/stack/sheet/mineral/silver walltype = /turf/closed/wall/mineral/silver @@ -220,7 +222,7 @@ /obj/structure/falsewall/diamond name = "diamond wall" desc = "A wall with diamond plating. You monster." - icon = 'icons/turf/walls/diamond_wall.dmi' + icon = 'GainStation13/icons/turf/walls/diamond_wall.dmi' icon_state = "diamond" mineral = /obj/item/stack/sheet/mineral/diamond walltype = /turf/closed/wall/mineral/diamond @@ -230,7 +232,7 @@ /obj/structure/falsewall/plasma name = "plasma wall" desc = "A wall with plasma plating. This is definitely a bad idea." - icon = 'icons/turf/walls/plasma_wall.dmi' + icon = 'GainStation13/icons/turf/walls/plasma_wall.dmi' icon_state = "plasma" mineral = /obj/item/stack/sheet/mineral/plasma walltype = /turf/closed/wall/mineral/plasma @@ -258,7 +260,7 @@ /obj/structure/falsewall/bananium name = "bananium wall" desc = "A wall with bananium plating. Honk!" - icon = 'icons/turf/walls/bananium_wall.dmi' + icon = 'GainStation13/icons/turf/walls/bananium_wall.dmi' icon_state = "bananium" mineral = /obj/item/stack/sheet/mineral/bananium walltype = /turf/closed/wall/mineral/bananium @@ -268,7 +270,7 @@ /obj/structure/falsewall/sandstone name = "sandstone wall" desc = "A wall with sandstone plating. Rough." - icon = 'icons/turf/walls/sandstone_wall.dmi' + icon = 'GainStation13/icons/turf/walls/sandstone_wall.dmi' icon_state = "sandstone" mineral = /obj/item/stack/sheet/mineral/sandstone walltype = /turf/closed/wall/mineral/sandstone @@ -277,7 +279,7 @@ /obj/structure/falsewall/wood name = "wooden wall" desc = "A wall with wooden plating. Stiff." - icon = 'icons/turf/walls/wood_wall.dmi' + icon = 'GainStation13/icons/turf/walls/wood_wall.dmi' icon_state = "wood" mineral = /obj/item/stack/sheet/mineral/wood walltype = /turf/closed/wall/mineral/wood @@ -286,7 +288,7 @@ /obj/structure/falsewall/iron name = "rough metal wall" desc = "A wall with rough metal plating." - icon = 'icons/turf/walls/iron_wall.dmi' + icon = 'GainStation13/icons/turf/walls/iron_wall.dmi' icon_state = "iron" mineral = /obj/item/stack/rods mineral_amount = 5 @@ -315,7 +317,7 @@ /obj/structure/falsewall/plastitanium name = "wall" desc = "An evil wall of plasma and titanium." - icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon = 'GainStation13/icons/turf/walls/plastitanium_wall.dmi' icon_state = "shuttle" mineral = /obj/item/stack/sheet/mineral/plastitanium walltype = /turf/closed/wall/mineral/plastitanium diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 5bae49aa91..1aebcf0610 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -26,7 +26,7 @@ /turf/closed/indestructible name = "wall" - icon = 'icons/turf/walls.dmi' + icon = 'GainStation13/icons/turf/walls/walls.dmi' explosion_block = 50 wave_explosion_block = INFINITY @@ -54,7 +54,7 @@ /turf/closed/indestructible/sandstone name = "sandstone wall" desc = "A wall with sandstone plating. Rough." - icon = 'icons/turf/walls/sandstone_wall.dmi' + icon = 'GainStation13/icons/turf/walls/sandstone_wall.dmi' icon_state = "sandstone" baseturfs = /turf/closed/indestructible/sandstone smooth = SMOOTH_TRUE @@ -62,7 +62,7 @@ /turf/closed/indestructible/wood name = "wooden wall" desc = "A wall with wooden plating. Stiff." - icon = 'icons/turf/walls/wood_wall.dmi' + icon = 'GainStation13/icons/turf/walls/wood_wall.dmi' icon_state = "wood" baseturfs = /turf/closed/indestructible/wood smooth = SMOOTH_TRUE @@ -106,20 +106,20 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) name = null desc = null mouse_opacity = MOUSE_OPACITY_TRANSPARENT - + /turf/closed/indestructible/riveted - icon = 'icons/turf/walls/riveted.dmi' + icon = 'GainStation13/icons/turf/walls/riveted.dmi' icon_state = "riveted" smooth = SMOOTH_TRUE explosion_block = INFINITY /turf/closed/indestructible/syndicate - icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon = 'GainStation13/icons/turf/walls/plastitanium_wall.dmi' icon_state = "map-shuttle" smooth = SMOOTH_TRUE /turf/closed/indestructible/riveted/uranium - icon = 'icons/turf/walls/uranium_wall.dmi' + icon = 'GainStation13/icons/turf/walls/uranium_wall.dmi' icon_state = "uranium" /turf/closed/indestructible/abductor @@ -167,7 +167,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) icon_state = "icerock" /turf/closed/indestructible/rock/snow/ice/ore - icon = 'icons/turf/walls/icerock_wall.dmi' + icon = 'GainStation13/icons/turf/walls/icerock_wall.dmi' icon_state = "icerock" smooth = SMOOTH_MORE|SMOOTH_BORDER canSmoothWith = list (/turf/closed) diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index f59b90a62a..40eb36c126 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -7,10 +7,12 @@ canSmoothWith = null smooth = SMOOTH_TRUE +//GS13: Most of these walls have icon paths changed to GS13 folders + /turf/closed/wall/mineral/gold name = "gold wall" desc = "A wall with gold plating. Swag!" - icon = 'icons/turf/walls/gold_wall.dmi' + icon = 'GainStation13/icons/turf/walls/gold_wall.dmi' icon_state = "gold" sheet_type = /obj/item/stack/sheet/mineral/gold explosion_block = 0 //gold is a soft metal you dingus. @@ -19,7 +21,7 @@ /turf/closed/wall/mineral/silver name = "silver wall" desc = "A wall with silver plating. Shiny!" - icon = 'icons/turf/walls/silver_wall.dmi' + icon = 'GainStation13/icons/turf/walls/silver_wall.dmi' icon_state = "silver" sheet_type = /obj/item/stack/sheet/mineral/silver canSmoothWith = list(/turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver) @@ -27,7 +29,7 @@ /turf/closed/wall/mineral/diamond name = "diamond wall" desc = "A wall with diamond plating. You monster." - icon = 'icons/turf/walls/diamond_wall.dmi' + icon = 'GainStation13/icons/turf/walls/diamond_wall.dmi' icon_state = "diamond" sheet_type = /obj/item/stack/sheet/mineral/diamond slicing_duration = 200 //diamond wall takes twice as much time to slice @@ -37,7 +39,7 @@ /turf/closed/wall/mineral/bananium name = "bananium wall" desc = "A wall with bananium plating. Honk!" - icon = 'icons/turf/walls/bananium_wall.dmi' + icon = 'GainStation13/icons/turf/walls/bananium_wall.dmi' icon_state = "bananium" sheet_type = /obj/item/stack/sheet/mineral/bananium canSmoothWith = list(/turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium) @@ -45,7 +47,7 @@ /turf/closed/wall/mineral/sandstone name = "sandstone wall" desc = "A wall with sandstone plating. Rough." - icon = 'icons/turf/walls/sandstone_wall.dmi' + icon = 'GainStation13/icons/turf/walls/sandstone_wall.dmi' icon_state = "sandstone" sheet_type = /obj/item/stack/sheet/mineral/sandstone explosion_block = 0 @@ -55,7 +57,7 @@ article = "a" name = "uranium wall" desc = "A wall with uranium plating. This is probably a bad idea." - icon = 'icons/turf/walls/uranium_wall.dmi' + icon = 'GainStation13/icons/turf/walls/uranium_wall.dmi' icon_state = "uranium" sheet_type = /obj/item/stack/sheet/mineral/uranium canSmoothWith = list(/turf/closed/wall/mineral/uranium, /obj/structure/falsewall/uranium) @@ -87,7 +89,7 @@ /turf/closed/wall/mineral/plasma name = "plasma wall" desc = "A wall with plasma plating. This is definitely a bad idea." - icon = 'icons/turf/walls/plasma_wall.dmi' + icon = 'GainStation13/icons/turf/walls/plasma_wall.dmi' icon_state = "plasma" sheet_type = /obj/item/stack/sheet/mineral/plasma thermal_conductivity = 0.04 @@ -126,7 +128,7 @@ /turf/closed/wall/mineral/wood name = "wooden wall" desc = "A wall with wooden plating. Stiff." - icon = 'icons/turf/walls/wood_wall.dmi' + icon = 'GainStation13/icons/turf/walls/wood_wall.dmi' icon_state = "wood" sheet_type = /obj/item/stack/sheet/mineral/wood hardness = 70 @@ -153,7 +155,7 @@ /turf/closed/wall/mineral/iron name = "rough metal wall" desc = "A wall with rough metal plating." - icon = 'icons/turf/walls/iron_wall.dmi' + icon = 'GainStation13/icons/turf/walls/iron_wall.dmi' icon_state = "iron" sheet_type = /obj/item/stack/rods canSmoothWith = list(/turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron) @@ -161,7 +163,7 @@ /turf/closed/wall/mineral/snow name = "packed snow wall" desc = "A wall made of densely packed snow blocks." - icon = 'icons/turf/walls/snow_wall.dmi' + icon = 'GainStation13/icons/turf/walls/snow_wall.dmi' icon_state = "snow" hardness = 80 explosion_block = 0 diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm index 944934df75..7063cf4b42 100644 --- a/code/game/turfs/simulated/wall/reinf_walls.dm +++ b/code/game/turfs/simulated/wall/reinf_walls.dm @@ -1,7 +1,7 @@ /turf/closed/wall/r_wall name = "reinforced wall" desc = "A huge chunk of reinforced metal used to separate rooms." - icon = 'icons/turf/walls/reinforced_wall.dmi' + icon = 'GainStation13/icons/turf/walls/reinforced_wall.dmi' //GS13 icon_state = "r_wall" opacity = 1 density = TRUE diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index cac03b0637..99d9bc8189 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -3,7 +3,7 @@ /turf/closed/wall name = "wall" desc = "A huge chunk of metal used to separate rooms." - icon = 'icons/turf/walls/wall.dmi' + icon = 'GainStation13/icons/turf/walls/wall.dmi' //GS13 icon_state = "wall" explosion_block = 1 wave_explosion_block = EXPLOSION_BLOCK_WALL