Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow Surgery, construction small puddles. #6340

Closed
wants to merge 12 commits into from
Closed

Allow Surgery, construction small puddles. #6340

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9340320
Com Tech Plasteel QOL 5 full plasteel cades
hislittlecuzingames May 27, 2024
365a490
Allow Surgery and construction in shallow puddles
hislittlecuzingames May 27, 2024
519986e
Update code/game/turfs/floors/desert.dm
hislittlecuzingames May 30, 2024
a8f319c
Update code/game/turfs/open.dm
hislittlecuzingames May 30, 2024
11d8e1c
Update code/game/turfs/floors/desert.dm
hislittlecuzingames May 30, 2024
586ee58
Update code/game/turfs/open.dm
hislittlecuzingames May 30, 2024
760a278
Update code/game/turfs/open.dm
hislittlecuzingames May 30, 2024
c73171b
Update code/game/turfs/open.dm
hislittlecuzingames May 30, 2024
994673f
Update squad_engineer.dm
hislittlecuzingames May 30, 2024
ddb66d3
polish of changes
hislittlecuzingames Jun 19, 2024
fdd7cb9
Merge branch 'misc-polish-and-qol' of https://github.com/hislittlecuz…
hislittlecuzingames Jun 19, 2024
688ef41
Resolve merge conflicts and pulled master.
hislittlecuzingames Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
View file
Open in desktop
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,
hislittlecuzingames marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/stack/sheet/plasteel/medium_stack = 40,
/obj/item/cell/high,
/obj/item/tool/shovel/etool/folded,
/obj/item/device/lightreplacer,
Expand Down
19 changes: 19 additions & 0 deletions code/game/turfs/floors/desert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@
/turf/open/desert/desert_shore/desert_shore1
name = "shore"
icon_state = "shore1"

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

/*
/turf/open/desert/desert_shore/desert_shore2
name = "shore"
Expand All @@ -139,12 +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
hislittlecuzingames marked this conversation as resolved.
Show resolved Hide resolved

//Desert Waterway
/turf/open/desert/waterway
Expand Down Expand Up @@ -236,6 +252,9 @@
/turf/open/gm/river/desert/shallow
icon_state = "shallow"
icon_overlay = "_shallow"
/turf/open/gm/river/desert/shallow/can_surgery
hislittlecuzingames marked this conversation as resolved.
Show resolved Hide resolved
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/gm/river/desert/shallow/covered
covered = 1
Expand Down
12 changes: 12 additions & 0 deletions code/game/turfs/open.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,9 @@
baseturfs = /turf/open/gm/river
supports_surgery = FALSE
minimap_color = MINIMAP_WATER
/turf/open/gm/river/can_surgery
hislittlecuzingames marked this conversation as resolved.
Show resolved Hide resolved
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/gm/river/Initialize(mapload, ...)
. = ..()
Expand Down Expand Up @@ -605,6 +608,9 @@
icon_state = "beach"
baseturfs = /turf/open/gm/coast
supports_surgery = FALSE
/turf/open/gm/coast/can_surgery
hislittlecuzingames marked this conversation as resolved.
Show resolved Hide resolved
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/gm/coast/north

Expand All @@ -619,6 +625,9 @@

/turf/open/gm/coast/beachcorner
icon_state = "beachcorner"
/turf/open/gm/coast/beachcorner/can_surgery
hislittlecuzingames marked this conversation as resolved.
Show resolved Hide resolved
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/gm/coast/beachcorner/north_west

Expand All @@ -633,6 +642,9 @@

/turf/open/gm/coast/beachcorner2
icon_state = "beachcorner2"
/turf/open/gm/coast/beachcorner2/can_surgery
hislittlecuzingames marked this conversation as resolved.
Show resolved Hide resolved
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/gm/coast/beachcorner2/north_west

Expand Down
69 changes: 51 additions & 18 deletions maps/map_files/DesertDam/Desert_Dam.dmm
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whats special about the left lake that it allows surgery but the others don't?
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other ponds are more than 1 tile "deep".

I decided to just allow surgery on all the ponds to avoid confusion.
I assume it'll just be changed that way in a few months anyway.

Original file line number Diff line number Diff line change
Expand Up @@ -61011,6 +61011,11 @@
icon_state = "tile"
},
/area/desert_dam/exterior/valley/south_valley_dam)
"hef" = (
/turf/open/desert/desert_shore/desert_shore1/can_surgery{
dir = 4
},
/area/desert_dam/exterior/valley/valley_crashsite)
"het" = (
/obj/structure/surface/table,
/obj/structure/machinery/computer/objective,
Expand Down Expand Up @@ -61559,6 +61564,11 @@
icon_state = "cement_sunbleached15"
},
/area/desert_dam/exterior/valley/valley_hydro)
"iQO" = (
/turf/open/desert/desert_shore/shore_corner2/can_surgery{
dir = 4
},
/area/desert_dam/exterior/valley/valley_crashsite)
"iRU" = (
/obj/effect/decal/sand_overlay/sand1/corner1{
dir = 8
Expand Down Expand Up @@ -62366,6 +62376,11 @@
icon_state = "desert_transition_edge1"
},
/area/desert_dam/exterior/valley/south_valley_dam)
"lVs" = (
/turf/open/desert/desert_shore/shore_edge1/can_surgery{
dir = 8
},
/area/desert_dam/exterior/valley/valley_crashsite)
"lVW" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 4
Expand Down Expand Up @@ -63917,6 +63932,9 @@
icon_state = "bluecorner"
},
/area/desert_dam/interior/dam_interior/tech_storage)
"rqH" = (
/turf/open/gm/river/desert/shallow/can_surgery,
/area/desert_dam/exterior/valley/valley_crashsite)
"rtW" = (
/obj/effect/blocker/toxic_water/Group_2,
/turf/open/asphalt/cement_sunbleached{
Expand Down Expand Up @@ -64107,6 +64125,9 @@
name = "reinforced metal wall"
},
/area/desert_dam/exterior/rock)
"rTW" = (
/turf/open/gm/river/desert/deep,
/area/desert_dam/interior/caves/temple)
"rUA" = (
/obj/structure/fence,
/turf/open/desert/dirt{
Expand Down Expand Up @@ -64325,6 +64346,9 @@
icon_state = "cement_sunbleached4"
},
/area/desert_dam/exterior/valley/valley_hydro)
"syH" = (
/turf/open/desert/desert_shore/desert_shore1/can_surgery,
/area/desert_dam/exterior/valley/valley_crashsite)
"sDf" = (
/obj/effect/decal/cleanable/generic,
/turf/open/floor/prison{
Expand Down Expand Up @@ -64352,6 +64376,12 @@
},
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"sGs" = (
/obj/effect/decal/sand_overlay/sand1/corner1{
dir = 8
},
/turf/open/desert/desert_shore/shore_edge1/can_surgery,
/area/desert_dam/exterior/valley/valley_crashsite)
"sGP" = (
/obj/structure/shuttle/diagonal{
icon_state = "swall_f5"
Expand Down Expand Up @@ -64754,6 +64784,9 @@
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/r_wall/bunker,
/area/desert_dam/interior/lab_northeast/east_lab_west_entrance)
"tRT" = (
/turf/open/gm/river/desert/deep,
/area/desert_dam/exterior/valley/valley_crashsite)
"tSK" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal7"
Expand Down Expand Up @@ -105314,7 +105347,7 @@ dTs
dTs
dTs
dTs
aJx
sGs
aJM
adA
dTs
Expand Down Expand Up @@ -105547,8 +105580,8 @@ dTs
dTs
dTs
dTs
aIv
aJB
rqH
syH
acZ
adA
dTs
Expand Down Expand Up @@ -105781,8 +105814,8 @@ dTs
dTs
dTs
dTs
aIv
aJB
rqH
syH
njF
adA
dTs
Expand Down Expand Up @@ -106015,8 +106048,8 @@ dTs
dTs
dTs
dTs
aIv
aJB
rqH
syH
uGU
aJM
dTs
Expand Down Expand Up @@ -106249,8 +106282,8 @@ dTs
dTs
dTs
dTs
aIv
aJB
rqH
syH
aIy
adr
adA
Expand Down Expand Up @@ -106482,9 +106515,9 @@ dTs
dTs
dTs
dTs
aIv
aIF
aIG
rqH
iQO
lVs
acZ
adA
adA
Expand Down Expand Up @@ -106715,9 +106748,9 @@ azT
dTs
dTs
dTs
aIx
aIx
aIG
hef
hef
lVs
aIy
adr
adA
Expand Down Expand Up @@ -115833,7 +115866,7 @@ dTs
dTs
dTs
dTs
aIv
tRT
aIv
aIF
aIG
Expand Down Expand Up @@ -117720,8 +117753,8 @@ dTs
dTs
uhf
ioA
ioA
ioA
rTW
rTW
ioA
ktJ
aBE
Expand Down
Loading
Loading