Skip to content

Commit

Permalink
Washing machine density fix + nimbus bathroom lock (#4135)
Browse files Browse the repository at this point in the history
## About The Pull Request

makes washing machines that are set to not be dense when loaded not
become dense later

adds a bathroom lock to the nimbus.

## Changelog

:cl:
add: nimbus bathroom lock
fix: some washing machines no longer magically become dense
/:cl:
  • Loading branch information
Erikafox authored Feb 8, 2025
1 parent cb3d906 commit d557674
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
12 changes: 11 additions & 1 deletion _maps/shuttles/cybersun/cybersun_nimbus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2197,6 +2197,15 @@
pixel_y = 6
},
/obj/item/soap/deluxe,
/obj/machinery/button/door{
pixel_y = -20;
pixel_x = 22;
dir = 1;
name = "door lock";
normaldoorcontrol = 1;
specialfunctions = 4;
id = "nimbbath"
},
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/cargo)
"NU" = (
Expand Down Expand Up @@ -2460,7 +2469,8 @@
/area/ship/crew/ccommons)
"SN" = (
/obj/machinery/door/airlock/hatch{
name = "Restroom"
name = "Restroom";
id_tag = "nimbbath"
},
/obj/effect/turf_decal/spline/fancy/opaque/white,
/turf/open/floor/plasteel/tech,
Expand Down
3 changes: 2 additions & 1 deletion code/game/machinery/washing_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -349,5 +349,6 @@ GLOBAL_LIST_INIT(dye_registry, list(

/obj/machinery/washing_machine/open_machine(drop = 1)
..()
density = TRUE //because machinery/open_machine() sets it to 0
if(initial(density))
density = TRUE //because machinery/open_machine() sets it to 0
color_source = null

0 comments on commit d557674

Please sign in to comment.