Roselia's Small Fixes and Changes Part 2 (#2328)

## About The Pull Request

Small map edits of previous PRs of mine that don't need PRs of their
own.

- The Interlink Administrative Office now has: a photocopier, a
boozeomat and beer dispenser, a commandrobe, an actual pet in the form
of Pengy The Mighty Empress Penguin, a couple folders, a feather (cause
you're fancy), and a chalkboard. A single camera has been added (on the
secret network) so holopad calls can see the interior of the room, and
for AIs to verify the identity of any occupants.
- Lizard Gas stations all around now stock the fabled Gas Station Sushi
(but it's edible and not spiked). The pipe gun has also been replaced
with a much more reliable (or unreliable since they're used against
fauna) laser musket. The weird double-wall bathroom is now single wall
since I finally figured out how to have vending machines in the walls
properly.

## Why It's Good For The Game

Cause some stuff needs adjustments or fixing to feel more proper, or be
less obtuse.

## Proof Of Testing

It's just map edits of already working maps. No code changes. It'll
work.

## Changelog

🆑
qol: The Interlink Administrative Office has had new equipment brought
in and installed.
balance: Lizard Gas now has slightly better but still shoddy weaponry
for its employee.
/🆑

---------

Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
Otome
2024-11-04 19:05:27 +00:00
committed by GitHub
co-authored by LT3
parent 1ccf238e20
commit d82ab5e4d3
4 changed files with 243 additions and 134 deletions
@@ -169,23 +169,15 @@
"gm" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/item/food/cornuto{
pixel_y = 4;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = 2
},
/obj/item/food/cornuto{
pixel_y = 5;
pixel_x = 6
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = -3
},
/obj/structure/closet/crate/freezer,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/nigiri_sushi,
/obj/item/food/nigiri_sushi,
/obj/item/food/nigiri_sushi,
/turf/open/floor/iron/freezer{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
@@ -355,10 +347,11 @@
/area/icemoon/underground/unexplored)
"lt" = (
/obj/machinery/vending/dorms{
onstation = 0
density = 0;
pixel_y = -32
},
/turf/closed/wall/r_wall{
baseturfs = /turf/open/floor/plating/lavaland_baseturf
/turf/open/floor/iron{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
/area/ruin/powered/lizard_gas)
"lK" = (
@@ -567,6 +560,22 @@
},
/obj/structure/closet/crate/freezer,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden/layer4,
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = 4;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = 5;
pixel_x = 6
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = 2
},
/turf/open/floor/iron/freezer{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
@@ -649,10 +658,6 @@
/obj/item/tank/internals/oxygen,
/obj/item/clothing/mask/breath,
/obj/item/pickaxe,
/obj/item/gun/ballistic/rifle/boltaction/pipegun,
/obj/item/ammo_casing/junk/hunter,
/obj/item/ammo_casing/junk/hunter,
/obj/item/ammo_casing/junk/hunter,
/obj/item/storage/box/coffeepack/robusta,
/obj/item/storage/box/coffeepack/robusta,
/obj/item/flatpacked_machine,
@@ -660,6 +665,7 @@
/obj/item/flatpacked_machine/sustenance_machine,
/obj/item/flatpacked_machine/organics_ration_printer,
/obj/item/flatpacked_machine/macrowave,
/obj/item/gun/energy/laser/musket,
/turf/open/floor/iron/smooth{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
@@ -1958,7 +1964,7 @@ qM
qM
Xn
qM
qM
gv
gv
gv
gv
@@ -1979,11 +1985,10 @@ Ji
ed
Ji
ur
qM
ur
qM
HE
Jv
Py
lt
qM
gv
@@ -1993,6 +1998,7 @@ gv
gv
gv
gv
gv
"}
(24,1,1) = {"
gv
@@ -2006,13 +2012,13 @@ wN
RW
mE
pO
qM
ur
qM
Kr
kI
ei
qM
qM
gv
gv
gv
gv
@@ -2033,13 +2039,13 @@ Md
Ji
Ji
Ji
ur
qM
qM
qM
qM
qM
qM
qM
gv
gv
gv
gv
@@ -45,6 +45,22 @@
},
/obj/structure/closet/crate/freezer,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden/layer4,
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = 4;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = 5;
pixel_x = 6
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = 2
},
/turf/open/floor/iron/freezer{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
@@ -418,10 +434,11 @@
/area/lavaland/surface/outdoors)
"oT" = (
/obj/machinery/vending/dorms{
onstation = 0
density = 0;
pixel_y = -32
},
/turf/closed/wall/r_wall{
baseturfs = /turf/open/floor/plating/lavaland_baseturf
/turf/open/floor/iron{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
/area/ruin/thelizardsgas_lavaland)
"pp" = (
@@ -445,10 +462,6 @@
/obj/item/tank/internals/oxygen,
/obj/item/clothing/mask/breath,
/obj/item/pickaxe,
/obj/item/gun/ballistic/rifle/boltaction/pipegun,
/obj/item/ammo_casing/junk/hunter,
/obj/item/ammo_casing/junk/hunter,
/obj/item/ammo_casing/junk/hunter,
/obj/item/storage/box/coffeepack/robusta,
/obj/item/storage/box/coffeepack/robusta,
/obj/item/flatpacked_machine,
@@ -456,6 +469,7 @@
/obj/item/flatpacked_machine/sustenance_machine,
/obj/item/flatpacked_machine/organics_ration_printer,
/obj/item/flatpacked_machine/macrowave,
/obj/item/gun/energy/laser/musket,
/turf/open/floor/iron/smooth{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
@@ -1313,23 +1327,15 @@
"Zf" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/item/food/cornuto{
pixel_y = 4;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = 2
},
/obj/item/food/cornuto{
pixel_y = 5;
pixel_x = 6
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = -3
},
/obj/structure/closet/crate/freezer,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/nigiri_sushi,
/obj/item/food/nigiri_sushi,
/obj/item/food/nigiri_sushi,
/turf/open/floor/iron/freezer{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
@@ -1734,11 +1740,10 @@ DI
DI
DI
DI
FA
DI
FA
cC
Bb
xW
oT
FA
DI
@@ -1748,6 +1753,7 @@ DI
DI
DI
DI
DI
"}
(19,1,1) = {"
DI
@@ -1757,13 +1763,13 @@ DI
DI
DI
DI
FA
DI
FA
Bw
Hd
jB
FA
FA
DI
DI
DI
DI
@@ -1780,13 +1786,13 @@ DI
DI
DI
DI
DI
FA
FA
FA
FA
FA
FA
FA
DI
DI
DI
DI
@@ -14,10 +14,6 @@
/obj/item/tank/internals/oxygen,
/obj/item/clothing/mask/breath,
/obj/item/pickaxe,
/obj/item/gun/ballistic/rifle/boltaction/pipegun,
/obj/item/ammo_casing/junk/hunter,
/obj/item/ammo_casing/junk/hunter,
/obj/item/ammo_casing/junk/hunter,
/obj/item/storage/box/coffeepack/robusta,
/obj/item/storage/box/coffeepack/robusta,
/obj/item/flatpacked_machine,
@@ -26,6 +22,7 @@
/obj/item/flatpacked_machine/organics_ration_printer,
/obj/item/flatpacked_machine/macrowave,
/obj/item/storage/toolbox/mechanical,
/obj/item/gun/energy/laser/musket,
/turf/open/floor/plating,
/area/ruin/space/has_grav/thelizardsgas)
"bo" = (
@@ -108,6 +105,14 @@
/area/ruin/space/has_grav/thelizardsgas)
"eV" = (
/obj/structure/sign/poster/fluff/lizards_gas_payment/directional/north,
/mob/living/basic/lizard/space{
desc = "How are you ALIVE?!";
name = "Blarpo"
},
/obj/structure/bed/dogbed{
name = "Blarpo's bed";
desc = "A comfy-looking lizard bed. Looks a lot like a dog bed."
},
/turf/open/floor/iron/dark/smooth_corner{
dir = 8
},
@@ -285,23 +290,17 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/thelizardsgas)
"vj" = (
/obj/item/food/cornuto{
pixel_y = 4;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = 2
},
/obj/item/food/cornuto{
pixel_y = 5;
pixel_x = 6
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = -3
},
/obj/structure/closet/crate/freezer,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/vendor_tray_meal/sushi,
/obj/item/food/nigiri_sushi,
/obj/item/food/nigiri_sushi,
/obj/item/food/nigiri_sushi,
/obj/item/food/nigiri_sushi,
/obj/item/food/nigiri_sushi,
/turf/open/floor/iron/freezer{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
@@ -621,15 +620,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden,
/turf/open/floor/plating,
/area/ruin/space/has_grav/thelizardsgas)
"Ua" = (
/mob/living/basic/lizard/space{
desc = "How are you ALIVE?!";
name = "Blarpo"
},
/turf/open/floor/iron/white/side{
dir = 1
},
/area/ruin/space/has_grav/thelizardsgas)
"Ud" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 4
@@ -710,6 +700,22 @@
pixel_x = 3
},
/obj/structure/closet/crate/freezer,
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = -5;
pixel_x = 2
},
/obj/item/food/cornuto{
pixel_y = 4;
pixel_x = -3
},
/obj/item/food/cornuto{
pixel_y = 5;
pixel_x = 6
},
/turf/open/floor/iron/freezer{
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
},
@@ -1089,7 +1095,7 @@ mR
gS
Zs
cn
Ua
UO
uh
CA
CA
@@ -4,13 +4,19 @@
/area/centcom/central_command_areas/admin/interlink)
"b" = (
/obj/machinery/holopad/secure,
/turf/open/floor/wood/tile,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"d" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/effect/mapping_helpers/apc/cell_10k,
/obj/structure/cable,
/turf/open/floor/wood/tile,
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"e" = (
/obj/machinery/modular_computer/preset/id/centcom,
@@ -18,30 +24,67 @@
/area/centcom/central_command_areas/admin/interlink)
"g" = (
/obj/structure/table/wood,
/obj/item/folder/red{
pixel_x = 7;
pixel_y = 7
},
/obj/item/folder/blue{
pixel_x = 5;
pixel_y = 5
},
/obj/item/folder/yellow{
pixel_x = 3;
pixel_y = 2
},
/turf/open/floor/carpet/executive,
/area/centcom/central_command_areas/admin/interlink)
"h" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/fullupgrade,
/obj/machinery/chem_dispenser/drinks/fullupgrade{
pixel_y = 24;
density = 0
},
/obj/machinery/light/directional/west,
/turf/open/floor/wood/tile,
/obj/effect/turf_decal/siding/wood/corner,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"j" = (
/obj/structure/bed/double,
/obj/item/bedsheet/centcom/double,
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"k" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/machinery/camera/autoname/directional/south{
network = list("secret")
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"l" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
/turf/open/floor/wood/tile,
/obj/effect/turf_decal/siding/wood,
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{
density = 0;
pixel_y = 24
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"m" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/vending/boozeomat/all_access{
density = 0;
pixel_y = 32
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"n" = (
/turf/closed/indestructible/riveted,
/area/centcom/central_command_areas/admin/interlink)
"o" = (
/obj/machinery/light/directional/east,
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"p" = (
/obj/structure/table/wood,
@@ -56,10 +99,22 @@
/obj/item/stamp{
pixel_y = 10
},
/obj/machinery/requests_console/auto_name/directional/north,
/obj/machinery/requests_console/auto_name/directional/north{
pixel_x = 3;
pixel_y = 31
},
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/assistance,
/obj/effect/mapping_helpers/requests_console/information,
/obj/machinery/button/door/directional/north{
name = "Admin Shutter Control";
id = "admin_shutters";
pixel_x = -5;
pixel_y = 21
},
/obj/item/toy/crayon/white{
pixel_x = 9
},
/turf/open/floor/carpet/executive,
/area/centcom/central_command_areas/admin/interlink)
"q" = (
@@ -69,11 +124,11 @@
/obj/structure/chair/comfy/beige{
dir = 4
},
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"r" = (
/obj/structure/dresser,
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"s" = (
/obj/structure/filingcabinet/employment,
@@ -93,7 +148,13 @@
/obj/machinery/door/poddoor/shutters/indestructible{
id = "admin_shutters"
},
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"v" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"x" = (
/obj/machinery/light/directional/east,
@@ -102,25 +163,32 @@
"z" = (
/obj/structure/closet/crate/bin,
/obj/machinery/light/directional/west,
/turf/open/floor/wood/tile,
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"A" = (
/obj/structure/bookcase/random/reference,
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"C" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"D" = (
/obj/machinery/computer/camera_advanced,
/obj/machinery/button/door/directional/north{
name = "Admin Shutter Control";
id = "admin_shutters";
pixel_x = -7
/obj/structure/chalkboard{
pixel_y = 32
},
/turf/open/floor/carpet/executive,
/area/centcom/central_command_areas/admin/interlink)
"E" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"F" = (
/obj/machinery/door/airlock/corporate{
name = "Administrative Office"
@@ -130,21 +198,22 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"G" = (
/obj/structure/table/wood,
/obj/item/pen/fourcolor{
pixel_x = 8;
pixel_y = 3
/obj/item/flashlight/lamp/green{
pixel_x = -8;
pixel_y = 2
},
/obj/item/feather,
/obj/item/pen/fountain/captain{
pixel_y = -1;
pixel_x = 6
},
/obj/item/flashlight/lamp/green{
pixel_x = -8;
pixel_y = 2
/obj/item/pen/fourcolor{
pixel_x = 8;
pixel_y = 3
},
/turf/open/floor/carpet/executive,
/area/centcom/central_command_areas/admin/interlink)
@@ -155,20 +224,31 @@
/turf/open/floor/carpet/executive,
/area/centcom/central_command_areas/admin/interlink)
"J" = (
/obj/machinery/vending/wardrobe/cent_wardrobe,
/turf/open/floor/wood/tile,
/obj/machinery/vending/wardrobe/cent_wardrobe{
density = 0;
pixel_y = 31;
pixel_x = 6
},
/obj/machinery/vending/access/command{
pixel_x = 28;
density = 0
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"K" = (
/obj/machinery/light_switch/directional/south,
/turf/open/floor/carpet/executive,
/area/centcom/central_command_areas/admin/interlink)
"L" = (
/obj/structure/bed/dogbed,
/obj/machinery/photocopier/gratis,
/turf/open/floor/carpet/executive,
/area/centcom/central_command_areas/admin/interlink)
"M" = (
/obj/item/banner/command/mundane,
/turf/open/floor/wood/tile,
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"N" = (
/obj/structure/fireplace,
@@ -176,7 +256,10 @@
pixel_y = -5;
pixel_x = -10
},
/turf/open/floor/wood/tile,
/obj/effect/turf_decal/siding/wood/corner{
dir = 8
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"O" = (
/obj/structure/table/wood,
@@ -184,7 +267,7 @@
fax_name = "Administrative Office"
},
/obj/effect/turf_decal/siding/wood/corner,
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"P" = (
/obj/structure/table/wood,
@@ -195,7 +278,15 @@
/area/centcom/central_command_areas/admin/interlink)
"R" = (
/obj/structure/sign/flag/nanotrasen/directional/south,
/turf/open/floor/wood/tile,
/obj/structure/bed/dogbed,
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/mob/living/basic/pet/penguin/emperor/neuter{
desc = "Empress of all she surveys. No wonder the room is kept so cold though!";
name = "Pengy The Mighty"
},
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"S" = (
/obj/effect/turf_decal/siding/wood{
@@ -204,7 +295,7 @@
/obj/machinery/door/airlock/corporate,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_or_captain,
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"T" = (
/turf/open/floor/carpet/royalblack,
@@ -213,14 +304,14 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"W" = (
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
"X" = (
/obj/machinery/light_switch/directional/west,
/turf/open/floor/wood/tile,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/admin/interlink)
(1,1,1) = {"
@@ -240,8 +331,8 @@ t
(2,1,1) = {"
n
h
W
W
U
U
M
z
u
@@ -257,7 +348,7 @@ l
T
T
T
W
v
u
t
t
@@ -267,7 +358,7 @@ t
"}
(4,1,1) = {"
n
W
m
T
T
T
@@ -282,9 +373,9 @@ t
(5,1,1) = {"
n
N
W
E
b
W
E
d
n
t
@@ -296,10 +387,10 @@ t
(6,1,1) = {"
n
O
U
q
q
U
U
k
n
t
t