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

Jump to bottom

Expands perma, adds license plate presses #14017

Merged
merged 12 commits into from
May 10, 2022
Merged

Expands perma, adds license plate presses #14017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
863649c
bru
bruhlookatthisdood May 5, 2022
d8b65ef
Update code/game/machinery/prisonlabor.dm
bruhlookatthisdood May 6, 2022
a9830b7
wew
bruhlookatthisdood May 6, 2022
ff0cace
Merge branch 'pribson' of https://github.com/bruhlookatthisdood/Yogst…
bruhlookatthisdood May 6, 2022
baa3303
decorations
bruhlookatthisdood May 6, 2022
6a276e2
jamie suggestions
bruhlookatthisdood May 7, 2022
4e11d52
more stuff
bruhlookatthisdood May 7, 2022
84bc2db
m
bruhlookatthisdood May 7, 2022
9fc781b
stuff?
bruhlookatthisdood May 7, 2022
b773382
bibby helped me
bruhlookatthisdood May 8, 2022
b04ff3f
adds to meta
bruhlookatthisdood May 8, 2022
63cb37a
delta exists too, i forgor :skull:
bruhlookatthisdood May 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1,474 changes: 1,000 additions & 474 deletions _maps/map_files/YogStation/YogStation.dmm
View file
Open in desktop

Large diffs are not rendered by default.

139 changes: 109 additions & 30 deletions _maps/map_files/YogsDelta/YogsDelta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10632,6 +10632,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/plasteel,
/area/security/prison)
"asR" = (
Expand Down Expand Up @@ -23120,20 +23121,12 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/item/twohanded/required/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/turf/open/floor/plasteel,
/area/security/prison)
"aMo" = (
/obj/structure/cable/white{
icon_state = "1-8"
},
/obj/structure/punching_bag,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/blue{
dir = 4
Expand Down Expand Up @@ -23917,6 +23910,7 @@
pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/punching_bag,
/turf/open/floor/plating,
/area/security/prison)
"aNL" = (
Expand Down Expand Up @@ -74760,6 +74754,11 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"clp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"clq" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase{
Expand Down Expand Up @@ -121243,6 +121242,11 @@
/obj/structure/bodycontainer/morgue,
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"hym" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/plate_press,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"hzl" = (
/turf/closed/wall,
/area/security/checkpoint/medical)
Expand Down Expand Up @@ -122276,6 +122280,13 @@
/obj/structure/bodycontainer/morgue,
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"kkh" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
"kmE" = (
/obj/structure/table/glass,
/obj/machinery/airalarm{
Expand Down Expand Up @@ -122366,6 +122377,9 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"kvN" = (
/turf/open/floor/plasteel/dark,
/area/security/prison)
"kwl" = (
/obj/structure/cable/white{
icon_state = "0-2"
Expand Down Expand Up @@ -122614,6 +122628,10 @@
},
/turf/open/floor/plasteel/dark,
/area/science/nanite)
"kXV" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"kYA" = (
/obj/machinery/vending/medical,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -123543,6 +123561,14 @@
},
/turf/open/floor/plasteel,
/area/medical/patients_rooms/room_b)
"mHo" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/structure/cable/white{
icon_state = "1-8"
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
"mHL" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -26
Expand Down Expand Up @@ -125471,6 +125497,15 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"rbR" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark/side{
dir = 1
},
/area/security/prison)
"rdQ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
Expand Down Expand Up @@ -126378,6 +126413,18 @@
},
/turf/open/floor/plasteel,
/area/medical/patients_rooms/room_c)
"sOB" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/license_plates/empty/fifty,
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/structure/cable/white{
icon_state = "2-4"
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
"sPa" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
Expand Down Expand Up @@ -126547,6 +126594,17 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/central)
"tnz" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plating,
/area/security/prison)
"top" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
Expand Down Expand Up @@ -126793,6 +126851,13 @@
},
/turf/open/floor/plasteel,
/area/medical/paramedic)
"tEc" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/security/prison)
"tHs" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/machinery/atmospherics/miner/nitrogen,
Expand Down Expand Up @@ -127660,6 +127725,11 @@
/obj/machinery/light/small,
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"vMy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/oil/streak,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"vMH" = (
/obj/machinery/light{
dir = 1
Expand Down Expand Up @@ -127881,6 +127951,11 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/central)
"vYD" = (
/turf/open/floor/plasteel/dark/side{
dir = 1
},
/area/security/prison)
"wcs" = (
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
Expand Down Expand Up @@ -128211,6 +128286,10 @@
},
/turf/open/floor/plasteel/white,
/area/medical/storage/locker)
"wHY" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/security/prison)
"wJG" = (
/obj/structure/cable/white{
icon_state = "0-2"
Expand Down Expand Up @@ -183683,10 +183762,10 @@ aaa
aaa
ajr
aad
aad
aad
aaa
aad
aFm
hym
kXV
clp
aFm
aMm
azi
Expand Down Expand Up @@ -183940,11 +184019,11 @@ aaa
aaa
aaa
aaa
aaa
aad
aad
aad
aFn
tnz
sOB
kkh
tEc
rbR
aMn
azr
aPr
Expand Down Expand Up @@ -184197,11 +184276,11 @@ aaa
aaa
aaa
aaa
ajr
aad
aaa
aad
aFn
tnz
mHo
kXV
vMy
vYD
aMo
aNJ
aPs
Expand Down Expand Up @@ -184454,10 +184533,10 @@ aaa
aaa
aaa
aaa
ajr
aad
aad
aad
aFm
hym
wHY
kvN
aFm
aMp
aNK
Expand Down Expand Up @@ -184711,10 +184790,10 @@ aaa
aaa
aaa
aaa
aaa
aad
aaa
aJD
aFm
aFm
aFm
aFm
aKZ
aKZ
aKZ
Expand Down