Skip to content

Commit

Permalink
Merge branch 'misc-polish-and-qol' of https://github.com/hislittlecuz…
Browse files Browse the repository at this point in the history
…ingames/cmss13 into misc-polish-and-qol
  • Loading branch information
hislittlecuzingames committed Jun 19, 2024
2 parents ddb66d3 + 994673f commit fdd7cb9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
/obj/item/explosive/plastic,
/obj/item/stack/sandbags_empty = 25,
/obj/item/stack/sheet/metal/large_stack,
/obj/item/stack/sheet/plasteel/medium_stack = 40,
/obj/item/stack/sheet/plasteel/medium_stack,
/obj/item/cell/high,
/obj/item/tool/shovel/etool/folded,
/obj/item/device/lightreplacer,
Expand Down
4 changes: 4 additions & 0 deletions code/game/turfs/floors/desert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -144,20 +144,23 @@
/turf/open/desert/desert_shore/shore_edge1
name = "shore"
icon_state = "shore_edge1"

/turf/open/desert/desert_shore/shore_edge1/can_surgery
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/desert/desert_shore/shore_corner1
name = "shore"
icon_state = "shore_corner1"

/turf/open/desert/desert_shore/shore_corner1/can_surgery
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/desert/desert_shore/shore_corner2
name = "shore"
icon_state = "shore_corner2"

/turf/open/desert/desert_shore/shore_corner2/can_surgery
allow_construction = TRUE
supports_surgery = TRUE
Expand Down Expand Up @@ -252,6 +255,7 @@
/turf/open/gm/river/desert/shallow
icon_state = "shallow"
icon_overlay = "_shallow"

/turf/open/gm/river/desert/shallow/can_surgery
allow_construction = TRUE
supports_surgery = TRUE
Expand Down
4 changes: 4 additions & 0 deletions code/game/turfs/open.dm
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@
baseturfs = /turf/open/gm/river
supports_surgery = FALSE
minimap_color = MINIMAP_WATER

/turf/open/gm/river/can_surgery
allow_construction = TRUE
supports_surgery = TRUE
Expand Down Expand Up @@ -608,6 +609,7 @@
icon_state = "beach"
baseturfs = /turf/open/gm/coast
supports_surgery = FALSE

/turf/open/gm/coast/can_surgery
allow_construction = TRUE
supports_surgery = TRUE
Expand All @@ -625,6 +627,7 @@

/turf/open/gm/coast/beachcorner
icon_state = "beachcorner"

/turf/open/gm/coast/beachcorner/can_surgery
allow_construction = TRUE
supports_surgery = TRUE
Expand All @@ -642,6 +645,7 @@

/turf/open/gm/coast/beachcorner2
icon_state = "beachcorner2"

/turf/open/gm/coast/beachcorner2/can_surgery
allow_construction = TRUE
supports_surgery = TRUE
Expand Down

0 comments on commit fdd7cb9

Please sign in to comment.