cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Privateers 2.0 Prototype (#6046)

Browse Source 
* privateer 1? Who knows.

* shutters to windows

* Linters is moaning about area path?

* Update slaver_syndie.dmm

* Backpacks are too heavy!

* Oops! Forgot AI wire helpers for the rest of the doors.

* Tiny fan in airlock.

* Emptying the Captain's backpack into the map.

It won't pass sanity tests otherwise.
This commit is contained in:
KathrinBailey
2021-06-01 12:31:50 +12:00
committed by GitHub
parent 6d22d733df
commit c3d4aac47a
10 changed files with 1808 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/skyrat/shuttles/slaver_syndie.dmm
+1670
View File
File diff suppressed because it is too large Load Diff
code/__DEFINES/~skyrat_defines/mapping.dm
+6
View File
@@ -9,3 +9,9 @@
#define RADIO_TOKEN_INTERDYNE ":w"
#define FREQ_INTERDYNE 1209
#define RADIO_CHANNEL_GUILD "Guild"
#define RADIO_KEY_GUILD "g"
#define RADIO_TOKEN_GUILD ":g"
#define FREQ_GUILD 1214
code/game/communications.dm
+1
View File
@@ -102,6 +102,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
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,
RADIO_CHANNEL_SERVICE = FREQ_SERVICE,
code/game/objects/items/devices/radio/headset.dm
+1
View File
@@ -10,6 +10,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_FACTION = RADIO_TOKEN_FACTION, //SKYRAT EDIT ADDITION - Faction
RADIO_CHANNEL_CYBERSUN = RADIO_TOKEN_CYBERSUN, //SKYRAT EDIT ADDITION - Mapping
RADIO_CHANNEL_INTERDYNE = RADIO_TOKEN_INTERDYNE, //SKYRAT EDIT ADDITION - Mapping
RADIO_CHANNEL_GUILD = RADIO_TOKEN_GUILD, //SKYRAT EDIT ADDITION - Mapping
RADIO_CHANNEL_SYNDICATE = RADIO_TOKEN_SYNDICATE,
RADIO_CHANNEL_SUPPLY = RADIO_TOKEN_SUPPLY,
RADIO_CHANNEL_SERVICE = RADIO_TOKEN_SERVICE,
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -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_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 || freq == FREQ_ASSAULT)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, ASSAULT OPS
signal.data["compression"] = 0
signal.transmission_method = TRANSMISSION_SUPERSPACE
signal.levels = list(0) // reaches all Z-levels
code/game/say.dm
+1
View File
@@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_FACTION]" = "suppradio", //SKYRAT EDIT ADDITIION - FACTION
"[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",
code/modules/mob/living/living_say.dm
+1
View File
@@ -23,6 +23,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
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
MODE_KEY_ADMIN = MODE_ADMIN,
modular_skyrat/modules/mapping/code/radio.dm
+6
View File
@@ -9,3 +9,9 @@
icon_state = "syn_cypherkey"
channels = list(RADIO_CHANNEL_INTERDYNE = 1)
independent = TRUE
/obj/item/encryptionkey/headset_guild
name = "private radio encryption key"
icon_state = "syn_cypherkey"
channels = list(RADIO_CHANNEL_GUILD = 1)
independent = TRUE
modular_skyrat/modules/mapping/code/shuttles.dm
+120
View File
@@ -0,0 +1,120 @@
/area/shuttle/syndicate/slaver
name = "Slave Ship"
requires_power = TRUE
/obj/machinery/computer/camera_advanced/shuttle_docker/slaver
name = "Ship Navigation Computer"
desc = "Used to designate a precise custom destination to land."
shuttleId = "slaver_syndie"
lock_override = NONE
shuttlePortId = "slaver"
jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1)
view_range = 10
x_offset = 0
y_offset = 0
designate_time = 30
/obj/machinery/computer/shuttle/slaver
name = "Ship Travel Terminal"
desc = "Controls for moving the ship to a pre-programmed destination or a custom one marked out by the navigation computer."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = COLOR_SOFT_RED
req_access = list(ACCESS_SYNDICATE)
shuttleId = "slaver_syndie"
possible_destinations = "syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags_1 = NODECONSTRUCT_1
/datum/map_template/shuttle/slaver_ship
port_id = "slaver ship"
prefix = "_maps/skyrat/shuttles/"
port_id = "slaver"
suffix = "syndie"
name = "Slaver Ship"
who_can_purchase = null
/obj/effect/mob_spawn/human/guild/slaver
name = "Privateer Slaver"
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
short_desc = "You're here to capture valuable hostages to sell into slavery."
flavour_text = "You're part of a privateer crew that sometimes takes contracts from the illusive Guild, which offers bounties and contracts to independent crews. Raiding colonies of the many less technologically advanced species in the area is much easier than this. You've been told that your mission is to capture as many valuable hostages from the station as possible. Your anonymous employer insists on the importance of humiliating SolFed by snatching those under their protection from right under their noses."
important_info = ""
outfit = /datum/outfit/guild/slaver
excluded_gamemodes = list()
can_use_alias = TRUE
death = FALSE
any_station_species = TRUE
/obj/effect/mob_spawn/human/guild/slaver/captain
name = "Privateer Slaver Captain"
short_desc = "You lead a small team focused on capturing hostages."
flavour_text = "You're the captain of a privateer crew that sometimes takes contracts from the illusive Guild, which offers bounties and contracts to independent crews, like yours! Lead your crew to infiltrate the station and capture hostages and hold them till the station's emergency shuttle leaves. The higher ranking the hostages, the more you'll get paid out. You're free to (and encouraged to) beat and humiliate, but not kill. Your anonymous employer wants your victims as their personel slaves. They mentioned something about propaganda? Ah, who knows with the Guild... All sorts of types posts these bounties."
important_info = "You are expected to roleplay heavily and lead effectively in this role."
outfit = /datum/outfit/guild/slaver/captain
excluded_gamemodes = list()
/obj/item/radio/headset/guild
keyslot = new /obj/item/encryptionkey/headset_guild
/obj/item/radio/headset/guild/command
command = TRUE
/datum/outfit/guild/slaver
name = "Privateer Slaver"
head = /obj/item/clothing/head/helmet/alt
suit = /obj/item/clothing/suit/armor/bulletproof
uniform = /obj/item/clothing/under/syndicate/combat
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/guild
glasses = /obj/item/clothing/glasses/hud/security/chameleon
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/weapons_auth)
belt = /obj/item/storage/belt/military
r_pocket = /obj/item/storage/bag/ammo
l_pocket = /obj/item/gun/energy/disabler/cfa_disabler
id = /obj/item/card/id/advanced/chameleon
id_trim = /datum/id_trim/chameleon/operative
skillchips = list(/obj/item/skillchip/job/engineer)
backpack_contents = list(
/obj/item/storage/box/survival/engineer/radio,
/obj/item/melee/classic_baton/telescopic,
/obj/item/gun/ballistic/automatic/pistol/cfa_snub/empty,
/obj/item/ammo_box/magazine/multi_sprite/cfa_snub,
/obj/item/ammo_box/magazine/multi_sprite/cfa_snub,
/obj/item/ammo_box/magazine/multi_sprite/cfa_snub/ap,
/obj/item/ammo_box/magazine/multi_sprite/cfa_snub/rubber,
/obj/item/ammo_box/magazine/multi_sprite/cfa_snub/rubber,
/obj/item/grenade/c4,
/obj/item/grenade/smokebomb
)
/datum/outfit/guild/slaver/captain
name = "Privateer Slaver Captain"
head = /obj/item/clothing/head/helmet/alt
suit = /obj/item/clothing/suit/armor/bulletproof
uniform = /obj/item/clothing/under/syndicate/combat
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/guild/command
glasses = /obj/item/clothing/glasses/thermal/syndi
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/weapons_auth)
belt = /obj/item/storage/belt/military
r_pocket = /obj/item/storage/bag/ammo
l_pocket = /obj/item/gun/energy/disabler/cfa_disabler
id = /obj/item/card/id/advanced/chameleon
id_trim = /datum/id_trim/chameleon/operative
skillchips = list(/obj/item/skillchip/job/engineer)
backpack_contents = list(
/obj/item/storage/box/survival/engineer/radio,
/obj/item/melee/classic_baton/telescopic,
/obj/item/gun/ballistic/automatic/pistol/cfa_ruby/empty,
/obj/item/ammo_box/magazine/multi_sprite/cfa_ruby/ap,
/obj/item/ammo_box/magazine/multi_sprite/cfa_ruby/ap,
/obj/item/ammo_box/magazine/multi_sprite/cfa_ruby/rubber,
/obj/item/ammo_box/magazine/multi_sprite/cfa_ruby/rubber,
/obj/item/megaphone/command
)
tgstation.dme
+1
View File
@@ -4181,6 +4181,7 @@
#include "modular_skyrat\modules\mapping\code\plated_catwalk.dm"
#include "modular_skyrat\modules\mapping\code\pool.dm"
#include "modular_skyrat\modules\mapping\code\radio.dm"
#include "modular_skyrat\modules\mapping\code\shuttles.dm"
#include "modular_skyrat\modules\mapping\code\turnstile.dm"
#include "modular_skyrat\modules\mapping\code\datums\shuttles.dm"
#include "modular_skyrat\modules\mapping\code\datums\ruins\icemoon.dm"