cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tile painter menu

Browse Source 
Tin. Also renamed a floor icon because its name conflicted with another.
Luckily, this icon was used in only one place.
This commit is contained in:
Exxion
2015-03-08 16:48:47 -04:00
parent 2656967664
commit 743dd955a7
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/TriDimension/Turfs.dm
View File

@@ -26,7 +26,7 @@ atom/movable/Move() //Hackish
name = "open space"
intact = 0
density = 0
icon_state = "black"
icon_state = "fullblack"
pathweight = 100000 //Seriously, don't try and path over this one numbnuts
var/icon/darkoverlays = null
var/turf/floorbelow

37
code/game/objects/items/weapons/tile_painter.dm
View File

@@ -80,6 +80,7 @@ var/global/list/paint_variants = list(
// Atmos lettering
new /datum/paint_info/decal(DIR_ORTHO, "oxygen"),
new /datum/paint_info/decal(DIR_ORTHO, "nitrogen"),
new /datum/paint_info/decal(DIR_ORTHO, "carbon_dioxide"),
new /datum/paint_info/decal(DIR_ORTHO, "nitrous_oxide"),
new /datum/paint_info/decal(DIR_ORTHO, "air"),
@@ -245,38 +246,38 @@ var/global/list/paint_variants = list(
"Chapel" = list(new /datum/paint_info(DIR_ALL,"chapel")),
"SS13 logo" = list(new /datum/paint_info(DIR_ONE,"L1"),
new /datum/paint_info(DIR_ONE,"L2"),
new /datum/paint_info(DIR_ONE,"L3"),
new /datum/paint_info(DIR_ONE,"L4"),
new /datum/paint_info(DIR_ONE,"L5"),
new /datum/paint_info(DIR_ONE,"L6"),
new /datum/paint_info(DIR_ONE,"L7"),
new /datum/paint_info(DIR_ONE,"L8"),
new /datum/paint_info(DIR_ONE,"L9"),
new /datum/paint_info(DIR_ONE,"L10"),
new /datum/paint_info(DIR_ONE,"L11"),
new /datum/paint_info(DIR_ONE,"L12"),
new /datum/paint_info(DIR_ONE,"L13"),
new /datum/paint_info(DIR_ONE,"L14"),
new /datum/paint_info(DIR_ONE,"L15"),
new /datum/paint_info(DIR_ONE,"L2"),
new /datum/paint_info(DIR_ONE,"L4"),
new /datum/paint_info(DIR_ONE,"L6"),
new /datum/paint_info(DIR_ONE,"L8"),
new /datum/paint_info(DIR_ONE,"L10"),
new /datum/paint_info(DIR_ONE,"L12"),
new /datum/paint_info(DIR_ONE,"L14"),
new /datum/paint_info(DIR_ONE,"L16")),
"Derelict logo" = list(new /datum/paint_info(DIR_ONE,"derelict1"),
new /datum/paint_info(DIR_ONE,"derelict2"),
new /datum/paint_info(DIR_ONE,"derelict3"),
new /datum/paint_info(DIR_ONE,"derelict4"),
new /datum/paint_info(DIR_ONE,"derelict5"),
new /datum/paint_info(DIR_ONE,"derelict6"),
new /datum/paint_info(DIR_ONE,"derelict7"),
new /datum/paint_info(DIR_ONE,"derelict8"),
new /datum/paint_info(DIR_ONE,"derelict9"),
"Derelict logo" = list(new /datum/paint_info(DIR_ONE,"derelict9"),
new /datum/paint_info(DIR_ONE,"derelict10"),
new /datum/paint_info(DIR_ONE,"derelict11"),
new /datum/paint_info(DIR_ONE,"derelict12"),
new /datum/paint_info(DIR_ONE,"derelict13"),
new /datum/paint_info(DIR_ONE,"derelict14"),
new /datum/paint_info(DIR_ONE,"derelict15"),
new /datum/paint_info(DIR_ONE,"derelict16")),
new /datum/paint_info(DIR_ONE,"derelict16"),
new /datum/paint_info(DIR_ONE,"derelict1"),
new /datum/paint_info(DIR_ONE,"derelict2"),
new /datum/paint_info(DIR_ONE,"derelict3"),
new /datum/paint_info(DIR_ONE,"derelict4"),
new /datum/paint_info(DIR_ONE,"derelict5"),
new /datum/paint_info(DIR_ONE,"derelict6"),
new /datum/paint_info(DIR_ONE,"derelict7"),
new /datum/paint_info(DIR_ONE,"derelict8")),
"Other" = list(new /datum/paint_info(DIR_ONE,"dark"),
new /datum/paint_info(DIR_ONE,"bar"),
@@ -402,6 +403,8 @@ var/global/list/paint_variants = list(
data += "<p><b>[category]</b></p>"
data += "<p>"
for(var/i = 1; i <= tiles.len; i++)
if((category == "SS13 logo" || category == "Derelict logo") && i == 9)
data += "<br>"
var/datum/paint_info/I = tiles[i]
data += populate_selection(user, I)

BIN
icons/turf/floors.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 337 KiB

After

Width:  |  Height:  |  Size: 337 KiB