From a18ae7f48f7317ffef728752a3af33f7fbad736b Mon Sep 17 00:00:00 2001 From: Moff Date: Mon, 11 Nov 2024 16:40:55 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=95-=D0=B2=D0=BE=D0=BE=D1=80=D1=83?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=9A=D0=BE=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=B8=20=D0=9A=D0=B0=D1=83.=20=20=D0=9F=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BE=D1=81=D0=BC=D1=8B=D1=81=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=AD=D0=BB=D0=B5=D0=B3=D0=B8=D0=B8=20=D0=98=20=D0=A2?= =?UTF-8?q?=D0=B8=D1=80=D0=B4=D1=80=D0=BE=D0=BF=D0=B0..=20=D0=91=D0=BE?= =?UTF-8?q?=D0=BB=D0=B5=D0=B5=20=D1=87=D0=B8=D1=81=D1=82=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20(#1175)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * РЕ-вооружение Тирдропа и Синдиката. Исследовательская Элегия.. * микрофикс, кэпа с маленькой написал) --- .../configs/nanotrasen_teardrop.json | 18 +- .../configs/syndicate_elegia.json | 18 +- .../nanotrasen/nanotrasen_teardrop.dmm | 162 ++++++------ .../shuttles/syndicate/syndicate_elegia.dmm | 247 ++++++++++-------- .../syndicate/syndicate_gorlex_komodo.dmm | 43 +-- .../syndicate/syndicate_kau_delta.dmm | 105 +++++--- .../outfit/code/syndicate/syndi_outfit.dm | 13 + 7 files changed, 341 insertions(+), 265 deletions(-) diff --git a/_maps/_mod_celadon/configs/nanotrasen_teardrop.json b/_maps/_mod_celadon/configs/nanotrasen_teardrop.json index a37ffc13c467..d8b42069f965 100644 --- a/_maps/_mod_celadon/configs/nanotrasen_teardrop.json +++ b/_maps/_mod_celadon/configs/nanotrasen_teardrop.json @@ -6,10 +6,10 @@ "map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm", "enabled": true, "limit": 1, - "prefix": "NTASV", + "prefix": "NTSPSV", "faction": "/datum/faction/nt", "tags": [ - "Combat", + "Intelligence", "Scout" ], "namelists": [ @@ -17,27 +17,23 @@ "WEAPONS" ], "job_slots": { - "Lieutenant": { + "Intelligence officer": { "outfit": "/datum/outfit/job/nanotrasen/captain/lp", "officer": true, "slots": 1 - }, - "Flight group commander": { - "outfit": "/datum/outfit/job/nanotrasen/hos", - "officer": true, - "slots": 1 + } }, "Military technician": { "outfit": "/datum/outfit/job/nanotrasen/engineer/lp", "slots": 2 }, - "Flight group officer": { + "Scout": { "outfit": "/datum/outfit/job/nanotrasen/security/lp", - "slots": 3 + "slots": 4 }, "Military surgeon": { "outfit": "/datum/outfit/job/nanotrasen/paramedic", "slots": 1 } } -} + diff --git a/_maps/_mod_celadon/configs/syndicate_elegia.json b/_maps/_mod_celadon/configs/syndicate_elegia.json index 67b127cfcbf0..2d9ec98f0f1f 100644 --- a/_maps/_mod_celadon/configs/syndicate_elegia.json +++ b/_maps/_mod_celadon/configs/syndicate_elegia.json @@ -1,20 +1,16 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", - "map_name": "Elegia-class Battle Schnau", + "map_name": "Elegia-class Explorer Schnau", "map_short_name": "Elegia", - "description": "Боевой шахтёрский корвет под названием Elegia предназначен для диверсионных патрульных заданий, где он может находиться длительное время на самообеспечении. Основной целью является подрыв исследовательских и шахтёрских миссий NT. Для этого он оснащен шахтёрским инвентарём, боевым оружием и средствами стабилизации полевых оперативников.", + "description": "Исследовательский корвет под названием Элегия предназначен для исследовательских задач, ведь он может находиться длительное время на самообеспечении. Основной целью является исследование планет и фауны. Для этого он оснащен шахтёрским инвентарём, боевым оружием и средствами стабилизации полевых оперативников, а также специальным медицинским боргом Синдиката.", "map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm", "enabled": true, "limit": 1, - "prefix": "BSSV", + "prefix": "SSV", "faction": "/datum/faction/syndicate", - "tags": ["Шахтёрский", "Боевой"], + "tags": ["Исследовательский"], "namelists": [ - "GORLEX", - "NATURAL_AGGRESSIVE", - "BEASTS", - "WEAPONS" - ], + "CYBERSUN"], "job_slots": { "Captain": { "outfit": "/datum/outfit/job/syndicate/captain/gorlex", @@ -30,8 +26,8 @@ "slots": 1 }, - "Trooper": { - "outfit": "/datum/outfit/job/syndicate/security/gorlex", + "Cybersun scientist": { + "outfit": "/datum/outfit/job/syndicate/science/cybersun", "slots": 2 }, "Wrecker": { diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm index 13455847bb3f..fa9e1129177b 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm @@ -48,15 +48,17 @@ "aZ" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/corner/opaque/blue/mono, -/obj/structure/closet/crate/secure/weapon{ - req_access_txt = "1" +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/blue{ + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75) }, -/obj/item/melee/knife/survival, -/obj/item/melee/knife/survival, -/obj/item/melee/knife/survival, -/obj/item/melee/knife/survival, -/obj/machinery/syndicatebomb/training, -/mob/living/simple_animal/bot/secbot/beepsky/jr, +/obj/item/clothing/head/helmet/space/syndicate/black{ + pixel_x = 0; + pixel_y = 7; + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75) + }, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/white, /area/ship/cargo) "bc" = ( @@ -113,7 +115,6 @@ name = "\proper captain's locker"; req_access_txt = "20" }, -/obj/item/gun/energy/e_gun/hos/brazil/true, /obj/item/clothing/suit/armor/laserproof, /obj/item/screwdriver/nuke, /obj/item/radio/headset/heads/captain/alt, @@ -122,6 +123,7 @@ /obj/item/stock_parts/cell/gun/upgraded, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/megaphone/command, +/obj/item/binoculars, /turf/open/floor/carpet/royalblack, /area/ship/crew/dorm/dormtwo) "bx" = ( @@ -784,9 +786,6 @@ /area/ship/security) "jj" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/security, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/tank/jetpack/carbondioxide, /obj/machinery/light/directional/west, /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 10 @@ -794,6 +793,9 @@ /obj/effect/turf_decal/techfloor{ dir = 1 }, +/obj/item/clothing/suit/armor/vest/marine/medium{ + armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50) + }, /turf/open/floor/plasteel/white, /area/ship/security) "jn" = ( @@ -972,11 +974,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white, /area/ship/security) -"lM" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/bridge) "lN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/poddoor{ @@ -1132,6 +1129,17 @@ "mK" = ( /obj/effect/turf_decal/corner/opaque/blue/mono, /obj/machinery/newscaster/directional/west, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/blue{ + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75) + }, +/obj/item/clothing/head/helmet/space/syndicate/black{ + pixel_x = 0; + pixel_y = 7; + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75) + }, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/white, /area/ship/cargo) "mO" = ( @@ -1348,6 +1356,9 @@ /obj/effect/turf_decal/techfloor, /obj/item/clothing/under/nanotrasen/officer, /obj/item/clothing/head/beret/sec/officer, +/obj/item/clothing/head/helmet/swat/nanotrasen{ + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) + }, /turf/open/floor/plasteel/white, /area/ship/security) "ot" = ( @@ -1549,7 +1560,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/kirbyplants/random, +/obj/structure/displaycase/captain{ + req_access = list(68) + }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormtwo) "qn" = ( @@ -1982,6 +1995,9 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/clothing/under/nanotrasen/officer, /obj/item/clothing/head/beret/sec/officer, +/obj/item/clothing/head/helmet/swat/nanotrasen{ + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) + }, /turf/open/floor/plasteel/white, /area/ship/security) "vZ" = ( @@ -2740,12 +2756,13 @@ /area/ship/hallway/central) "Dt" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/security, -/obj/item/tank/jetpack/carbondioxide, /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 5 }, /obj/effect/turf_decal/techfloor, +/obj/item/clothing/suit/armor/vest/marine/medium{ + armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50) + }, /turf/open/floor/plasteel/white, /area/ship/security) "DD" = ( @@ -2760,15 +2777,15 @@ /area/ship/medical) "DM" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/security, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/tank/jetpack/carbondioxide, /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 10 }, /obj/effect/turf_decal/techfloor{ dir = 1 }, +/obj/item/clothing/suit/armor/vest/marine/medium{ + armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50) + }, /turf/open/floor/plasteel/white, /area/ship/security) "DN" = ( @@ -2828,13 +2845,17 @@ /area/ship/hallway/central) "Eg" = ( /obj/effect/turf_decal/corner/opaque/blue/mono, -/obj/item/storage/bag/ore, -/obj/item/pickaxe/drill, -/obj/item/pickaxe, -/obj/item/mining_scanner, -/obj/item/mining_scanner, -/obj/item/storage/bag/ore, -/obj/item/gun/energy/plasmacutter, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/blue{ + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75) + }, +/obj/item/clothing/head/helmet/space/syndicate/black{ + pixel_x = 0; + pixel_y = 7; + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75) + }, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/white, /area/ship/cargo) "Eh" = ( @@ -2979,6 +3000,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/corner/opaque/solgovblue/mono, +/mob/living/simple_animal/bot/secbot/beepsky/jr, /turf/open/floor/plasteel/white, /area/ship/cargo) "Gk" = ( @@ -3094,6 +3116,9 @@ }, /obj/item/clothing/under/nanotrasen/security/director, /obj/item/clothing/head/beret/sec/hos, +/obj/item/clothing/head/helmet/swat/nanotrasen{ + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) + }, /turf/open/floor/plasteel/white, /area/ship/security) "HL" = ( @@ -3301,6 +3326,7 @@ pixel_x = -8; pixel_y = 12 }, +/obj/item/binoculars, /turf/open/floor/plasteel/white, /area/ship/bridge) "KE" = ( @@ -3339,10 +3365,6 @@ /obj/item/ammo_box/magazine/gauss, /obj/item/stock_parts/cell/gun, /obj/item/stock_parts/cell/gun, -/obj/item/stock_parts/cell/gun, -/obj/item/stock_parts/cell/gun, -/obj/item/stock_parts/cell/gun, -/obj/item/stock_parts/cell/gun, /obj/item/screwdriver/nuke, /obj/item/screwdriver, /obj/item/screwdriver, @@ -3353,6 +3375,11 @@ /obj/effect/turf_decal/techfloor{ dir = 1 }, +/obj/item/stock_parts/cell/gun, +/obj/item/stock_parts/cell/gun, +/obj/item/ammo_box/a300_box, +/obj/item/ammo_box/a300, +/obj/item/ammo_box/a300, /turf/open/floor/plasteel/white, /area/ship/security) "KX" = ( @@ -3596,6 +3623,7 @@ /obj/item/documents/nanotrasen{ pixel_y = 6 }, +/obj/item/toy/plush/beeplushie, /turf/open/floor/carpet/royalblack, /area/ship/crew/dorm/dormtwo) "NW" = ( @@ -3807,6 +3835,9 @@ /obj/effect/turf_decal/techfloor, /obj/item/clothing/under/nanotrasen/officer, /obj/item/clothing/head/beret/sec/officer, +/obj/item/clothing/head/helmet/swat/nanotrasen{ + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) + }, /turf/open/floor/plasteel/white, /area/ship/security) "PZ" = ( @@ -3878,7 +3909,6 @@ /obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/mask/gas/sechailer/swat, /obj/item/clothing/suit/space/hardsuit/swat/captain, -/obj/item/toy/plush/beeplushie, /turf/open/floor/carpet/royalblack, /area/ship/crew/dorm/dormtwo) "QF" = ( @@ -3925,8 +3955,14 @@ /area/ship/hallway/central) "Rc" = ( /obj/effect/turf_decal/corner/opaque/solgovblue/mono, +/obj/item/gun/energy/plasmacutter, +/obj/item/storage/bag/ore, +/obj/item/mining_scanner, +/obj/item/mining_scanner, +/obj/item/pickaxe, +/obj/item/pickaxe/drill, +/obj/item/storage/bag/ore, /obj/structure/closet/crate/large, -/obj/mecha/combat/tanklp, /turf/open/floor/plasteel/white, /area/ship/cargo) "Ro" = ( @@ -4183,42 +4219,22 @@ anchored = 1; req_access_txt = "1" }, -/obj/item/gun/energy/kalix/pgf{ - desc = "An advanced variant of the BG-12, the BG-16 is the military-grade beam gun designed and manufactured by NanoTrasen as the standard-issue close-range weapon of the NT."; - name = "NanoTrasen BG-16"; - manufacturer = "the Nanotrasen logo"; - pixel_y = 12; - cell_type = /obj/item/stock_parts/cell/gun - }, -/obj/item/gun/energy/kalix/pgf{ - desc = "An advanced variant of the BG-12, the BG-16 is the military-grade beam gun designed and manufactured by NanoTrasen as the standard-issue close-range weapon of the NT."; - name = "NanoTrasen BG-16"; - manufacturer = "the Nanotrasen logo"; - pixel_y = 8; - cell_type = /obj/item/stock_parts/cell/gun - }, -/obj/item/gun/energy/kalix/pgf{ - desc = "An advanced variant of the BG-12, the BG-16 is the military-grade beam gun designed and manufactured by NanoTrasen as the standard-issue close-range weapon of the NT."; - name = "NanoTrasen BG-16"; - manufacturer = "the Nanotrasen logo"; - pixel_y = 4; - cell_type = /obj/item/stock_parts/cell/gun +/obj/item/gun/ballistic/rifle/scout{ + pixel_x = -5; + pixel_y = 8 }, -/obj/item/gun/energy/kalix/pgf{ - desc = "An advanced variant of the BG-12, the BG-16 is the military-grade beam gun designed and manufactured by NanoTrasen as the standard-issue close-range weapon of the NT."; - name = "NanoTrasen BG-16"; - manufacturer = "the Nanotrasen logo"; - cell_type = /obj/item/stock_parts/cell/gun +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/kinetic_accelerator/crossbow/large{ + pixel_x = 0; + pixel_y = -5 }, -/obj/item/gun/energy/ionrifle/carbine{ - pixel_y = -7 +/obj/item/gun/energy/disabler{ + pixel_x = 0; + pixel_y = -14 }, -/obj/item/gun/energy/kalix/pgf/heavy{ - cell_type = /obj/item/stock_parts/cell/gun; - name = "NanoTrasen HBG-7"; - desc = "The HBG-7 is the standard-issue rifle weapon of the NanoTrasen. If the stopping power and fire rate isn't enough, it comes with a DMR mode that has greater armor piercing for dealing with armored targets."; - manufacturer = "the Nanotrasen logo"; - pixel_y = -10 +/obj/item/gun/energy/disabler{ + pixel_x = 0; + pixel_y = -9 }, /turf/open/floor/plasteel/mono/dark, /area/ship/security) @@ -4572,13 +4588,13 @@ "Yj" = ( /obj/machinery/light/directional/west, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/mask/gas/clown_hat, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/clothing/suit/space/hardsuit/security/hos, /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 5 }, /obj/effect/turf_decal/techfloor, +/obj/item/clothing/suit/armor/vest/marine/medium{ + armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50) + }, /turf/open/floor/plasteel/white, /area/ship/security) "Yn" = ( @@ -5507,7 +5523,7 @@ JZ cv cv hw -lM +cv vZ cv cv diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm index a0397400e791..2e4cc4b0dd84 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_elegia.dmm @@ -63,10 +63,14 @@ /turf/open/floor/carpet/black, /area/ship/bridge) "cd" = ( -/obj/machinery/computer/mech_bay_power_console{ - dir = 1 +/obj/structure/table/reinforced, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_x = 1; + pixel_y = 1 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/circuit, /area/ship/science/robotics) "ci" = ( /obj/effect/turf_decal/industrial/warning/fulltile, @@ -132,9 +136,19 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "cR" = ( -/obj/machinery/mech_bay_recharge_port, /obj/machinery/airalarm/directional/south, -/turf/open/floor/mineral/plastitanium/red, +/obj/structure/table/reinforced, +/obj/item/circuitboard/aicore{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/stack/cable_coil/red{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/turf/open/floor/circuit, /area/ship/science/robotics) "cU" = ( /obj/structure/cable{ @@ -239,13 +253,9 @@ /turf/open/floor/carpet/red_gold, /area/ship/bridge) "dV" = ( -/obj/machinery/mineral/ore_redemption{ - output_dir = 4; - dir = 4; - input_dir = 4 - }, /obj/machinery/light/directional/west, -/turf/open/floor/plasteel/tech, +/obj/machinery/mech_bay_recharge_port, +/turf/open/floor/mineral/plastitanium/red, /area/ship/cargo) "ec" = ( /obj/structure/cable{ @@ -287,7 +297,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/effect/turf_decal/corner/transparent/purple/border, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, @@ -321,12 +330,9 @@ /area/ship/maintenance/port) "fw" = ( /obj/effect/turf_decal/corner/transparent/purple/mono, -/obj/structure/table/reinforced, -/obj/machinery/cell_charger{ - pixel_x = -1; - pixel_y = 2 +/obj/machinery/computer/rdconsole{ + dir = 1 }, -/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel/tech, /area/ship/science) "fH" = ( @@ -396,10 +402,13 @@ /area/ship/medical) "hE" = ( /obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/corner/transparent/purple/mono, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/turf_decal/corner/transparent/purple/border{ + icon_state = "bordercolor"; + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/science) "hS" = ( @@ -442,9 +451,6 @@ pixel_y = 12; dir = 4 }, -/obj/structure/rack, -/obj/item/clothing/glasses/hud/diagnostic, -/obj/item/weldingtool/hugetank, /turf/open/floor/mineral/plastitanium, /area/ship/science/robotics) "io" = ( @@ -487,14 +493,7 @@ /area/ship/bridge) "jb" = ( /obj/structure/table/reinforced, -/obj/item/clothing/glasses/hud/diagnostic/sunglasses, -/obj/item/assembly/flash, -/obj/item/assembly/prox_sensor, /obj/machinery/light/directional/west, -/obj/item/analyzer{ - pixel_x = -2; - pixel_y = 3 - }, /obj/effect/turf_decal/corner/transparent/purple/mono, /obj/machinery/button/door{ dir = 1; @@ -502,9 +501,10 @@ name = "Windows"; pixel_y = -24 }, -/obj/item/assembly/signaler{ - pixel_x = 11; - pixel_y = 10 +/obj/item/stock_parts/cell/high/plus, +/obj/machinery/cell_charger{ + pixel_x = -1; + pixel_y = 2 }, /turf/open/floor/plasteel/tech, /area/ship/science) @@ -577,7 +577,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plasteel/tech, +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/cargo) "kO" = ( /obj/structure/cable{ @@ -636,18 +639,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/corner/transparent/purple/border, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plasteel/tech, /area/ship/science) "lx" = ( -/obj/effect/turf_decal/corner/transparent/purple/border, -/obj/effect/turf_decal/corner/transparent/purple/border{ - icon_state = "bordercolor"; - dir = 4 - }, /turf/open/floor/plasteel/tech, /area/ship/science) "lz" = ( @@ -793,6 +790,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/turf_decal/industrial/fire, /turf/open/floor/plasteel/tech, /area/ship/cargo) "nS" = ( @@ -811,7 +809,7 @@ "of" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/corner/transparent/purple/mono, -/obj/item/kirbyplants/random, +/obj/machinery/rnd/production/circuit_imprinter/department/science, /turf/open/floor/plasteel/tech, /area/ship/science) "ok" = ( @@ -822,11 +820,6 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "op" = ( -/obj/structure/rack, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/mining_scanner, -/obj/item/mining_scanner, /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/light_switch{ pixel_x = -20; @@ -836,6 +829,7 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/turf_decal/industrial/fire, /turf/open/floor/plasteel/tech, /area/ship/cargo) "oH" = ( @@ -872,7 +866,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/corner/transparent/purple/border, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, @@ -1027,7 +1020,7 @@ /obj/structure/extinguisher_cabinet/directional/south{ pixel_x = -3 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/mech_bay_recharge_floor, /area/ship/cargo) "rC" = ( /obj/effect/turf_decal/syndicateemblem/bottom/right, @@ -1037,9 +1030,9 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "rZ" = ( -/obj/structure/mecha_wreckage/gygax/dark, /obj/machinery/light/directional/south, -/turf/open/floor/mech_bay_recharge_floor, +/obj/structure/AIcore, +/turf/open/floor/circuit, /area/ship/science/robotics) "sj" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1111,8 +1104,6 @@ /obj/item/clothing/suit/armor/vest/syndie, /obj/item/clothing/suit/armor/vest/syndie, /obj/effect/turf_decal/industrial/traffic/full, -/obj/item/clothing/accessory/holster, -/obj/item/clothing/accessory/holster, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "tz" = ( @@ -1184,6 +1175,7 @@ pixel_x = 7 }, /obj/item/folder/documents/syndicate/red, +/obj/item/stamp/cybersun, /turf/open/floor/carpet/black, /area/ship/bridge) "vd" = ( @@ -1193,7 +1185,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/item/analyzer, /obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/tech, /area/ship/cargo) @@ -1295,10 +1286,6 @@ /area/ship/maintenance/port) "xd" = ( /obj/structure/rack, -/obj/item/storage/toolbox/syndicate{ - pixel_x = -5; - pixel_y = -5 - }, /obj/item/stack/cable_coil/random, /obj/item/clothing/head/welding, /obj/effect/turf_decal/corner/transparent/purple/mono, @@ -1306,6 +1293,18 @@ /obj/item/stack/sheet/plasteel{ amount = 10 }, +/obj/item/assembly/signaler{ + pixel_x = 11; + pixel_y = 10 + }, +/obj/item/analyzer{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/clothing/glasses/hud/diagnostic/sunglasses, +/obj/structure/sign/poster/syndicate/random{ + pixel_y = 32 + }, /turf/open/floor/plasteel/tech, /area/ship/science) "xg" = ( @@ -1409,6 +1408,7 @@ icon_state = "4-8" }, /obj/item/trash/syndi_cakes, +/obj/effect/turf_decal/industrial/fire, /turf/open/floor/plasteel/tech, /area/ship/cargo) "yd" = ( @@ -1501,7 +1501,7 @@ /area/ship/maintenance/port) "yZ" = ( /obj/effect/turf_decal/corner/transparent/purple/mono, -/obj/machinery/rnd/production/protolathe/department/cargo, +/obj/machinery/rnd/production/protolathe/department/science, /turf/open/floor/plasteel/tech, /area/ship/science) "zh" = ( @@ -1573,10 +1573,12 @@ /obj/item/clothing/accessory/armband/cargo, /obj/item/storage/belt/mining, /obj/item/clothing/glasses/welding, -/obj/item/kinetic_crusher/syndie_crusher, /obj/item/clothing/mask/gas/syndicate, /obj/item/radio/intercom/directional/north, /obj/item/gps/mining, +/obj/item/pickaxe/mini, +/obj/item/storage/bag/ore, +/obj/item/mining_scanner, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Aa" = ( @@ -1748,7 +1750,7 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 1 }, -/obj/item/clothing/suit/space/hardsuit/syndi/hl, +/obj/item/clothing/suit/space/hardsuit/syndi/cybersun, /turf/open/floor/carpet/red_gold, /area/ship/bridge) "Dg" = ( @@ -1774,6 +1776,34 @@ /obj/item/stack/sheet/metal/fifty, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/item/reagent_containers/food/drinks/waterbottle/large{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/drinks/waterbottle/large{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/drinks/waterbottle/large{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/snacks/canned/beans{ + pixel_x = -2 + }, +/obj/item/reagent_containers/food/snacks/canned/beans{ + pixel_x = -2 + }, +/obj/item/reagent_containers/food/snacks/canned/beans{ + pixel_x = -2 + }, +/obj/item/reagent_containers/food/snacks/canned/beans{ + pixel_x = -2 + }, +/obj/item/reagent_containers/food/snacks/canned/peaches, +/obj/item/reagent_containers/food/snacks/canned/peaches, +/obj/item/reagent_containers/food/snacks/canned/peaches, +/obj/item/reagent_containers/food/snacks/canned/peaches, /turf/open/floor/plasteel/tech, /area/ship/cargo) "DM" = ( @@ -1917,14 +1947,11 @@ /obj/structure/table/reinforced, /obj/item/storage/box/lethalshot, /obj/item/storage/box/lethalshot, -/obj/item/storage/backpack/duffelbag/syndie/c4, -/obj/item/ammo_box/magazine/m12g_bulldog/drum, -/obj/item/ammo_box/magazine/m12g_bulldog/drum, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/industrial/traffic/full, -/obj/item/ammo_box/magazine/m556_42_hydra, -/obj/item/ammo_box/magazine/m556_42_hydra, -/obj/item/ammo_box/magazine/m556_42_hydra, +/obj/item/ammo_box/c10mm, +/obj/item/ammo_box/magazine/m10mm_ringneck, +/obj/item/ammo_box/magazine/m10mm_ringneck, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Gm" = ( @@ -2001,9 +2028,34 @@ pixel_x = -28; name = "Mecha parts locker" }, -/obj/item/mecha_parts/mecha_equipment/thrusters/ion, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine, -/obj/item/circuitboard/mecha/gygax/main, +/obj/item/borg/upgrade/ai{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/borg/upgrade/ai{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/mmi/posibrain{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/mmi/posibrain{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/borg/upgrade/transform{ + desc = "Allows you to to turn a cyborg into a... something."; + name = "borg module picker (Unknown)"; + new_module = /obj/item/robot_module/syndicate_medical + }, +/obj/item/storage/toolbox/syndicate{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/clothing/glasses/hud/diagnostic/sunglasses, +/obj/item/clothing/under/syndicate/cybersun/research, +/obj/item/clothing/under/syndicate/cybersun/research, /turf/open/floor/mineral/plastitanium, /area/ship/science/robotics) "Hr" = ( @@ -2185,12 +2237,12 @@ /area/ship/science) "Kh" = ( /obj/structure/guncloset, -/obj/item/gun/ballistic/shotgun/automatic/combat/compact, /obj/machinery/airalarm/directional/west, /obj/machinery/light/directional/north, /obj/effect/turf_decal/industrial/traffic/full, -/obj/item/gun/ballistic/shotgun/automatic/bulldog, -/obj/item/gun/ballistic/automatic/assault/hydra, +/obj/item/gun/ballistic/automatic/pistol/ringneck, +/obj/item/gun/ballistic/shotgun/brimstone, +/obj/item/gun/ballistic/shotgun/brimstone, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Kw" = ( @@ -2290,44 +2342,11 @@ /turf/template_noop, /area/template_noop) "Mw" = ( -/obj/effect/turf_decal/industrial/outline, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/closet/crate{ - name = "food crate" - }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -2 - }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -2 - }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -2 - }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -2 - }, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/snacks/canned/peaches, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/industrial/fire/corner{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "MV" = ( @@ -2376,7 +2395,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/corner/transparent/purple/border, /turf/open/floor/plasteel/tech, /area/ship/science) "OA" = ( @@ -2507,7 +2525,6 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Rk" = ( -/obj/item/radio/intercom/directional/east, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -2708,6 +2725,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/effect/turf_decal/industrial/fire{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Uv" = ( @@ -2812,7 +2832,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/corner/transparent/purple/bordercorner, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -2978,8 +2997,6 @@ /obj/item/radio, /obj/item/radio, /obj/structure/table/wood, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/under/syndicate/gorlex, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/head/soft/black, @@ -2987,6 +3004,10 @@ /obj/item/radio, /obj/item/radio, /obj/item/radio/intercom/directional/north, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/head/soft/cybersun, +/obj/item/clothing/head/soft/cybersun, /turf/open/floor/carpet/blue, /area/ship/crew/dorm) "Yk" = ( @@ -3021,9 +3042,11 @@ /obj/item/clothing/accessory/armband/cargo, /obj/item/storage/belt/mining, /obj/item/clothing/glasses/welding, -/obj/item/kinetic_crusher/syndie_crusher, /obj/item/clothing/mask/gas/syndicate, /obj/item/gps/mining, +/obj/item/pickaxe/mini, +/obj/item/storage/bag/ore, +/obj/item/mining_scanner, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Yn" = ( diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm index c58ee1df5265..7a17cc9e5499 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -1450,9 +1450,7 @@ /obj/machinery/camera/autoname{ dir = 10 }, -/obj/machinery/mineral/ore_redemption{ - dir = 4 - }, +/obj/machinery/autolathe, /turf/open/floor/pod, /area/ship/cargo) "nv" = ( @@ -1532,7 +1530,6 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/obj/machinery/autolathe/hacked, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2019,8 +2016,12 @@ /obj/item/ammo_box/magazine/m12g_bulldog/drum, /obj/item/ammo_box/a12g/slug, /obj/item/ammo_box/a12g, -/obj/item/ammo_box/c45, -/obj/item/ammo_box/c45, +/obj/item/ammo_box/magazine/m556_42_hydra, +/obj/item/ammo_box/magazine/m556_42_hydra, +/obj/item/ammo_box/magazine/m556_42_hydra, +/obj/item/ammo_box/magazine/m556_42_hydra, +/obj/item/ammo_box/a556_42, +/obj/item/ammo_box/a556_42, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "sY" = ( @@ -2697,13 +2698,9 @@ /obj/structure/guncloset, /obj/structure/railing, /obj/machinery/light/directional/east, -/obj/item/gun/ballistic/automatic/smg/cobra{ - pixel_x = 14 - }, -/obj/item/gun/ballistic/automatic/smg/cobra{ - pixel_x = 14 - }, /obj/item/gun/ballistic/shotgun/automatic/bulldog, +/obj/item/gun/ballistic/automatic/assault/hydra, +/obj/item/gun/ballistic/automatic/assault/hydra, /turf/open/floor/pod/dark, /area/ship/security/armory) "yJ" = ( @@ -2852,9 +2849,6 @@ /obj/effect/turf_decal/borderfloor{ dir = 1 }, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/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." @@ -2874,7 +2868,12 @@ /obj/item/clothing/shoes/combat, /obj/item/radio/headset/syndicate, /obj/item/clothing/glasses/hud/security/sunglasses, -/obj/item/gun/ballistic/automatic/pistol/ringneck, +/obj/item/gun/ballistic/automatic/smg/cobra{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/m45_cobra, +/obj/item/ammo_box/magazine/m45_cobra, /turf/open/floor/plasteel/dark, /area/ship/bridge) "AS" = ( @@ -4014,9 +4013,6 @@ }, /obj/item/storage/belt/military/assault, /obj/item/storage/belt/military/assault, -/obj/item/clothing/suit/armor/vest/syndie, -/obj/item/clothing/suit/armor/vest/syndie, -/obj/item/clothing/suit/armor/vest/syndie, /obj/item/storage/belt/military/assault, /obj/item/clothing/head/helmet/swat, /obj/item/clothing/head/helmet/swat, @@ -4024,6 +4020,15 @@ /obj/item/attachment/silencer, /obj/item/attachment/silencer, /obj/item/attachment/silencer, +/obj/item/clothing/suit/armor/vest/marine/medium{ + armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50) + }, +/obj/item/clothing/suit/armor/vest/marine/medium{ + armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50) + }, +/obj/item/clothing/suit/armor/vest/marine/medium{ + armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50) + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Nj" = ( diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm index 47eceeadcd4a..4aa442bac01c 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm @@ -96,6 +96,11 @@ /obj/effect/turf_decal/spline/plain/opaque/syndiered, /turf/open/floor/circuit/red, /area/ship/crew/dorm) +"cw" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/light/floor, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) "cz" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable{ @@ -507,6 +512,12 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/dorm) +"jT" = ( +/obj/structure/catwalk/over, +/obj/structure/marker_beacon, +/obj/item/toy/plush/moth/poison, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) "kb" = ( /obj/structure/closet/secure_closet/wall{ icon_state = "sec_wall"; @@ -520,15 +531,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/item/storage/belt/military/assault, -/obj/item/storage/belt/military/assault, -/obj/item/storage/belt/military/assault, -/obj/item/storage/belt/military/assault, -/obj/item/clothing/suit/armor/vest/marine/medium, -/obj/item/clothing/suit/armor/vest/marine/medium, -/obj/item/clothing/suit/armor/vest/marine/medium, -/obj/item/clothing/suit/armor/vest/marine/medium, -/obj/item/clothing/head/helmet/swat, /obj/item/clothing/head/helmet/swat, /obj/item/clothing/head/helmet/swat, /obj/item/clothing/head/helmet/swat, @@ -536,6 +538,11 @@ /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/suit/armor/vest/syndie, +/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/caphat/cowboy, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "kc" = ( @@ -607,6 +614,7 @@ /obj/item/coin/antagtoken{ pixel_x = -7 }, +/obj/item/binoculars, /turf/open/floor/carpet/red_gold, /area/ship/bridge) "lX" = ( @@ -680,13 +688,13 @@ "oq" = ( /obj/effect/turf_decal/industrial/traffic/full, /obj/structure/table/reinforced, -/obj/machinery/cell_charger{ - pixel_y = 7; - pixel_x = -2 +/obj/item/binoculars{ + pixel_x = -7; + pixel_y = 4 }, -/obj/item/stock_parts/cell/high{ - pixel_y = 2; - pixel_x = -2 +/obj/item/binoculars{ + pixel_x = 7; + pixel_y = 0 }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) @@ -1193,8 +1201,13 @@ dir = 8 }, /obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/tank/internals/oxygen/red, +/obj/item/clothing/suit/space/syndicate{ + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + }, +/obj/item/clothing/head/helmet/space/syndicate/black/red{ + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + }, /turf/open/floor/plasteel/dark, /area/ship/cargo/port) "Ar" = ( @@ -1330,6 +1343,9 @@ /obj/item/clothing/gloves/combat, /obj/item/clothing/head/HoS/beret/syndicate, /obj/item/radio/headset/syndicate/alt/captain, +/obj/item/ammo_box/magazine/m45_cobra, +/obj/item/ammo_box/magazine/m45_cobra, +/obj/item/ammo_box/c45, /turf/open/floor/carpet/red_gold, /area/ship/bridge) "BW" = ( @@ -1403,7 +1419,14 @@ pixel_y = -29; name = "ammo locker" }, -/obj/item/storage/backpack/duffelbag/syndie/ammo/smg, +/obj/item/ammo_box/a300, +/obj/item/ammo_box/a300_box, +/obj/item/ammo_box/c45, +/obj/item/ammo_box/c45, +/obj/item/ammo_box/magazine/m45_cobra, +/obj/item/ammo_box/magazine/m45_cobra, +/obj/item/ammo_box/magazine/m45_cobra, +/obj/item/ammo_box/magazine/m45_cobra, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Dz" = ( @@ -1901,6 +1924,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ dir = 4 }, +/obj/item/toy/plush/celadon/duffmoth, /turf/open/floor/engine/hull/reinforced, /area/ship/external) "Mc" = ( @@ -2112,6 +2136,12 @@ /obj/item/pickaxe/mini, /turf/open/floor/plasteel/dark, /area/ship/cargo) +"OH" = ( +/obj/structure/catwalk/over, +/obj/structure/marker_beacon, +/obj/item/toy/plush/moth/deadhead, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) "OY" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/item/toy/plush/moth/error{ @@ -2160,23 +2190,14 @@ }, /obj/structure/guncloset, /obj/effect/turf_decal/industrial/traffic/full, -/obj/item/gun/ballistic/automatic/assault/hydra/dmr{ - name = "Special Operative 92 EBR"; - desc = "Thats special operative syndicate rifle modified to be more usable in the heat of battle, chambered in .45 ACP. Effective against personnel and armor alike. Has a CyberSun TM"; - mag_type = /obj/item/ammo_box/magazine/m45_cobra; - projectile_damage_multiplier = 1.7; - wield_delay = 6; - wield_slowdown = 0.45; - zoom_amt = 8 - }, -/obj/item/gun/ballistic/automatic/assault/hydra/dmr{ - name = "Special Operative 92 EBR"; - desc = "Thats special operative syndicate rifle modified to be more usable in the heat of battle, chambered in .45 ACP. Effective against personnel and armor alike. Has a CyberSun TM"; - mag_type = /obj/item/ammo_box/magazine/m45_cobra; - projectile_damage_multiplier = 1.7; - wield_delay = 6; - wield_slowdown = 0.45; - zoom_amt = 8 +/obj/item/gun/ballistic/rifle/scout, +/obj/item/gun/ballistic/automatic/smg/cobra{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/gun/ballistic/automatic/smg/cobra{ + pixel_x = 3; + pixel_y = -1 }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) @@ -2348,6 +2369,7 @@ "SL" = ( /obj/structure/catwalk/over, /obj/structure/marker_beacon, +/obj/item/toy/plush/moth/firewatch, /turf/open/floor/engine/hull/reinforced, /area/ship/external) "TK" = ( @@ -2429,8 +2451,13 @@ dir = 8 }, /obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/tank/internals/oxygen/red, +/obj/item/clothing/suit/space/syndicate{ + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + }, +/obj/item/clothing/head/helmet/space/syndicate/black/red{ + armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + }, /turf/open/floor/plasteel/dark, /area/ship/cargo/port) "WE" = ( @@ -2633,10 +2660,10 @@ jv jv jv jv -SL +jT jv jv -SL +OH jv jv jv @@ -3067,11 +3094,11 @@ jv jv pf pf +cw Ov Ov Ov -Ov -Ov +cw GD FU Ha diff --git a/mod_celadon/outfit/code/syndicate/syndi_outfit.dm b/mod_celadon/outfit/code/syndicate/syndi_outfit.dm index ec4df0bce872..55cf39f315e7 100644 --- a/mod_celadon/outfit/code/syndicate/syndi_outfit.dm +++ b/mod_celadon/outfit/code/syndicate/syndi_outfit.dm @@ -22,3 +22,16 @@ /datum/outfit/job/syndicate/post_equip(mob/living/carbon/human/H) . = ..() get_syndi_general_access(H) + +/datum/outfit/job/syndicate/science/cybersun + name = "Syndicate - Scientist" + jobtype = /datum/job/scientist + job_icon = "scientist" + + uniform = /obj/item/clothing/under/syndicate/cybersun/research + suit = /obj/item/clothing/suit/toggle/labcoat + head = /obj/item/clothing/head/soft/cybersun + + backpack = /obj/item/storage/backpack/duffelbag/syndie + satchel = /obj/item/storage/backpack/satchel/tox + courierbag = /obj/item/storage/backpack/messenger/tox