diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 9f21dbcd2c..e5b421e9af 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -72,8 +72,6 @@ proc/admin_spawn_room_at_pos() wall=/turf/simulated/wall/r_wall if("Regular wall") wall=/turf/simulated/wall - if("Asteroid wall") - wall=/turf/simulated/wall/asteroid if("Resin wall") wall=/obj/effect/alien/resin switch(alert("Floor type",null,"Regular floor","Reinforced floor")) diff --git a/code/game/turfs/simulated/asteroid.dm b/code/game/turfs/simulated/asteroid.dm deleted file mode 100644 index ec0c20afc2..0000000000 --- a/code/game/turfs/simulated/asteroid.dm +++ /dev/null @@ -1,85 +0,0 @@ -/turf/simulated/wall/asteroid - name = "asteroid" - icon = 'icons/turf/walls.dmi' - icon_state = "asteroid" - opacity = 1 - density = 1 - oxygen = 0 - nitrogen = 0 - temperature = TCMB - var/contains = null - var/max_amount = 1 - var/min_amount = 0 - -/turf/simulated/wall/asteroid/iron - icon_state = "asteroid_i" - contains = /obj/item/stack/sheet/metal - max_amount = 3 - min_amount = 1 - -/turf/simulated/wall/asteroid/silicon - icon_state = "asteroid_i" - contains = /obj/item/stack/sheet/glass - max_amount = 3 - min_amount = 1 - -/turf/simulated/wall/asteroid/facehugger - icon_state = "asteroid_i" - contains = /obj/item/clothing/mask/facehugger - max_amount = 1 - min_amount = 0 - -/* -/turf/simulated/wall/asteroid/frozen_gas - name="frozen gas" - icon = 'icons/obj/atmos.dmi' - -/turf/simulated/wall/asteroid/frozen_gas/oxygen - icon_state = "blue" - - New() - src.oxygen = rand(40,200) - ..() - -/turf/simulated/wall/asteroid/frozen_gas/nitrogen - icon_state = "red" - - New() - src.nitrogen = rand(40,200) - ..() - -/turf/simulated/wall/asteroid/frozen_gas/toxins - icon_state = "orange" - - New() - src.toxins = rand(40,200) - ..() - -/turf/simulated/wall/asteroid/frozen_gas/carbon_dioxide - icon_state = "black" - - New() - src.carbon_dioxide = rand(40,200) - ..() - -*/ - - -/turf/simulated/wall/asteroid/dismantle_wall(devastated=0) - if(contains && ispath(contains)) - var/iterations = 0 - if(!devastated) - iterations = max_amount - else - iterations = min_amount - for(var/i=0 to iterations) - new contains(src) - ChangeTurf(/turf/space) - - -/turf/simulated/wall/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)//TODO - return attack_hand(user) - - -/turf/simulated/wall/asteroid/relativewall()//TODO. - return diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index d6b187e0f9..935884f1e6 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -7,10 +7,14 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," "asteroid","asteroid_dug", "asteroid0","asteroid1","asteroid2","asteroid3","asteroid4", "asteroid5","asteroid6","asteroid7","asteroid8","asteroid9","asteroid10","asteroid11","asteroid12", - "burning","oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken", "carpet", "carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5", "ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11", + "oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken", "carpet", + "carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5", + "ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11", "ironsand12", "ironsand13", "ironsand14", "ironsand15") -var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3","asteroid","asteroid_dug", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5", "ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11", +var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3","asteroid","asteroid_dug", + "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5", "ironsand6", "ironsand7", + "ironsand8", "ironsand9", "ironsand10", "ironsand11", "ironsand12", "ironsand13", "ironsand14", "ironsand15") var/list/wood_icons = list("wood","wood-broken") diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi index 08f807df99..49d49a1088 100644 Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ diff --git a/icons/obj/flora/deadtrees.dmi b/icons/obj/flora/deadtrees.dmi new file mode 100644 index 0000000000..f76ffd442f Binary files /dev/null and b/icons/obj/flora/deadtrees.dmi differ diff --git a/icons/obj/flora/pinetrees.dmi b/icons/obj/flora/pinetrees.dmi new file mode 100644 index 0000000000..3af14f8738 Binary files /dev/null and b/icons/obj/flora/pinetrees.dmi differ diff --git a/icons/obj/flora/snowflora.dmi b/icons/obj/flora/snowflora.dmi new file mode 100644 index 0000000000..11cbf5a505 Binary files /dev/null and b/icons/obj/flora/snowflora.dmi differ diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index 2df1c92462..8f8cd72f2e 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index f795d85869..786464e1c8 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/icons/turf/flora.dmi b/icons/turf/flora.dmi deleted file mode 100644 index 7ff902e8e7..0000000000 Binary files a/icons/turf/flora.dmi and /dev/null differ diff --git a/icons/turf/snow.dmi b/icons/turf/snow.dmi new file mode 100644 index 0000000000..32f14ba3d9 Binary files /dev/null and b/icons/turf/snow.dmi differ diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index d206bf0e46..fd7478d64f 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ diff --git a/tgstation.dme b/tgstation.dme index c5ad5d644f..fcc8d4a4dd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -799,7 +799,6 @@ #include "code\game\turfs\simulated.dm" #include "code\game\turfs\turf.dm" #include "code\game\turfs\unsimulated.dm" -#include "code\game\turfs\simulated\asteroid.dm" #include "code\game\turfs\simulated\floor.dm" #include "code\game\turfs\simulated\floor_types.dm" #include "code\game\turfs\simulated\walls.dm"