Skip to content

Commit

Permalink
BAYMED PART 1: Surgery, stumps, arteries, oh my! (#425)
Browse files Browse the repository at this point in the history
* i need to see diffs

* 10000% MAAAAAAAAAAAAAAAAAAAAAAD

* fix hands

* small drop limb bug

* small bugs

* BASIC SURGERY

* I CLICKED STAGE ALL, DAMN IT

* oops

* Unsure how this didn't come up sooner.

* embedding take 1

* oopsie

* im an idiot

* im gonna see if this unit test works the fun way

* i always forget the abstract type!!

* FUCK

* Likely fixes unit test

* audit existing datums

* del operating computer

* Adds deletion functionality to update paths script. (#66506)

Sometimes actually needed in the update scripts but wasn't supported properly.

* Makes update paths remove keys left after merging. (#66916)

Fixes #66914

* couple tweaks

* UpdatePaths

* fixes

* body scanner work

* body scanners

* oops

* oh. duh.

* adds padding to the bodyscanner UI

* bah i did it again

* Removes the medical kiosk, more bodyscanner stuff

* health analyzer rework

* wound

* Update code/game/objects/items/devices/scanners/health_analyzer.dm

Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>

* kapuchange

* suit sensors

* nerf suit sensors, prettify bodyparts

* Lots to do before I punch out

* IM SENDING IT

* oop

* fix linter

* fixes

* more work. its close.

* bugs

* brian surgery. thanks brian.

* bandage mechanics

* lotso fixes

* fix brain surgery

* give me debug info

* more debug stuff

* fix arm slowdown runtime

* bugs

* remove debug code

* dont leave that in there

* slightly remap the OR

* codex + remove lowmemorymode

* disambiguate

* codex tweaks

* this should fix it

* Fixes bad codex link, and makes failure more clear

* fix incorrect flag check

* suture rework and surgery code cleanup

* fix unarmed attacks, fix minor name bugs

* fix poor feedback WRT bandage interaction

* nullcheck

* fix opttable again

* De-scuff organ surgery

* i love regex

---------

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: John Doe <johndoe@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
  • Loading branch information
4 people committed Jul 24, 2023
1 parent 385ba08 commit da014f7
Show file tree
Hide file tree
Showing 268 changed files with 5,426 additions and 5,966 deletions.
3 changes: 0 additions & 3 deletions _maps/RandomRuins/AnywhereRuins/golem_ship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,6 @@
/area/ruin/powered/golem_ship)
"A" = (
/obj/structure/table/wood,
/obj/item/surgical_drapes{
pixel_x = 15
},
/obj/item/storage/medkit/fire,
/obj/item/storage/medkit/fire,
/obj/item/stock_parts/matter_bin,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,6 @@
pixel_x = 6;
pixel_y = 2
},
/obj/item/surgical_drapes{
pixel_x = 4;
pixel_y = -2
},
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/white,
/area/ruin/plasma_facility/commons)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
/area/ruin/powered/snow_biodome)
"ad" = (
/obj/structure/table,
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/gauze,
/obj/item/stack/gauze,
/obj/item/stack/gauze,
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
/area/ruin/powered/snow_biodome)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
/turf/open/misc/asteroid/basalt/wasteland,
/area/ruin/unpowered/elephant_graveyard)
"mO" = (
/obj/item/stack/medical/gauze/improvised,
/obj/item/stack/gauze/improvised,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/misc/asteroid/basalt/wasteland,
/area/ruin/unpowered/elephant_graveyard)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3987,7 +3987,6 @@
/area/ruin/syndicate_lava_base/bar)
"NR" = (
/obj/structure/table/optable,
/obj/item/surgical_drapes,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
/turf/open/floor/iron/white/side{
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
/area/ruin/unpowered)
"v" = (
/obj/item/scalpel/alien,
/obj/item/surgical_drapes,
/turf/open/floor/plating/abductor{
initial_gas = list("oxygen" = 14, "nitrogen" = 30)
},
Expand Down
4 changes: 0 additions & 4 deletions _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@
/turf/open/floor/iron/dark/side,
/area/ruin/space/has_grav/abandonedzoo)
"bl" = (
/obj/machinery/computer/operating{
dir = 8
},
/turf/open/floor/iron/dark/side,
/area/ruin/space/has_grav/abandonedzoo)
"bm" = (
Expand Down Expand Up @@ -568,7 +565,6 @@
/obj/item/surgicaldrill,
/obj/item/hemostat,
/obj/item/scalpel,
/obj/item/surgical_drapes,
/obj/item/retractor,
/obj/item/cautery,
/obj/item/circular_saw,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/deepstorage.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1179,8 +1179,8 @@
/obj/structure/table,
/obj/item/healthanalyzer,
/obj/item/healthanalyzer,
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/gauze,
/obj/item/stack/gauze,
/obj/item/stack/gauze,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"de" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/derelict7.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav)
"Ca" = (
/obj/machinery/medical_kiosk,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
Expand Down
9 changes: 2 additions & 7 deletions _maps/RandomRuins/SpaceRuins/forgottenship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"ad" = (
/obj/machinery/computer/operating,
/turf/open/floor/plastic,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"ae" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/external/ruin{
Expand Down Expand Up @@ -505,7 +501,7 @@
/obj/item/stack/medical/ointment{
amount = 12
},
/obj/item/healthanalyzer/advanced,
/obj/item/healthanalyzer,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/syndicate_forgotten_cargopod)
"bD" = (
Expand Down Expand Up @@ -1139,7 +1135,6 @@
/obj/structure/closet/crate/secure/gear{
req_one_access_txt = "150"
},
/obj/item/disk/surgery/forgottenship,
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
"dj" = (
Expand Down Expand Up @@ -2198,7 +2193,7 @@ aa
aa
aa
bZ
ad
am
am
am
ct
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,6 @@
"bu" = (
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/latex,
/obj/item/surgical_drapes,
/turf/open/floor/iron/white/side{
dir = 8
},
Expand Down
2 changes: 0 additions & 2 deletions _maps/RandomRuins/SpaceRuins/oldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2440,7 +2440,6 @@
/obj/structure/table/optable{
name = "Robotics Operating Table"
},
/obj/item/surgical_drapes,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/ancientstation/delta/rnd)
"gR" = (
Expand Down Expand Up @@ -5372,7 +5371,6 @@
pixel_y = 12
},
/obj/item/retractor,
/obj/item/surgical_drapes,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
Expand Down
7 changes: 1 addition & 6 deletions _maps/RandomZLevels/SnowCabin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@
/obj/item/surgicaldrill,
/obj/item/circular_saw,
/obj/item/cautery,
/obj/item/surgical_drapes,
/obj/item/scalpel,
/obj/item/hemostat,
/turf/open/floor/iron/white,
Expand Down Expand Up @@ -483,10 +482,6 @@
/obj/machinery/gibber,
/turf/open/floor/iron/freezer,
/area/awaymission/cabin)
"bD" = (
/obj/machinery/computer/operating,
/turf/open/floor/iron/white,
/area/awaymission/cabin)
"bE" = (
/turf/open/floor/iron/white,
/area/awaymission/cabin)
Expand Down Expand Up @@ -33112,7 +33107,7 @@ an
eg
aq
an
bD
bE
bE
bE
cI
Expand Down
4 changes: 0 additions & 4 deletions _maps/RandomZLevels/moonoutpost19.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2388,7 +2388,6 @@
/area/awaymission/moonoutpost19/research)
"gI" = (
/obj/structure/table,
/obj/item/surgical_drapes,
/obj/machinery/light/small/broken/directional/east,
/obj/structure/alien/weeds,
/turf/open/floor/iron/white,
Expand Down Expand Up @@ -2498,9 +2497,6 @@
},
/area/awaymission/moonoutpost19/research)
"gU" = (
/obj/machinery/computer/operating{
dir = 8
},
/obj/structure/alien/weeds,
/turf/open/floor/iron/white/side{
dir = 1;
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomZLevels/research.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2490,7 +2490,6 @@
/area/awaymission/research/interior/medbay)
"jS" = (
/obj/structure/table,
/obj/item/surgical_drapes,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomZLevels/snowdin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9339,7 +9339,6 @@
"EM" = (
/obj/structure/table/optable,
/obj/effect/turf_decal/bot_white,
/obj/item/surgical_drapes,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/cave)
Expand Down
Loading

0 comments on commit da014f7

Please sign in to comment.