Skip to content

Commit

Permalink
minor mapfixes (#4232)
Browse files Browse the repository at this point in the history
adds some equipment to cs engi lockers
fixes a wall on the gauze
removes washing machine from nimbus. thrax.
moves button and door on the haboob
## Changelog

:cl:
fix: Assorted cybersun mapfixes
fix: and also two things on the haboob
/:cl:
  • Loading branch information
Erikafox authored Feb 22, 2025
1 parent 3e751e5 commit 139b559
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 28 deletions.
1 change: 0 additions & 1 deletion _maps/configs/cybersun_nimbus.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
},
"Troubleshooter": {
"outfit": "/datum/outfit/job/syndicate/miner/cybersun",
"officer": true,
"slots": 2
},
"Technician": {
Expand Down
37 changes: 27 additions & 10 deletions _maps/shuttles/cybersun/cybersun_cirrus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -997,17 +997,15 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"ia" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/trimline/transparent/syndiered/line{
dir = 6
},
/obj/effect/turf_decal/siding/wood{
color = "#E6D2BA";
dir = 1
},
/obj/item/radio/intercom/wideband/table{
pixel_x = 4;
pixel_y = -1
/obj/machinery/modular_computer/console/preset/command{
dir = 1
},
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/bridge)
Expand Down Expand Up @@ -1127,15 +1125,22 @@
dir = 1
},
/obj/item/paper_bin{
pixel_y = 6;
pixel_x = 15
pixel_y = 7;
pixel_x = 11
},
/obj/item/pen/sleepy{
pixel_y = 8;
pixel_x = 14
pixel_x = 13
},
/obj/item/modular_computer/laptop/preset/civilian{
pixel_x = -14;
pixel_y = 3
},
/obj/item/modular_computer/laptop/preset/civilian,
/obj/item/computer_hardware/card_slot,
/obj/item/radio/intercom/wideband/table{
pixel_x = 5;
pixel_y = -5
},
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/bridge)
"iq" = (
Expand Down Expand Up @@ -1251,6 +1256,10 @@
/obj/item/clothing/mask/gas/syndicate{
pixel_x = 6
},
/obj/item/healthanalyzer{
pixel_y = -9;
pixel_x = -6
},
/turf/open/floor/plasteel/dark,
/area/ship/storage/equip)
"iR" = (
Expand Down Expand Up @@ -1345,6 +1354,10 @@
/obj/item/clothing/mask/gas/syndicate{
pixel_x = 6
},
/obj/item/healthanalyzer{
pixel_y = -9;
pixel_x = -6
},
/turf/open/floor/plasteel/dark,
/area/ship/storage/equip)
"ja" = (
Expand Down Expand Up @@ -1512,7 +1525,7 @@
},
/obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag{
name = "PC-82 'Himejoshi'";
desc = "A limited production run of the \"Himehabu\" catered towards Cybersun Executives. It has an engraving of two women kissing each other across the handle."
desc = "A limited production run of the 'Himehabu' catered towards Cybersun Executives. It has an engraving of two women kissing each other across the handle."
},
/obj/item/ammo_box/magazine/m22lr_himehabu,
/obj/item/ammo_box/magazine/m22lr_himehabu,
Expand Down Expand Up @@ -3527,8 +3540,8 @@
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/bridge)
"JD" = (
/obj/structure/chair/sofa/red/corpo/right/directional/west,
/obj/item/radio/intercom/directional/west,
/obj/structure/chair/sofa/red/corpo/right/directional/east,
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/crew/ccommons)
"JF" = (
Expand Down Expand Up @@ -3914,6 +3927,10 @@
pixel_x = -12;
pixel_y = -9
},
/obj/item/clothing/suit/toggle/industrial{
pixel_x = 7;
pixel_y = -8
},
/turf/open/floor/plasteel/dark,
/area/ship/engineering/engines/port)
"Nt" = (
Expand Down
25 changes: 20 additions & 5 deletions _maps/shuttles/cybersun/cybersun_nimbus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,6 @@
pixel_y = 16;
pixel_x = -32
},
/obj/machinery/washing_machine{
pixel_y = 18;
pixel_x = 9;
density = 0
},
/turf/open/floor/suns/hatch{
color = "#E6D2BA"
},
Expand Down Expand Up @@ -978,6 +973,10 @@
pixel_x = 20;
pixel_y = -12
},
/obj/item/megaphone/command{
pixel_x = -5;
pixel_y = 5
},
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/bridge)
"sl" = (
Expand Down Expand Up @@ -1333,6 +1332,22 @@
pixel_y = 13;
pixel_x = -6
},
/obj/item/storage/backpack/industrial{
pixel_y = 5;
pixel_x = 7
},
/obj/item/clothing/suit/hazardvest{
pixel_y = 5;
pixel_x = 7
},
/obj/item/clothing/under/syndicate/gec{
pixel_x = -12;
pixel_y = -9
},
/obj/item/clothing/suit/toggle/industrial{
pixel_x = 7;
pixel_y = -8
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"xM" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/subshuttles/cybersun_bambulance.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -393,5 +393,5 @@ a
u
C
S
Y
a
"}
24 changes: 13 additions & 11 deletions _maps/shuttles/syndicate/syndicate_ngr_haboob.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
/obj/machinery/door/airlock/grunge{
dir = 4;
req_access = list(3);
name = "Armory"
},
/turf/open/floor/plasteel/dark,
/area/ship/security/armory)
"hB" = (
Expand Down Expand Up @@ -606,6 +601,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
/obj/machinery/door/airlock/grunge{
dir = 4;
req_access = list(3);
name = "Armory"
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"nB" = (
Expand Down Expand Up @@ -2132,15 +2132,17 @@
/obj/structure/table/reinforced,
/obj/machinery/light/directional/south,
/obj/machinery/button/door{
name = "Window Shutters";
name = "Cargo Shutters";
id = "haboobcargo";
pixel_x = -8;
pixel_y = 8
pixel_x = 22;
pixel_y = 8;
dir = 8
},
/obj/machinery/button/shieldwallgen{
pixel_x = 1;
pixel_y = 6;
id = "boobfield"
pixel_x = 21;
pixel_y = -1;
id = "boobfield";
dir = 8
},
/obj/item/hand_labeler{
pixel_x = 5;
Expand Down

0 comments on commit 139b559

Please sign in to comment.