Skip to content

Commit fbf1935

Browse files
authored
Reworks floor/airlock/pipe painters' sprites and sounds. (ParadiseSS13#14379)
* Adds new sprites, and sounds to painters. * Adds check, and inhand sprites * minor fixes on sprotes
1 parent 2c93d34 commit fbf1935

File tree

6 files changed

+22
-4
lines changed

6 files changed

+22
-4
lines changed

code/game/machinery/doors/airlock.dm

+4
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,10 @@ About the new airlock wires panel:
516516
var/obj/machinery/door/airlock/airlock = painter.available_paint_jobs["[painter.paint_setting]"] // get the airlock type path associated with the airlock name the user just chose
517517
var/obj/structure/door_assembly/assembly = initial(airlock.assemblytype)
518518

519+
if(assemblytype == assembly)
520+
to_chat(user, "<span class='notice'>This airlock is already painted [painter.paint_setting]!</span>")
521+
return
522+
519523
if(airlock_material == "glass" && initial(assembly.noglass)) // prevents painting glass airlocks with a paint job that doesn't have a glass version, such as the freezer
520524
to_chat(user, "<span class='warning'>This paint job can only be applied to non-glass airlocks.</span>")
521525
return

code/game/objects/items/devices/floor_painter.dm

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
name = "floor painter"
55
icon = 'icons/obj/device.dmi'
66
icon_state = "floor_painter"
7-
item_state = "electronic"
7+
item_state = "floor_painter"
8+
usesound = 'sound/effects/spray2.ogg'
89

910
var/floor_icon
1011
var/floor_state = "floor"
@@ -31,10 +32,16 @@
3132
return
3233

3334
var/turf/simulated/floor/plasteel/F = A
35+
36+
if(F.icon_state == floor_state && F.dir == floor_dir)
37+
to_chat(user, "<span class='notice'>This is already painted [floor_state] [dir2text(floor_dir)]!</span>")
38+
return
39+
3440
if(!istype(F))
3541
to_chat(user, "<span class='warning'>\The [src] can only be used on station flooring.</span>")
3642
return
3743

44+
playsound(loc, usesound, 30, TRUE)
3845
F.icon_state = floor_state
3946
F.icon_regular_floor = floor_state
4047
F.dir = floor_dir

code/game/objects/items/devices/pipe_painter.dm

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/obj/item/pipe_painter
22
name = "pipe painter"
3-
icon = 'icons/obj/bureaucracy.dmi'
4-
icon_state = "labeler1"
5-
item_state = "flight"
3+
icon = 'icons/obj/device.dmi'
4+
icon_state = "pipe_painter"
5+
item_state = "pipe_painter"
6+
usesound = 'sound/effects/spray2.ogg'
67
var/list/modes
78
var/mode
89

@@ -18,13 +19,19 @@
1819
return
1920
var/obj/machinery/atmospherics/pipe/P = A
2021

22+
if(P.pipe_color == "[GLOB.pipe_colors[mode]]")
23+
to_chat(user, "<span class='notice'>This pipe is aready painted [mode]!</span>")
24+
return
25+
2126
var/turf/T = P.loc
2227
if(P.level < 2 && T.level==1 && isturf(T) && T.intact)
2328
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
2429
return
2530

31+
playsound(loc, usesound, 30, TRUE)
2632
P.change_color(GLOB.pipe_colors[mode])
2733

34+
2835
/obj/item/pipe_painter/attack_self(mob/user as mob)
2936
mode = input("Which colour do you want to use?", "Pipe Painter", mode) in modes
3037

icons/mob/inhands/items_lefthand.dmi

571 Bytes
Binary file not shown.

icons/mob/inhands/items_righthand.dmi

727 Bytes
Binary file not shown.

icons/obj/device.dmi

194 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)