cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-09 16:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

squash-merge-staging-branch-into-main

Browse Source
This commit is contained in:
grungussuss
2024-12-26 23:46:26 +03:00
parent af3c45436d
commit da2ba44f9a
7 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_maps/fulp_maps/RandomRuins/SpaceRuins/beef_station.dmm
View File

@@ -850,7 +850,7 @@
"jW" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/siding/blue,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/turf/open/floor/iron/white/herringbone,
/area/ruin/space/has_grav/beef/medical)
"ka" = (

2
_maps/map_files/Heliostation/Heliostation.dmm
View File

@@ -49502,7 +49502,7 @@
/area/station/science/robotics/lab)
"mfv" = (
/obj/structure/table/reinforced,
/obj/item/surgery_tray/full/morgue,
/obj/effect/spawner/surgery_tray/full/morgue,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"mfJ" = (

6
_maps/map_files/PubbyStation/PubbyStation.dmm
View File

@@ -2175,6 +2175,9 @@
/obj/item/gun/energy/temperature/security,
/obj/item/clothing/suit/hooded/ablative,
/obj/machinery/light/directional/west,
/obj/item/gun/ballistic/automatic/battle_rifle{
pixel_y = 3
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"aiO" = (
@@ -19107,6 +19110,7 @@
"bzO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/light/directional/east,
/obj/structure/sign/eyechart/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"bzX" = (
@@ -50566,7 +50570,7 @@
/obj/structure/disposalpipe/segment,
/obj/structure/table/reinforced,
/obj/machinery/newscaster/directional/west,
/obj/item/surgery_tray/full/morgue,
/obj/effect/spawner/surgery_tray/full/morgue,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"ulV" = (

14
_maps/map_files/SeleneStation/SeleneStation.dmm
View File

@@ -14910,7 +14910,7 @@
/area/station/maintenance/solars/port/aft)
"frD" = (
/obj/structure/table/glass,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/tile/blue/fourcorners,
@@ -18520,6 +18520,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
/obj/structure/sign/eyechart/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/patients_rooms)
"gKE" = (
@@ -25536,7 +25537,7 @@
/area/station/cargo/lobby)
"jpL" = (
/obj/structure/table,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/item/healthanalyzer{
pixel_x = 3;
@@ -35301,7 +35302,7 @@
/area/station/maintenance/starboard/fore)
"mGU" = (
/obj/structure/table/reinforced,
/obj/item/surgery_tray/full/morgue,
/obj/effect/spawner/surgery_tray/full/morgue,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"mGV" = (
@@ -37759,6 +37760,9 @@
/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{
dir = 8
},
/obj/item/gun/ballistic/automatic/battle_rifle{
pixel_y = 3
},
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"nzu" = (
@@ -60302,7 +60306,7 @@
/area/space/nearstation)
"vXl" = (
/obj/structure/table/glass,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/surgery)
@@ -63465,7 +63469,7 @@
/area/station/maintenance/department/medical)
"xdY" = (
/obj/structure/table/glass,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/medical{
dir = 4

16
_maps/map_files/TheiaStation/TheiaStation.dmm
View File

@@ -11791,12 +11791,12 @@
/turf/open/floor/grass,
/area/station/hallway/primary/central/aft)
"ehR" = (
/obj/item/ammo_casing/a357/spent{
/obj/item/ammo_casing/c357/spent{
dir = 5;
pixel_y = -4;
pixel_x = 7
},
/obj/item/ammo_casing/a357/spent{
/obj/item/ammo_casing/c357/spent{
dir = 9
},
/obj/structure/grille/broken,
@@ -27576,7 +27576,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/light/small/directional/south,
/obj/machinery/firealarm/directional/south,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"jNq" = (
@@ -32199,6 +32199,9 @@
dir = 4
},
/obj/machinery/light/directional/east,
/obj/item/gun/ballistic/automatic/battle_rifle{
pixel_y = 3
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"lxh" = (
@@ -33120,7 +33123,7 @@
network = list("ss13","medbay")
},
/obj/machinery/light/small/directional/north,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"lRW" = (
@@ -53001,6 +53004,7 @@
network = list("ss13","medbay")
},
/obj/machinery/light/no_nightlight/directional/east,
/obj/structure/sign/eyechart/directional/east,
/turf/open/floor/iron/white/smooth_edge{
dir = 4
},
@@ -53152,7 +53156,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/item/ammo_casing/a357/spent{
/obj/item/ammo_casing/c357/spent{
dir = 5;
pixel_y = -4;
pixel_x = 7
@@ -62011,7 +62015,7 @@
/obj/effect/turf_decal/trimline/neutral/warning{
dir = 10
},
/obj/item/surgery_tray/full/morgue,
/obj/effect/spawner/surgery_tray/full/morgue,
/turf/open/floor/iron/dark/textured_half{
dir = 1
},

2
_maps/shuttles/emergency_selene.dmm
View File

@@ -111,7 +111,7 @@
/area/shuttle/escape)
"lQ" = (
/obj/structure/table/reinforced,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"mp" = (

2
_maps/shuttles/emergency_theia.dmm
View File

@@ -694,7 +694,7 @@
/area/shuttle/escape)
"CL" = (
/obj/structure/table/reinforced,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/obj/machinery/defibrillator_mount/directional/east,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)