Skip to content

Commit

Permalink
HEEEEEEEEEELP
Browse files Browse the repository at this point in the history
  • Loading branch information
@Imaginos16
Imaginos16 committed Jun 11, 2024
1 parent 63b2ff9 commit cc9c974
Show file tree
Hide file tree
Showing 20 changed files with 286 additions and 79 deletions.
4 changes: 2 additions & 2 deletions _maps/configs/syndicate_gorlex_komodo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
"outfit": "/datum/outfit/job/syndicate/engineer/gorlex",
"slots": 1
},
"Trooper": {
Expand All @@ -45,7 +45,7 @@
"slots": 2
},
"Bridge Officer": {
"outfit": "/datum/outfit/job/syndicate/head_of_personnel",
"outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun",
"slots": 1
}
},
Expand Down
86 changes: 43 additions & 43 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,16 @@
/turf/open/floor/plating/rust,
/area/ship/maintenance/starboard)
"dD" = (
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/mask/gas/syndicate,
/obj/effect/turf_decal/techfloor{
dir = 10
},
/obj/item/clothing/head/beret/black,
/obj/item/clothing/under/syndicate,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/hardliners,
/turf/open/floor/mineral/plastitanium,
/area/ship/hallway/central)
"dG" = (
Expand Down Expand Up @@ -372,21 +371,21 @@
pixel_x = -12;
pixel_y = 7
},
/obj/item/clothing/under/syndicate/sniper,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/suit/armor/vest/duster,
/obj/structure/closet/secure_closet/wall/directional/south{
icon_state = "sec_wall";
name = "Bridge Officer's Locker";
req_access_txt = "57"
},
/obj/item/melee/classic_baton/telescopic,
/obj/item/clothing/neck/chameleon,
/obj/item/radio/headset/syndicate,
/obj/item/megaphone{
pixel_x = -2
},
/obj/item/clothing/under/syndicate/cybersun/officer,
/obj/item/clothing/suit/cybersun_suit,
/obj/item/clothing/head/HoS/cybersun,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"eN" = (
Expand Down Expand Up @@ -653,12 +652,10 @@
dir = 1;
layer = 2.8
},
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/mask/gas/syndicate,
/obj/effect/turf_decal/techfloor{
dir = 8
},
/obj/item/clothing/under/syndicate,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
Expand All @@ -668,6 +665,8 @@
pixel_x = -23;
pixel_y = 4
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/hardliners,
/turf/open/floor/mineral/plastitanium,
/area/ship/hallway/central)
"hk" = (
Expand Down Expand Up @@ -1156,8 +1155,6 @@
/obj/structure/closet/wall/orange/directional/south{
name = "Engineering locker"
},
/obj/item/clothing/under/syndicate/coldres,
/obj/item/clothing/suit/toggle/industrial,
/obj/item/clothing/shoes/workboots,
/obj/item/clothing/head/welding,
/obj/item/clothing/head/hardhat/red,
Expand All @@ -1174,6 +1171,8 @@
/obj/structure/cable{
icon_state = "1-4"
},
/obj/item/clothing/under/syndicate/hardliners,
/obj/item/clothing/suit/hazardvest/hardliners,
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"ls" = (
Expand Down Expand Up @@ -2880,23 +2879,19 @@
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/c10mm,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/suit/armor/vest/leather{
desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of the Gorlex Marauders."
},
/obj/item/clothing/mask/gas/sechailer/swat,
/obj/item/clothing/head/HoS/beret/syndicate,
/obj/structure/closet/secure_closet/wall/directional/west{
icon_state = "sec_wall";
name = "Sergeant's Locker";
req_access_txt = "58"
},
/obj/item/melee/classic_baton/telescopic,
/obj/item/clothing/suit/armor/vest/blueshirt,
/obj/item/clothing/under/syndicate/combat,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/accessory/holster,
/obj/item/clothing/shoes/combat,
/obj/item/radio/headset/syndicate,
/obj/item/clothing/under/syndicate/hardliners/officer,
/obj/item/clothing/suit/armor/hardliners/sergeant,
/obj/item/clothing/head/hardliners/peaked,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"AS" = (
Expand Down Expand Up @@ -3124,18 +3119,17 @@
name = "captain's locker";
req_access_txt = "20"
},
/obj/item/clothing/under/syndicate/combat,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/glasses/thermal/eyepatch,
/obj/item/clothing/head/HoS/beret/syndicate,
/obj/item/clothing/head/HoS/syndicate,
/obj/item/gun/ballistic/revolver,
/obj/item/clothing/under/syndicate/sniper,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/radio/headset/syndicate/alt/leader,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/hardliners/officer,
/obj/item/clothing/suit/toggle/armor/vest/hardliners,
/obj/item/clothing/head/hardliners/peaked,
/turf/open/floor/carpet/black,
/area/ship/bridge)
"El" = (
Expand Down Expand Up @@ -3347,7 +3341,6 @@
},
/area/ship/maintenance/starboard)
"GD" = (
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/mask/gas/syndicate,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
Expand All @@ -3356,11 +3349,12 @@
dir = 9
},
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/under/syndicate/gorlex,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/hardliners,
/turf/open/floor/mineral/plastitanium,
/area/ship/hallway/central)
"GJ" = (
Expand Down Expand Up @@ -3845,7 +3839,6 @@
/turf/open/floor/mineral/plastitanium,
/area/ship/hallway/aft)
"Lb" = (
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/neck/scarf/red,
/obj/item/clothing/mask/bandana/skull,
/obj/item/clothing/mask/gas/syndicate,
Expand All @@ -3855,11 +3848,12 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
/obj/item/clothing/under/utility,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/hardliners/jumpsuit,
/turf/open/floor/mineral/plastitanium,
/area/ship/hallway/central)
"Lj" = (
Expand Down Expand Up @@ -4064,21 +4058,16 @@
/obj/effect/turf_decal/techfloor{
dir = 9
},
/obj/item/clothing/under/syndicate/skirt,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/hardliners/jumpsuit,
/turf/open/floor/mineral/plastitanium,
/area/ship/hallway/central)
"Ni" = (
/obj/effect/turf_decal/industrial/warning,
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/head/helmet/operator,
/obj/item/clothing/head/helmet/operator,
/obj/item/clothing/head/helmet/operator,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
Expand All @@ -4090,9 +4079,21 @@
name = "Armor Locker";
req_access_txt = "1"
},
/obj/item/storage/belt/military,
/obj/item/storage/belt/military,
/obj/item/storage/belt/military,
/obj/item/clothing/suit/armor/hardliners/jacket,
/obj/item/clothing/suit/armor/hardliners/jacket,
/obj/item/clothing/suit/armor/hardliners/jacket,
/obj/item/clothing/suit/armor/hardliners,
/obj/item/clothing/suit/armor/hardliners,
/obj/item/clothing/suit/armor/hardliners,
/obj/item/clothing/head/helmet/hardliners,
/obj/item/clothing/head/helmet/hardliners,
/obj/item/clothing/head/helmet/hardliners,
/obj/item/storage/belt/security/webbing/hardliners,
/obj/item/storage/belt/security/webbing/hardliners,
/obj/item/storage/belt/security/webbing/hardliners,
/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
/turf/open/floor/mineral/plastitanium/red,
/area/ship/security/armory)
"Nj" = (
Expand Down Expand Up @@ -4271,7 +4272,6 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/cargo)
"PE" = (
/obj/structure/chair/comfy,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/trimline/transparent/bar/filled/line{
dir = 8
Expand All @@ -4281,6 +4281,7 @@
pixel_y = -1
},
/obj/machinery/airalarm/directional/west,
/obj/structure/chair/comfy/red,
/turf/open/floor/mineral/plastitanium,
/area/ship/crew/canteen)
"PG" = (
Expand Down Expand Up @@ -5096,17 +5097,17 @@
/area/ship/hallway/central)
"WQ" = (
/obj/structure/railing,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/mask/gas/syndicate,
/obj/effect/turf_decal/techfloor{
dir = 8
},
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/under/syndicate/gorlex,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/hardliners,
/turf/open/floor/mineral/plastitanium,
/area/ship/hallway/central)
"WR" = (
Expand Down Expand Up @@ -5426,12 +5427,8 @@
/obj/structure/cable{
icon_state = "1-8"
},
/obj/item/clothing/under/utility,
/obj/item/clothing/suit/longcoat/roboblack,
/obj/item/clothing/suit/apron/surgical,
/obj/item/clothing/neck/stethoscope,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/head/beret/black,
/obj/item/clothing/gloves/color/latex/nitrile/evil{
pixel_x = 1;
pixel_y = -3
Expand All @@ -5442,6 +5439,9 @@
pixel_x = -3;
pixel_y = 3
},
/obj/item/clothing/suit/hardliners,
/obj/item/clothing/head/hardliners,
/obj/item/clothing/under/syndicate/hardliners,
/turf/open/floor/mineral/plastitanium,
/area/ship/medical)
"Zy" = (
Expand Down
Loading

0 comments on commit cc9c974

Please sign in to comment.