Skip to content

Commit

Permalink
[MIRROR] Move punitelli to safer spawns
Browse files Browse the repository at this point in the history
  • Loading branch information
@SierraKomodo @SuhEugene
SierraKomodo authored and SuhEugene committed Jan 7, 2024
1 parent a7b0e91 commit edc8f13
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 69 deletions.
8 changes: 4 additions & 4 deletions maps/torch/torch1_deck5.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5007,9 +5007,9 @@
},
/obj/structure/window/reinforced,
/obj/machinery/door/window/northright{
autoset_access = 0;
name = "suit storage";
req_access = list("ACCESS_MINING");
autoset_access = 0
req_access = list("ACCESS_MINING")
},
/obj/item/rig/industrial/equipped,
/obj/structure/window/reinforced{
Expand Down Expand Up @@ -8724,8 +8724,8 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Canister Storage";
autoset_access = 0;
name = "Canister Storage";
req_access = list("ACCESS_TOX_STORAGE")
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
Expand Down Expand Up @@ -8785,8 +8785,8 @@
"tj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Canister Storage";
autoset_access = 0;
name = "Canister Storage";
req_access = list("ACCESS_TOX_STORAGE")
},
/obj/machinery/atmospherics/pipe/simple/hidden{
Expand Down
22 changes: 15 additions & 7 deletions maps/torch/torch2_deck4.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/head/deck4)
"dI" = (
Expand Down Expand Up @@ -4100,6 +4101,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/laundry)
"nZ" = (
Expand Down Expand Up @@ -4390,6 +4392,11 @@
/obj/random/soap,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/laundry)
"pj" = (
/obj/structure/table/standard,
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled,
/area/crew_quarters/diplomatic_office)
"pl" = (
/obj/floor_decal/industrial/outline/grey,
/obj/machinery/suit_storage_unit/standard_unit,
Expand Down Expand Up @@ -5213,6 +5220,7 @@
},
/obj/floor_decal/industrial/outline/yellow,
/obj/catwalk_plated,
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/plating,
/area/storage/primary)
"sw" = (
Expand Down Expand Up @@ -7327,8 +7335,8 @@
},
/obj/structure/table/woodentable/walnut,
/obj/item/storage/box/silverware{
pixel_y = 10;
pixel_x = -3
pixel_x = -3;
pixel_y = 10
},
/obj/item/storage/box/silverware{
pixel_x = -3;
Expand Down Expand Up @@ -16326,12 +16334,12 @@
},
/obj/structure/table/woodentable/walnut,
/obj/item/reagent_containers/food/drinks/bottle/premiumwine{
pixel_y = 15;
pixel_x = -6
pixel_x = -6;
pixel_y = 15
},
/obj/item/reagent_containers/food/drinks/bottle/tadmorwine{
pixel_y = 15;
pixel_x = 3
pixel_x = 3;
pixel_y = 15
},
/obj/item/reagent_containers/food/drinks/bottle/champagne{
pixel_x = -6;
Expand Down Expand Up @@ -29173,7 +29181,7 @@ tv
tv
LZ
PY
PY
pj
PY
Ct
Oh
Expand Down
91 changes: 57 additions & 34 deletions maps/torch/torch3_deck3.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/gym)
"bx" = (
Expand Down Expand Up @@ -5164,6 +5165,7 @@
},
/obj/floor_decal/industrial/outline/yellow,
/obj/machinery/hologram/holopad,
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/safe_room/thirddeck)
"lE" = (
Expand Down Expand Up @@ -8106,6 +8108,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/lino,
/area/crew_quarters/office)
"sI" = (
Expand Down Expand Up @@ -9607,6 +9610,7 @@
dir = 8;
pixel_x = 21
},
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/sleep/bunk)
"wY" = (
Expand Down Expand Up @@ -12076,6 +12080,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/service_break_room)
"DU" = (
Expand Down Expand Up @@ -13869,34 +13874,52 @@
/turf/simulated/floor/tiled/techfloor,
/area/hallway/primary/thirddeck/fore)
"ID" = (
/obj/random_multi/single_item/punitelly,
/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled,
/area/vacant/brig)
/area/crew_quarters/gym)
"IE" = (
/obj/random_multi/single_item/punitelly,
/turf/simulated/floor/plating,
/area/maintenance/thirddeck/starboard)
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/carpet,
/area/crew_quarters/recreation)
"IF" = (
/obj/structure/sign/poster/torch,
/turf/simulated/wall/prepainted,
/area/crew_quarters/recreation)
"IH" = (
/obj/structure/table/steel,
/obj/random_multi/single_item/punitelly,
/turf/simulated/floor/tiled/dark,
/area/vacant/cabin)
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/head)
"II" = (
/obj/random_multi/single_item/punitelly,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/dark,
/area/vacant/cabin)
/area/chapel/main)
"IJ" = (
/obj/random_multi/single_item/punitelly,
/obj/structure/railing/mapped{
dir = 4;
icon_state = "railing0-1"
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/thirddeck/aftport)
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"IK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -16149,7 +16172,6 @@
/turf/simulated/floor/tiled,
/area/hallway/primary/thirddeck/fore)
"NO" = (
/obj/random_multi/single_item/punitelly,
/obj/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/vacant/mess)
Expand Down Expand Up @@ -16262,12 +16284,12 @@
pixel_y = 10
},
/obj/item/reagent_containers/glass/rag{
pixel_y = 4;
pixel_x = -3
pixel_x = -3;
pixel_y = 4
},
/obj/item/reagent_containers/glass/rag{
pixel_y = 4;
pixel_x = 3
pixel_x = 3;
pixel_y = 4
},
/obj/machinery/light{
dir = 8
Expand Down Expand Up @@ -16325,6 +16347,7 @@
},
/obj/structure/table/standard,
/obj/random_multi/single_item/runtime,
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/mess)
"Om" = (
Expand Down Expand Up @@ -17133,7 +17156,6 @@
dir = 1;
pixel_y = -22
},
/obj/random_multi/single_item/punitelly,
/obj/machinery/portable_atmospherics/powered/scrubber,
/obj/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/techfloor,
Expand Down Expand Up @@ -18388,6 +18410,7 @@
dir = 4
},
/obj/random/date_based/christmas/tree/fountain,
/obj/random_multi/single_item/punitelli,
/turf/simulated/floor/wood/walnut,
/area/crew_quarters/observation)
"Ui" = (
Expand Down Expand Up @@ -31203,7 +31226,7 @@ mS
pF
zj
pH
jb
ID
Wb
jb
ur
Expand Down Expand Up @@ -32631,7 +32654,7 @@ CF
CF
My
qu
qu
IE
qu
uC
IF
Expand Down Expand Up @@ -37487,7 +37510,7 @@ vW
yd
yW
vW
vW
IJ
vW
vW
Dd
Expand Down Expand Up @@ -39706,7 +39729,7 @@ cV
uU
fo
YK
YK
IH
gK
TZ
hL
Expand Down Expand Up @@ -41492,18 +41515,18 @@ ae
aq
ao
We
ID
ae
ag
az
ag
ag
aE
IE
aY
aY
PP
cl
dd
IE
aY
cl
da
dD
Expand Down Expand Up @@ -42141,7 +42164,7 @@ Ov
JV
ub
ED
II
Fj
FN
ub
ko
Expand Down Expand Up @@ -43958,7 +43981,7 @@ Do
DZ
ub
Fk
IH
FN
Gm
GO
ub
Expand Down Expand Up @@ -44567,7 +44590,7 @@ ED
ub
ub
ub
IJ
Tk
Tk
jZ
jZ
Expand Down Expand Up @@ -44757,7 +44780,7 @@ vn
Eh
Mj
uq
Mj
II
XY
WA
ZW
Expand Down
Loading

0 comments on commit edc8f13

Please sign in to comment.