Skip to content

Commit a352ad2

Browse files
authored
Haboob touchups (#4874)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Touches up the access to the armory, allowing operatives in. Replaces some 5.7 with proper ammo cans, adds an extra coat for the captain, and changes a turret placement so it hopefully stops gunning down walls. Also moves the autolathe to engineering. ## Why It's Good For The Game slight flow stuff and fixes to early unintended stuff. ## Changelog :cl: /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
1 parent 37cd3cd commit a352ad2

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

_maps/shuttles/syndicate/syndicate_ngr_haboob.dmm

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,22 @@
2222
/obj/item/ammo_box/magazine/m57_39_sidewinder,
2323
/obj/item/ammo_box/magazine/m57_39_sidewinder,
2424
/obj/item/ammo_box/magazine/m57_39_sidewinder,
25-
/obj/item/storage/box/ammo/c57x39,
26-
/obj/item/storage/box/ammo/c57x39,
27-
/obj/item/storage/box/ammo/c57x39,
28-
/obj/item/storage/box/ammo/c57x39,
2925
/obj/item/storage/toolbox/ammo/c9mm,
3026
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
3127
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
3228
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
3329
/obj/item/ammo_box/magazine/m57_39_asp,
3430
/obj/item/ammo_box/magazine/m57_39_asp,
3531
/obj/item/ammo_box/magazine/m57_39_asp,
36-
/obj/item/storage/box/ammo/c57x39,
32+
/obj/item/storage/toolbox/ammo/c57,
33+
/obj/item/gun_maint_kit{
34+
pixel_x = 13;
35+
pixel_y = -11
36+
},
37+
/obj/item/gun_maint_kit{
38+
pixel_x = -10;
39+
pixel_y = -11
40+
},
3741
/turf/open/floor/plasteel/dark,
3842
/area/ship/security/armory)
3943
"ap" = (
@@ -609,7 +613,7 @@
609613
},
610614
/obj/machinery/door/airlock/grunge{
611615
dir = 4;
612-
req_access = list(3);
616+
req_access = list(1);
613617
name = "Armory"
614618
},
615619
/turf/open/floor/plasteel/tech/grid,
@@ -1219,19 +1223,15 @@
12191223
/obj/effect/turf_decal/corner/opaque/beige{
12201224
dir = 1
12211225
},
1222-
/obj/machinery/computer/crew{
1226+
/obj/machinery/airalarm/directional/south,
1227+
/obj/machinery/modular_computer/console/preset/command{
12231228
dir = 8;
12241229
icon_state = "computer-right"
12251230
},
1226-
/obj/machinery/airalarm/directional/south,
12271231
/turf/open/floor/plasteel/mono/dark,
12281232
/area/ship/bridge)
12291233
"ys" = (
1230-
/obj/machinery/autolathe,
12311234
/obj/machinery/airalarm/directional/south,
1232-
/obj/item/stack/sheet/metal/ten,
1233-
/obj/item/stack/sheet/glass/five,
1234-
/obj/item/stack/sheet/glass/five,
12351235
/obj/effect/decal/cleanable/dirt/dust,
12361236
/turf/open/floor/plasteel/tech,
12371237
/area/ship/cargo)
@@ -1734,8 +1734,8 @@
17341734
},
17351735
/obj/effect/turf_decal/corner/opaque/red/half,
17361736
/obj/structure/table,
1737-
/obj/machinery/recharger,
17381737
/obj/machinery/light/directional/north,
1738+
/obj/machinery/recharger,
17391739
/turf/open/floor/plasteel/dark,
17401740
/area/ship/security/armory)
17411741
"JP" = (
@@ -2284,6 +2284,11 @@
22842284
/obj/item/megaphone,
22852285
/obj/item/computer_hardware/card_slot,
22862286
/obj/item/modular_computer/tablet/preset/cheap,
2287+
/obj/item/clothing/suit/armor/ngr/lieutenant,
2288+
/obj/item/storage/box/ammo/c57x39{
2289+
pixel_x = -8;
2290+
pixel_y = -9
2291+
},
22872292
/turf/open/floor/plasteel/mono/dark,
22882293
/area/ship/bridge)
22892294
"QJ" = (
@@ -2416,6 +2421,10 @@
24162421
dir = 4
24172422
},
24182423
/obj/machinery/firealarm/directional/south,
2424+
/obj/machinery/autolathe,
2425+
/obj/item/stack/sheet/glass/five,
2426+
/obj/item/stack/sheet/glass/five,
2427+
/obj/item/stack/sheet/metal/ten,
24192428
/turf/open/floor/pod/dark,
24202429
/area/ship/engineering)
24212430
"TH" = (
@@ -3271,7 +3280,7 @@ Fq
32713280
Fq
32723281
Fq
32733282
Fq
3274-
EB
32753283
VX
3284+
EB
32763285
Fq
32773286
"}

0 commit comments

Comments
 (0)