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

Necrosis #651

Merged
merged 16 commits into from
Dec 4, 2023
Merged

Necrosis #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7bee421
initial necrosis
Kapu1178 Sep 25, 2023
444d774
optimize hud code
Kapu1178 Oct 9, 2023
78f1476
Merge branch 'necrosis' of github.com:Kapu1178/daedalusdock; branch '…
Kapu1178 Oct 10, 2023
9f2da65
remove formaldehyde
Kapu1178 Oct 16, 2023
0b61c11
on-death germ processing
Kapu1178 Oct 17, 2023
fc00372
fix
Kapu1178 Oct 17, 2023
42e89c0
add shock to surgery
Kapu1178 Oct 17, 2023
0a8b785
fix stump-pain interaction
Kapu1178 Oct 28, 2023
998ee4d
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into ne…
Kapu1178 Nov 17, 2023
c85d0d1
improve feedback a bit
Kapu1178 Nov 27, 2023
92ad455
suture printable
Kapu1178 Nov 27, 2023
b8d3991
stasis bags
Kapu1178 Nov 28, 2023
885e125
slowdown
Kapu1178 Nov 28, 2023
c6be9ea
piss off linter
Kapu1178 Nov 28, 2023
9198118
jlsnow debug interface
Kapu1178 Nov 29, 2023
618ab88
boolean
Kapu1178 Nov 29, 2023
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
40 changes: 24 additions & 16 deletions _maps/map_files/Theseus/Theseus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3018,7 +3018,7 @@
/obj/structure/cable,
/obj/machinery/door/airlock/medical/glass{
name = "Operating Rooms";
req_access_txt = "45";
req_access_txt = "5";
stripe_paint = "#DE3A3A"
},
/obj/effect/turf_decal/siding/red{
Expand Down Expand Up @@ -35356,15 +35356,15 @@
/obj/effect/turf_decal/siding/yellow{
dir = 1
},
/obj/machinery/door/airlock/medical/glass{
name = "Operating Rooms";
req_access_txt = "45";
stripe_paint = "#DE3A3A"
},
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/unres{
dir = 1
},
/obj/machinery/door/airlock/medical/glass{
name = "Operating Rooms";
req_access_txt = "5";
stripe_paint = "#DE3A3A"
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"lZy" = (
Expand Down Expand Up @@ -36008,6 +36008,14 @@
"mkV" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/obj/machinery/firealarm/directional/south,
/obj/structure/rack,
/obj/item/bodybag/stasis{
pixel_y = 12
},
/obj/item/bodybag/stasis{
pixel_y = 6
},
/obj/item/bodybag/stasis,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"mkY" = (
Expand Down Expand Up @@ -53081,16 +53089,16 @@
"smN" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/door/airlock/medical/glass{
name = "Operating Rooms";
req_access_txt = "45";
stripe_paint = "#DE3A3A"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/siding/red{
dir = 1
},
/obj/machinery/door/airlock/medical/glass{
name = "Operating Rooms";
req_access_txt = "5";
stripe_paint = "#DE3A3A"
},
/turf/open/floor/iron,
/area/station/medical/surgery/prep)
"smR" = (
Expand Down Expand Up @@ -63445,16 +63453,16 @@
dir = 1
},
/obj/effect/turf_decal/trimline/blue/corner,
/obj/machinery/door/airlock/medical/glass{
name = "Operating Rooms";
req_access_txt = "45";
stripe_paint = "#DE3A3A"
},
/obj/machinery/door/firedoor,
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/unres{
dir = 1
},
/obj/machinery/door/airlock/medical/glass{
name = "Operating Rooms";
req_access_txt = "5";
stripe_paint = "#DE3A3A"
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"wmB" = (
Expand Down
58 changes: 28 additions & 30 deletions _maps/map_files/Theseus/medbay_holder.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11639,23 +11639,6 @@
},
/turf/open/floor/iron/textured,
/area/station/medical/medbay/central)
"BO" = (
/obj/structure/rack,
/obj/item/reagent_containers/glass/bottle/basic_buffer{
pixel_x = -5;
pixel_y = 3
},
/obj/item/reagent_containers/glass/bottle/formaldehyde{
pixel_x = 1
},
/obj/structure/sign/warning/chemdiamond{
pixel_y = 32
},
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/dark/textured_edge{
dir = 8
},
/area/station/medical/medbay/central)
"BP" = (
/obj/machinery/door/airlock/maintenance{
name = "Morgue Maintenance";
Expand Down Expand Up @@ -14034,17 +14017,6 @@
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
"HQ" = (
/obj/docking_port/stationary{
dir = 2;
dwidth = 9;
height = 25;
id = "emergency_home";
name = "emergency evac bay";
width = 29
},
/turf/open/space/basic,
/area/space)
"HR" = (
/obj/effect/mapping_helpers/paint_wall/medical,
/turf/closed/wall/r_wall/prepainted/daedalus,
Expand Down Expand Up @@ -14748,6 +14720,32 @@
/obj/effect/mapping_helpers/paint_wall/medical,
/turf/open/floor/plating,
/area/space)
"KZ" = (
/obj/docking_port/stationary{
dir = 2;
dwidth = 9;
height = 25;
id = "emergency_home";
name = "emergency evac bay";
width = 29
},
/turf/open/space/basic,
/area/space)
"RX" = (
/obj/structure/rack,
/obj/item/reagent_containers/glass/bottle/basic_buffer{
pixel_x = -5;
pixel_y = 3
},
/obj/item/reagent_containers/glass/bottle/space_cleaner,
/obj/structure/sign/warning/chemdiamond{
pixel_y = 32
},
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/dark/textured_edge{
dir = 8
},
/area/station/medical/medbay/central)

(1,1,1) = {"
aa
Expand Down Expand Up @@ -24309,7 +24307,7 @@ na
zZ
AK
lb
BO
RX
Ci
CC
CX
Expand Down Expand Up @@ -25887,7 +25885,7 @@ He
Ht
Hb
HO
HQ
KZ
aa
aa
aa
Expand Down
Loading