shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4049 from Citadel-Station-13/upstream-merge-32860

Browse Source 
[MIRROR] Cleans up floors.dmi a bit and adds new turf decals.
This commit is contained in:
deathride58
2017-11-21 06:42:22 +00:00
committed by GitHub
parent 700f3f354c fcac2a9fa7
commit c1b344f08f
41 changed files with 4300 additions and 3709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/decal.dm
+125 -13
View File
@@ -42,6 +42,12 @@
/obj/effect/turf_decal/stripes/corner
icon_state = "warninglinecorner"
/obj/effect/turf_decal/stripes/box
icon_state = "warn_box"
/obj/effect/turf_decal/stripes/full
icon_state = "warn_full"
/obj/effect/turf_decal/stripes/asteroid/line
icon_state = "ast_warn"
@@ -51,32 +57,138 @@
/obj/effect/turf_decal/stripes/asteroid/corner
icon_state = "ast_warn_corner"
/obj/effect/turf_decal/stripes/asteroid/box
icon_state = "ast_warn_box"
/obj/effect/turf_decal/stripes/asteroid/full
icon_state = "ast_warn_full"
/obj/effect/turf_decal/stripes/white/line
icon_state = "warningline_white"
/obj/effect/turf_decal/stripes/white/end
icon_state = "warn_end_white"
/obj/effect/turf_decal/stripes/white/corner
icon_state = "warninglinecorner_white"
/obj/effect/turf_decal/stripes/white/box
icon_state = "warn_box_white"
/obj/effect/turf_decal/stripes/white/full
icon_state = "warn_full_white"
/obj/effect/turf_decal/stripes/red/line
icon_state = "warningline_red"
/obj/effect/turf_decal/stripes/red/end
icon_state = "warn_end_red"
/obj/effect/turf_decal/stripes/red/corner
icon_state = "warninglinecorner_red"
/obj/effect/turf_decal/stripes/red/box
icon_state = "warn_box_red"
/obj/effect/turf_decal/stripes/red/full
icon_state = "warn_full_red"
/obj/effect/turf_decal/delivery
icon_state = "delivery"
/obj/effect/turf_decal/delivery/white
icon_state = "delivery_white"
/obj/effect/turf_decal/delivery/red
icon_state = "delivery_red"
/obj/effect/turf_decal/bot
icon_state = "bot"
/obj/effect/turf_decal/bot/right
icon_state = "bot_right"
/obj/effect/turf_decal/bot/left
icon_state = "bot_left"
/obj/effect/turf_decal/bot_white
icon_state = "bot_white"
/obj/effect/turf_decal/bot_white/right
icon_state = "bot_right_white"
/obj/effect/turf_decal/bot_white/left
icon_state = "bot_left_white"
/obj/effect/turf_decal/bot_red
icon_state = "bot_red"
/obj/effect/turf_decal/bot_red/right
icon_state = "bot_right_red"
/obj/effect/turf_decal/bot_red/left
icon_state = "bot_left_red"
/obj/effect/turf_decal/loading_area
icon_state = "loading_area"
icon_state = "loadingarea"
/obj/effect/turf_decal/loading_area/white
icon_state = "loadingarea_white"
/obj/effect/turf_decal/loading_area/red
icon_state = "loadingarea_red"
/obj/effect/turf_decal/sand
icon_state = "sandyfloor"
/obj/effect/turf_decal/sand/warning
icon_state = "sandy_warn"
/obj/effect/turf_decal/sand/warning/corner
icon_state = "sandy_warn_corner"
/obj/effect/turf_decal/sand/plating
icon_state = "sandyplating"
/obj/effect/turf_decal/sand/plating/warning
icon_state = "sandy_plating_warn"
/obj/effect/turf_decal/sand/plating/warning/corner
icon_state = "sandy_plating_warn_corner"
/obj/effect/turf_decal/plaque
icon_state = "plaque"
/obj/effect/turf_decal/caution
icon_state = "caution"
/obj/effect/turf_decal/caution/white
icon_state = "caution_white"
/obj/effect/turf_decal/caution/red
icon_state = "caution_red"
/obj/effect/turf_decal/caution/stand_clear
icon_state = "stand_clear"
/obj/effect/turf_decal/caution/stand_clear/white
icon_state = "stand_clear_white"
/obj/effect/turf_decal/caution/stand_clear/red
icon_state = "stand_clear_red"
/obj/effect/turf_decal/arrows
icon_state = "arrows"
/obj/effect/turf_decal/arrows/white
icon_state = "arrows_white"
/obj/effect/turf_decal/arrows/red
icon_state = "arrows_red"
/obj/effect/turf_decal/box
icon_state = "box"
/obj/effect/turf_decal/box/corners
icon_state = "box_corners"
/obj/effect/turf_decal/box/white
icon_state = "box_white"
/obj/effect/turf_decal/box/white/corners
icon_state = "box_corners_white"
/obj/effect/turf_decal/box/red
icon_state = "box_red"
/obj/effect/turf_decal/box/red/corners
icon_state = "box_corners_red"
code/game/turfs/simulated/floor/plasteel_floor.dm
+20 -39
View File
@@ -19,22 +19,22 @@
initial_gas_mix = "TEMP=2.7"
/turf/open/floor/plasteel/black
icon_state = "dark"
/turf/open/floor/plasteel/black/telecomms
/turf/open/floor/plasteel/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/black/telecomms/mainframe
/turf/open/floor/plasteel/dark/telecomms/mainframe
name = "Mainframe Floor"
/turf/open/floor/plasteel/black/telecomms/server
/turf/open/floor/plasteel/dark/telecomms/server
name = "Server Base"
/turf/open/floor/plasteel/black/telecomms/server/walkway
/turf/open/floor/plasteel/dark/telecomms/server/walkway
name = "Server Walkway"
/turf/open/floor/plasteel/airless/black
/turf/open/floor/plasteel/airless/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/side
icon_state = "dark"
/turf/open/floor/plasteel/black/side
icon_state = "black" //NOTICE ME SEMPAI: floors.dmi contains two sprites named black, remove the incorrect one
/turf/open/floor/plasteel/black/corner
icon_state = "blackcorner"
/turf/open/floor/plasteel/dark/corner
icon_state = "darkcorner"
@@ -224,20 +224,16 @@
/turf/open/floor/plasteel/arrival/corner
icon_state = "arrivalcorner"
/turf/open/floor/plasteel/caution
icon_state = "caution"
/turf/open/floor/plasteel/caution/corner
icon_state = "cautioncorner"
/turf/open/floor/plasteel/escape
icon_state = "escape"
/turf/open/floor/plasteel/escape/corner
icon_state = "escapecorner"
/turf/open/floor/plasteel/whitebot
icon_state = "whitebot"
/turf/open/floor/plasteel/whitebot/delivery
icon_state = "whitedelivery"
/turf/open/floor/plasteel/caution
icon_state = "caution"
/turf/open/floor/plasteel/caution/corner
icon_state = "cautioncorner"
/turf/open/floor/plasteel/redyellow
@@ -284,19 +280,6 @@
icon_state = "yellowcornersiding"
/turf/open/floor/plasteel/podhatch
icon_state = "podhatch"
/turf/open/floor/plasteel/podhatch/corner
icon_state = "podhatchcorner"
/turf/open/floor/plasteel/loadingarea
icon_state = "loadingarea"
/turf/open/floor/plasteel/loadingarea/dirty
icon_state = "loadingareadirty1"
/turf/open/floor/plasteel/loadingarea/dirtydirty
icon_state = "loadingareadirty2"
/turf/open/floor/plasteel/asteroid
icon_state = "asteroidfloor"
/turf/open/floor/plasteel/airless/asteroid
@@ -333,12 +316,6 @@
/turf/open/floor/plasteel/hydrofloor
icon_state = "hydrofloor"
/turf/open/floor/plasteel/delivery
icon_state = "delivery"
/turf/open/floor/plasteel/bot
icon_state = "bot"
/turf/open/floor/plasteel/freezer
icon_state = "freezerfloor"
@@ -358,7 +335,11 @@
icon_state = "cafeteria"
/turf/open/floor/plasteel/vault
icon_state = "vaultfull"
/turf/open/floor/plasteel/vault/side
icon_state = "vault"
/turf/open/floor/plasteel/vault/corner
icon_state = "vaultcorner"
/turf/open/floor/plasteel/vault/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/vault/telecomms/mainframe