mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
An Actual Surgical tray (#23297)
* Delete Table * File + Sprite * table list * Comment * MAP QUEUE AAAAAAAAAAAAAAA * space ruins and shuttle * Map Update + Fix MAPDIFF is GOD * Revert "table list" This reverts commitba57c7d172. * Revert "Delete Table" This reverts commitfa35ef12e8. * Added back the tray table * meta merge conflict --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
Deniz
@@ -51738,7 +51738,6 @@
|
||||
},
|
||||
/area/station/medical/reception)
|
||||
"cKS" = (
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/stack/medical/bruise_pack/advanced{
|
||||
pixel_x = -7;
|
||||
pixel_y = 7
|
||||
@@ -57672,7 +57671,6 @@
|
||||
/area/station/maintenance/starboard)
|
||||
"dbA" = (
|
||||
/obj/item/hemostat,
|
||||
/obj/structure/table/tray,
|
||||
/obj/machinery/newscaster{
|
||||
dir = 1;
|
||||
name = "south bump";
|
||||
@@ -65223,14 +65221,6 @@
|
||||
/area/station/medical/medbay)
|
||||
"dwL" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/hemostat{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/item/retractor{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/stack/medical/bruise_pack/advanced,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/machinery/status_display{
|
||||
pixel_y = -32
|
||||
@@ -66017,8 +66007,6 @@
|
||||
/obj/machinery/status_display{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/turf/simulated/floor/plasteel/white,
|
||||
/area/station/science/robotics)
|
||||
"dAa" = (
|
||||
@@ -66501,16 +66489,16 @@
|
||||
/area/station/maintenance/aft)
|
||||
"dBO" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/robotanalyzer,
|
||||
/obj/item/bonegel,
|
||||
/obj/item/FixOVein,
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/effect/turf_decal/delivery/hollow,
|
||||
/obj/machinery/button/windowtint{
|
||||
id = "RoboSurgery";
|
||||
pixel_x = 24;
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/item/reagent_containers/spray/cleaner,
|
||||
/obj/item/robotanalyzer,
|
||||
/turf/simulated/floor/plasteel/white,
|
||||
/area/station/science/robotics)
|
||||
"dBP" = (
|
||||
@@ -66804,12 +66792,6 @@
|
||||
/area/station/maintenance/theatre)
|
||||
"dCr" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/bonesetter{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/machinery/firealarm{
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
@@ -67343,17 +67325,8 @@
|
||||
},
|
||||
/area/station/medical/medbay)
|
||||
"dEu" = (
|
||||
/obj/item/bonegel{
|
||||
pixel_x = 6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/cautery,
|
||||
/obj/item/FixOVein{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/storage/surgical_tray,
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/scalpel,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
@@ -67562,12 +67535,11 @@
|
||||
dir = 8;
|
||||
id = "RoboSurgery"
|
||||
},
|
||||
/obj/item/tank/internals/anesthetic,
|
||||
/obj/item/clothing/mask/breath/medical,
|
||||
/obj/item/mmi,
|
||||
/obj/item/mmi,
|
||||
/obj/item/mmi,
|
||||
/obj/effect/turf_decal/delivery/hollow,
|
||||
/obj/item/mmi,
|
||||
/turf/simulated/floor/plasteel/white,
|
||||
/area/station/science/robotics)
|
||||
"dFx" = (
|
||||
@@ -67585,15 +67557,8 @@
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/retractor,
|
||||
/obj/item/hemostat,
|
||||
/obj/item/bonesetter,
|
||||
/obj/item/stack/medical/bruise_pack/advanced{
|
||||
pixel_x = -4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/reagent_containers/spray/cleaner,
|
||||
/obj/effect/turf_decal/delivery/hollow,
|
||||
/obj/item/storage/surgical_tray,
|
||||
/turf/simulated/floor/plasteel/white,
|
||||
/area/station/science/robotics)
|
||||
"dFB" = (
|
||||
@@ -68199,13 +68164,16 @@
|
||||
dir = 8;
|
||||
id = "RoboSurgery"
|
||||
},
|
||||
/obj/item/mmi,
|
||||
/obj/item/storage/box/gloves{
|
||||
pixel_x = 3;
|
||||
pixel_y = 5
|
||||
/obj/effect/turf_decal/delivery/hollow,
|
||||
/obj/item/storage/box/bodybags{
|
||||
pixel_x = -4;
|
||||
pixel_y = -4
|
||||
},
|
||||
/obj/item/storage/box/masks,
|
||||
/obj/effect/turf_decal/delivery/hollow,
|
||||
/obj/item/storage/box/gloves{
|
||||
pixel_x = 4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/simulated/floor/plasteel/white,
|
||||
/area/station/science/robotics)
|
||||
"dHT" = (
|
||||
@@ -70994,12 +70962,9 @@
|
||||
/obj/structure/sign/nosmoking_2{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/item/scalpel{
|
||||
pixel_y = 12
|
||||
},
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/cautery,
|
||||
/obj/effect/turf_decal/delivery/hollow,
|
||||
/obj/item/tank/internals/anesthetic,
|
||||
/obj/item/clothing/mask/breath/medical,
|
||||
/turf/simulated/floor/plasteel/white,
|
||||
/area/station/science/robotics)
|
||||
"dQr" = (
|
||||
@@ -71033,17 +70998,8 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/station/maintenance/aft)
|
||||
"dQu" = (
|
||||
/obj/item/bonegel{
|
||||
pixel_x = 6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/cautery,
|
||||
/obj/item/FixOVein{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/storage/surgical_tray,
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/scalpel,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
@@ -71479,12 +71435,6 @@
|
||||
/area/station/service/chapel)
|
||||
"dRx" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/bonesetter{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/surgicaldrill,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
@@ -78581,35 +78531,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/station/engineering/control)
|
||||
"hLZ" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/hemostat{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/item/retractor{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/stack/medical/bruise_pack/advanced,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Medbay Surgery West";
|
||||
dir = 1;
|
||||
network = list("Medical","SS13")
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/item/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner"
|
||||
},
|
||||
/obj/item/stack/medical/ointment/advanced,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
/area/station/medical/surgery/primary)
|
||||
"hMD" = (
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Research Toxin Mixing";
|
||||
@@ -79264,6 +79185,26 @@
|
||||
/obj/effect/spawner/window/reinforced/grilled,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/station/science/xenobiology)
|
||||
"ilr" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Medbay Surgery West";
|
||||
dir = 1;
|
||||
network = list("Medical","SS13")
|
||||
},
|
||||
/obj/machinery/status_display{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/item/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner"
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
/area/station/medical/surgery/primary)
|
||||
"imf" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/paper_bin,
|
||||
@@ -148180,7 +148121,7 @@ dEu
|
||||
dtm
|
||||
nRf
|
||||
dvM
|
||||
hLZ
|
||||
ilr
|
||||
cXJ
|
||||
eha
|
||||
hTW
|
||||
|
||||
@@ -23996,21 +23996,15 @@
|
||||
/area/station/engineering/atmos/control)
|
||||
"bCx" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/surgicaldrill{
|
||||
pixel_x = 17;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/stack/medical/bruise_pack/advanced{
|
||||
pixel_x = -4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/cautery,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/item/robotanalyzer,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "whitepurple"
|
||||
@@ -32796,20 +32790,11 @@
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/station/science/explab)
|
||||
"cgH" = (
|
||||
/obj/item/bonegel{
|
||||
pixel_x = 6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/cautery,
|
||||
/obj/item/FixOVein{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/item/storage/surgical_tray,
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/scalpel,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "darkblue"
|
||||
@@ -36595,12 +36580,6 @@
|
||||
/area/station/science/toxins/mixing)
|
||||
"cuS" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/bonesetter{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/item/radio/intercom{
|
||||
name = "west bump";
|
||||
pixel_x = -28
|
||||
@@ -38429,19 +38408,12 @@
|
||||
/area/station/science/server)
|
||||
"cBT" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/retractor{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/bonegel,
|
||||
/obj/item/hemostat{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
name = "north bump";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/obj/item/storage/surgical_tray,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "whitepurple"
|
||||
@@ -41417,20 +41389,11 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/station/science/robotics)
|
||||
"cMx" = (
|
||||
/obj/item/bonegel{
|
||||
pixel_x = 6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/cautery,
|
||||
/obj/item/FixOVein{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/item/storage/surgical_tray,
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/scalpel,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "darkblue"
|
||||
@@ -42707,7 +42670,6 @@
|
||||
/obj/machinery/optable{
|
||||
name = "Robotics Operating Table"
|
||||
},
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
name = "south bump";
|
||||
pixel_y = -30
|
||||
@@ -42719,12 +42681,6 @@
|
||||
/area/station/science/robotics)
|
||||
"cRp" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/bonesetter{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/item/radio/intercom{
|
||||
name = "east bump";
|
||||
pixel_x = 28
|
||||
@@ -61347,14 +61303,6 @@
|
||||
/area/station/security/permabrig)
|
||||
"jOX" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/hemostat{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/item/retractor{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/stack/medical/bruise_pack/advanced,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/item/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
@@ -83111,27 +83059,6 @@
|
||||
icon_state = "red"
|
||||
},
|
||||
/area/station/security/processing)
|
||||
"tfV" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/hemostat{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/item/retractor{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/stack/medical/bruise_pack/advanced,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/item/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner"
|
||||
},
|
||||
/obj/item/stack/medical/ointment/advanced,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "darkblue"
|
||||
},
|
||||
/area/station/medical/surgery/secondary)
|
||||
"tgu" = (
|
||||
/obj/structure/table,
|
||||
/obj/machinery/recharger,
|
||||
@@ -83331,6 +83258,18 @@
|
||||
},
|
||||
/turf/space,
|
||||
/area/space/nearstation)
|
||||
"tkA" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner"
|
||||
},
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "darkblue"
|
||||
},
|
||||
/area/station/medical/surgery/secondary)
|
||||
"tlh" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible{
|
||||
dir = 9
|
||||
@@ -85689,18 +85628,18 @@
|
||||
/area/station/command/office/captain)
|
||||
"uuG" = (
|
||||
/obj/structure/rack,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/storage/box/bodybags{
|
||||
pixel_x = -4;
|
||||
pixel_y = -4
|
||||
},
|
||||
/obj/item/storage/box/masks,
|
||||
/obj/item/storage/box/gloves{
|
||||
pixel_x = 4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/storage/box/masks,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 5;
|
||||
icon_state = "whitepurple"
|
||||
@@ -86038,14 +85977,6 @@
|
||||
/area/station/command/teleporter)
|
||||
"uEX" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/scalpel{
|
||||
pixel_y = 12
|
||||
},
|
||||
/obj/item/bonesetter{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/circular_saw,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "whitepurple"
|
||||
@@ -90646,7 +90577,6 @@
|
||||
/obj/item/mmi,
|
||||
/obj/item/mmi,
|
||||
/obj/item/mmi,
|
||||
/obj/item/robotanalyzer,
|
||||
/obj/machinery/alarm{
|
||||
dir = 1;
|
||||
name = "south bump";
|
||||
@@ -115822,7 +115752,7 @@ cKX
|
||||
cNa
|
||||
cNs
|
||||
cnd
|
||||
tfV
|
||||
tkA
|
||||
cyE
|
||||
tSj
|
||||
cry
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1411,9 +1411,7 @@
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"dC" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/door/window/classic/reversed{
|
||||
dir = 2
|
||||
},
|
||||
/obj/machinery/door/window/classic/reversed,
|
||||
/obj/item/folder{
|
||||
pixel_x = 31;
|
||||
pixel_y = 1
|
||||
@@ -1965,10 +1963,10 @@
|
||||
},
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
"eO" = (
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/scalpel{
|
||||
pixel_y = 12
|
||||
},
|
||||
/obj/structure/table,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 1;
|
||||
icon_state = "purple"
|
||||
@@ -2385,10 +2383,10 @@
|
||||
},
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
"fI" = (
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/circular_saw{
|
||||
pixel_y = 10
|
||||
},
|
||||
/obj/structure/table,
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/ruin/space/derelict/hallway/primary)
|
||||
"fJ" = (
|
||||
@@ -3750,9 +3748,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 2
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/corner,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ruin/space/derelict/crew_quarters)
|
||||
"jh" = (
|
||||
@@ -5574,9 +5570,7 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/window/classic/reversed{
|
||||
dir = 2
|
||||
},
|
||||
/obj/machinery/door/window/classic/reversed,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "showroomfloor"
|
||||
@@ -7196,9 +7190,7 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 2
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/simulated/floor/grass,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"rz" = (
|
||||
@@ -7210,9 +7202,7 @@
|
||||
name = "Cygni Commemorative Statue";
|
||||
pixel_y = 16
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 2
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/structure/flora/ausbushes/fullgrass{
|
||||
pixel_y = 5
|
||||
},
|
||||
@@ -7231,9 +7221,7 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 2
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/simulated/floor/grass,
|
||||
/area/ruin/space/derelict/arrival)
|
||||
"rB" = (
|
||||
@@ -7356,9 +7344,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 2
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/corner,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 10;
|
||||
icon_state = "red"
|
||||
@@ -7378,9 +7364,7 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 2
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "red"
|
||||
},
|
||||
@@ -7399,9 +7383,7 @@
|
||||
name = "interior access button";
|
||||
pixel_y = -25
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 2
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "red"
|
||||
},
|
||||
@@ -7417,9 +7399,7 @@
|
||||
dir = 10;
|
||||
initialize_directions = 10
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 2
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "red"
|
||||
},
|
||||
|
||||
+15238
-15295
File diff suppressed because it is too large
Load Diff
@@ -32203,10 +32203,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/station/supply/office)
|
||||
"bXl" = (
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/station/command/teleporter)
|
||||
"bXn" = (
|
||||
/obj/machinery/shieldwallgen,
|
||||
/obj/effect/turf_decal/delivery/hollow,
|
||||
@@ -33114,15 +33110,9 @@
|
||||
/area/station/science/robotics)
|
||||
"cav" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/scalpel{
|
||||
pixel_y = 12
|
||||
},
|
||||
/obj/item/hemostat,
|
||||
/obj/item/retractor,
|
||||
/obj/item/stack/medical/bruise_pack/advanced{
|
||||
pixel_x = -4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/item/robotanalyzer,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "freezerfloor"
|
||||
},
|
||||
@@ -33317,8 +33307,6 @@
|
||||
/obj/machinery/optable{
|
||||
name = "Robotics Operating Table"
|
||||
},
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/obj/item/storage/firstaid/machine,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "freezerfloor"
|
||||
},
|
||||
@@ -33700,26 +33688,6 @@
|
||||
icon_state = "freezerfloor"
|
||||
},
|
||||
/area/station/science/robotics)
|
||||
"cck" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/hemostat{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/item/retractor{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/stack/medical/bruise_pack/advanced,
|
||||
/obj/machinery/firealarm{
|
||||
name = "north bump";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/item/stack/medical/ointment/advanced,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
/area/station/medical/surgery/primary)
|
||||
"ccm" = (
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
name = "Central Access"
|
||||
@@ -40161,7 +40129,6 @@
|
||||
/area/station/maintenance/aft)
|
||||
"cyM" = (
|
||||
/obj/item/clothing/under/rank/medical/gown,
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/hemostat{
|
||||
pixel_x = 6
|
||||
},
|
||||
@@ -54585,21 +54552,11 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/station/aisat/hall)
|
||||
"dRz" = (
|
||||
/obj/item/bonegel{
|
||||
pixel_x = 6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/cautery,
|
||||
/obj/item/FixOVein{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/scalpel,
|
||||
/obj/machinery/status_display{
|
||||
layer = 4;
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/structure/table/tray,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whitebluecorner"
|
||||
},
|
||||
@@ -62042,9 +61999,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table,
|
||||
/obj/item/bonegel,
|
||||
/obj/item/bonesetter,
|
||||
/obj/item/FixOVein,
|
||||
/obj/item/storage/surgical_tray,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "freezerfloor"
|
||||
},
|
||||
@@ -62546,35 +62501,6 @@
|
||||
/obj/structure/flora/rock/pile/largejungle,
|
||||
/turf/simulated/floor/grass,
|
||||
/area/station/security/permabrig)
|
||||
"hAl" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/hemostat{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/item/retractor{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/stack/medical/bruise_pack/advanced,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/machinery/holosign_switch{
|
||||
id = "surgery2";
|
||||
pixel_x = -24;
|
||||
pixel_y = 4;
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = -24;
|
||||
dir = 4;
|
||||
name = "custom placement";
|
||||
pixel_y = -4
|
||||
},
|
||||
/obj/item/stack/medical/ointment/advanced,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 4;
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
/area/station/medical/surgery/secondary)
|
||||
"hAG" = (
|
||||
/obj/effect/spawner/lootdrop/maintenance,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
@@ -64882,6 +64808,10 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/station/maintenance/apmaint2)
|
||||
"iLY" = (
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/station/command/teleporter)
|
||||
"iMo" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Bar Office Maintenance"
|
||||
@@ -75499,9 +75429,15 @@
|
||||
/area/station/maintenance/asmaint2)
|
||||
"ocX" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/item/cautery,
|
||||
/obj/item/storage/box/bodybags{
|
||||
pixel_x = -4;
|
||||
pixel_y = -4
|
||||
},
|
||||
/obj/item/storage/box/masks,
|
||||
/obj/item/storage/box/gloves{
|
||||
pixel_x = 4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "freezerfloor"
|
||||
},
|
||||
@@ -75707,13 +75643,8 @@
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/station/security/main)
|
||||
"oiA" = (
|
||||
/obj/item/storage/surgical_tray,
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/bonesetter{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/surgicaldrill,
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 4;
|
||||
icon_state = "whiteblue"
|
||||
@@ -76552,15 +76483,6 @@
|
||||
/area/station/supply/storage)
|
||||
"ozX" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/box/bodybags{
|
||||
pixel_x = -4;
|
||||
pixel_y = -4
|
||||
},
|
||||
/obj/item/storage/box/masks,
|
||||
/obj/item/storage/box/gloves{
|
||||
pixel_x = 4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/tank/internals/anesthetic,
|
||||
/obj/item/clothing/mask/breath/medical,
|
||||
/turf/simulated/floor/plasteel{
|
||||
@@ -78211,17 +78133,8 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/station/maintenance/apmaint2)
|
||||
"pop" = (
|
||||
/obj/item/storage/surgical_tray,
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/cautery,
|
||||
/obj/item/FixOVein{
|
||||
pixel_x = -6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/bonegel{
|
||||
pixel_x = 6;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/scalpel,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
@@ -84635,6 +84548,26 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/station/command/office/hop)
|
||||
"suJ" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/obj/machinery/holosign_switch{
|
||||
id = "surgery2";
|
||||
pixel_x = -24;
|
||||
pixel_y = 4;
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = -24;
|
||||
dir = 4;
|
||||
name = "custom placement";
|
||||
pixel_y = -4
|
||||
},
|
||||
/turf/simulated/floor/plasteel{
|
||||
dir = 4;
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
/area/station/medical/surgery/secondary)
|
||||
"suM" = (
|
||||
/obj/structure/flora/grass/jungle,
|
||||
/obj/machinery/light{
|
||||
@@ -85618,6 +85551,17 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/station/engineering/atmos/control)
|
||||
"sYi" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/machinery/firealarm{
|
||||
name = "north bump";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/item/reagent_containers/iv_bag/salglu,
|
||||
/turf/simulated/floor/plasteel{
|
||||
icon_state = "whiteblue"
|
||||
},
|
||||
/area/station/medical/surgery/primary)
|
||||
"sYp" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/cable{
|
||||
@@ -95476,12 +95420,6 @@
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/item/bonesetter{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/radio/intercom{
|
||||
name = "west bump";
|
||||
pixel_x = -28
|
||||
@@ -122804,7 +122742,7 @@ bOK
|
||||
oRE
|
||||
bTR
|
||||
jqu
|
||||
bXl
|
||||
iLY
|
||||
bZc
|
||||
bSi
|
||||
cdU
|
||||
@@ -123061,7 +122999,7 @@ bQw
|
||||
oRE
|
||||
bTS
|
||||
tvD
|
||||
bXl
|
||||
iLY
|
||||
cbl
|
||||
bSi
|
||||
cdJ
|
||||
@@ -130788,7 +130726,7 @@ nEA
|
||||
oxN
|
||||
der
|
||||
cCW
|
||||
cck
|
||||
sYi
|
||||
tsJ
|
||||
cAr
|
||||
cuf
|
||||
@@ -132081,7 +132019,7 @@ hpR
|
||||
cDf
|
||||
dRz
|
||||
oiA
|
||||
hAl
|
||||
suJ
|
||||
chq
|
||||
cDf
|
||||
cKj
|
||||
|
||||
@@ -304,18 +304,8 @@
|
||||
/turf/simulated/floor/mineral/titanium,
|
||||
/area/shuttle/administration)
|
||||
"bw" = (
|
||||
/obj/item/storage/surgical_tray,
|
||||
/obj/structure/table/tray,
|
||||
/obj/item/stack/medical/bruise_pack/advanced,
|
||||
/obj/item/scalpel,
|
||||
/obj/item/hemostat,
|
||||
/obj/item/retractor,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/bonegel,
|
||||
/obj/item/bonesetter,
|
||||
/obj/item/cautery,
|
||||
/obj/item/FixOVein,
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/item/storage/backpack/duffel/medical,
|
||||
/turf/simulated/floor/mineral/titanium,
|
||||
/area/shuttle/administration)
|
||||
"bx" = (
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
// Sprites from CM13
|
||||
/obj/item/storage/surgical_tray
|
||||
name = "surgical tray"
|
||||
desc = "A small metallic tray covered in sterile tarp. Intended to store surgical tools in a neat and clean fashion."
|
||||
icon_state = "surgical_tray"
|
||||
storage_slots = 22 // 11 Items, x2 to be sure
|
||||
max_w_class = WEIGHT_CLASS_GIGANTIC
|
||||
max_combined_w_class = 38 // Items listed add up to 19, x2 to be sure
|
||||
can_hold = list(
|
||||
/obj/item/scalpel,
|
||||
/obj/item/cautery,
|
||||
/obj/item/hemostat,
|
||||
/obj/item/retractor,
|
||||
/obj/item/FixOVein,
|
||||
/obj/item/surgicaldrill,
|
||||
/obj/item/circular_saw,
|
||||
/obj/item/bonegel,
|
||||
/obj/item/bonesetter,
|
||||
/obj/item/stack/medical/bruise_pack,
|
||||
/obj/item/stack/medical/ointment
|
||||
)
|
||||
|
||||
/obj/item/storage/surgical_tray/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/scalpel(src)
|
||||
new /obj/item/cautery(src)
|
||||
new /obj/item/hemostat(src)
|
||||
new /obj/item/retractor(src)
|
||||
new /obj/item/FixOVein(src)
|
||||
new /obj/item/surgicaldrill(src)
|
||||
new /obj/item/circular_saw(src)
|
||||
new /obj/item/bonegel(src)
|
||||
new /obj/item/bonesetter(src)
|
||||
new /obj/item/stack/medical/bruise_pack/advanced(src)
|
||||
new /obj/item/stack/medical/ointment/advanced(src)
|
||||
|
||||
/obj/item/storage/surgical_tray/update_icon_state()
|
||||
if(!contents.len)
|
||||
icon_state = "surgical_tray_e"
|
||||
else
|
||||
icon_state = "surgical_tray"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 62 KiB |
@@ -1167,6 +1167,7 @@
|
||||
#include "code\game\objects\items\weapons\storage\lockbox.dm"
|
||||
#include "code\game\objects\items\weapons\storage\secure.dm"
|
||||
#include "code\game\objects\items\weapons\storage\storage_base.dm"
|
||||
#include "code\game\objects\items\weapons\storage\surgical_tray.dm"
|
||||
#include "code\game\objects\items\weapons\storage\toolbox.dm"
|
||||
#include "code\game\objects\items\weapons\storage\uplink_kits.dm"
|
||||
#include "code\game\objects\items\weapons\storage\wallets.dm"
|
||||
|
||||
Reference in New Issue
Block a user