cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

More floors and decals (#18328)

Browse Source 
* industrial decals from galatean ship

* aa

* wood

* a

* hbsr4thb

* freezer and white

* floor spritez

* uggghh

* dme

* graegrae

* cccc

* aerhbgran

* hhhghghg

* 4

* g5eah5e

* hhh

* line decals

* 234gf3erg

* s6u 45r

* door marking

* 56s46hb45

* jtfjft

* th

* eg

* g

* 4ewrahbd

* rhb

* #include "interface\skin.dmf" huh????

* soul injection

* cc

* wdfqasc

* b

* ugh

* tests rerun please

* rg

---------

Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
2024-03-17 22:01:35 +00:00
committed by GitHub
co-authored by DreamySkrell <>
parent d0c6f4ffe1
commit 6b12b09df3
22 changed files with 1822 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/paint_sprayer.dm
+16 -7
View File
@@ -16,14 +16,22 @@
var/paint_colour = COLOR_WHITE
var/list/decals = list(
"quarter-turf" = list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "coloured" = 1),
"wide quarter-turf" = list("path" = /obj/effect/floor_decal/corner_wide, "precise" = 1, "coloured" = 1),
"full quarter-turf" = list("path" = /obj/effect/floor_decal/corner_full, "precise" = 1, "coloured" = 1),
"hazard stripes" = list("path" = /obj/effect/floor_decal/industrial/warning),
"corner, hazard" = list("path" = /obj/effect/floor_decal/industrial/warning/corner),
"hatched marking" = list("path" = /obj/effect/floor_decal/industrial/hatch, "coloured" = 1),
"dotted outline" = list("path" = /obj/effect/floor_decal/industrial/outline, "coloured" = 1),
// quarter
"quarter-turf" = list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "coloured" = 1),
"wide quarter-turf" = list("path" = /obj/effect/floor_decal/corner_wide, "precise" = 1, "coloured" = 1),
"full quarter-turf" = list("path" = /obj/effect/floor_decal/corner_full, "precise" = 1, "coloured" = 1),
// hazard
"hazard stripes" = list("path" = /obj/effect/floor_decal/industrial/warning),
"corner, hazard" = list("path" = /obj/effect/floor_decal/industrial/warning/corner),
// hatch
"hatched marking" = list("path" = /obj/effect/floor_decal/industrial/hatch, "coloured" = 1),
"hatched marking small" = list("path" = /obj/effect/floor_decal/industrial/hatch_small, "coloured" = 1),
"hatched marking tiny" = list("path" = /obj/effect/floor_decal/industrial/hatch_tiny, "coloured" = 1),
// outline
"dotted outline" = list("path" = /obj/effect/floor_decal/industrial/outline, "coloured" = 1),
"arrow" = list("path" = /obj/effect/floor_decal/industrial/arrow, "precise" = 1, "coloured" = 1),
"loading sign" = list("path" = /obj/effect/floor_decal/industrial/loading),
// signs
"1" = list("path" = /obj/effect/floor_decal/sign),
"2" = list("path" = /obj/effect/floor_decal/sign/two),
"A" = list("path" = /obj/effect/floor_decal/sign/a),
@@ -35,6 +43,7 @@
"CMO" = list("path" = /obj/effect/floor_decal/sign/cmo),
"V" = list("path" = /obj/effect/floor_decal/sign/v),
"Psy" = list("path" = /obj/effect/floor_decal/sign/p),
// remove all
"remove all decals" = list("path" = /obj/effect/floor_decal/reset)
)
code/game/objects/items/stacks/tiles/tile_types.dm
+6
View File
@@ -329,6 +329,12 @@
icon_state = "tile_lightmarble"
matter = list(MATERIAL_MARBLE = TILE_MATERIAL_AMOUNT)
/obj/item/stack/tile/marble/dark
name = "dark marble floor tile"
singular_name = "dark marble floor tile"
icon_state = "tile_darkmarble"
matter = list(MATERIAL_MARBLE = TILE_MATERIAL_AMOUNT)
/*
* Cyborg modules
*/
code/game/objects/structures/lattice.dm
+7 -1
View File
@@ -169,7 +169,7 @@
icon_state = "grate_light"
base_icon_state = "grate_light"
return_amount = 1
color = COLOR_GUNMETAL
color = COLOR_GRAY50
/obj/structure/lattice/catwalk/indoor/grate/light/old/Initialize()
. = ..()
@@ -186,6 +186,12 @@
/obj/structure/lattice/catwalk/indoor/grate/dark
color = COLOR_DARK_GUNMETAL
/obj/structure/lattice/catwalk/indoor/grate/gunmetal
color = COLOR_DARK_GUNMETAL
/obj/structure/lattice/catwalk/indoor/grate/slate
color = COLOR_SLATE
/obj/structure/lattice/catwalk/indoor/urban
name = "grate"
desc = "A metal grate."