Skip to content

Commit

Permalink
Merge Upstream 21.05.2024 (#1241)
Browse files Browse the repository at this point in the history 
## Changelog

:cl: ParadiseSS13
add: Добавлен абдукторский тулсет
tweak: Медицинский луч тепреь имеет шанс вылечить все внутренние
повреждения
fix: Прыжок больше не должен впечатывать вас в стену, буквально
/:cl:
  • Loading branch information
@ss220bot
ss220bot committed May 21, 2024
2 parents eaba468 + c01fa5c commit afa5185
Show file tree
Hide file tree
Showing 17 changed files with 223 additions and 210 deletions.
85 changes: 12 additions & 73 deletions _maps/map_files/stations/boxstation.dmm
View file

Large diffs are not rendered by default.

107 changes: 75 additions & 32 deletions _maps/map_files/stations/cerestation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3893,7 +3893,6 @@
announcementConsole = 1;
department = "Head of Security's Desk";
departmentType = 5;
name = "Head of Security Requests Console";
pixel_y = -30
},
/obj/machinery/computer/secure_data{
Expand Down Expand Up @@ -9904,7 +9903,6 @@
},
/obj/machinery/requests_console{
department = "EVA";
name = "EVA Requests Console";
pixel_x = -32
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -16098,7 +16096,6 @@
},
/obj/machinery/requests_console{
department = "Virology";
name = "Virology Requests Console";
pixel_x = -32
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
Expand Down Expand Up @@ -24251,7 +24248,6 @@
},
/obj/machinery/requests_console{
department = "Crew Quarters";
name = "Crew Quarters Requests Console";
pixel_y = 30
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -24493,9 +24489,8 @@
/area/space)
"cEm" = (
/obj/machinery/requests_console{
department = "Cargo Bay";
department = "Quartermaster's Desk";
departmentType = 5;
name = "Quartermaster Requests Console";
pixel_x = 30;
announcementConsole = 1
},
Expand Down Expand Up @@ -24581,7 +24576,6 @@
/obj/machinery/requests_console{
department = "Warden";
departmentType = 7;
name = "Warden's Requests Console";
pixel_x = -30
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -27688,6 +27682,10 @@
/obj/item/paper_bin/nanotrasen,
/obj/item/stamp/magistrate,
/obj/item/pen/multi/gold,
/obj/machinery/requests_console{
department = "Magistrate";
pixel_x = 30
},
/turf/simulated/floor/carpet,
/area/station/legal/magistrate)
"cSQ" = (
Expand Down Expand Up @@ -28896,7 +28894,6 @@
},
/obj/machinery/requests_console{
department = "Tool Storage";
name = "Tool Storage Requests Console";
pixel_y = 30
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -29344,7 +29341,6 @@
/obj/machinery/requests_console{
department = "Bar";
departmentType = 2;
name = "Bar Requests Console";
pixel_x = -30
},
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -30509,7 +30505,6 @@
/area/station/science/hallway)
"dkb" = (
/obj/machinery/requests_console{
name = "Detective Requests Console";
pixel_y = -30;
department = "Detective";
departmentType = 5
Expand Down Expand Up @@ -33924,7 +33919,6 @@
/obj/item/multitool,
/obj/machinery/requests_console{
department = "Tech Storage";
name = "Tech Storage Requests Console";
pixel_x = -30
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -43068,7 +43062,6 @@
/obj/machinery/requests_console{
department = "Janitorial";
departmentType = 1;
name = "Janitor Requests Console";
pixel_x = 30
},
/turf/simulated/floor/plasteel,
Expand Down Expand Up @@ -44348,6 +44341,11 @@
/area/station/maintenance/storage)
"hkr" = (
/obj/item/kirbyplants,
/obj/machinery/requests_console{
department = "Chapel";
departmentType = 2;
pixel_y = 30
},
/turf/simulated/floor/carpet/black,
/area/station/service/chapel)
"hkt" = (
Expand Down Expand Up @@ -46618,6 +46616,16 @@
icon_state = "darkblue"
},
/area/station/medical/storage/secondary)
"hUK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/requests_console{
department = "Mining";
departmentType = 5;
pixel_x = 30;
announcementConsole = 1
},
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"hUN" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
Expand Down Expand Up @@ -49554,7 +49562,6 @@
announcementConsole = 1;
department = "Blueshield";
departmentType = 5;
name = "Blueshield Requests Console";
pixel_x = 30
},
/obj/structure/table/wood,
Expand Down Expand Up @@ -52798,6 +52805,14 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/port)
"jMh" = (
/obj/item/kirbyplants,
/obj/machinery/requests_console{
department = "Psychiatrist";
pixel_x = -30
},
/turf/simulated/floor/carpet,
/area/station/medical/psych)
"jMr" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
Expand Down Expand Up @@ -53924,6 +53939,13 @@
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"kgy" = (
/obj/machinery/requests_console{
department = "Library";
pixel_x = -30
},
/turf/simulated/floor/wood,
/area/station/service/library)
"kgP" = (
/turf/simulated/floor/plasteel{
dir = 4;
Expand Down Expand Up @@ -54974,7 +54996,6 @@
announcementConsole = 1;
department = "NT Representative";
departmentType = 5;
name = "NT Representative Requests Console";
pixel_x = 30
},
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -62366,7 +62387,6 @@
/obj/structure/closet/wardrobe/black,
/obj/machinery/requests_console{
department = "Arrival Shuttle";
name = "Arrival Shuttle Requests Console";
pixel_y = -30
},
/turf/simulated/floor/mineral/titanium/blue,
Expand Down Expand Up @@ -63470,7 +63490,6 @@
/obj/machinery/requests_console{
department = "Medbay";
departmentType = 1;
name = "Medbay Requests Console";
pixel_y = 30
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -65774,6 +65793,16 @@
"nTa" = (
/turf/simulated/mineral/ancient,
/area/station/hallway/primary/central/east)
"nTo" = (
/obj/machinery/requests_console{
department = "Expedition";
departmentType = 2;
pixel_x = 30
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
"nTJ" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
Expand Down Expand Up @@ -67759,7 +67788,6 @@
/obj/machinery/requests_console{
department = "Kitchen";
departmentType = 2;
name = "Kitchen Requests Console";
pixel_y = -30
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -67866,7 +67894,6 @@
/obj/machinery/requests_console{
department = "Engineering";
departmentType = 3;
name = "Engineering Requests Console";
pixel_x = 30
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -70284,6 +70311,17 @@
icon_state = "white"
},
/area/station/science/misc_lab)
"pqq" = (
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Xenobiology";
departmentType = 5;
pixel_x = -30
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurplefull"
},
/area/station/science/xenobiology)
"pqr" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
Expand Down Expand Up @@ -77273,7 +77311,6 @@
/obj/machinery/requests_console{
department = "Morgue";
departmentType = 5;
name = "Morgue Requests Console";
pixel_x = -30
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -80554,7 +80591,6 @@
/obj/machinery/requests_console{
department = "Hydroponics";
departmentType = 2;
name = "Hydroponics Requests Console";
pixel_y = 30
},
/obj/machinery/hydroponics/constructable,
Expand Down Expand Up @@ -83266,7 +83302,6 @@
/obj/machinery/requests_console{
department = "Science";
departmentType = 2;
name = "Science Requests Console";
pixel_x = -30
},
/obj/machinery/r_n_d/circuit_imprinter,
Expand Down Expand Up @@ -87017,6 +87052,14 @@
/obj/structure/falsewall/rock_ancient,
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"uJE" = (
/obj/machinery/requests_console{
department = "Courtroom";
departmentType = 2;
pixel_x = 30
},
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
"uJT" = (
/turf/simulated/wall,
/area/station/maintenance/gambling_den)
Expand Down Expand Up @@ -87998,9 +88041,8 @@
/obj/item/storage/box/monkeycubes/stokcubes,
/obj/item/storage/box/monkeycubes/wolpincubes,
/obj/machinery/requests_console{
department = "Medbay";
department = "Genetics";
departmentType = 1;
name = "Genetics Requests Console";
pixel_x = -30
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -88993,7 +89035,6 @@
/obj/item/pen/multi,
/obj/machinery/requests_console{
department = "Internal Affairs Office";
name = "Internal Affairs Requests Console";
pixel_x = -30
},
/obj/item/taperecorder,
Expand Down Expand Up @@ -93175,7 +93216,6 @@
/obj/machinery/requests_console{
department = "Security";
departmentType = 5;
name = "Security Requests Console";
pixel_x = 30
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
Expand Down Expand Up @@ -93366,6 +93406,10 @@
},
/area/station/maintenance/gambling_den)
"wyn" = (
/obj/machinery/requests_console{
department = "Paramedic";
pixel_x = 30
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
Expand Down Expand Up @@ -98146,7 +98190,6 @@
"xYV" = (
/obj/machinery/requests_console{
department = "Locker Room";
name = "Locker Room Requests Console";
pixel_y = -30
},
/turf/simulated/floor/plasteel,
Expand Down Expand Up @@ -112105,7 +112148,7 @@ xJa
gbb
xJa
gLH
xhk
uJE
bIR
xhk
xhk
Expand Down Expand Up @@ -113724,7 +113767,7 @@ aEe
aEe
aEe
bLH
bHZ
kgy
qKM
bRi
bPj
Expand Down Expand Up @@ -120723,7 +120766,7 @@ cGd
qqa
muT
uBC
uBC
pqq
uBC
cAh
pon
Expand Down Expand Up @@ -138883,7 +138926,7 @@ jVI
jVI
jVI
bzs
vId
nTo
hou
oVI
xbO
Expand Down Expand Up @@ -145816,7 +145859,7 @@ fMl
fMl
aZM
cMM
bcO
jMh
oFv
oWH
poU
Expand Down Expand Up @@ -153997,7 +154040,7 @@ uHx
aFb
byd
qbb
qbb
hUK
aJH
cbR
aIA
Expand Down
Loading

0 comments on commit afa5185

Please sign in to comment.