mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-26 18:13:35 +00:00
Adds more decals. Moving turfs now includes under/overlays.
This commit is contained in:
@@ -774,11 +774,15 @@ proc/GaussRandRound(var/sigma,var/roundto)
|
|||||||
var/old_dir1 = T.dir
|
var/old_dir1 = T.dir
|
||||||
var/old_icon_state1 = T.icon_state
|
var/old_icon_state1 = T.icon_state
|
||||||
var/old_icon1 = T.icon
|
var/old_icon1 = T.icon
|
||||||
|
var/old_overlays = T.overlays.Copy()
|
||||||
|
var/old_underlays = T.underlays.Copy()
|
||||||
|
|
||||||
var/turf/X = B.ChangeTurf(T.type)
|
var/turf/X = B.ChangeTurf(T.type)
|
||||||
X.set_dir(old_dir1)
|
X.set_dir(old_dir1)
|
||||||
X.icon_state = old_icon_state1
|
X.icon_state = old_icon_state1
|
||||||
X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi
|
X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi
|
||||||
|
X.overlays = old_overlays
|
||||||
|
X.underlays = old_underlays
|
||||||
|
|
||||||
var/turf/simulated/ST = T
|
var/turf/simulated/ST = T
|
||||||
if(istype(ST) && ST.zone)
|
if(istype(ST) && ST.zone)
|
||||||
@@ -921,6 +925,8 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
|
|||||||
var/old_dir1 = T.dir
|
var/old_dir1 = T.dir
|
||||||
var/old_icon_state1 = T.icon_state
|
var/old_icon_state1 = T.icon_state
|
||||||
var/old_icon1 = T.icon
|
var/old_icon1 = T.icon
|
||||||
|
var/old_overlays = T.overlays.Copy()
|
||||||
|
var/old_underlays = T.underlays.Copy()
|
||||||
|
|
||||||
if(platingRequired)
|
if(platingRequired)
|
||||||
if(istype(B, get_base_turf(B.z)))
|
if(istype(B, get_base_turf(B.z)))
|
||||||
@@ -931,7 +937,8 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
|
|||||||
X.set_dir(old_dir1)
|
X.set_dir(old_dir1)
|
||||||
X.icon_state = old_icon_state1
|
X.icon_state = old_icon_state1
|
||||||
X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi
|
X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi
|
||||||
|
X.overlays = old_overlays
|
||||||
|
X.underlays = old_underlays
|
||||||
|
|
||||||
var/list/objs = new/list()
|
var/list/objs = new/list()
|
||||||
var/list/newobjs = new/list()
|
var/list/newobjs = new/list()
|
||||||
|
|||||||
@@ -194,6 +194,27 @@ var/list/floor_decals = list()
|
|||||||
/obj/effect/floor_decal/corner/grey/full
|
/obj/effect/floor_decal/corner/grey/full
|
||||||
icon_state = "corner_white_full"
|
icon_state = "corner_white_full"
|
||||||
|
|
||||||
|
/obj/effect/floor_decal/spline/plain
|
||||||
|
name = "spline - plain"
|
||||||
|
icon_state = "spline_plain"
|
||||||
|
|
||||||
|
/obj/effect/floor_decal/spline/fancy
|
||||||
|
name = "spline - fancy"
|
||||||
|
icon_state = "spline_fancy"
|
||||||
|
|
||||||
|
/obj/effect/floor_decal/spline/fancy/wood
|
||||||
|
name = "spline - wood"
|
||||||
|
color = "#CB9E04"
|
||||||
|
|
||||||
|
/obj/effect/floor_decal/spline/fancy/wood/corner
|
||||||
|
icon_state = "spline_fancy_corner"
|
||||||
|
|
||||||
|
/obj/effect/floor_decal/spline/fancy/wood/cee
|
||||||
|
icon_state = "spline_fancy_cee"
|
||||||
|
|
||||||
|
/obj/effect/floor_decal/spline/fancy/wood/full
|
||||||
|
icon_state = "spline_fancy_full"
|
||||||
|
|
||||||
/obj/effect/floor_decal/industrial/warning
|
/obj/effect/floor_decal/industrial/warning
|
||||||
name = "hazard stripes"
|
name = "hazard stripes"
|
||||||
icon_state = "warning"
|
icon_state = "warning"
|
||||||
@@ -246,6 +267,16 @@ var/list/floor_decals = list()
|
|||||||
name = "plaque"
|
name = "plaque"
|
||||||
icon_state = "plaque"
|
icon_state = "plaque"
|
||||||
|
|
||||||
|
/obj/effect/floor_decal/carpet
|
||||||
|
name = "carpet"
|
||||||
|
icon = 'icons/turf/flooring/carpet.dmi'
|
||||||
|
icon_state = "carpet_edges"
|
||||||
|
|
||||||
|
/obj/effect/floor_decal/carpet/corners
|
||||||
|
name = "carpet"
|
||||||
|
icon = 'icons/turf/flooring/carpet.dmi'
|
||||||
|
icon_state = "carpet_corners"
|
||||||
|
|
||||||
/obj/effect/floor_decal/asteroid
|
/obj/effect/floor_decal/asteroid
|
||||||
name = "random asteroid rubble"
|
name = "random asteroid rubble"
|
||||||
icon_state = "asteroid0"
|
icon_state = "asteroid0"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 60 KiB |
Reference in New Issue
Block a user