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 on crashed ships (and new tile variants allowing surgury & construction) #5579

Merged
merged 43 commits into from
Feb 1, 2024
Merged

Allow surgery on crashed ships (and new tile variants allowing surgury & construction) #5579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
6f9088e
Testing out a new map
hislittlecuzingames Nov 20, 2023
9120bdd
some changes
hislittlecuzingames Nov 21, 2023
73b9f74
Testing Areas
hislittlecuzingames Nov 21, 2023
aa0a701
Added Flanker Zone
hislittlecuzingames Nov 22, 2023
da281fa
Created first drafts of first frontline combat
hislittlecuzingames Nov 27, 2023
81b5dc5
Some work on combat encounters
hislittlecuzingames Nov 27, 2023
3865c5f
Some work on testmap
hislittlecuzingames Dec 1, 2023
7f34a3e
More detailing
hislittlecuzingames Dec 1, 2023
4dd36cb
Lots of CC SE work
hislittlecuzingames Dec 2, 2023
9deeda7
Completed Version 1
hislittlecuzingames Dec 2, 2023
352a659
Minor work
hislittlecuzingames Dec 2, 2023
af248d5
detailing
hislittlecuzingames Dec 2, 2023
cfe8527
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into F…
hislittlecuzingames Jan 28, 2024
666f600
Big Red Solar crashland offices allow surgury
hislittlecuzingames Jan 28, 2024
cdb05c9
big red solar crashland eva allow surgury
hislittlecuzingames Jan 28, 2024
6d76bae
allow surgury on desert dam nightmare inserts
hislittlecuzingames Jan 28, 2024
6517213
Update __game.dm
hislittlecuzingames Jan 28, 2024
db88760
Update maps.dm
hislittlecuzingames Jan 28, 2024
c023fb6
Delete maps/map_files/TestMap/TestMap.dmm
hislittlecuzingames Jan 28, 2024
0abd8f0
Added tile variants for can surgury
hislittlecuzingames Jan 28, 2024
b70443c
nightmare insert discrete tiles
hislittlecuzingames Jan 28, 2024
ef43f1c
discrete allow surgury tiles chance claim
hislittlecuzingames Jan 28, 2024
62d1f7c
Changed configs of code files for tiles surgury and construction
hislittlecuzingames Jan 28, 2024
9fa49d9
Merge branch 'Fucking-Surgury-On-Crashed-Ships' of https://github.com…
hislittlecuzingames Jan 28, 2024
bc5f617
added tile variant
hislittlecuzingames Jan 28, 2024
c11f510
desert dam ships and nigthmares
hislittlecuzingames Jan 28, 2024
18ad07a
old ice and shrivaled snowball
hislittlecuzingames Jan 28, 2024
c5c3e0f
new tile variant black shutt
hislittlecuzingames Jan 28, 2024
0bd7a79
used the new tiles
hislittlecuzingames Jan 28, 2024
2c04ed7
added for default can surgury shuttle var
hislittlecuzingames Jan 28, 2024
ce3e9d6
fixed stray tiles
hislittlecuzingames Jan 28, 2024
f8b6aaa
refactor and medium grey
hislittlecuzingames Jan 28, 2024
c8b0da0
Update crashlanding-eva.dmm can_surgEry
hislittlecuzingames Jan 28, 2024
3fbff70
Update Desert_Dam.dmm
hislittlecuzingames Jan 28, 2024
425bc13
Update crashlanding-upp-alt1.dmm
hislittlecuzingames Jan 28, 2024
5aa9221
Update crashlanding-upp-bar.dmm
hislittlecuzingames Jan 28, 2024
5341a48
Update Ice_Colony_v2.dmm
hislittlecuzingames Jan 28, 2024
74507bb
Update Shivas_Snowball.dmm
hislittlecuzingames Jan 28, 2024
a464a29
surgEry
hislittlecuzingames Jan 28, 2024
bca6f2a
Merge branch 'Fucking-Surgury-On-Crashed-Ships' of https://github.com…
hislittlecuzingames Jan 28, 2024
4e022c7
Update crashlanding-offices.dmm
hislittlecuzingames Jan 28, 2024
26c8127
Update LV522_Chances_Claim.dmm
hislittlecuzingames Jan 28, 2024
af4a316
space
hislittlecuzingames Jan 28, 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
57 changes: 57 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 @@ -910,10 +910,67 @@
allow_construction = FALSE
supports_surgery = FALSE

/turf/open/shuttle/can_surgery
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/shuttle/can_surgery/blue
name = "floor"
icon_state = "floor"
icon = 'icons/turf/shuttle.dmi'

/turf/open/shuttle/can_surgery/red
icon_state = "floor6"

/turf/open/shuttle/can_surgery/black
icon_state = "floor7"

/turf/open/shuttle/dropship
name = "floor"
icon_state = "rasputin1"

/turf/open/shuttle/dropship/can_surgery
icon_state = "rasputin1"
allow_construction = TRUE
supports_surgery = TRUE

/turf/open/shuttle/dropship/can_surgery/light_grey_middle
icon_state = "rasputin13"

/turf/open/shuttle/dropship/can_surgery/light_grey_top
icon_state = "rasputin10"

/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right
icon_state = "floor8"

/*same two but helps with finding if you think top to bottom or up to down*/
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down
icon_state = "rasputin3"

/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_top_to_bottom
icon_state = "rasputin3"

/turf/open/shuttle/dropship/can_surgery/light_grey_top_left
icon_state = "rasputin6"

/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_left
icon_state = "rasputin4"

/turf/open/shuttle/dropship/can_surgery/light_grey_top_right
icon_state = "rasputin7"

/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_right
icon_state = "rasputin8"

/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_left_to_right
icon_state = "rasputin14"

/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down
icon_state = "rasputin15"

/turf/open/shuttle/dropship/can_surgery/dark_grey
icon_state = "rasputin15"

/turf/open/shuttle/predship
name = "ship floor"
icon_state = "floor6"
Expand Down
96 changes: 24 additions & 72 deletions maps/map_files/BigRed/standalone/crashlanding-eva.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@
/area/bigredv2/outside/general_offices)
"aE" = (
/obj/structure/computerframe,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"aF" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -107,26 +105,18 @@
/turf/open/mars,
/area/bigredv2/caves_north)
"aR" = (
/turf/open/shuttle/dropship{
icon_state = "rasputin6"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_top_left,
/area/bigredv2/outside/general_offices)
"aS" = (
/turf/open/shuttle/dropship{
icon_state = "floor8"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/bigredv2/outside/general_offices)
"aT" = (
/turf/open/shuttle/dropship{
icon_state = "rasputin7"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_top_right,
/area/bigredv2/outside/general_offices)
"aU" = (
/obj/structure/surface/rack,
/obj/item/map/big_red_map,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"aV" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -191,34 +181,24 @@
/area/bigredv2/outside/general_offices)
"bg" = (
/obj/structure/machinery/door/airlock/almayer/generic,
/turf/open/shuttle/dropship{
icon_state = "rasputin3"
},
/turf/open/shuttle/dropship/can_surgery,
/area/bigredv2/outside/general_offices)
"bh" = (
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bi" = (
/obj/item/paper/crumpled/bloody,
/obj/effect/decal/cleanable/blood{
icon_state = "u_psycopath_l"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin3"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/general_offices)
"bj" = (
/obj/structure/bed/chair/dropship/passenger,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bk" = (
/turf/open/shuttle/dropship{
icon_state = "rasputin3"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/general_offices)
"bl" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -249,9 +229,7 @@
/area/bigredv2/outside/general_offices)
"bq" = (
/obj/effect/landmark/corpsespawner/wygoon,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"br" = (
/turf/closed/shuttle/ert{
Expand All @@ -262,22 +240,16 @@
/obj/structure/bed/chair/dropship/passenger{
dir = 4
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bt" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/landmark/corpsespawner/wygoon,
/turf/open/shuttle/dropship{
icon_state = "rasputin3"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/general_offices)
"bu" = (
/obj/effect/decal/cleanable/blood,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bv" = (
/obj/structure/bed/chair/dropship/passenger{
Expand All @@ -287,9 +259,7 @@
dir = 1;
icon_state = "gib6"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bw" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -339,9 +309,7 @@
dir = 1;
icon_state = "gib6"
},
/turf/open/shuttle/dropship{
icon_state = "rasputin3"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/general_offices)
"bG" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -481,25 +449,17 @@
"cb" = (
/obj/structure/surface/rack,
/obj/item/restraints,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"cc" = (
/turf/open/shuttle/dropship{
icon_state = "rasputin4"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_left,
/area/bigredv2/outside/general_offices)
"cd" = (
/turf/open/shuttle/dropship{
icon_state = "rasputin8"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_right,
/area/bigredv2/outside/general_offices)
"ce" = (
/obj/structure/surface/rack,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"cf" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -546,9 +506,7 @@
"cm" = (
/obj/effect/spawner/gibspawner/human,
/obj/effect/decal/cleanable/blood,
/turf/open/shuttle/dropship{
icon_state = "floor8"
},
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/bigredv2/outside/general_offices)
"cn" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -586,9 +544,7 @@
"cu" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/remains,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"cv" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -1049,9 +1005,7 @@
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 2
},
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery,
/area/bigredv2/outside/general_offices)
"eM" = (
/obj/item/stack/rods,
Expand Down Expand Up @@ -1104,9 +1058,7 @@
"Zt" = (
/obj/structure/bed/chair/dropship/passenger,
/obj/effect/landmark/corpsespawner/wygoon,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)

(1,1,1) = {"
Expand Down
Loading
Loading