cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: move pipe icon manager out of SSair (#26867)

Browse Source
This commit is contained in:
warriorstar-orion
2024-09-27 01:22:17 -04:00
committed by GitHub
parent be71a2b55c
commit 3eb0c0dcd5
14 changed files with 52 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/painter/pipe_painter.dm
+3 -3
View File
@@ -7,7 +7,7 @@
/datum/painter/pipe/New()
..()
if(!length(modes))
for(var/C in GLOB.pipe_colors)
for(var/C in GLOB.pipe_icon_manager.pipe_colors)
modes += "[C]"
paint_setting = pick(modes)
@@ -25,7 +25,7 @@
if(is_type_in_list(P, blacklisted_pipes))
return
if(P.pipe_color == GLOB.pipe_colors[paint_setting])
if(P.pipe_color == GLOB.pipe_icon_manager.pipe_colors[paint_setting])
to_chat(user, "<span class='notice'>This pipe is aready painted [paint_setting]!</span>")
return
@@ -34,5 +34,5 @@
to_chat(user, "<span class='warning'>You must remove the flooring first.</span>")
return
P.change_color(GLOB.pipe_colors[paint_setting])
P.change_color(GLOB.pipe_icon_manager.pipe_colors[paint_setting])
return TRUE
code/game/objects/items/devices/painter/window_painter.dm
+5 -5
View File
@@ -20,17 +20,17 @@
var/obj/structure/window/W = target
if(is_type_in_list(target, polarized_windows))
if((W.opacity && W.old_color == GLOB.pipe_colors[paint_setting]) || (!W.opacity && W.color == GLOB.pipe_colors[paint_setting]))
if((W.opacity && W.old_color == GLOB.pipe_icon_manager.pipe_colors[paint_setting]) || (!W.opacity && W.color == GLOB.pipe_icon_manager.pipe_colors[paint_setting]))
to_chat(user, "<span class='notice'>This window is aready painted [paint_setting]!</span>")
return
if(!W.opacity)
W.color = GLOB.pipe_colors[paint_setting]
W.old_color = GLOB.pipe_colors[paint_setting]
W.color = GLOB.pipe_icon_manager.pipe_colors[paint_setting]
W.old_color = GLOB.pipe_icon_manager.pipe_colors[paint_setting]
return TRUE
if(W.color == GLOB.pipe_colors[paint_setting])
if(W.color == GLOB.pipe_icon_manager.pipe_colors[paint_setting])
to_chat(user, "<span class='notice'>This window is aready painted [paint_setting]!</span>")
return
W.color = GLOB.pipe_colors[paint_setting]
W.color = GLOB.pipe_icon_manager.pipe_colors[paint_setting]
return TRUE