[Semi-Modular] DS-2: Because It's Not A Feature, It's a "Map Change". (#6487)

* Port changes from the WIP part of the feature megabundle first

* adjust that cost

* start

* Update interdynefob.dmm

* SYNDICATE STAY WINNING

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update lavaland_ruin_code.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* WOOO

* Update interdynefob.dmm

* Update interdynefob.dmm

* a

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update space.dm

* Update shuttles.dm

* Update interdyne_cargo.dmm

* Update interdynefob.dmm

* Shuttle is fucking broke

* Stupid ass shuttle broke

* Update interdynefob.dmm

* Update interdynefob.dmm

* new decal

* Update interdynefob.dmm

* Update space.dm

* Update space.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* new.. closet..

* Update interdynefob.dmm

* handicapped

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update space.dm

* secatures

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Nukes DS-1

* Nukes DS1 part 2

* Update interdynefob.dmm

* more ds2 changes

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* DS2 (REAL?) (NOT FAKE)

* Update ghost_role_spawners.dm

* Update interdynefob.dmm

* Update ghost_role_spawners.dm

* Update space.dm

* Update interdynefob.dmm

* Update wildwest_skyrat.dmm

* FIX ATMOS

* aaa

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update CentCom_skyrat_z2.dmm
This commit is contained in:
BluBerry016
2021-06-29 22:08:10 +01:00
committed by GitHub
parent 0499853f10
commit fec7aea76d
42 changed files with 33245 additions and 27931 deletions
+1 -7
View File
@@ -1716,12 +1716,6 @@
/obj/effect/decal/cleanable/blood/tracks,
/turf/open/floor/plating/ironsand,
/area/awaymission/wildwest/mines)
"EW" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/gun/assaultops/ballistics,
/obj/item/storage/firstaid/regular,
/turf/open/floor/plating/cobblestone/dungeon,
/area/awaymission/wildwest/vault)
"EZ" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/lizardboots,
@@ -20885,7 +20879,7 @@ Ua
go
OR
go
EW
Mq
Ua
tg
gy
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
-722
View File
@@ -1,722 +0,0 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ak" = (
/obj/effect/turf_decal/stripes/red/line,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"bc" = (
/obj/machinery/suit_storage_unit/syndicate,
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"br" = (
/obj/machinery/door/poddoor/shutters{
id = "frigateleftshutters"
},
/obj/effect/turf_decal/delivery/red,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/shuttle/syndicate/frigate)
"ep" = (
/obj/machinery/light/cold/no_nightlight{
dir = 8;
icon_state = "tube"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"eG" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"fo" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"fJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"id" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
/obj/effect/turf_decal/caution/stand_clear/red{
dir = 8
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"jh" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/obj/effect/turf_decal/caution/stand_clear/red{
dir = 8
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"kS" = (
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"lr" = (
/obj/structure/chair/comfy/shuttle{
dir = 8;
name = "tactical chair"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"mt" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light/cold/no_nightlight{
dir = 8;
icon_state = "tube"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"mv" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"nt" = (
/turf/closed/wall/r_wall/syndicate/cruiser,
/area/shuttle/syndicate/frigate)
"nJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"nL" = (
/obj/structure/rack,
/obj/item/pickaxe{
pixel_x = 5
},
/obj/item/pickaxe{
pixel_x = 5
},
/obj/item/pickaxe{
pixel_x = 5
},
/obj/item/shovel{
pixel_x = -5
},
/obj/item/shovel{
pixel_x = -5
},
/obj/item/shovel{
pixel_x = -5
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"pW" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light/cold/no_nightlight{
dir = 4;
icon_state = "tube"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"qp" = (
/obj/machinery/button/door{
id = "frigaterightshutters"
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/shuttle/syndicate/frigate)
"sZ" = (
/obj/machinery/suit_storage_unit/syndicate,
/obj/effect/turf_decal/stripes/box,
/obj/machinery/light/cold/no_nightlight{
dir = 8;
icon_state = "tube"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"tg" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"to" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/obj/machinery/light/cold/no_nightlight{
dir = 4;
icon_state = "tube"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"tt" = (
/obj/machinery/mineral/equipment_vendor/golem{
name = "Syndie-Mine"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"tz" = (
/obj/structure/chair/comfy/shuttle{
dir = 1;
name = "captains chair"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"wJ" = (
/obj/structure/closet/secure_closet/miner{
req_access = null;
req_access_txt = "150"
},
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"xp" = (
/obj/machinery/button/door{
id = "frigateleftshutters"
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/shuttle/syndicate/frigate)
"xw" = (
/obj/structure/tank_dispenser/oxygen,
/obj/effect/turf_decal/stripes/red/box,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"BX" = (
/obj/effect/turf_decal/stripes/full,
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"De" = (
/obj/structure/chair/comfy/shuttle{
dir = 4;
name = "tactical chair"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"Dy" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/ore_box,
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"DB" = (
/obj/effect/turf_decal/stripes/red/corner{
dir = 4
},
/obj/effect/turf_decal/stripes/red/corner{
dir = 1
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"EF" = (
/obj/machinery/door/poddoor/shutters{
id = "frigateleftshutters"
},
/obj/effect/turf_decal/delivery/red,
/obj/structure/fans/tiny,
/obj/machinery/button/door{
id = "frigateleftshutters";
pixel_y = -32;
req_access_txt = "150"
},
/turf/open/floor/plating,
/area/shuttle/syndicate/frigate)
"Gp" = (
/obj/machinery/suit_storage_unit/syndicate,
/obj/effect/turf_decal/stripes/box,
/obj/machinery/light/cold/no_nightlight{
dir = 4;
icon_state = "tube"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"HD" = (
/obj/structure/table/reinforced,
/obj/machinery/light/cold/no_nightlight{
dir = 8;
icon_state = "tube"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"HX" = (
/obj/machinery/porta_turret/assaultops/shuttle{
name = "Defense System Turret";
system_id = "frigate_turrets_outer"
},
/turf/closed/wall/r_wall/syndicate/cruiser,
/area/shuttle/syndicate/frigate)
"Iw" = (
/obj/structure/window/plasma/reinforced/plastitanium,
/obj/structure/grille,
/turf/open/floor/plating,
/area/shuttle/syndicate/frigate)
"KC" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"KN" = (
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/door/airlock/mining/glass{
req_access_txt = "150"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"NU" = (
/obj/effect/turf_decal/delivery/red,
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor/shutters/preopen{
id = "frigaterightshutters"
},
/turf/open/floor/plating,
/area/shuttle/syndicate/frigate)
"OY" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"Pw" = (
/obj/effect/turf_decal/stripes/red/line,
/obj/machinery/light/cold/no_nightlight,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"PQ" = (
/obj/effect/turf_decal/delivery/red,
/obj/structure/fans/tiny,
/obj/machinery/button/door{
id = "frigaterightshutters";
pixel_y = -32;
req_access_txt = "150"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "frigaterightshutters"
},
/turf/open/floor/plating,
/area/shuttle/syndicate/frigate)
"PS" = (
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"Qh" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"Qk" = (
/obj/machinery/light/cold/no_nightlight{
dir = 4;
icon_state = "tube"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"SY" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/medical,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"Tw" = (
/turf/template_noop,
/area/template_noop)
"TC" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/shuttle/syndicate/frigate)
"UA" = (
/obj/structure/table/reinforced,
/obj/item/toy/plush/moth{
pixel_y = 5
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"VV" = (
/obj/effect/turf_decal/delivery/red,
/obj/docking_port/mobile{
dir = 8;
dwidth = 8;
height = 13;
hidden = 1;
id = "syndicate_frigate";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "syndicate frigate";
port_direction = 4;
width = 22
},
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor/shutters/preopen{
id = "frigaterightshutters"
},
/turf/open/floor/plating,
/area/shuttle/syndicate/frigate)
"Wl" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"Wp" = (
/obj/machinery/computer/shuttle/syndicate_frigate,
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"WO" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"Xo" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/ore_box,
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"Yi" = (
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"YC" = (
/obj/machinery/turretid{
name = "DANGER: Outer Turret Control";
pixel_x = -32;
req_access = null;
req_access_txt = "150";
system_id = "frigate_turrets_outer"
},
/turf/open/floor/iron/dark,
/area/shuttle/syndicate/frigate)
"Zl" = (
/obj/structure/shuttle/engine/large,
/obj/effect/turf_decal/stripes/full,
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
"Zn" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/engine,
/area/shuttle/syndicate/frigate)
(1,1,1) = {"
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
nt
br
br
br
EF
nt
nt
nt
Tw
Tw
Tw
"}
(2,1,1) = {"
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
nt
xp
id
id
id
id
nt
BX
Zl
Tw
Tw
Tw
"}
(3,1,1) = {"
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
HX
TC
sZ
PS
PS
PS
Pw
nt
BX
BX
Tw
Tw
Tw
"}
(4,1,1) = {"
Tw
nt
nt
nt
nt
nt
nt
nt
nt
TC
bc
PS
PS
PS
PS
ak
TC
nt
nt
nt
nt
Tw
"}
(5,1,1) = {"
nt
nt
HD
SY
nt
KC
mt
KC
Wl
Iw
Wl
PS
OY
WO
fo
ak
Iw
PS
ep
wJ
nt
HX
"}
(6,1,1) = {"
Iw
UA
YC
lr
Iw
KC
KC
KC
Wl
KN
Wl
PS
Dy
Yi
Xo
ak
KN
PS
PS
tt
nt
nt
"}
(7,1,1) = {"
Iw
Wp
tz
PS
KN
mv
mv
mv
DB
Iw
xw
PS
fJ
Yi
eG
ak
Iw
nL
PS
wJ
nt
Tw
"}
(8,1,1) = {"
Iw
kS
PS
De
Iw
KC
KC
KC
Wl
KN
Wl
PS
Dy
Yi
Xo
ak
KN
PS
PS
tt
nt
nt
"}
(9,1,1) = {"
nt
nt
to
tg
nt
KC
pW
KC
Wl
Iw
Wl
PS
nJ
Zn
Qh
ak
Iw
PS
Qk
wJ
nt
HX
"}
(10,1,1) = {"
Tw
nt
nt
nt
nt
nt
nt
nt
nt
TC
bc
PS
PS
PS
PS
ak
TC
nt
nt
nt
nt
Tw
"}
(11,1,1) = {"
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
HX
TC
Gp
PS
PS
PS
Pw
nt
BX
Zl
Tw
Tw
Tw
"}
(12,1,1) = {"
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
nt
qp
jh
jh
jh
jh
nt
BX
BX
Tw
Tw
Tw
"}
(13,1,1) = {"
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
Tw
nt
NU
VV
NU
PQ
nt
nt
nt
Tw
Tw
Tw
"}
@@ -1,5 +0,0 @@
#define RADIO_CHANNEL_ASSAULT "DS-1"
#define RADIO_KEY_ASSAULT "z"
#define RADIO_TOKEN_ASSAULT ":z"
#define FREQ_ASSAULT 1207
-2
View File
@@ -101,7 +101,6 @@ GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_FACTION = FREQ_FACTION, //SKYRAT EDIT ADDITION - FACTION
RADIO_CHANNEL_CYBERSUN = FREQ_CYBERSUN, //SKYRAT EDIT ADDITION - MAPPING
RADIO_CHANNEL_INTERDYNE = FREQ_INTERDYNE, //SKYRAT EDIT ADDITION - MAPPING
RADIO_CHANNEL_ASSAULT = FREQ_ASSAULT, //SKYRAT EDIT ADDITION - ASSAULT OPS
RADIO_CHANNEL_GUILD = FREQ_GUILD, //SKYRAT EDIT ADDITION - ASSAULT OPS
RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE,
RADIO_CHANNEL_SUPPLY = FREQ_SUPPLY,
@@ -124,7 +123,6 @@ GLOBAL_LIST_INIT(reverseradiochannels, list(
"[FREQ_FACTION]" = RADIO_CHANNEL_FACTION, //SKYRAT EDIT ADDITION - FACTION
"[FREQ_CYBERSUN]" = RADIO_CHANNEL_CYBERSUN, //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_INTERDYNE]" = RADIO_CHANNEL_INTERDYNE, //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_ASSAULT]" = RADIO_CHANNEL_ASSAULT, //SKYRAT EDIT ADDITION - ASSAULT OPS
"[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE,
"[FREQ_SUPPLY]" = RADIO_CHANNEL_SUPPLY,
"[FREQ_SERVICE]" = RADIO_CHANNEL_SERVICE,
@@ -264,7 +264,7 @@
// Independent radios, on the CentCom frequency, reach all independent radios
//if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW)) ORIGINAL
if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE || freq == FREQ_GUILD || freq == FREQ_ASSAULT)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, ASSAULT OPS
if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE || freq == FREQ_GUILD)) //SKYRAT EDIT CHANGE - FACTION, MAPPING
signal.data["compression"] = 0
signal.transmission_method = TRANSMISSION_SUPERSPACE
signal.levels = list(0) // reaches all Z-levels
-1
View File
@@ -18,7 +18,6 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_CYBERSUN]" = "syndradio", //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_INTERDYNE]" = "syndradio", //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_GUILD]" = "syndradio", //SKYRAT EDIT ADDITION - MAPPING
"[FREQ_ASSAULT]" = "syndradio", //SKYRAT EDIT ADDITION - ASSAULT OPS
"[FREQ_CTF_RED]" = "redteamradio",
"[FREQ_CTF_BLUE]" = "blueteamradio",
"[FREQ_CTF_GREEN]" = "greenteamradio",
-1
View File
@@ -22,7 +22,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
RADIO_KEY_FACTION = RADIO_CHANNEL_FACTION, //SKYRAT EDIT ADDITION - FACTION
RADIO_KEY_CYBERSUN = RADIO_CHANNEL_CYBERSUN, //SKYRAT EDIT ADDITION - MAPPING
RADIO_KEY_INTERDYNE = RADIO_CHANNEL_INTERDYNE, //SKYRAT EDIT ADDITION - MAPPING
RADIO_KEY_ASSAULT = RADIO_CHANNEL_ASSAULT, //SKYRAT EDIT ADDITION - MAPPING
RADIO_KEY_GUILD = RADIO_CHANNEL_GUILD, //SKYRAT EDIT ADDITION - MAPPING
// Admin
@@ -12,10 +12,10 @@
trim_state = "trim_syndicateshipcaptain"
access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS)
///DS-1
///DS-2
/datum/id_trim/syndicom/skyrat/assault
assignment = "DS-1 Operative"
assignment = "DS-2 Operative"
trim_state = "trim_syndicateoperative"
/datum/id_trim/syndicom/skyrat/assault/assistant
@@ -37,27 +37,32 @@
/datum/id_trim/syndicom/skyrat/assault/masteratarms
assignment = "Master At Arms"
trim_state = "trim_masteratarms"
access = list(ACCESS_SYNDICATE,ACCESS_ROBOTICS,ACCESS_SYNDICATE_LEADER)
/datum/id_trim/syndicom/skyrat/assault/brigofficer
assignment = "Brig Officer"
trim_state = "trim_brigofficer"
access = list(ACCESS_SYNDICATE,ACCESS_ROBOTICS,ACCESS_SYNDICATE_LEADER)
/datum/id_trim/syndicom/skyrat/assault/chiefmasteratarms
assignment = "Chief Master At Arms"
trim_state = "trim_chiefmasteratarms"
access = list(ACCESS_SYNDICATE,ACCESS_ROBOTICS,ACCESS_SYNDICATE_LEADER)
/datum/id_trim/syndicom/skyrat/assault/chiefresearchofficer
assignment = "Chief Research Officer"
trim_state = "trim_chiefresearchofficer"
access = list(ACCESS_SYNDICATE,ACCESS_ROBOTICS,ACCESS_SYNDICATE_LEADER)
/datum/id_trim/syndicom/skyrat/assault/chiefengineeringofficer
assignment = "Chief Engineering Officer"
trim_state = "trim_chiefengineeringofficer"
access = list(ACCESS_ENGINE_EQUIP,ACCESS_SYNDICATE)
access = list(ACCESS_ENGINE_EQUIP,ACCESS_SYNDICATE,ACCESS_ROBOTICS,ACCESS_SYNDICATE_LEADER)
/datum/id_trim/syndicom/skyrat/assault/stationadmiral
assignment = "Station Admiral"
trim_state = "trim_stationadmiral"
access = list(ACCESS_ENGINE_EQUIP,ACCESS_SYNDICATE,ACCESS_ROBOTICS,ACCESS_SYNDICATE_LEADER)
///Interdyne
@@ -111,9 +116,6 @@
trim_state = "trim_deckcrewman"
///No Custom Icon
/datum/id_trim/syndicom/skyratnoicon
assignment = "Mr. S"
/datum/id_trim/syndicom/skyratnoicon/roboticstechnician
assignment = "Robotics Technician"
trim_state = "trim_roboticist"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

@@ -79,3 +79,16 @@
icon = 'modular_skyrat/modules/advanced_shuttles/icons/closet.dmi'
icon_state = "emergency_wall"
/obj/structure/closet/secure_closet/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
icon = 'modular_skyrat/modules/advanced_shuttles/icons/closet.dmi'
icon_state = "closet_wall"
/obj/structure/closet/secure_closet/personal/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
icon = 'modular_skyrat/modules/advanced_shuttles/icons/closet.dmi'
icon_state = "closet_wall"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 388 KiB

After

Width:  |  Height:  |  Size: 386 KiB

@@ -4,3 +4,10 @@
/obj/machinery/status_display/LateInitialize()
. = ..()
set_picture("default")
/obj/machinery/status_display/syndie
name = "syndicate status display"
/obj/machinery/status_display/syndie/LateInitialize()
. = ..()
set_picture("synd")
Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 134 KiB

@@ -1,175 +0,0 @@
GLOBAL_LIST_EMPTY(assaultop_start)
/area/shuttle/syndicate/cruiser
name = "Syndicate Cruiser"
/area/shuttle/syndicate/cruiser/bridge
name = "Syndicate Cruiser Control"
color = COLOR_BLUE
/area/shuttle/syndicate/cruiser/medical
name = "Syndicate Cruiser Medbay"
color = COLOR_LIGHT_PINK
/area/shuttle/syndicate/cruiser/armory
name = "Syndicate Cruiser Armory"
color = COLOR_ORANGE
/area/shuttle/syndicate/cruiser/eva
name = "Syndicate Cruiser EVA"
color = COLOR_GREEN
/area/shuttle/syndicate/cruiser/hallway
/area/shuttle/syndicate/cruiser/airlock
name = "Syndicate Cruiser Airlock"
color = COLOR_RED
/area/shuttle/syndicate/cruiser/brig
name = "Syndicate Cruiser Brig"
color = COLOR_BLACK
/area/shuttle/syndicate/cruiser/engineering
name = "Syndicate Cruiser Engineering"
color = COLOR_YELLOW
/area/shuttle/syndicate/frigate
name = "Syndicate Frigate"
/area/cruiser_dock
name = "Cruiser Holding Facility"
icon_state = "syndie-ship"
requires_power = TRUE
has_gravity = STANDARD_GRAVITY
area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT
ambientsounds = AMBIENCE_GENERIC
/area/cruiser_dock/brig
name = "Cruiser Dock Prison"
color = COLOR_BLUE
ambientsounds = AMBIENCE_CREEPY
/area/cruiser_dock/heads
name = "Head Of Staff Office"
/area/cruiser_dock/heads/admiral
name = "Station Admiral's Office"
icon_state = "captain"
sound_environment = SOUND_AREA_WOODFLOOR
/area/cruiser_dock/heads/cmo
name = "DS-1 Chief Medical Officer's Office"
icon_state = "cmo_office"
/area/cruiser_dock/heads/ceo
name = "Chief Engineering Officer's Office"
icon_state = "ce_office"
/area/cruiser_dock/heads/cl
name = "Corporate Liaison's Office"
icon_state = "hop_office"
/area/cruiser_dock/heads/cmaa
name = "Chief Master At Arms' Office"
icon_state = "hos_office"
/area/cruiser_dock/heads/cro
name = "Chief Research Officer's Office"
icon_state = "rd_office"
/area/cruiser_dock/security
name = "DS-1 Security"
icon_state = "security"
ambience_index = AMBIENCE_DANGER
/area/cruiser_dock/security/armory
name = "DS-1 Armory"
/area/cruiser_dock/service
name = "DS-1 Service Halls"
icon_state = "hall_service"
/area/cruiser_dock/research
name = "DS-1 Research And Development"
icon_state = "science"
sound_environment = SOUND_AREA_STANDARD_STATION
/area/cruiser_dock/cargo
name = "DS-1 Cargo"
icon_state = "cargo_bay"
sound_environment = SOUND_AREA_LARGE_ENCLOSED
/area/cruiser_dock/cargo/hangar
name = "DS-1 Hangar"
/area/cruiser_dock/vault
name = "DS-1 Vault"
icon_state = "nuke_storage"
/area/cruiser_dock/engineering
name = "DS-1 Engineering"
ambience_index = AMBIENCE_ENGI
sound_environment = SOUND_AREA_LARGE_ENCLOSED
icon_state = "engine"
/area/cruiser_dock/commons
name = "DS-1 Commons"
icon_state = "dorms"
sound_environment = SOUND_AREA_STANDARD_STATION
/area/cruiser_dock/commons/dorms
name = "DS-1 Dormitories"
/area/cruiser_dock/maint
name = "DS-1 Maintenance Tunnels"
ambience_index = AMBIENCE_MAINT
sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
icon_state = "maint_electrical"
/area/cruiser_dock/medical
name = "DS-1 Medical"
icon_state = "medbay1"
ambience_index = AMBIENCE_MEDICAL
sound_environment = SOUND_AREA_STANDARD_STATION
min_ambience_cooldown = 90 SECONDS
max_ambience_cooldown = 180 SECONDS
/area/cruiser_dock/medical/virology
name = "DS-1 Virology"
icon_state = "virology"
/area/cruiser_dock/bridge
name = "DS-1 Bridge"
icon_state = "bridge_hallway"
ambientsounds = list('sound/ambience/signal.ogg')
sound_environment = SOUND_AREA_STANDARD_STATION
/area/cruiser_dock/bridge/hallway
name = "DS-1 Command Hallway"
/obj/machinery/door/poddoor/shutters
smoothing_groups = list(SMOOTH_GROUP_SHUTTERS)
/turf/closed/wall/r_wall/syndicate/cruiser
canSmoothWith = list(SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_SHUTTERS)
/obj/effect/landmark/start/assaultop
name = "assaultop"
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "snukeop_spawn"
delete_after_roundstart = FALSE
/obj/effect/landmark/start/assaultop/Initialize()
. = ..()
GLOB.assaultop_start += src
/obj/effect/spawner/lootdrop/gun/assaultops/ballistics
name = "gun spawner"
loot = list(
/obj/item/gun/ballistic/automatic/assault_rifle/m16,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/gun/ballistic/automatic/sniper_rifle/modular/syndicate,
/obj/item/gun/ballistic/automatic/submachine_gun/mp40,
/obj/item/gun/ballistic/automatic/c20r,
/obj/item/gun/ballistic/automatic/m90
)
@@ -1,128 +0,0 @@
//TURRETS>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
/obj/machinery/porta_turret/assaultops
use_power = IDLE_POWER_USE
req_access = list(ACCESS_SYNDICATE)
faction = list(ROLE_SYNDICATE)
mode = TURRET_STUN
uses_stored = FALSE
max_integrity = 200
base_icon_state = "syndie"
stun_projectile = /obj/projectile/energy/electrode
stun_projectile_sound = 'sound/weapons/taser.ogg'
lethal_projectile = /obj/projectile/beam/laser/heavylaser
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
/obj/machinery/porta_turret/assaultops/assess_perp(mob/living/carbon/human/perp)
return 10
/obj/machinery/porta_turret/assaultops/setup(obj/item/gun/turret_gun)
return
/obj/machinery/porta_turret/assaultops/shuttle
scan_range = 9
lethal_projectile = /obj/projectile/bullet/p50/penetrator/shuttle
lethal_projectile_sound = 'modular_skyrat/modules/aesthetics/guns/sound/sniperrifle.ogg'
stun_projectile = /obj/projectile/energy/electrode
stun_projectile_sound = 'sound/weapons/taser.ogg'
max_integrity = 600
armor = list(MELEE = 50, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 80, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)
/obj/machinery/porta_turret/assaultops/ComponentInitialize()
. = ..()
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
//VENDING MACHINES>>>>>>>>>>>>>>>>>>>>>>>>>
/obj/machinery/vending/assaultops_ammo
name = "\improper Syndicate Ammo Station"
desc = "An ammo vending machine which holds a variety of different ammo mags."
icon_state = "liberationstation"
vend_reply = "Item dispensed."
scan_id = FALSE
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
onstation = FALSE
light_mask = "liberation-light-mask"
default_price = 0
var/filled = FALSE
/obj/machinery/vending/assaultops_ammo/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
fill_ammo(user)
ui = new(user, src, "Vending")
ui.open()
/obj/machinery/vending/assaultops_ammo/proc/fill_ammo(mob/user)
if(last_shopper == user && filled)
return
else
filled = FALSE
if(!ishuman(user))
return FALSE
//Remove all current items from the vending machine
products.Cut()
product_records.Cut()
var/mob/living/carbon/human/H = user
//Find all the ammo we should display
for(var/i in H.contents)
if(istype(i, /obj/item/gun/ballistic))
var/obj/item/gun/ballistic/G = i
if(!G.internal_magazine)
products.Add(G.mag_type)
if(istype(i, /obj/item/storage))
var/obj/item/storage/S = i
for(var/C in S.contents)
if(istype(C, /obj/item/gun/ballistic))
var/obj/item/gun/ballistic/G = C
if(!G.internal_magazine)
products.Add(G.mag_type)
//Add our items to the list of products
build_inventory(products, product_records, FALSE)
filled = TRUE
/obj/machinery/vending/assaultops_ammo/build_inventory(list/productlist, list/recordlist, start_empty = FALSE)
default_price = 0
extra_price = 0
for(var/typepath in productlist)
var/amount = 4
var/atom/temp = typepath
var/datum/data/vending_product/R = new /datum/data/vending_product()
GLOB.vending_products[typepath] = 1
R.name = initial(temp.name)
R.product_path = typepath
if(!start_empty)
R.amount = amount
R.max_amount = amount
R.custom_price = 0
R.custom_premium_price = 0
R.age_restricted = FALSE
recordlist += R
//ASSAULT OPS RADIO//
/obj/item/encryptionkey/headset_assault
name = "ds-1 radio encryption key"
icon_state = "syn_cypherkey"
channels = list(RADIO_CHANNEL_ASSAULT = 1)
independent = TRUE
/obj/item/radio/headset/syndicate/alt/assault
keyslot2 = new /obj/item/encryptionkey/headset_assault
/obj/item/radio/headset/assault
keyslot = new /obj/item/encryptionkey/headset_assault
/obj/item/radio/headset/assault/command
name = "ds-1 command headset"
desc = "The headset of the boss. Or maybe his boss."
keyslot = new /obj/item/encryptionkey/headset_assault
command = TRUE
@@ -1,144 +0,0 @@
//KITS
/datum/outfit/assaultops
name = "I couldn't choose one!"
head = /obj/item/clothing/head/helmet/swat
mask = /obj/item/clothing/mask/gas/syndicate
glasses = /obj/item/clothing/glasses/thermal
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/fireproof
ears = /obj/item/radio/headset/syndicate/alt/assault
l_pocket = /obj/item/modular_computer/tablet/nukeops
id = /obj/item/card/id/advanced/chameleon
suit = /obj/item/clothing/suit/space/hardsuit/syndi
suit_store = /obj/item/gun/ballistic/automatic/pistol/aps
r_pocket = /obj/item/ammo_box/magazine/m9mm_aps
belt = /obj/item/storage/belt/utility/syndicate
id_trim = /datum/id_trim/chameleon/operative
var/command_radio = FALSE
var/cqc = FALSE
/datum/outfit/assaultops/cqb
name = "Assault Operative - CQB"
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival,\
/obj/item/gun/energy/disabler,\
/obj/item/gun/ballistic/automatic/c20r,\
/obj/item/ammo_box/magazine/smgm45=4,\
)
cqc = TRUE
/datum/outfit/assaultops/demoman
name = "Assault Operative - Demolitions"
belt = /obj/item/storage/belt/grenade/full
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival,\
/obj/item/gun/energy/disabler,\
/obj/item/gun/ballistic/automatic/gyropistol,\
/obj/item/ammo_box/magazine/m75=4,\
/obj/item/implant/explosive/macro, \
/obj/item/storage/box/assaultops/demoman
)
l_hand = /obj/item/clothing/suit/space/hardsuit/rd
/obj/item/storage/box/assaultops/demoman
name = "Assault Operative - Demolitions"
/obj/item/storage/box/assaultops/demoman/PopulateContents()
for(var/i in 1 to 4)
new /obj/item/grenade/syndieminibomb(src)
new /obj/item/grenade/c4/x4(src)
/datum/outfit/assaultops/medic
name = "Assault Operative - Medic"
glasses = /obj/item/clothing/glasses/hud/health
belt = /obj/item/storage/belt/medical/paramedic
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/gun/energy/disabler,\
/obj/item/gun/ballistic/automatic/submachine_gun/pps,\
/obj/item/ammo_box/magazine/pps=2,\
/obj/item/storage/firstaid/tactical=2,\
/obj/item/gun/medbeam)
/datum/outfit/assaultops/heavy
name = "Assault Operative - Heavy Gunner"
suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival,\
/obj/item/gun/energy/disabler)
r_hand = /obj/item/minigunpack
r_pocket = /obj/item/grenade/syndieminibomb
/datum/outfit/assaultops/assault
name = "Assault Operative - Assault"
suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival,\
/obj/item/gun/energy/disabler,\
/obj/item/gun/ballistic/automatic/assault_rifle/akm,\
/obj/item/ammo_box/magazine/akm=4,\
/obj/item/grenade/syndieminibomb=2)
/datum/outfit/assaultops/sniper
name = "Assault Operative - Sniper"
suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival,\
/obj/item/gun/energy/disabler,\
/obj/item/gun/ballistic/automatic/sniper_rifle/modular/blackmarket,\
/obj/item/ammo_box/magazine/sniper_rounds=4,\
/obj/item/grenade/syndieminibomb=2)
/datum/outfit/assaultops/tech
name = "Assault Operative - Tech"
suit = /obj/item/clothing/suit/space/hardsuit/shielded
belt = /obj/item/storage/belt/military/abductor/full/assaultops
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival,\
/obj/item/gun/energy/disabler,\
/obj/item/gun/ballistic/automatic/battle_rifle/fg42,\
/obj/item/ammo_box/magazine/fg42=4,\
/obj/item/card/emag,\
/obj/item/card/emag/doorjack)
/obj/item/storage/belt/military/abductor/full/assaultops
name = "Assault Belt"
desc = "A tactical belt full of highly advanced hacking equipment."
/datum/outfit/assaultops/post_equip(mob/living/carbon/human/H)
var/obj/item/radio/R = H.ears
R.set_frequency(FREQ_SYNDICATE)
R.freqlock = TRUE
if(command_radio)
R.command = TRUE
if(cqc)
var/datum/martial_art/cqc/MA = new
MA.teach(H)
var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(H)
W.implant(H)
H.update_icons()
@@ -1,249 +0,0 @@
/obj/effect/mob_spawn/human/syndicate/assops
name = "Syndicate DS-1 Operative"
roundstart = FALSE
death = FALSE
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
outfit = /datum/outfit/syndicate_empty
assignedrole = "Syndicate DS-1 Operative"
permanent = FALSE
can_use_alias = TRUE
any_station_species = TRUE
//PRISONERS//
/obj/effect/mob_spawn/human/assops_prisoner
name = "Syndicate Prisoner"
short_desc = "You are the syndicate prisoner aboard an unknown station."
flavour_text = "You don't know where you are, but you know you are a prisoner. Perhaps that guard knows more?"
important_info = "Admin-help before you provoke the Syndicate."
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
outfit = /datum/outfit/assops/prisoner
roundstart = FALSE
permanent = FALSE
death = FALSE
can_use_alias = TRUE
any_station_species = TRUE
/datum/outfit/assops/prisoner
name = "Syndicate Prisoner"
uniform = /obj/item/clothing/under/rank/prisoner
shoes = /obj/item/clothing/shoes/sneakers/orange
id = /obj/item/card/id/advanced/prisoner
/datum/outfit/syndicate_empty/assops
id = /obj/item/card/id/advanced/black
id_trim = /datum/id_trim/chameleon/operative
//SECURITY//
/obj/effect/mob_spawn/human/syndicate/assops/prison_guard
short_desc = "You are a brig officer aboard the Syndicate facility DS-1."
flavour_text = "Your job is to keep the prisoners in check and ensure they do not cause trouble. Patrol the prison, DO NOT TAKE ITEMS FROM THE ARMORY."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives."
outfit = /datum/outfit/syndicate_empty/assops/prison_guard
/datum/outfit/syndicate_empty/assops/prison_guard
name = "Syndicate Brig Officer"
head = /obj/item/clothing/head/helmet/swat
suit = /obj/item/clothing/suit/armor/bulletproof
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/assault
back = /obj/item/storage/backpack
belt = /obj/item/storage/belt/security/full
implants = list(/obj/item/implant/weapons_auth)
id_trim = /datum/id_trim/syndicom/skyrat/assault/brigofficer
backpack_contents = list(
/obj/item/storage/box/handcuffs,\
/obj/item/melee/baton/loaded
)
/obj/effect/mob_spawn/human/syndicate/assops/prison_warden
short_desc = "You are a Master At Arms aboard the Syndicate facility DS-1."
flavour_text = "Your job is to oversee facility operations and ensure a smooth running prison. You deal with executions and sentencing."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives."
outfit = /datum/outfit/syndicate_empty/assops/prison_warden
excluded_gamemodes = list()
/datum/outfit/syndicate_empty/assops/prison_warden
name = "Syndicate Master At Arms"
head = /obj/item/clothing/head/warden/syndicate
suit = /obj/item/clothing/suit/armor/vest/warden/syndicate
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/assault
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/weapons_auth)
belt = /obj/item/storage/belt/security/full
id_trim = /datum/id_trim/syndicom/skyrat/assault/masteratarms
backpack_contents = list(
/obj/item/storage/box/handcuffs,\
/obj/item/melee/baton/loaded
)
//SERVICE//
/obj/effect/mob_spawn/human/syndicate/assops/facility_staff
short_desc = "You are a general purpose crewmember aboard the Syndicate facility DS-1."
flavour_text = "Your job is not combat, but instead is to run the syndicate facilites such as the bar, cooking areas, engineering and janitorial work."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/assops/facility_staff
/datum/outfit/syndicate_empty/assops/facility_staff
name = "Syndicate Facility Staff"
suit = /obj/item/clothing/suit/armor/bulletproof
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/assault
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/weapons_auth)
id_trim = /datum/id_trim/syndicom/skyrat/assault/syndicatestaff
/obj/effect/mob_spawn/human/syndicate/assops/syndicate_assistant
short_desc = "You are an operative aboard the Syndicate facility DS-1."
flavour_text = "Your job is NOT combat, unless the assault team requires it. Otherwise you are simply there to assist the guards and warden. Or relax."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/assops/syndicate_assistant
/datum/outfit/syndicate_empty/assops/syndicate_assistant
name = "Syndicate Assistant"//Ditto
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/assault
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/weapons_auth)
id_trim = /datum/id_trim/syndicom/skyrat/assault/assistant
//SCIENCE//
/obj/effect/mob_spawn/human/syndicate/assops/syndicate_scientist
short_desc = "You are a scientist aboard the Syndicate facility DS-1."
flavour_text = "Your job is that of research and development! You should further your scientific research and utilise the given tools."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/assops/syndicate_scientist
/datum/outfit/syndicate_empty/assops/syndicate_scientist
name = "Syndicate Researcher"
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/toggle/labcoat
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/assault
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/weapons_auth)
id_trim = /datum/id_trim/syndicom/skyrat/assault/researcher
//MEDICAL//
/obj/effect/mob_spawn/human/syndicate/assops/station_medical_officer
short_desc = "You are a Medical Officer aboard the Syndicate facility DS-1."
flavour_text = "Your job is to maintain and improve the health and safety of the crew on-board."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/assops/station_medical_officer
/datum/outfit/syndicate_empty/assops/station_medical_officer
name = "Syndicate Medical Officer"
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/toggle/labcoat/medical
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/assault
back = /obj/item/storage/backpack/medic
implants = list(/obj/item/implant/weapons_auth)
id_trim = /datum/id_trim/syndicom/skyrat/assault/stationmedicalofficer
//HEADS OF STAFF//
/obj/effect/mob_spawn/human/syndicate/assops/heads
outfit = /datum/outfit/syndicate_empty/assops/heads
/datum/outfit/syndicate_empty/assops/heads
name = "Syndicate Head Of Staff"
ears = /obj/item/radio/headset/assault/command
implants = list(/obj/item/implant/weapons_auth)
//Admiral//
/obj/effect/mob_spawn/human/syndicate/assops/heads/station_admiral
short_desc = "You are the Station Admiral of Syndicate facility DS-1."
flavour_text = "Your job is to coordinate the heads of staff onboard, and otherwise relax. Unlike those Nanotrasen NADs, yours is in no danger of being tracked."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/assops/heads/syndicate_admiral
/datum/outfit/syndicate_empty/assops/heads/syndicate_admiral
name = "Syndicate Admiral"
uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
head = /obj/item/clothing/head/hos/beret/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack
backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/aps)
id_trim = /datum/id_trim/syndicom/skyrat/assault/stationadmiral
//Chief Master At Arms//
/obj/effect/mob_spawn/human/syndicate/assops/heads/chief_master_at_arms
short_desc = "You are the Chief Master At Arms onboard the Syndicate facility DS-1."
flavour_text = "Your job is to oversee the Brig Officers and Master At Arms."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/assops/heads/chief_master_at_arms
/datum/outfit/syndicate_empty/assops/heads/chief_master_at_arms
name = "Chief Master At Arms"
uniform = /obj/item/clothing/under/rank/security/head_of_security
suit = /obj/item/clothing/suit/armor/hos/trenchcoat
head = /obj/item/clothing/head/hos/beret/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/security
belt = /obj/item/storage/belt/security/full
backpack_contents = list(/obj/item/storage/box/handcuffs)
id_trim = /datum/id_trim/syndicom/skyrat/assault/chiefmasteratarms
//Chief Research Officer//
/obj/effect/mob_spawn/human/syndicate/assops/heads/chief_research_officer
short_desc = "You are the Chief Research Officer onboard the Syndicate facility DS-1."
flavour_text = "Your job is to oversee the Researchers and maintain DS-1's coordinate secrecy." //An IC Solution to the problem of DS-1 Operatives getting too handsy with research, since RND consoles log who did research and where.
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/assops/heads/chief_research_officer
/datum/outfit/syndicate_empty/assops/heads/chief_research_officer
name = "Chief Research Officer"
uniform = /obj/item/clothing/under/rank/rnd/research_director
suit = /obj/item/clothing/suit/toggle/labcoat
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/science
backpack_contents = list(/obj/item/melee/classic_baton/telescopic)
id_trim = /datum/id_trim/syndicom/skyrat/assault/chiefresearchofficer
//Chief Engineering Officer//
/obj/effect/mob_spawn/human/syndicate/assops/heads/chief_engineering_officer
short_desc = "You are the Chief Engineering Officer onboard the Syndicate facility DS-1."
flavour_text = "Your job is to maintain DS-1's power generation and hull integrity. Or 'touching up' the disused section east of cargo."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/assops/heads/chief_engineering_officer
/datum/outfit/syndicate_empty/assops/heads/chief_engineering_officer
name = "Chief Engineering Officer"
uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
head = /obj/item/clothing/head/hardhat/white
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/industrial
backpack_contents = list(/obj/item/melee/classic_baton/telescopic)
id_trim = /datum/id_trim/syndicom/skyrat/assault/chiefengineeringofficer
skillchips = list(/obj/item/skillchip/job/engineer)
@@ -1,73 +0,0 @@
/obj/machinery/base_alarm
name = "base alarm"
desc = "Pull this to alert the guards!"
icon = 'modular_skyrat/modules/assaultops/icons/alarm.dmi'
icon_state = "alarm"
max_integrity = 250
integrity_failure = 0.4
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 100, FIRE = 90, ACID = 30)
use_power = NO_POWER_USE
resistance_flags = FIRE_PROOF
light_power = 0
light_range = 4
light_color = COLOR_VIVID_RED
//Trick to get the glowing overlay visible from a distance
luminosity = 1
var/alarm_playing = FALSE
var/triggered = FALSE
var/list/obj/machinery/base_alarm/alarms = list()
var/area/myarea = null
/obj/machinery/base_alarm/Initialize()
. = ..()
update_icon()
myarea = get_area(src)
for(var/obj/machinery/base_alarm/alarm in myarea)
alarms.Add(alarm)
/obj/machinery/base_alarm/attack_hand(mob/user)
add_fingerprint(user)
to_chat(user, "<span class='userdanger'>You trigger the [src]!</span>")
playsound(src, 'sound/machines/pda_button1.ogg', 100)
trigger_alarm()
/obj/machinery/base_alarm/attack_ai(mob/user)
return attack_hand(user)
/obj/machinery/base_alarm/attack_robot(mob/user)
return attack_hand(user)
/obj/machinery/base_alarm/proc/trigger_alarm()
if(triggered)
reset()
else
alarm()
/obj/machinery/base_alarm/proc/alarm()
for(var/i in alarms)
var/obj/machinery/base_alarm/A = i
A.icon_state = "alarm_on"
A.set_light(l_power = 2)
A.triggered = TRUE
if(!A.alarm_playing)
A.alarm_playing = TRUE
playsound(A, 'modular_skyrat/modules/assaultops/sound/GoldeneyeAlarm.ogg', 30)
addtimer(CALLBACK(A, .proc/alarm_sound), 65)
/obj/machinery/base_alarm/proc/alarm_sound()
if(!triggered)
alarm_playing = FALSE
else
playsound(src, 'modular_skyrat/modules/assaultops/sound/GoldeneyeAlarm.ogg', 30)
addtimer(CALLBACK(src, .proc/alarm_sound), 65)
/obj/machinery/base_alarm/proc/reset(mob/user)
for(var/i in alarms)
var/obj/machinery/base_alarm/A = i
A.icon_state = "alarm"
A.set_light(l_power = 0)
A.triggered = FALSE
@@ -1,78 +0,0 @@
/obj/machinery/computer/shuttle/syndicate_cruiser
name = "syndicate cruiser helm"
desc = "The terminal used to control the syndicate cruiser."
shuttleId = "syndicate_cruiser"
possible_destinations = "syndicate_cruiser_custom;syndicate_cruiser_away;syndicate_away;syndicate_z5;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s;syndicate_cruiser_dock;whiteship_away;whiteship_home;whiteship_z4;whiteship_lavaland;ferry_away"
circuit = /obj/item/circuitboard/computer/syndicate_shuttle
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = COLOR_SOFT_RED
req_access = list(ACCESS_SYNDICATE)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/machinery/computer/shuttle/syndicate_cruiser/launch_check(mob/user)
return TRUE
/obj/machinery/computer/shuttle/syndicate_cruiser/allowed(mob/M)
if(issilicon(M) && !(ROLE_SYNDICATE in M.faction))
return FALSE
return ..()
/obj/machinery/computer/shuttle/syndicate_cruiser/recall
name = "syndicate shuttle recall terminal"
desc = "Use this if your friends left you behind."
possible_destinations = "syndicate_cruiser_away"
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate_cruiser
name = "syndicate cruiser navigation computer"
desc = "Used to designate a precise transit location for the syndicate cruiser."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
shuttlePortId = "syndicate_cruiser_dock"
shuttleId = "syndicate_cruiser"
jumpto_ports = list("syndicate_n" = 1, "whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1)
view_range = 14
whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/closed/mineral)
see_hidden = TRUE
x_offset = -10
y_offset = 5
/datum/map_template/shuttle/syndicate_cruiser
name = "syndicate cruiser"
prefix = "_maps/skyrat/shuttles/"
port_id = "syndicate"
suffix = "cruiser"
who_can_purchase = null
/////////////FRIGATE
/obj/machinery/computer/shuttle/syndicate_frigate
name = "syndicate frigate helm"
desc = "The terminal used to control the syndicate frigate."
shuttleId = "syndicate_frigate"
possible_destinations = "syndicate_frigate_away;syndicate_frigate_dock;rockplanet_lz1"
circuit = /obj/item/circuitboard/computer/syndicate_shuttle
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = COLOR_SOFT_RED
req_access = list(ACCESS_SYNDICATE)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/machinery/computer/shuttle/syndicate_frigate/launch_check(mob/user)
return TRUE
/obj/machinery/computer/shuttle/syndicate_frigate/allowed(mob/M)
if(issilicon(M) && !(ROLE_SYNDICATE in M.faction))
return FALSE
return ..()
/obj/machinery/computer/shuttle/syndicate_frigate/recall
name = "syndicate shuttle recall terminal"
desc = "Use this if your friends left you behind."
possible_destinations = "syndicate_frigate_away"
/datum/map_template/shuttle/syndicate_frigate
name = "syndicate frigate"
prefix = "_maps/skyrat/shuttles/"
port_id = "syndicate"
suffix = "frigate"
who_can_purchase = null
Binary file not shown.

Before

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

@@ -1,31 +0,0 @@
## Title: Assault Operatives
MODULE ID: ASSAULTOPS
### Description:
Adds assault operatives, nukies without the nuke. See code for information.
### TG Proc Changes:
- code/__DEFINES/role_preferences.dm
- code/datums/mind.dm
-
### Defines:
- #define ROLE_ASSAULTOPS "Assault Operative"
- #define ASSAULT_RESULT_FLUKE 0
- #define ASSAULT_RESULT_ASSAULT_WIN 1
- #define ASSAULT_RESULT_CREW_WIN 2
### Master file additions
- N/A
### Included files that are not contained in this module:
- code/datums/components/gunpoint.dm
### Credits:
Gandalf2k15 - OG & refactor
@@ -7,6 +7,10 @@
body_parts_covered = CHEST|ARMS|GROIN|LEGS
can_adjust = FALSE
/obj/item/clothing/under/utility/syndicate
armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 40) //Same stats as the tactical turtleneck.
has_sensor = NO_SENSORS
/obj/item/clothing/under/utility/eng
name = "engineering utility uniform"
desc = "A utility uniform worn by Engineering personnel."
@@ -98,10 +98,10 @@
/area/ruin/unpowered/syndicate_lava_base/cargo)
"aG" = (
/obj/structure/table/glass,
/obj/item/clothing/glasses/science,
/obj/item/book/manual/wiki/chemistry{
pixel_y = 8
},
/obj/item/clothing/glasses/science,
/turf/open/floor/iron/white,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"aI" = (
@@ -164,6 +164,7 @@
/obj/item/plant_analyzer,
/obj/item/geneshears,
/obj/item/gun/energy/floragun,
/obj/item/secateurs,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/unpowered/syndicate_lava_base/bar)
"bh" = (
@@ -316,12 +317,9 @@
/turf/open/floor/iron/dark/textured_half,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"ce" = (
/obj/structure/chair{
dir = 1
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/bar)
/obj/machinery/smartfridge/chemistry/preloaded,
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"cf" = (
/obj/structure/closet/crate,
/obj/item/flashlight{
@@ -354,6 +352,9 @@
/obj/effect/turf_decal/siding/brown{
dir = 1
},
/obj/item/card/id/advanced/chameleon,
/obj/item/card/id/advanced/chameleon,
/obj/item/card/id/advanced/chameleon,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"ci" = (
@@ -429,7 +430,16 @@
dir = 1
},
/area/ruin/unpowered/syndicate_lava_base/main)
"cZ" = (
/obj/machinery/smartfridge/drinks,
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/bar)
"db" = (
/obj/structure/safe,
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe{
desc = "It's a box, for storing things.";
name = "chameleon kit"
},
/turf/open/floor/iron/corner{
dir = 1
},
@@ -471,6 +481,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"ds" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/virology)
"dw" = (
/turf/open/floor/iron/telecomms,
/area/ruin/unpowered/syndicate_lava_base/testlab)
@@ -491,6 +507,12 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/bar)
"dJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"dL" = (
/obj/structure/window/reinforced/survival_pod,
/obj/structure/window/reinforced/survival_pod{
@@ -672,7 +694,9 @@
dir = 1
},
/obj/structure/table/reinforced,
/obj/item/kinetic_crusher,
/obj/item/fakeartefact{
possible = list(/obj/item/kinetic_crusher)
},
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"gn" = (
@@ -898,6 +922,7 @@
/obj/effect/turf_decal/tile/bar{
dir = 8
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/bar)
"iQ" = (
@@ -937,8 +962,7 @@
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/bar)
"jb" = (
/obj/structure/table/glass,
/obj/machinery/reagentgrinder,
/obj/machinery/chem_master,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"jc" = (
@@ -1213,6 +1237,10 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"lD" = (
/obj/machinery/smartfridge/food,
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/bar)
"lT" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 8
@@ -1259,6 +1287,16 @@
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"mx" = (
/obj/machinery/button/door{
id = "interdynecargowest";
pixel_x = 32;
pixel_y = 8
},
/obj/machinery/button/door{
id = "interdynecargoeast";
pixel_x = 32;
pixel_y = -8
},
/obj/machinery/computer/shuttle{
desc = "Occasionally used to call in a resupply shuttle if one is in range.";
dir = 8;
@@ -1270,16 +1308,6 @@
req_access_txt = "150";
shuttleId = "syndie_cargo"
},
/obj/machinery/button/door{
id = "interdynecargowest";
pixel_x = 32;
pixel_y = 8
},
/obj/machinery/button/door{
id = "interdynecargoeast";
pixel_x = 32;
pixel_y = -8
},
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"my" = (
@@ -1354,6 +1382,7 @@
/obj/item/storage/box/beakers/bluespace,
/obj/item/storage/box/beakers/bluespace,
/obj/machinery/firealarm/directional/west,
/obj/machinery/reagentgrinder,
/turf/open/floor/iron/white,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"nC" = (
@@ -1567,7 +1596,9 @@
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/main)
"qa" = (
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/virology)
"qd" = (
@@ -1946,10 +1977,10 @@
/turf/open/lava/plasma/ice_moon,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"vl" = (
/obj/machinery/chem_master,
/obj/structure/sign/departments/chemistry{
pixel_x = 32
},
/obj/structure/table/glass,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"vo" = (
@@ -2177,7 +2208,9 @@
dir = 1
},
/obj/structure/table/reinforced,
/obj/item/gun/energy/kinetic_accelerator,
/obj/item/fakeartefact{
possible = list(/obj/item/gun/energy/kinetic_accelerator)
},
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"xS" = (
@@ -2615,10 +2648,10 @@
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/main)
"DI" = (
/obj/effect/turf_decal/tile/bar,
/obj/machinery/vending/boozeomat/syndicate_access{
onstation = 0
},
/obj/effect/turf_decal/tile/bar,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/bar)
"DL" = (
@@ -3052,6 +3085,11 @@
dir = 1
},
/obj/machinery/firealarm/directional/south,
/obj/machinery/quantumpad{
map_pad_id = "interdyne";
map_pad_link_id = "ds2";
name = "quantum pad to DS-2"
},
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"Ie" = (
@@ -3122,6 +3160,10 @@
"IP" = (
/obj/structure/table/reinforced,
/obj/item/kitchen/rollingpin,
/obj/item/reagent_containers/food/condiment/saltshaker,
/obj/item/reagent_containers/food/condiment/peppermill{
pixel_x = 6
},
/turf/open/floor/iron/kitchen,
/area/ruin/unpowered/syndicate_lava_base/bar)
"IS" = (
@@ -3139,10 +3181,10 @@
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"Jq" = (
/obj/machinery/seed_extractor,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/machinery/chem_dispenser/mutagensaltpeter,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/unpowered/syndicate_lava_base/bar)
"Jx" = (
@@ -4114,6 +4156,12 @@
dir = 1
},
/area/ruin/unpowered/syndicate_lava_base/cargo)
"VO" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"VQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 8;
@@ -4246,7 +4294,6 @@
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/bar)
"Xw" = (
@@ -5816,13 +5863,13 @@ us
us
us
td
sF
Ol
dR
NY
Yv
CC
FF
td
lD
Xq
LK
iL
@@ -6057,8 +6104,8 @@ dR
NY
OV
jc
ce
td
FF
cZ
xf
sF
DI
@@ -6679,7 +6726,7 @@ ab
ab
ab
ab
Iy
ab
Mt
PQ
gB
@@ -6738,7 +6785,7 @@ ab
ab
ab
ab
bz
ab
qa
rD
Kg
@@ -6797,8 +6844,8 @@ ab
ab
ab
ab
Iy
Mt
ab
ds
Mt
Mt
Mt
@@ -6857,7 +6904,7 @@ ab
ab
ab
ab
yQ
dJ
jg
jl
yQ
@@ -6916,7 +6963,7 @@ ab
ab
ab
ab
yQ
dJ
gp
EU
PW
@@ -6975,7 +7022,7 @@ ab
ab
ab
ab
yQ
dJ
yQ
yQ
yQ
@@ -7034,7 +7081,7 @@ ab
ab
ab
ab
yQ
dJ
uA
st
vH
@@ -7092,8 +7139,8 @@ ab
ab
ab
ab
ab
yQ
Iy
dJ
ZR
Lm
Lm
@@ -7151,8 +7198,8 @@ ab
ab
ab
ab
ab
yQ
bz
VO
kh
JM
Xo
@@ -7163,7 +7210,7 @@ EV
ZL
wu
xJ
QN
ce
vl
jb
Vr
@@ -7210,7 +7257,7 @@ ab
ab
ab
ab
ab
Iy
yQ
yQ
yQ
@@ -203,6 +203,11 @@
dir = 1
},
/obj/machinery/firealarm/directional/south,
/obj/machinery/quantumpad{
map_pad_id = "interdyne";
map_pad_link_id = "ds2";
name = "quantum pad to DS-2"
},
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"ca" = (
@@ -242,12 +247,9 @@
/turf/open/floor/iron/showroomfloor,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"cp" = (
/obj/structure/chair{
dir = 1
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/bar)
/obj/machinery/smartfridge/chemistry/preloaded,
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"cr" = (
/obj/structure/window/reinforced/survival_pod{
dir = 1
@@ -626,6 +628,7 @@
dir = 4;
id = "interdynecargoout"
},
/obj/structure/plasticflaps,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"gR" = (
@@ -881,10 +884,10 @@
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"kq" = (
/obj/machinery/chem_master,
/obj/structure/sign/departments/chemistry{
pixel_x = 32
},
/obj/structure/table/glass,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"ku" = (
@@ -918,6 +921,12 @@
dir = 1
},
/area/ruin/unpowered/syndicate_lava_base/cargo)
"kD" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"kL" = (
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
/obj/machinery/door/poddoor{
@@ -955,6 +964,10 @@
"lE" = (
/obj/structure/table/reinforced,
/obj/item/kitchen/rollingpin,
/obj/item/reagent_containers/food/condiment/saltshaker,
/obj/item/reagent_containers/food/condiment/peppermill{
pixel_x = 6
},
/turf/open/floor/iron/kitchen,
/area/ruin/unpowered/syndicate_lava_base/bar)
"lF" = (
@@ -990,7 +1003,9 @@
dir = 1
},
/obj/structure/table/reinforced,
/obj/item/kinetic_crusher,
/obj/item/fakeartefact{
possible = list(/obj/item/kinetic_crusher)
},
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"mb" = (
@@ -1241,6 +1256,7 @@
/obj/item/plant_analyzer,
/obj/item/geneshears,
/obj/item/gun/energy/floragun,
/obj/item/secateurs,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/unpowered/syndicate_lava_base/bar)
"oY" = (
@@ -1577,6 +1593,16 @@
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"tI" = (
/obj/machinery/button/door{
id = "interdynecargowest";
pixel_x = 32;
pixel_y = 8
},
/obj/machinery/button/door{
id = "interdynecargoeast";
pixel_x = 32;
pixel_y = -8
},
/obj/machinery/computer/shuttle{
desc = "Occasionally used to call in a resupply shuttle if one is in range.";
dir = 8;
@@ -1588,16 +1614,6 @@
req_access_txt = "150";
shuttleId = "syndie_cargo"
},
/obj/machinery/button/door{
id = "interdynecargowest";
pixel_x = 32;
pixel_y = 8
},
/obj/machinery/button/door{
id = "interdynecargoeast";
pixel_x = 32;
pixel_y = -8
},
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"tO" = (
@@ -1909,10 +1925,10 @@
/turf/open/floor/stone,
/area/ruin/unpowered/syndicate_lava_base/bar)
"xx" = (
/obj/machinery/seed_extractor,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/machinery/chem_dispenser/mutagensaltpeter,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/unpowered/syndicate_lava_base/bar)
"xH" = (
@@ -1920,6 +1936,12 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/ruin/unpowered/syndicate_lava_base/bar)
"xL" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/virology)
"xM" = (
/obj/structure/chair/office/light{
dir = 1
@@ -1985,6 +2007,7 @@
dir = 8;
id = "interdynecargoin"
},
/obj/structure/plasticflaps,
/turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"yA" = (
@@ -2053,7 +2076,9 @@
/turf/open/floor/iron/white,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"zt" = (
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/virology)
"zu" = (
@@ -2410,8 +2435,7 @@
},
/area/ruin/unpowered/syndicate_lava_base/cargo)
"Ct" = (
/obj/structure/table/glass,
/obj/machinery/reagentgrinder,
/obj/machinery/chem_master,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"CB" = (
@@ -2454,7 +2478,9 @@
dir = 1
},
/obj/structure/table/reinforced,
/obj/item/gun/energy/kinetic_accelerator,
/obj/item/fakeartefact{
possible = list(/obj/item/gun/energy/kinetic_accelerator)
},
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"CZ" = (
@@ -2517,6 +2543,7 @@
/obj/effect/turf_decal/tile/bar{
dir = 8
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/bar)
"DZ" = (
@@ -2598,6 +2625,9 @@
/obj/effect/turf_decal/siding/brown{
dir = 1
},
/obj/item/card/id/advanced/chameleon,
/obj/item/card/id/advanced/chameleon,
/obj/item/card/id/advanced/chameleon,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"Fm" = (
@@ -3015,7 +3045,6 @@
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/ruin/unpowered/syndicate_lava_base/bar)
"Kp" = (
@@ -3519,6 +3548,11 @@
},
/area/ruin/unpowered/syndicate_lava_base/main)
"PS" = (
/obj/structure/safe,
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe{
desc = "It's a box, for storing things.";
name = "chameleon kit"
},
/turf/open/floor/iron/corner{
dir = 1
},
@@ -3542,10 +3576,10 @@
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"Qk" = (
/obj/structure/table/glass,
/obj/item/clothing/glasses/science,
/obj/item/book/manual/wiki/chemistry{
pixel_y = 8
},
/obj/item/clothing/glasses/science,
/turf/open/floor/iron/white,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"Qm" = (
@@ -3611,6 +3645,10 @@
dir = 4
},
/area/ruin/unpowered/syndicate_lava_base/medbay)
"QN" = (
/obj/machinery/smartfridge/drinks,
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/bar)
"QQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3847,6 +3885,12 @@
"Tx" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/bar)
"TJ" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"TV" = (
/obj/effect/turf_decal/tile/bar{
dir = 4
@@ -3937,6 +3981,10 @@
},
/turf/open/floor/plating/lavaland_atmos,
/area/ruin/unpowered/syndicate_lava_base/testlab)
"Vi" = (
/obj/machinery/smartfridge/food,
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/bar)
"Vj" = (
/obj/structure/lattice/catwalk,
/turf/open/lava/smooth/lava_land_surface,
@@ -4192,6 +4240,7 @@
/obj/item/storage/box/beakers/bluespace,
/obj/item/storage/box/beakers/bluespace,
/obj/machinery/firealarm/directional/west,
/obj/machinery/reagentgrinder,
/turf/open/floor/iron/white,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"XN" = (
@@ -5816,13 +5865,13 @@ df
df
df
Tx
WW
To
QQ
wo
Cd
Pd
YN
Tx
Vi
Ko
Ji
DQ
@@ -6057,8 +6106,8 @@ QQ
wo
Oy
xH
cp
Tx
YN
QN
ej
WW
ae
@@ -6679,7 +6728,7 @@ ab
ab
ab
ab
Sy
ab
rq
Xl
is
@@ -6738,7 +6787,7 @@ ab
ab
ab
ab
wn
ab
zt
bu
PC
@@ -6797,8 +6846,8 @@ ab
ab
ab
ab
Sy
rq
ab
xL
rq
rq
rq
@@ -6857,7 +6906,7 @@ ab
ab
ab
ab
ZX
kD
Wr
Na
ZX
@@ -6916,7 +6965,7 @@ ab
ab
ab
ab
ZX
kD
oe
pI
FO
@@ -6975,7 +7024,7 @@ ab
ab
ab
ab
ZX
kD
ZX
ZX
ZX
@@ -7034,7 +7083,7 @@ ab
ab
ab
ab
ZX
kD
cy
pM
Pk
@@ -7092,8 +7141,8 @@ ab
ab
ab
ab
ab
ZX
Sy
kD
RP
Vt
Vt
@@ -7151,8 +7200,8 @@ ab
ab
ab
ab
ab
ZX
wn
TJ
Sk
pW
Wd
@@ -7163,7 +7212,7 @@ Qt
Vv
rE
qL
VY
cp
kq
Ct
Ha
@@ -7210,7 +7259,7 @@ ab
ab
ab
ab
ab
Sy
ZX
ZX
ZX
File diff suppressed because it is too large Load Diff
@@ -8,7 +8,6 @@
id = "ice-base"
description = "A secret base researching illegal bioweapons, it is closely guarded by an elite team of syndicate agents."
suffix = "icemoon_underground_syndicate_base1_skyrat.dmm"
cost = 20
allow_duplicates = FALSE
never_spawn_with = list(/datum/map_template/ruin/lavaland/skyrat/syndicate_base)
always_place = TRUE
@@ -8,7 +8,6 @@
id = "lava-base"
description = "A secret base researching illegal bioweapons, it is closely guarded by an elite team of syndicate agents."
suffix = "lavaland_surface_syndicate_base1_skyrat.dmm"
cost = 20
allow_duplicates = FALSE
never_spawn_with = list(/datum/map_template/ruin/icemoon/underground/skyrat/syndicate_base)
always_place = TRUE
@@ -10,6 +10,13 @@
suffix = "forgottenship_skyrat.dmm"
always_place = TRUE
/datum/map_template/ruin/space/skyrat/interdynefob
name = "DS-2"
id = "interdynefob"
description = "If DS-1 was so good..."
suffix = "interdynefob.dmm"
always_place = TRUE
/datum/map_template/ruin/space/skyrat/derelictferry
id = "derelictferry"
suffix = "derelictferry.dmm"
@@ -28,7 +28,7 @@
desc = "Used to designate a precise transit location for the affectionately named 'Chevvy'."
shuttleId = "blackmarket_chevvy"
lock_override = NONE
shuttlePortId = "caravansyndicate1_custom"
shuttlePortId = "blackmarket_chevvy_custom"
jumpto_ports = list("blackmarket_chevvy_home" = 1, "whiteship_home" = 1)
view_range = 0
x_offset = 2
@@ -1,4 +1,4 @@
//Cybersun, Forgotten Ship
///Cybersun, Forgotten Ship
/area/ruin/space/has_grav/cybersun
name = "Cybersun"
icon_state = "spacecontent1"
@@ -7,8 +7,7 @@
name = "Abandoned Atmospherics Wing"
icon_state = "atmos"
/area/ruin/space/has_grav/powered/skyrat
name = "Powered, Gravity-Filled Room" //Yes, yes it is
///Generic Skyrat Ruins
/area/ruin/space/has_grav/powered/skyrat/smugglies
name = "Suspicious Cargo Installation"
@@ -22,6 +21,157 @@
/area/ruin/space/has_grav/powered/skyrat/blackmarket
name = "Shady Market"
///Interdyne, Forward Operating Base
/area/ruin/space/has_grav/skyrat/interdynefob
name = "DS-2" //If DS-1 is so great...
icon_state = "syndie-elite"
//Cargo
/area/ruin/space/has_grav/skyrat/interdynefob/cargo
name = "DS-2 Cargo"
icon_state = "cargo_bay"
/area/ruin/space/has_grav/skyrat/interdynefob/cargo/hangar
name = "DS-2 Hangar"
icon_state = "quart_perch"
/area/ruin/space/has_grav/skyrat/interdynefob/cargo/mining_equipment
name = "DS-2 Mining Equipment"
icon_state = "mining"
/area/ruin/space/has_grav/skyrat/interdynefob/cargo/commissary
name = "DS-2 Abandoned Commissary"
icon_state = "vacant_commissary"
/area/ruin/space/has_grav/skyrat/interdynefob/cargo/warehouse
name = "DS-2 Warehouse"
icon_state = "cargo_warehouse"
//Bridge
/area/ruin/space/has_grav/skyrat/interdynefob/bridge
name = "DS-2 Bridge"
icon_state = "bridge"
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/cl
name = "DS-2 Corporate Liaison's Office"
icon_state = "hop_office"
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/admiral
name = "DS-2 Station Admiral's Office"
icon_state = "captain"
sound_environment = SOUND_AREA_WOODFLOOR
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/vault
name = "DS-2 Vault"
icon_state = "nuke_storage"
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/eva
name = "DS-2 E.V.A."
icon_state = "eva"
//Security
/area/ruin/space/has_grav/skyrat/interdynefob/security
name = "DS-2 Security"
icon_state = "security"
ambience_index = AMBIENCE_DANGER
/area/ruin/space/has_grav/skyrat/interdynefob/security/armory
name = "DS-2 Armory"
icon_state = "armory"
/area/ruin/space/has_grav/skyrat/interdynefob/security/lawyer
name = "DS-2 Corporate Lawyer's Office"
icon_state = "law"
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison
name = "DS-2 Long-Term Brig"
icon_state = "sec_prison"
//Service
/area/ruin/space/has_grav/skyrat/interdynefob/service
name = "DS-2 Service Wing"
icon_state = "crew_quarters"
/area/ruin/space/has_grav/skyrat/interdynefob/service/diner
name = "DS-2 Diner"
icon_state = "cafeteria"
/area/ruin/space/has_grav/skyrat/interdynefob/service/chapel
name = "DS-2 Chapel"
icon_state = "chapel"
/area/ruin/space/has_grav/skyrat/interdynefob/service/dorms
name = "DS-2 Dormitories"
/area/ruin/space/has_grav/skyrat/interdynefob/service/dorms/fitness
name = "DS-2 Fitness Halls"
icon_state = "fitness"
/area/ruin/space/has_grav/skyrat/interdynefob/service/library
name = "DS-2 Library"
icon_state = "library"
/area/ruin/space/has_grav/skyrat/interdynefob/service/hydroponics
name = "DS-2 Hydroponics"
icon_state = "garden"
//Hallways
/area/ruin/space/has_grav/skyrat/interdynefob/halls
name = "DS-2 Central Halls"
icon_state = "hallC"
//Engineering
/area/ruin/space/has_grav/skyrat/interdynefob/engineering
name = "DS-2 Engineering"
icon_state = "engine"
/area/ruin/space/has_grav/skyrat/interdynefob/solars
name = "DS-2 Solar Array"
icon_state = "apmaint"
/area/ruin/space/has_grav/skyrat/interdynefob/solars/southwest
name = "DS-2 Port Quarter Solars"
icon_state = "SolarcontrolAP"
/area/ruin/space/has_grav/skyrat/interdynefob/solars/northeast
name = "DS-2 Starboard Bow Solars"
icon_state = "panelsS"
//Maintenance
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance
name = "DS-2 Maintenance"
icon_state = "maintcentral"
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southwest
name = "DS-2 Port Quarter Maintenance"
icon_state = "apmaint"
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/northwest
name = "DS-2 Port Fore Maintenance"
icon_state = "fpmaint"
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/northeast
name = "DS-2 Starboard Bow Maintenance"
icon_state = "smaint"
/area/ruin/space/has_grav/skyrat/interdynefob/maintenance/southeast
name = "DS-2 Starboard Quarter Maintenance"
icon_state = "smaint_2"
//Research
/area/ruin/space/has_grav/skyrat/interdynefob/research
name = "DS-2 Research"
icon_state = "research"
//Medbay
/area/ruin/space/has_grav/skyrat/interdynefob/medbay
name = "DS-2 Medical Bay"
icon_state = "medbay1"
/area/ruin/space/has_grav/skyrat/interdynefob/medbay/chem
name = "DS-2 Chemistry"
icon_state = "chem"
/area/ruin/space/has_grav/shuttle8532engineering
name = "Shuttle 8532 Engine Room"
@@ -36,6 +186,6 @@
/area/ruin/space/has_grav/shuttle8532bridge
name = "Shuttle 8532 Bridge"
/area/ruin/space/has_grav/vaulttango
name = "ARBORLINK Vault Tango"
@@ -1,2 +1,5 @@
/area/shuttle/blackmarket_chevvy
name = "Blackmarket Chevvy"
/area/shuttle/interdyne_cargo
name = "Interdyne Cargo Shuttle"
@@ -0,0 +1,50 @@
/obj/effect/turf_decal/skyrat_decals
icon = 'modular_skyrat/modules/mapping/icons/turf/turf_decals.dmi'
icon_state = "bad_coder"
///SYNDICATE EMBLEM///
//Bottom
/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left
icon_state = "1,1"
/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle
icon_state = "1,2"
/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right
icon_state = "1,3"
//Middle
/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left
icon_state = "2,1"
/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle
icon_state = "2,2"
/obj/effect/turf_decal/skyrat_decals/syndicate/middle/right
icon_state = "2,3"
//Top
/obj/effect/turf_decal/skyrat_decals/syndicate/top/left
icon_state = "3,1"
/obj/effect/turf_decal/skyrat_decals/syndicate/top/middle
icon_state = "3,2"
/obj/effect/turf_decal/skyrat_decals/syndicate/top/right
icon_state = "3,3"
///Departments///
/obj/effect/turf_decal/skyrat_decals/departments/bridge
icon_state = "bridge"
///DS-2 Sign///
/obj/effect/turf_decal/skyrat_decals/ds2/left
icon_state = "ds1"
/obj/effect/turf_decal/skyrat_decals/ds2/middle
icon_state = "ds2"
/obj/effect/turf_decal/skyrat_decals/ds2/right
icon_state = "ds3"
///Misc///
/obj/effect/turf_decal/skyrat_decals/misc/handicapped
icon_state = "handicapped"
@@ -22,6 +22,66 @@
can_use_alias = TRUE
any_station_species = TRUE
/obj/effect/mob_spawn/human/ds2/prisoner
name = "Syndicate Prisoner"
short_desc = "You are the syndicate prisoner aboard an unknown station."
flavour_text = "You don't know where you are, but you know you are a prisoner. The plastitanium clues you into your captors.. as for why you're here? That's up to you."
important_info = "You are still subject to standard prisoner policy, and must Adminhelp before antagonizing Interdyne."
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
outfit = /datum/outfit/ds2/prisoner
roundstart = FALSE
permanent = FALSE
death = FALSE
can_use_alias = TRUE
any_station_species = TRUE
/obj/effect/mob_spawn/human/ds2/syndicate
name = "Syndicate Operative"
roundstart = FALSE
death = FALSE
random = TRUE
can_use_alias = TRUE
any_station_species = TRUE
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
short_desc = "You are a syndicate operative, employed in a top secret research facility developing biological weapons."
flavour_text = "Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Continue operating as best you can, and try to keep a low profile."
important_info = "You are not an antagonist."
outfit = /datum/outfit/ds2/syndicate
assignedrole = "DS-2 Operative"
/obj/effect/mob_spawn/human/ds2/syndicate/special(mob/living/new_spawn)
new_spawn.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND)
/obj/effect/mob_spawn/human/ds2/syndicate/service
outfit = /datum/outfit/ds2/syndicate/service
assignedrole = "DS-2 Service Staff"
/obj/effect/mob_spawn/human/ds2/syndicate/enginetech
outfit = /datum/outfit/ds2/syndicate/enginetech
assignedrole = "DS-2 Engine Technician"
/obj/effect/mob_spawn/human/ds2/syndicate/researcher
outfit = /datum/outfit/ds2/syndicate/researcher
assignedrole = "DS-2 Researcher"
/obj/effect/mob_spawn/human/ds2/syndicate/stationmed
outfit = /datum/outfit/ds2/syndicate/stationmed
assignedrole = "DS-2 Station Medical Officer"
/obj/effect/mob_spawn/human/ds2/syndicate/masteratarms
outfit = /datum/outfit/ds2/syndicate/masteratarms
assignedrole = "DS-2 Master At Arms"
/obj/effect/mob_spawn/human/ds2/syndicate/brigoff
outfit = /datum/outfit/ds2/syndicate/brigoff
assignedrole = "DS-2 Brig Officer"
/obj/effect/mob_spawn/human/ds2/syndicate/admiral
outfit = /datum/outfit/ds2/syndicate/admiral
assignedrole = "DS-2 Station Admiral"
//OUTFITS//
/datum/outfit/syndicatespace/syndicrew
ears = /obj/item/radio/headset/cybersun
@@ -31,6 +91,87 @@
ears = /obj/item/radio/headset/cybersun/captain
id_trim = /datum/id_trim/syndicom/skyrat/captain
/datum/outfit/ds2/prisoner
name = "Syndicate Prisoner"
uniform = /obj/item/clothing/under/rank/prisoner
shoes = /obj/item/clothing/shoes/sneakers/orange
id = /obj/item/card/id/advanced/prisoner
/datum/outfit/ds2/syndicate
name = "DS-2 Operative"
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/interdyne
back = /obj/item/storage/backpack
id = /obj/item/card/id/advanced/black
implants = list(/obj/item/implant/weapons_auth)
id_trim = /datum/id_trim/syndicom/skyrat/assault/assistant
/datum/outfit/ds2/syndicate/service
name = "DS-2 Staff"
uniform = /obj/item/clothing/under/utility/syndicate
id_trim = /datum/id_trim/syndicom/skyrat/assault/syndicatestaff
/datum/outfit/ds2/syndicate/enginetech
name = "DS-2 Engine Technician"
uniform = /obj/item/clothing/under/utility/eng/syndicate
id_trim = /datum/id_trim/syndicom/skyratnoicon/enginetechnician
gloves = /obj/item/clothing/gloves/combat
/datum/outfit/ds2/syndicate/researcher
name = "DS-2 Researcher"
uniform = /obj/item/clothing/under/utility/sci/syndicate
id_trim = /datum/id_trim/syndicom/skyrat/assault/researcher
/datum/outfit/ds2/syndicate/stationmed
name = "DS-2 Station Medical Officer"
uniform = /obj/item/clothing/under/utility/med/syndicate
id_trim = /datum/id_trim/syndicom/skyrat/assault/stationmedicalofficer
/datum/outfit/ds2/syndicate/masteratarms
name = "DS-2 Master At Arms"
uniform = /obj/item/clothing/under/utility/sec/old/syndicate
id_trim = /datum/id_trim/syndicom/skyrat/assault/masteratarms
belt = /obj/item/storage/belt/security/full
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
suit = /obj/item/clothing/suit/armor/vest/warden/syndicate
head = /obj/item/clothing/head/warden/syndicate
ears = /obj/item/radio/headset/headset_sec/alt/interdyne
backpack_contents = list(
/obj/item/storage/box/handcuffs,\
/obj/item/melee/baton/loaded
)
/datum/outfit/ds2/syndicate/brigoff
name = "DS-2 Brig Officer"
uniform = /obj/item/clothing/under/utility/sec/old/syndicate
id_trim = /datum/id_trim/syndicom/skyrat/assault/brigofficer
belt = /obj/item/storage/belt/security/full
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
suit = /obj/item/clothing/suit/armor/bulletproof
head = /obj/item/clothing/head/helmet/swat
ears = /obj/item/radio/headset/headset_sec/alt/interdyne
backpack_contents = list(
/obj/item/storage/box/handcuffs,\
/obj/item/melee/baton/loaded
)
/datum/outfit/ds2/syndicate/admiral
name = "DS-2 Station Admiral"
uniform = /obj/item/clothing/under/utility/com/syndicate
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
head = /obj/item/clothing/head/hos/beret/syndicate
back = /obj/item/storage/backpack
id = /obj/item/card/id/advanced/gold/generic
backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/aps)
id_trim = /datum/id_trim/syndicom/skyrat/assault/stationadmiral
ears = /obj/item/radio/headset/interdyne/command
/datum/outfit/ds2/syndicate/post_equip(mob/living/carbon/human/H)
H.faction |= ROLE_SYNDICATE
//ITEMS//
/obj/item/radio/headset/cybersun
keyslot = new /obj/item/encryptionkey/headset_cybersun
@@ -36,6 +36,7 @@
name = "Lavaland Syndicate Deck Officer"
uniform = /obj/item/clothing/under/rank/cargo/qm/syndie
neck = /obj/item/clothing/neck/cloak/qm/syndie
ears = /obj/item/radio/headset/interdyne/command
/obj/effect/mob_spawn/human/lavaland_syndicate/deckofficer
name = "Syndicate Deck Officer"
@@ -51,6 +52,15 @@
/obj/item/radio/headset/interdyne
keyslot = new /obj/item/encryptionkey/headset_interdyne
/obj/item/radio/headset/interdyne/command
name = "command radio headset"
desc = "A headset with a commanding channel."
icon_state = "com_headset"
command = TRUE
/obj/item/radio/headset/headset_sec/alt/interdyne
keyslot = new /obj/item/encryptionkey/headset_interdyne
/obj/item/radio/headset/interdyne/comms
keyslot = new /obj/item/encryptionkey/headset_interdyne
keyslot2 = new /obj/item/encryptionkey/syndicate
Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

+1 -7
View File
@@ -160,7 +160,6 @@
#include "code\__DEFINES\research\anomalies.dm"
#include "code\__DEFINES\~skyrat_defines\ambitions.dm"
#include "code\__DEFINES\~skyrat_defines\ammo_defines.dm"
#include "code\__DEFINES\~skyrat_defines\assaultops.dm"
#include "code\__DEFINES\~skyrat_defines\banning.dm"
#include "code\__DEFINES\~skyrat_defines\cells.dm"
#include "code\__DEFINES\~skyrat_defines\combat.dm"
@@ -3852,12 +3851,6 @@
#include "modular_skyrat\modules\antagonists\eldritch_cult\knowledge\ash_lore_skyrat.dm"
#include "modular_skyrat\modules\antagonists\eldritch_cult\knowledge\flesh_lore_skyrat.dm"
#include "modular_skyrat\modules\ashwalkers\Ashwalker\Ashwalkers.dm"
#include "modular_skyrat\modules\assaultops\code\areas.dm"
#include "modular_skyrat\modules\assaultops\code\assaultops_misc.dm"
#include "modular_skyrat\modules\assaultops\code\assaultops_outfits.dm"
#include "modular_skyrat\modules\assaultops\code\assaultops_spawners.dm"
#include "modular_skyrat\modules\assaultops\code\base_alarm.dm"
#include "modular_skyrat\modules\assaultops\code\shuttle.dm"
#include "modular_skyrat\modules\autotransfer\code\autotransfer.dm"
#include "modular_skyrat\modules\autotransfer\code\autotransfer_config.dm"
#include "modular_skyrat\modules\autotransfer\code\shuttle.dm"
@@ -4247,6 +4240,7 @@
#include "modular_skyrat\modules\mapping\code\game\area\areas\ruins\space.dm"
#include "modular_skyrat\modules\mapping\code\game\machinery\machinery.dm"
#include "modular_skyrat\modules\mapping\code\game\objects\fluff.dm"
#include "modular_skyrat\modules\mapping\code\game\objects\effects\decals\turf_decals.dm"
#include "modular_skyrat\modules\mapping\code\game\objects\effects\decals\vgdecals.dm"
#include "modular_skyrat\modules\mapping\code\game\objects\items\catwalk_items.dm"
#include "modular_skyrat\modules\mapping\code\game\objects\items\spaceship_items.dm"