Removed the old style asteroid turfs.
Removed a lot of old and unused turf sprites. Removed some old botany sprites (fucking cocoa pods). Replaces the lava turf sprite with a good one. Adds a lot of Ausops' snow sprites. Defines for these coming soon. I might have been overzealous with the turf removal, so if anything was actually used, feel free to just revert, or add back the sprites. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5106 316c924e-a436-60f5-8080-3fe189b3f50e
@@ -72,8 +72,6 @@ proc/admin_spawn_room_at_pos()
|
|||||||
wall=/turf/simulated/wall/r_wall
|
wall=/turf/simulated/wall/r_wall
|
||||||
if("Regular wall")
|
if("Regular wall")
|
||||||
wall=/turf/simulated/wall
|
wall=/turf/simulated/wall
|
||||||
if("Asteroid wall")
|
|
||||||
wall=/turf/simulated/wall/asteroid
|
|
||||||
if("Resin wall")
|
if("Resin wall")
|
||||||
wall=/obj/effect/alien/resin
|
wall=/obj/effect/alien/resin
|
||||||
switch(alert("Floor type",null,"Regular floor","Reinforced floor"))
|
switch(alert("Floor type",null,"Regular floor","Reinforced floor"))
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -7,10 +7,14 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
|
|||||||
"asteroid","asteroid_dug",
|
"asteroid","asteroid_dug",
|
||||||
"asteroid0","asteroid1","asteroid2","asteroid3","asteroid4",
|
"asteroid0","asteroid1","asteroid2","asteroid3","asteroid4",
|
||||||
"asteroid5","asteroid6","asteroid7","asteroid8","asteroid9","asteroid10","asteroid11","asteroid12",
|
"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")
|
"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")
|
"ironsand12", "ironsand13", "ironsand14", "ironsand15")
|
||||||
var/list/wood_icons = list("wood","wood-broken")
|
var/list/wood_icons = list("wood","wood-broken")
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 204 KiB After Width: | Height: | Size: 202 KiB |
BIN
icons/obj/flora/deadtrees.dmi
Normal file
|
After Width: | Height: | Size: 25 KiB |
BIN
icons/obj/flora/pinetrees.dmi
Normal file
|
After Width: | Height: | Size: 25 KiB |
BIN
icons/obj/flora/snowflora.dmi
Normal file
|
After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 330 KiB After Width: | Height: | Size: 274 KiB |
|
Before Width: | Height: | Size: 74 KiB |
BIN
icons/turf/snow.dmi
Normal file
|
After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 129 KiB |
@@ -799,7 +799,6 @@
|
|||||||
#include "code\game\turfs\simulated.dm"
|
#include "code\game\turfs\simulated.dm"
|
||||||
#include "code\game\turfs\turf.dm"
|
#include "code\game\turfs\turf.dm"
|
||||||
#include "code\game\turfs\unsimulated.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.dm"
|
||||||
#include "code\game\turfs\simulated\floor_types.dm"
|
#include "code\game\turfs\simulated\floor_types.dm"
|
||||||
#include "code\game\turfs\simulated\walls.dm"
|
#include "code\game\turfs\simulated\walls.dm"
|
||||||
|
|||||||