diff --git a/aurorastation.dme b/aurorastation.dme
index 3860bb6ab92..d2fc1f8b8fb 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -405,6 +405,7 @@
#include "code\game\antagonist\antagonist_print.dm"
#include "code\game\antagonist\antagonist_update.dm"
#include "code\game\antagonist\alien\borer.dm"
+#include "code\game\antagonist\outsider\burglar.dm"
#include "code\game\antagonist\outsider\commando.dm"
#include "code\game\antagonist\outsider\deathsquad.dm"
#include "code\game\antagonist\outsider\ert.dm"
@@ -439,6 +440,7 @@
#include "code\game\gamemodes\objective.dm"
#include "code\game\gamemodes\setupgame.dm"
#include "code\game\gamemodes\borer\borer.dm"
+#include "code\game\gamemodes\burglars\burglars.dm"
#include "code\game\gamemodes\calamity\calamity.dm"
#include "code\game\gamemodes\changeling\helpers\_framework.dm"
#include "code\game\gamemodes\changeling\helpers\_store.dm"
@@ -521,6 +523,7 @@
#include "code\game\gamemodes\meteor\meteors.dm"
#include "code\game\gamemodes\mixed\acolytes.dm"
#include "code\game\gamemodes\mixed\bughunt.dm"
+#include "code\game\gamemodes\mixed\conflict.dm"
#include "code\game\gamemodes\mixed\conflux.dm"
#include "code\game\gamemodes\mixed\crossfire.dm"
#include "code\game\gamemodes\mixed\feeding.dm"
diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm
index f48002d1bc1..25bd432e50d 100644
--- a/code/__defines/gamemode.dm
+++ b/code/__defines/gamemode.dm
@@ -43,6 +43,7 @@
#define MODE_MERCENARY "mercenary"
#define MODE_NINJA "ninja"
#define MODE_RAIDER "raider"
+#define MODE_BURGLAR "burglar"
#define MODE_WIZARD "wizard"
#define MODE_CHANGELING "changeling"
#define MODE_CULTIST "cultist"
diff --git a/code/__defines/radio.dm b/code/__defines/radio.dm
index d634b6b23b1..f7f3839f212 100644
--- a/code/__defines/radio.dm
+++ b/code/__defines/radio.dm
@@ -10,6 +10,7 @@
#define DTH_FREQ 1341
#define SYND_FREQ 1213
#define NINJ_FREQ 1255
+#define BURG_FREQ 1257
#define RAID_FREQ 1277
#define ENT_FREQ 1461 //entertainment frequency. This is not a diona exclusive frequency.
@@ -37,6 +38,7 @@ var/list/radiochannels = list(
"Special Ops" = DTH_FREQ,
"Mercenary" = SYND_FREQ,
"Ninja" = NINJ_FREQ,
+ "Burglar" = BURG_FREQ,
"Raider" = RAID_FREQ,
"Supply" = SUP_FREQ,
"Service" = SRV_FREQ,
@@ -63,13 +65,15 @@ var/list/CENT_FREQS_ASSOC = list(
var/list/ANTAG_FREQS = list(
SYND_FREQ,
RAID_FREQ,
- NINJ_FREQ
+ NINJ_FREQ,
+ BURG_FREQ
)
var/list/ANTAG_FREQS_ASSOC = list(
"[SYND_FREQ]" = TRUE,
"[RAID_FREQ]" = TRUE,
- "[NINJ_FREQ]" = TRUE
+ "[NINJ_FREQ]" = TRUE,
+ "[BURG_FREQ]" = TRUE
)
//Department channels, arranged lexically
diff --git a/code/controllers/subsystems/statistics.dm b/code/controllers/subsystems/statistics.dm
index 22384cb11c6..90af8d7c400 100644
--- a/code/controllers/subsystems/statistics.dm
+++ b/code/controllers/subsystems/statistics.dm
@@ -18,6 +18,7 @@
var/list/msg_deathsquad = list()
var/list/msg_syndicate = list()
var/list/msg_raider = list()
+ var/list/msg_burglar = list()
var/list/msg_ninja = list()
var/list/msg_cargo = list()
var/list/msg_service = list()
diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm
index 85205acea66..034251480e6 100644
--- a/code/datums/outfits/outfit_antag.dm
+++ b/code/datums/outfits/outfit_antag.dm
@@ -232,6 +232,96 @@
W.handle_item_insertion(id)
spawn_money(rand(50,150)*10,W)
+/datum/outfit/admin/syndicate/raider/burglar
+ name = "Burglar"
+
+ uniform = list(
+ /obj/item/clothing/under/suit_jacket/really_black,
+ /obj/item/clothing/under/suit_jacket/charcoal,
+ /obj/item/clothing/under/suit_jacket/navy,
+ /obj/item/clothing/under/suit_jacket/burgundy
+ )
+
+ suit = /obj/item/clothing/suit/armor/bulletproof
+
+ shoes = list(
+ /obj/item/clothing/shoes/laceup/all_species,
+ /obj/item/clothing/shoes/laceup/brown/all_species
+ )
+
+ glasses = list(
+ /obj/item/clothing/glasses/sunglasses,
+ /obj/item/clothing/glasses/sunglasses/aviator
+ )
+
+ head = null
+
+ gloves = list(
+ /obj/item/clothing/gloves/watch,
+ /obj/item/clothing/gloves/watch/silver,
+ /obj/item/clothing/gloves/watch/gold,
+ /obj/item/clothing/gloves/watch/spy
+ )
+
+ l_ear = /obj/item/device/radio/headset/burglar
+ l_pocket = /obj/item/syndie/teleporter
+ r_pocket = /obj/item/device/special_uplink/burglar
+ id = /obj/item/storage/wallet
+
+ r_hand = /obj/item/storage/briefcase/black
+
+ backpack_contents = list()
+
+/datum/outfit/admin/syndicate/raider/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+ if(visualsOnly)
+ return
+
+ var/static/list/burglar_guns = list(
+ /obj/item/gun/energy/rifle/icelance,
+ /obj/item/gun/energy/retro,
+ /obj/item/gun/projectile/silenced,
+ /obj/item/gun/projectile/colt,
+ /obj/item/gun/projectile/revolver/deckard,
+ /obj/item/gun/projectile/revolver/lemat
+ )
+
+ var/new_gun = pick(burglar_guns)
+ var/turf/T = get_turf(H)
+
+ var/obj/item/primary = new new_gun(T)
+ var/obj/item/clothing/accessory/holster/armpit/holster
+
+ if(primary.slot_flags & SLOT_HOLSTER)
+ holster = new /obj/item/clothing/accessory/holster/armpit(T)
+ holster.holstered = primary
+ primary.forceMove(holster)
+ else if(!H.belt && (primary.slot_flags & SLOT_BELT))
+ H.equip_to_slot_or_del(primary, slot_belt)
+ else if(!H.back && (primary.slot_flags & SLOT_BACK))
+ H.equip_to_slot_or_del(primary, slot_back)
+ else
+ H.put_in_any_hand_if_possible(primary)
+
+ if(istype(primary, /obj/item/gun/projectile))
+ var/obj/item/gun/projectile/bullet_thrower = primary
+ var/obj/item/storage/briefcase/B = locate() in H
+ if(bullet_thrower.magazine_type)
+ new bullet_thrower.magazine_type(B)
+ if(prob(20)) //don't want to give them too much
+ new bullet_thrower.magazine_type(B)
+ else if(bullet_thrower.ammo_type)
+ for(var/i in 1 to rand(3, 5) + rand(0, 2))
+ new bullet_thrower.ammo_type(B)
+ H.put_in_hands(B)
+
+ if(holster)
+ var/obj/item/clothing/under/uniform = H.w_uniform
+ if(istype(uniform) && uniform.can_attach_accessory(holster))
+ uniform.attackby(holster, H)
+ else
+ H.put_in_any_hand_if_possible(holster)
+
// Non-syndicate antag outfits
/datum/outfit/admin/highlander
diff --git a/code/datums/uplink/uplink_categories.dm b/code/datums/uplink/uplink_categories.dm
index 47c72886e01..1c003f43ba3 100644
--- a/code/datums/uplink/uplink_categories.dm
+++ b/code/datums/uplink/uplink_categories.dm
@@ -2,6 +2,7 @@
var/name = ""
var/list/datum/uplink_item/items
var/list/datum/antagonist/antag_roles
+ var/list/restricted_antags
/datum/uplink_category/New()
..()
@@ -11,23 +12,30 @@
if(!LAZYLEN(antag_roles))
for(var/datum/uplink_item/item in items)
if(item.can_view(U))
- return 1
- return 0
+ return TRUE
+ return FALSE
+
+ for(var/antag_role in restricted_antags)
+ var/datum/antagonist/antag = all_antag_types[antag_role]
+ if(antag.is_antagonist(U.uplink_owner))
+ return FALSE
for(var/antag_role in antag_roles)
var/datum/antagonist/antag = all_antag_types[antag_role]
if(antag.is_antagonist(U.uplink_owner))
- return 1
- return 0
+ return TRUE
+ return FALSE
/datum/uplink_category/ammunition
name = "Ammunition"
/datum/uplink_category/grenades
name = "Grenades and Thrown Objects"
+ restricted_antags = list(MODE_BURGLAR)
/datum/uplink_category/visible_weapons
name = "Highly Visible and Dangerous Weapons"
+ restricted_antags = list(MODE_BURGLAR)
/datum/uplink_category/stealthy_weapons
name = "Stealthy and Inconspicuous Weapons"
@@ -55,12 +63,15 @@
/datum/uplink_category/exosuit
name = "Exosuit"
+ restricted_antags = list(MODE_BURGLAR)
/datum/uplink_category/exosuit_equipment
name = "Exosuit Equipment"
+ restricted_antags = list(MODE_BURGLAR)
/datum/uplink_category/corporate_equipment
name = "Corporate Equipment"
+ restricted_antags = list(MODE_BURGLAR)
/datum/uplink_category/telecrystals
name = "Telecrystals"
diff --git a/code/game/antagonist/antagonist_create.dm b/code/game/antagonist/antagonist_create.dm
index 4bcfd645feb..9f8fba2908b 100644
--- a/code/game/antagonist/antagonist_create.dm
+++ b/code/game/antagonist/antagonist_create.dm
@@ -48,6 +48,8 @@
switch(freq)
if(NINJ_FREQ)
R = new/obj/item/device/radio/headset/ninja(player)
+ if(BURG_FREQ)
+ R = new /obj/item/device/radio/headset/burglar(player)
if(SYND_FREQ)
R = new/obj/item/device/radio/headset/syndicate(player)
if(RAID_FREQ)
diff --git a/code/game/antagonist/outsider/burglar.dm b/code/game/antagonist/outsider/burglar.dm
new file mode 100644
index 00000000000..da9dfddfb4e
--- /dev/null
+++ b/code/game/antagonist/outsider/burglar.dm
@@ -0,0 +1,58 @@
+var/datum/antagonist/burglar/burglars
+
+/datum/antagonist/burglar
+ id = MODE_BURGLAR
+ role_text = "Burglar"
+ role_text_plural = "Burglars"
+ bantype = "burglar"
+ antag_indicator = "burglar"
+ landmark_id = "burglarspawn"
+ welcome_text = "You are a Burglar, someone underequipped to deal with the station. You will probably not survive for the whole round, so don't sweat it if you die!
\
+ Your (syndicate) sponsored uplink will grant you access to various tools you may need to attempt to accomplish your goal.
\
+ You can use :H or :B to talk on your encrypted channel, which only you and your partner can read.
\
+ You have been outfitted with a special teleportation device, make sure to use it!"
+ flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER
+ antaghud_indicator = "hudburglar"
+ required_age = 7
+
+ hard_cap = 2
+ hard_cap_round = 3
+ initial_spawn_req = 1
+ initial_spawn_target = 2
+
+ faction = "syndicate"
+
+ id_type = /obj/item/card/id/syndicate
+
+/datum/antagonist/burglar/New()
+ ..()
+ burglars = src
+
+/datum/antagonist/burglar/update_access(var/mob/living/player)
+ for(var/obj/item/storage/wallet/W in player.contents)
+ for(var/obj/item/card/id/id in W.contents)
+ id.name = "[player.real_name]'s Passport"
+ id.registered_name = player.real_name
+ W.name = "[initial(W.name)] ([id.name])"
+
+/datum/antagonist/burglar/equip(var/mob/living/carbon/human/player)
+ if(!..())
+ return FALSE
+
+ for(var/obj/item/I in player)
+ if(istype(I, /obj/item/implant))
+ continue
+ player.drop_from_inventory(I)
+ if(I.loc != player)
+ qdel(I)
+
+ player.preEquipOutfit(/datum/outfit/admin/syndicate/raider/burglar, FALSE)
+ player.equipOutfit(/datum/outfit/admin/syndicate/raider/burglar, FALSE)
+ player.force_update_limbs()
+ player.update_eyes()
+ player.regenerate_icons()
+
+ return TRUE
+
+/datum/antagonist/burglar/get_antag_radio()
+ return "Burglar"
\ No newline at end of file
diff --git a/code/game/gamemodes/burglars/burglars.dm b/code/game/gamemodes/burglars/burglars.dm
new file mode 100644
index 00000000000..d6ef1fb54fd
--- /dev/null
+++ b/code/game/gamemodes/burglars/burglars.dm
@@ -0,0 +1,12 @@
+// lowpop heist
+
+/datum/game_mode/burglars
+ name = "burglars"
+ config_tag = "burglars"
+ required_players = 5
+ max_players = 15
+ required_enemies = 2
+ round_description = "Something tiny is on the horizon! Is it the distance, or...?"
+ extended_round_description = "Two of the Orion Spur's best and brightest (or so they were told) have been tasked with burglarizing a station that will change the way capitalism grips this galaxy forever (or so they were told). It is up to the crew to repel them, and up to them to survive and possibly thrive."
+ end_on_antag_death = FALSE
+ antag_tags = list(MODE_BURGLAR)
\ No newline at end of file
diff --git a/code/game/gamemodes/mixed/conflict.dm b/code/game/gamemodes/mixed/conflict.dm
new file mode 100644
index 00000000000..55f154da6d4
--- /dev/null
+++ b/code/game/gamemodes/mixed/conflict.dm
@@ -0,0 +1,9 @@
+/datum/game_mode/conflict
+ name = "Conflict (Burglar+Heist)"
+ round_description = "Two underprepared teams of fools pick the same day to rob a highly valuable space station."
+ extended_round_description = "Burglars and heisters spawn during this round."
+ config_tag = "conflict"
+ required_players = 15
+ required_enemies = 6
+ antag_tags = list(MODE_RAIDER, MODE_BURGLAR)
+ require_all_templates = TRUE
\ No newline at end of file
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 8eeb9fbcd76..e8ec4b2bdfe 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -390,6 +390,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
SSfeedback.msg_raider += blackbox_msg
if(NINJ_FREQ)
SSfeedback.msg_ninja += blackbox_msg
+ if(BURG_FREQ)
+ SSfeedback.msg_burglar += blackbox_msg
if(SUP_FREQ)
SSfeedback.msg_cargo += blackbox_msg
if(SRV_FREQ)
@@ -578,6 +580,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
SSfeedback.msg_raider += blackbox_msg
if(NINJ_FREQ)
SSfeedback.msg_ninja += blackbox_msg
+ if(BURG_FREQ)
+ SSfeedback.msg_burglar += blackbox_msg
if(SUP_FREQ)
SSfeedback.msg_cargo += blackbox_msg
if(SRV_FREQ)
diff --git a/code/game/objects/items/devices/radio/_radio_defines.dm b/code/game/objects/items/devices/radio/_radio_defines.dm
index 2f3dc55961a..a6eb388e49b 100644
--- a/code/game/objects/items/devices/radio/_radio_defines.dm
+++ b/code/game/objects/items/devices/radio/_radio_defines.dm
@@ -13,4 +13,5 @@
#define CHANNEL_RAIDER "Raider"
#define CHANNEL_MERCENARY "Mercenary"
-#define CHANNEL_NINJA "Ninja"
\ No newline at end of file
+#define CHANNEL_NINJA "Ninja"
+#define CHANNEL_BURGLAR "Burglar"
\ No newline at end of file
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 876a171e7b6..ba0471e544b 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -28,6 +28,12 @@
origin_tech = list(TECH_ILLEGAL = 2)
syndie = TRUE
+/obj/item/device/encryptionkey/burglar
+ icon_state = "cypherkey"
+ channels = list(CHANNEL_COMMON = TRUE, CHANNEL_ENTERTAINMENT = TRUE, CHANNEL_BURGLAR = TRUE)
+ origin_tech = list(TECH_ILLEGAL = 2)
+ syndie = TRUE
+
/obj/item/device/encryptionkey/ninja
icon_state = "cypherkey"
channels = list(CHANNEL_COMMON = TRUE, CHANNEL_ENTERTAINMENT = TRUE, CHANNEL_NINJA = TRUE)
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index d5c06701464..e303966a137 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -413,6 +413,12 @@
syndie = 1
ks1type = /obj/item/device/encryptionkey/raider
+/obj/item/device/radio/headset/burglar
+ icon_state = "syn_headset"
+ origin_tech = list(TECH_ILLEGAL = 2)
+ syndie = TRUE
+ ks1type = /obj/item/device/encryptionkey/burglar
+
/obj/item/device/radio/headset/ninja
icon_state = "syn_headset"
origin_tech = list(TECH_ILLEGAL = 3)
diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm
index dbe8436eabd..c66b0ba2ebb 100644
--- a/code/game/objects/items/devices/uplink.dm
+++ b/code/game/objects/items/devices/uplink.dm
@@ -413,8 +413,12 @@ A list of items and costs is stored under the datum of every game mode, alongsid
/obj/item/device/special_uplink/ninja
name = "infiltrator uplink"
+/obj/item/device/special_uplink/burglar
+ name = "sponsored uplink"
+ starting_telecrystals = 15
+
/obj/item/device/special_uplink/rev
name = "station bounced radio"
desc = null // SBRs have no desc
icon_state = "walkietalkie" // more incognito
- starting_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT * 2
+ starting_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT * 2
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm
index 25785b0f749..aaf5ab0303b 100644
--- a/code/game/objects/items/weapons/syndie.dm
+++ b/code/game/objects/items/weapons/syndie.dm
@@ -82,3 +82,83 @@
src.icon_state = "c-4detonator_0"
to_chat(user, "You close the lighter.")
pr_open = 0
+
+/obj/item/syndie/teleporter
+ name = "pen"
+ desc = "An instrument for writing or drawing with ink. This one is in black, in a classic, grey casing. Stylish, classic and professional."
+ desc_antag = "While this may look like a bog-standard pen, in reality, this is a handheld teleportation device. Simply click on any turf within view to attempt to teleport there! The teleporter will recharge after a minute."
+ icon = 'icons/obj/bureaucracy.dmi'
+ icon_state = "pen"
+ item_state = "pen"
+ slot_flags = SLOT_BELT | SLOT_EARS
+ throwforce = 0
+ w_class = ITEMSIZE_TINY
+ throw_speed = 7
+ throw_range = 15
+ drop_sound = 'sound/items/drop/accessory.ogg'
+ pickup_sound = 'sound/items/pickup/accessory.ogg'
+ maptext_x = 3
+ maptext_y = 2
+ var/ready_to_use = TRUE
+ var/recharge_time = 1 MINUTE
+ var/held_maptext = "Ready"
+
+/obj/item/syndie/teleporter/Initialize()
+ . = ..()
+ if(ismob(loc) || ismob(loc.loc))
+ maptext = held_maptext
+
+/obj/item/syndie/teleporter/attack()
+ return
+
+/obj/item/syndie/teleporter/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ if(!ready_to_use)
+ to_chat(user, SPAN_WARNING("\The [src] isn't ready to use yet!"))
+ return
+ var/turf/T = target
+ if(!istype(T))
+ T = get_turf(target)
+ if(!T)
+ to_chat(user, SPAN_WARNING("Something has gone terribly wrong while choosing a target, please try again somewhere else!"))
+ return
+ if(T.density || T.contains_dense_objects())
+ to_chat(user, SPAN_WARNING("You cannot teleport to a location with solid objects!"))
+ return
+
+ user.visible_message("[user] blinks into nothingness!", SPAN_NOTICE("You jump into the nothing."))
+ user.forceMove(T)
+ spark(user, 3, alldirs)
+ user.visible_message("[user] appears out of thin air!", SPAN_NOTICE("You successfully step into your destination."))
+ use()
+
+/obj/item/syndie/teleporter/proc/check_maptext(var/new_maptext)
+ if(new_maptext)
+ held_maptext = new_maptext
+ if(ismob(loc) || ismob(loc.loc))
+ maptext = held_maptext
+ else
+ maptext = ""
+
+/obj/item/syndie/teleporter/proc/use()
+ addtimer(CALLBACK(src, .proc/recharge), recharge_time)
+ ready_to_use = FALSE
+ check_maptext("Charge")
+
+/obj/item/syndie/teleporter/proc/recharge()
+ ready_to_use = TRUE
+ check_maptext("Ready")
+
+/obj/item/syndie/teleporter/throw_at()
+ ..()
+ check_maptext()
+
+/obj/item/syndie/teleporter/dropped()
+ ..()
+ check_maptext()
+
+/obj/item/syndie/teleporter/on_give()
+ check_maptext()
+
+/obj/item/syndie/teleporter/pickup()
+ ..()
+ addtimer(CALLBACK(src, .proc/check_maptext), 1)
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index f361b141d55..2f4b19f0a25 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -144,6 +144,9 @@ obj/item/clothing/shoes/sandal/clogs
icon_state = "oxford_black"
item_state = "oxford_black"
+/obj/item/clothing/shoes/laceup/all_species
+ species_restricted = null
+
/obj/item/clothing/shoes/laceup/grey
name = "grey oxford shoes"
icon_state = "oxford_grey"
@@ -154,6 +157,9 @@ obj/item/clothing/shoes/sandal/clogs
icon_state = "oxford_brown"
item_state = "oxford_brown"
+/obj/item/clothing/shoes/laceup/brown/all_species
+ species_restricted = null
+
/obj/item/clothing/shoes/swimmingfins
desc = "Help you swim good."
name = "swimming fins"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index ab65b10294d..58e5f30013c 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -58,7 +58,7 @@
..()
/obj/item/clothing/suit/armor/vest
- name = "armor"
+ name = "armored vest"
desc = "An armored vest that protects against some damage."
icon_state = "armor"
item_state = "armor"
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 89b99dd74d4..d196a917152 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -13,6 +13,7 @@ var/list/department_radio_keys = list(
":w" = "whisper", ".w" = "whisper",
":t" = "Mercenary", ".t" = "Mercenary",
":x" = "Raider", ".x" = "Raider",
+ ":b" = "Burglar", ".b" = "Burglar",
":q" = "Ninja", ".q" = "Ninja",
":u" = "Supply", ".u" = "Supply",
":v" = "Service", ".v" = "Service",
@@ -32,6 +33,7 @@ var/list/department_radio_keys = list(
":W" = "whisper", ".W" = "whisper",
":T" = "Mercenary", ".T" = "Mercenary",
":X" = "Raider", ".X" = "Raider",
+ ":B" = "Burglar", ".B" = "Burglar",
":Q" = "Ninja", ".Q" = "Ninja",
":U" = "Supply", ".U" = "Supply",
":V" = "Service", ".V" = "Service",
diff --git a/code/modules/shuttles/antagonist.dm b/code/modules/shuttles/antagonist.dm
index 3a577c8c6ec..cac49e2d70c 100644
--- a/code/modules/shuttles/antagonist.dm
+++ b/code/modules/shuttles/antagonist.dm
@@ -4,6 +4,12 @@
shuttle_tag = "Skipjack"
light_color = LIGHT_COLOR_RED
+/obj/machinery/computer/shuttle_control/multi/burglar
+ name = "pod control console"
+ req_access = list(access_syndicate)
+ shuttle_tag = "Burglar Pod"
+ light_color = LIGHT_COLOR_RED
+
/obj/machinery/computer/shuttle_control/multi/antag/syndicate
name = "mercenary shuttle control console"
req_access = list(access_syndicate)
diff --git a/html/changelogs/geeves-lowpop_antag.yml b/html/changelogs/geeves-lowpop_antag.yml
new file mode 100644
index 00000000000..6b14c5eebe3
--- /dev/null
+++ b/html/changelogs/geeves-lowpop_antag.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+ - rscadd: "Added a lowpop gamemode called 'Burglars', featuring a new type of antagonist, a mix between a heister and a traitor. Neutered for lowpop fun."
+ - rscadd: "Added a mixed gamemode, 'Conflict', which is heisters and burglars."
\ No newline at end of file
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 98dd833b2e9..e1ea461ca3c 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 6742b47d5d4..ba9d9729d1c 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm
index 6ef5cbe0149..9cbc0b454ca 100644
--- a/maps/_common/areas/special.dm
+++ b/maps/_common/areas/special.dm
@@ -254,6 +254,17 @@
name = "Kataphract Chapter - Hull"
icon_state = "blue"
+/area/burglar_base
+ name = "Burglar Base"
+ icon_state = "yellow"
+ requires_power = FALSE
+ no_light_control = TRUE
+
+/area/burglar_base/pod
+ name = "Burglar Pod"
+ base_turf = /turf/space
+ flags = SPAWN_ROOF
+
/area/skipjack_station
name = "Skipjack"
icon_state = "yellow"
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index fbde81cbf49..b3f2cf9eda2 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -17994,6 +17994,9 @@
icon_state = "0,2"
},
/area/shuttle/distress/centcom)
+"bhr" = (
+/turf/unsimulated/wall/darkshuttlewall,
+/area/burglar_base/pod)
"bhH" = (
/turf/unsimulated/floor/plating,
/turf/simulated/wall/shuttle/unique/hapt{
@@ -18070,6 +18073,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/unsimulated/floor/plating,
/area/centcom/legion/hangar5)
+"blS" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 8
+ },
+/obj/structure/window/reinforced/crescent{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner_wide/red/full{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/unsimulated/floor,
+/area/burglar_base)
"blX" = (
/obj/structure/table/standard,
/obj/item/stack/medical/advanced/bruise_pack,
@@ -18719,6 +18737,16 @@
icon_state = "engine"
},
/area/centcom/legion/hangar5)
+"cnZ" = (
+/obj/item/folder{
+ pixel_y = 2
+ },
+/obj/structure/table/glass,
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"coC" = (
/obj/structure/sign/greencross{
name = "Emergency Room"
@@ -18931,6 +18959,15 @@
/obj/structure/flora/ausbushes/leafybush,
/turf/simulated/floor/grass/alt,
/area/centcom/shared_dream)
+"cAN" = (
+/obj/structure/closet/crate,
+/obj/item/gun/custom_ka/frame01/illegal,
+/obj/item/gun/custom_ka/frame01/illegal,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"cCe" = (
/obj/structure/shuttle_part/hapt{
desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean.";
@@ -19076,6 +19113,16 @@
/obj/item/storage/belt/utility/full,
/turf/simulated/floor/tiled/dark,
/area/shuttle/administration/centcom)
+"cIa" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 1
+ },
+/obj/structure/window/reinforced/crescent,
+/obj/effect/floor_decal/corner_wide/red{
+ dir = 5
+ },
+/turf/unsimulated/floor,
+/area/burglar_base)
"cJl" = (
/obj/structure/shuttle_part/transfer{
desc = "A large, bloated shuttle designed for automated passenger transport.";
@@ -19539,6 +19586,13 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/tiled/ramp/bottom,
/area/merchant_station/warehouse)
+"dqJ" = (
+/obj/machinery/light,
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"dqP" = (
/turf/simulated/wall/shuttle/unique/raider{
desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands.";
@@ -19677,6 +19731,11 @@
icon_state = "6,0"
},
/area/shuttle/distress/centcom)
+"dDK" = (
+/obj/structure/table/reinforced/steel,
+/obj/item/storage/fancy/tray,
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"dEX" = (
/obj/structure/closet/secure_closet/merchant,
/turf/simulated/floor/tiled/dark,
@@ -19858,6 +19917,9 @@
icon_state = "wood_light"
},
/area/centcom/legion/hangar5)
+"dOH" = (
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"dPt" = (
/obj/structure/flora/pottedplant/random,
/turf/unsimulated/floor{
@@ -20090,6 +20152,16 @@
icon_state = "5,10"
},
/area/supply/dock)
+"ead" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 4
+ },
+/obj/structure/window/reinforced/crescent,
+/obj/machinery/vending/sovietsoda{
+ name = "Syndicate-Sponsored BODA"
+ },
+/turf/simulated/floor/carpet,
+/area/burglar_base)
"eby" = (
/turf/simulated/wall/shuttle/unique/tcfl{
icon_state = "15,2"
@@ -20133,6 +20205,11 @@
icon_state = "wood"
},
/area/centcom/distress_prep)
+"ein" = (
+/turf/simulated/wall/shuttle/dark/corner/underlay{
+ dir = 6
+ },
+/area/burglar_base/pod)
"eiw" = (
/turf/unsimulated/wall/fakepdoor{
dir = 4
@@ -20335,6 +20412,17 @@
name = "Skipjack"
},
/area/skipjack_station/start)
+"ezR" = (
+/obj/structure/bed/chair/office/bridge/generic{
+ desc = "Looks suspiciously comfortable.";
+ dir = 8;
+ name = "bolted chair"
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"eAT" = (
/turf/simulated/wall/shuttle/unique/mercenary{
icon_state = "10,22"
@@ -20424,6 +20512,10 @@
/obj/effect/wingrille_spawn/reinforced/crescent,
/turf/unsimulated/floor/plating,
/area/centcom/distress_prep)
+"eMY" = (
+/obj/machinery/computer/shuttle_control/multi/burglar,
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"eNz" = (
/turf/simulated/wall/shuttle/unique/raider{
desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands.";
@@ -20466,6 +20558,18 @@
/obj/structure/bedsheetbin,
/turf/simulated/floor/wood,
/area/skipjack_station/start)
+"ePN" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 1
+ },
+/obj/structure/window/reinforced/crescent{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner_wide/red/full{
+ dir = 1
+ },
+/turf/unsimulated/floor,
+/area/burglar_base)
"ePR" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
@@ -21040,6 +21144,11 @@
},
/turf/unsimulated/floor/plating,
/area/shuttle/administration/centcom)
+"ftj" = (
+/turf/simulated/wall/shuttle/dark/corner/underlay{
+ dir = 5
+ },
+/area/burglar_base/pod)
"ftu" = (
/obj/structure/shuttle_part/raider{
desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands.";
@@ -21105,6 +21214,23 @@
name = "autoshuttle"
},
/area/shuttle/arrival/centcom)
+"fwV" = (
+/turf/simulated/wall/shuttle/dark/corner/underlay{
+ dir = 9
+ },
+/area/burglar_base/pod)
+"fze" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 8
+ },
+/obj/structure/window/reinforced/crescent,
+/obj/machinery/vending/zora{
+ name = "Syndicate-Sponsored Zo'ra Soda";
+ prices = list()
+ },
+/obj/machinery/light,
+/turf/simulated/floor/carpet/blue,
+/area/burglar_base)
"fzh" = (
/turf/simulated/wall/shuttle/unique/transfer{
desc = "A large, bloated shuttle designed for automated passenger transport.";
@@ -21597,6 +21723,14 @@
icon_state = "floor-shuttle"
},
/area/centcom/legion)
+"glm" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/grille,
+/turf/unsimulated/floor/plating,
+/area/burglar_base)
"glx" = (
/obj/machinery/light/small{
dir = 8
@@ -21978,6 +22112,10 @@
},
/turf/space,
/area/syndicate_station/start)
+"gEt" = (
+/obj/machinery/optable,
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"gEu" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
@@ -22332,6 +22470,17 @@
icon_state = "0,10"
},
/area/supply/dock)
+"hat" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/grille,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/unsimulated/floor/plating,
+/area/burglar_base)
"hau" = (
/turf/simulated/wall/shuttle/unique/distress{
icon_state = "8,4"
@@ -23477,6 +23626,15 @@
icon_state = "dark"
},
/area/centcom/legion/hangar5)
+"iot" = (
+/obj/structure/sign/double/map/left{
+ pixel_y = 32
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"ioS" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/southright,
@@ -24229,6 +24387,14 @@
name = "military corvette"
},
/area/shuttle/administration/centcom)
+"jne" = (
+/obj/structure/table/rack,
+/obj/item/storage/belt/utility/very_full,
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"jnf" = (
/turf/simulated/wall/shuttle/unique/tcfl{
icon_state = "1,6"
@@ -24242,6 +24408,10 @@
icon_state = "dark"
},
/area/centcom/distress_prep)
+"jnL" = (
+/obj/effect/wingrille_spawn/reinforced,
+/turf/unsimulated/floor/plating,
+/area/burglar_base/pod)
"jon" = (
/obj/machinery/door/airlock/centcom{
icon = 'icons/obj/doors/Doorcomglass.dmi';
@@ -24273,6 +24443,15 @@
},
/turf/simulated/floor/plating,
/area/shuttle/merchant/start)
+"jqI" = (
+/obj/item/reagent_containers/food/drinks/cans/waterbottle{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/turf/unsimulated/floor{
+ icon_state = "floor"
+ },
+/area/centcom/holding)
"jrk" = (
/turf/simulated/wall/shuttle/unique/merchant{
icon_state = "6,3"
@@ -24560,6 +24739,16 @@
},
/turf/unsimulated/floor/plating,
/area/shuttle/transport1/centcom)
+"jKQ" = (
+/obj/machinery/vending/snack{
+ name = "Syndicate-Sponsored Getmore Chocolate Corp";
+ prices = list()
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"jKW" = (
/obj/machinery/light/spot{
icon_state = "tube1";
@@ -25465,6 +25654,13 @@
name = "military corvette"
},
/area/shuttle/administration/centcom)
+"kXY" = (
+/obj/machinery/suit_cycler/syndicate,
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"kYu" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
@@ -25522,6 +25718,28 @@
},
/turf/simulated/floor/tiled,
/area/merchant_station/warehouse)
+"lcy" = (
+/obj/structure/table/reinforced/steel,
+/obj/item/ammo_magazine/mc9mm{
+ pixel_x = 2
+ },
+/obj/item/ammo_magazine/mc9mm,
+/obj/item/ammo_magazine/mc9mm{
+ pixel_x = -2
+ },
+/obj/item/ammo_magazine/mc9mm{
+ pixel_x = -4
+ },
+/obj/item/gun/projectile/pistol{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/item/gun/projectile/pistol{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"ldQ" = (
/turf/unsimulated/wall/darkshuttlewall,
/area/centcom/legion/hangar5)
@@ -25539,6 +25757,20 @@
},
/turf/space,
/area/syndicate_station/start)
+"lfi" = (
+/obj/structure/table/rack,
+/obj/item/clothing/head/helmet/space/void,
+/obj/item/clothing/suit/space/void,
+/obj/item/tank/oxygen/red,
+/obj/item/clothing/shoes/magboots,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"lfp" = (
/obj/machinery/light{
dir = 8;
@@ -25730,6 +25962,18 @@
icon_state = "3,4"
},
/area/shuttle/distress/centcom)
+"lsh" = (
+/obj/structure/table/rack,
+/obj/item/clothing/head/helmet/space/void,
+/obj/item/clothing/suit/space/void,
+/obj/item/tank/oxygen/red,
+/obj/item/clothing/shoes/magboots,
+/obj/machinery/light,
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"lsU" = (
/turf/unsimulated/floor/plating,
/turf/simulated/wall/shuttle/unique/cargo{
@@ -25852,6 +26096,11 @@
/obj/effect/wingrille_spawn/reinforced/crescent,
/turf/unsimulated/floor/plating,
/area/centcom/legion/hangar5)
+"lBW" = (
+/turf/simulated/wall/shuttle/dark/corner/underlay{
+ dir = 10
+ },
+/area/burglar_base/pod)
"lBZ" = (
/obj/structure/shuttle_part/mercenary{
icon_state = "6,25"
@@ -25957,6 +26206,17 @@
icon_state = "wood"
},
/area/centcom/legion/hangar5)
+"lKr" = (
+/obj/structure/closet/crate,
+/obj/item/storage/firstaid/o2,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/fire,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"lKB" = (
/obj/structure/table/reinforced/steel,
/obj/item/spacecash/c1000{
@@ -26026,6 +26286,18 @@
icon_state = "7,12"
},
/area/syndicate_station/start)
+"lPu" = (
+/obj/structure/bed/chair/comfy/black{
+ dir = 4
+ },
+/obj/effect/landmark{
+ name = "burglarspawn"
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"lPG" = (
/obj/structure/shuttle_part/raider{
desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands.";
@@ -26135,6 +26407,10 @@
},
/turf/unsimulated/floor/plating,
/area/centcom/distress_prep)
+"lVU" = (
+/obj/effect/shuttle_landmark/burglar/interim,
+/turf/space/transit,
+/area/space)
"lWY" = (
/obj/structure/shuttle_part/hapt{
desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean.";
@@ -27896,6 +28172,17 @@
icon_state = "dark"
},
/area/centcom/legion)
+"oeU" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/unsimulated/floor/plating,
+/area/burglar_base)
"ofD" = (
/obj/effect/decal/fake_object{
icon = 'icons/obj/mining.dmi';
@@ -27907,6 +28194,15 @@
opacity = 0
},
/area/centcom/shared_dream)
+"ogh" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner_wide/red{
+ dir = 1
+ },
+/turf/unsimulated/floor,
+/area/burglar_base)
"ogn" = (
/turf/simulated/wall/shuttle/unique/raider{
desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands.";
@@ -28253,6 +28549,14 @@
},
/turf/simulated/floor/shuttle/black,
/area/shuttle/escape/centcom)
+"oCy" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/grille,
+/turf/unsimulated/floor/plating,
+/area/burglar_base)
"oCD" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -28917,6 +29221,10 @@
icon_state = "0,5"
},
/area/supply/dock)
+"pta" = (
+/obj/machinery/computer/operating,
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"pux" = (
/obj/item/pickaxe,
/turf/unsimulated/floor/asteroid/ash/rocky{
@@ -29008,6 +29316,12 @@
icon_state = "3,2"
},
/area/shuttle/merchant/start)
+"pDr" = (
+/obj/structure/shuttle/engine/propulsion{
+ icon_state = "propulsion_r"
+ },
+/turf/unsimulated/floor/plating,
+/area/burglar_base/pod)
"pDA" = (
/obj/structure/flora/rock/pile{
density = 0;
@@ -29645,6 +29959,17 @@
icon_state = "platebot"
},
/area/centcom/distress_prep)
+"qxs" = (
+/obj/structure/bed/chair/office/bridge/generic{
+ desc = "Looks suspiciously comfortable.";
+ dir = 4;
+ name = "bolted chair"
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"qxI" = (
/turf/simulated/wall/shuttle/unique/mercenary{
icon_state = "8,2"
@@ -29656,6 +29981,18 @@
},
/turf/space,
/area/syndicate_station/start)
+"qxQ" = (
+/obj/structure/bed/chair/comfy/black{
+ dir = 8
+ },
+/obj/effect/landmark{
+ name = "burglarspawn"
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"qzj" = (
/obj/structure/shuttle_part/mercenary{
icon_state = "5,22"
@@ -30515,6 +30852,18 @@
icon_state = "1,6"
},
/area/syndicate_station/start)
+"ryV" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 8
+ },
+/obj/structure/window/reinforced/crescent{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner_wide/red{
+ dir = 9
+ },
+/turf/unsimulated/floor,
+/area/burglar_base)
"rzy" = (
/obj/structure/bed/chair/office/bridge{
dir = 4
@@ -30575,6 +30924,17 @@
name = "military corvette"
},
/area/shuttle/administration/centcom)
+"rDV" = (
+/obj/machinery/door/airlock/centcom{
+ name = "Shuttle";
+ opacity = 1;
+ req_access = list(150)
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"rEP" = (
/obj/machinery/button/remote/blast_door{
dir = 4;
@@ -30823,6 +31183,13 @@
icon_state = "beach"
},
/area/centcom/shared_dream)
+"rTn" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced/crescent{
+ dir = 1
+ },
+/turf/unsimulated/floor/plating,
+/area/burglar_base/pod)
"rUc" = (
/obj/machinery/door/airlock/glass_command{
name = "Cell 1";
@@ -30900,6 +31267,9 @@
icon_state = "15,7"
},
/area/syndicate_station/start)
+"saE" = (
+/turf/unsimulated/wall/steel,
+/area/burglar_base)
"sbN" = (
/obj/structure/shuttle_part/raider{
desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands.";
@@ -30913,6 +31283,16 @@
icon_state = "10,8"
},
/area/shuttle/merchant/start)
+"scA" = (
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/grille,
+/turf/unsimulated/floor/plating,
+/area/burglar_base)
"scL" = (
/obj/structure/shuttle_part/mercenary{
icon_state = "9,1"
@@ -31396,6 +31776,17 @@
},
/turf/unsimulated/wall/darkshuttlewall,
/area/centcom/legion/hangar5)
+"sOh" = (
+/obj/machinery/vending/cigarette{
+ name = "hacked cigarette machine";
+ prices = list();
+ products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"sOJ" = (
/turf/unsimulated/floor/plating,
/turf/simulated/wall/shuttle/unique/cargo{
@@ -31721,6 +32112,12 @@
/obj/structure/bed/chair/office/bridge/legion,
/turf/simulated/floor/shuttle/black,
/area/shuttle/legion/centcom)
+"tfa" = (
+/obj/structure/shuttle/engine/propulsion{
+ icon_state = "propulsion_l"
+ },
+/turf/unsimulated/floor/plating,
+/area/burglar_base/pod)
"tfb" = (
/obj/structure/shuttle_part/merchant{
icon_state = "14,8"
@@ -31965,6 +32362,16 @@
},
/turf/simulated/floor/tiled,
/area/merchant_station/warehouse)
+"twB" = (
+/obj/machinery/vending/cola{
+ name = "hacked Robust Softdrinks";
+ prices = list()
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"tym" = (
/obj/structure/reagent_dispensers/watertank,
/obj/item/reagent_containers/glass/bucket{
@@ -31975,6 +32382,17 @@
dir = 1
},
/area/centcom/control)
+"tyS" = (
+/obj/structure/table/reinforced/steel,
+/obj/item/card/emag{
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_y = -10;
+ pixel_x = 2
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"tAQ" = (
/obj/machinery/door/blast/odin{
density = 0;
@@ -32069,6 +32487,16 @@
icon_state = "wood_light"
},
/area/centcom/legion/hangar5)
+"tHp" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/grille,
+/turf/unsimulated/floor/plating,
+/area/burglar_base)
"tHS" = (
/obj/structure/closet/crate/secure/legion,
/obj/item/storage/belt/security/tactical,
@@ -32755,6 +33183,13 @@
},
/turf/space,
/area/skipjack_station/start)
+"uDS" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"uEQ" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
@@ -33277,6 +33712,12 @@
icon_state = "floor"
},
/area/centcom/checkpoint/aft)
+"viy" = (
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"viR" = (
/turf/simulated/wall/shuttle/unique/mercenary{
icon_state = "3,12"
@@ -33746,6 +34187,19 @@
icon_state = "dark"
},
/area/centcom/legion)
+"vHw" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 1
+ },
+/obj/structure/window/reinforced/crescent,
+/obj/structure/window/reinforced/crescent{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner_wide/red{
+ dir = 5
+ },
+/turf/unsimulated/floor,
+/area/burglar_base)
"vIS" = (
/obj/structure/shuttle_part/mercenary{
icon_state = "0,10"
@@ -34068,6 +34522,18 @@
icon_state = "floor"
},
/area/centcom/legion/hangar5)
+"wdS" = (
+/obj/structure/sign/double/map/right{
+ pixel_y = 32
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/unsimulated/floor{
+ name = "plating";
+ icon_state = "cult"
+ },
+/area/burglar_base)
"weO" = (
/turf/simulated/wall/shuttle/unique/mercenary{
icon_state = "7,19"
@@ -34202,6 +34668,15 @@
name = "Skipjack"
},
/area/skipjack_station/start)
+"wpe" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner_wide/red{
+ dir = 4
+ },
+/turf/unsimulated/floor,
+/area/burglar_base)
"wpg" = (
/turf/unsimulated/floor{
name = "plating";
@@ -34705,6 +35180,10 @@
icon_state = "engine"
},
/area/centcom/legion/hangar5)
+"wZK" = (
+/obj/effect/shuttle_landmark/burglar/start,
+/turf/simulated/floor/carpet/rubber,
+/area/burglar_base/pod)
"xbK" = (
/obj/structure/shuttle_part/transfer{
desc = "A large, bloated shuttle designed for automated passenger transport.";
@@ -34733,6 +35212,10 @@
icon_state = "wood_light"
},
/area/centcom/legion/hangar5)
+"xdj" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/unsimulated/floor/plating,
+/area/burglar_base/pod)
"xgn" = (
/obj/structure/window/reinforced{
dir = 8
@@ -35555,6 +36038,18 @@
},
/turf/simulated/floor/plating,
/area/shuttle/merchant/start)
+"yjl" = (
+/obj/structure/window/reinforced/crescent{
+ dir = 8
+ },
+/obj/structure/window/reinforced/crescent{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner_wide/red{
+ dir = 6
+ },
+/turf/unsimulated/floor,
+/area/burglar_base)
"yjn" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/curtain/open/shower,
@@ -35643,26 +36138,26 @@ aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -35900,26 +36395,26 @@ aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -36153,30 +36648,30 @@ aax
aaq
aaq
aaq
-aaq
-aaq
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
aaq
aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -36410,30 +36905,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -36667,30 +37162,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -36924,30 +37419,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -37181,30 +37676,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -37438,30 +37933,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -37695,30 +38190,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -37952,30 +38447,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -38209,30 +38704,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -38466,30 +38961,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -38723,30 +39218,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+lVU
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -38980,30 +39475,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -39237,30 +39732,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -39494,30 +39989,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -39751,30 +40246,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -40008,30 +40503,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -40265,30 +40760,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -40522,30 +41017,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -40779,30 +41274,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -41036,30 +41531,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -41293,30 +41788,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -41550,30 +42045,30 @@ aax
aaq
aaq
aaq
+aax
aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aax
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -41807,30 +42302,30 @@ aax
aaq
aaq
aaq
-aaq
-aaq
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
+aax
aaq
aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -42068,26 +42563,26 @@ aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -42325,26 +42820,26 @@ aaq
aaq
aaq
aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
+aaq
bJl
bJl
-bJl
-bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
aaM
aaM
aaM
@@ -42586,22 +43081,22 @@ bJl
bJl
bJl
bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
aaM
aaM
aaM
@@ -42843,22 +43338,22 @@ bJl
bJl
bJl
bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
aaM
aaM
aaM
@@ -43100,22 +43595,22 @@ bJl
bJl
bJl
bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
aaM
aaM
aaM
@@ -43357,22 +43852,22 @@ bJl
bJl
bJl
bJl
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
+bJl
aaM
aaM
aaM
@@ -59311,24 +59806,24 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
aaM
aaM
aaM
@@ -59568,6 +60063,7 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
@@ -59584,8 +60080,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -59825,6 +60320,7 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
@@ -59841,8 +60337,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -60082,6 +60577,7 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
@@ -60098,8 +60594,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -60339,24 +60834,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+scA
+tHp
+tHp
+tHp
+tHp
+tHp
+oCy
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -60596,24 +61091,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+glm
+kXY
+viy
+lPu
+viy
+kXY
+glm
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -60853,24 +61348,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+glm
+lfi
+viy
+cnZ
+viy
+lsh
+glm
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -61110,24 +61605,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+hat
+jne
+viy
+qxQ
+viy
+jne
+oeU
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -61367,24 +61862,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+saE
+uDS
+viy
+viy
+viy
+uDS
+saE
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -61624,24 +62119,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+saE
+iot
+viy
+viy
+viy
+viy
+saE
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -61881,24 +62376,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+saE
+wdS
+viy
+viy
+viy
+dqJ
+saE
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -62138,24 +62633,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+saE
+jKQ
+viy
+viy
+twB
+sOh
+saE
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -62395,24 +62890,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
+saE
+saE
+rDV
+saE
+saE
+saE
+saE
aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -62652,6 +63147,15 @@ aaM
aaM
aaM
aaM
+aDQ
+aaM
+aaM
+aaM
+aaM
+aaM
+aaM
+aaM
+cIa
aaM
aaM
aaM
@@ -62660,16 +63164,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -62909,6 +63404,7 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
@@ -62916,17 +63412,16 @@ aaM
aaM
aaM
aaM
+ePN
+yjl
+yjl
+yjl
+yjl
+wpe
+fze
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -63166,24 +63661,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
aaM
aaM
+blS
+ryV
+ryV
+ryV
+ryV
+ryV
+ogh
+ead
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -63423,6 +63918,14 @@ aaM
aaM
aaM
aaM
+aDQ
+aaM
+aaM
+aaM
+aaM
+aaM
+aaM
+vHw
aaM
aaM
aaM
@@ -63432,15 +63935,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -63680,24 +64175,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
+fwV
+bhr
+jnL
+jnL
+jnL
+jnL
+bhr
+bhr
+lBW
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -63937,24 +64432,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
+bhr
+qxs
+dOH
+tyS
+dDK
+dOH
+cAN
+rTn
+tfa
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -64194,24 +64689,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
+jnL
+eMY
+wZK
+dOH
+dOH
+dOH
+lcy
+rTn
+xdj
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -64451,24 +64946,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
+bhr
+ezR
+dOH
+pta
+gEt
+dOH
+lKr
+rTn
+pDr
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -64708,24 +65203,24 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
aaM
+ftj
+bhr
+jnL
+jnL
+jnL
+jnL
+bhr
+bhr
+ein
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -64965,6 +65460,7 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
@@ -64981,8 +65477,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -65222,6 +65717,7 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
@@ -65238,8 +65734,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -65479,6 +65974,7 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
@@ -65495,8 +65991,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -65736,6 +66231,7 @@ aaM
aaM
aaM
aaM
+aDQ
aaM
aaM
aaM
@@ -65752,8 +66248,7 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
+aDQ
aaM
aaM
aaM
@@ -65993,24 +66488,24 @@ aaM
aaM
aaM
aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
-aaM
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
+aDQ
aaM
aaM
aaM
@@ -71517,7 +72012,7 @@ aOS
aCq
aMQ
aCo
-aCo
+jqI
aCo
aQM
aIv
diff --git a/maps/aurora/aurora-2_under-station.dmm b/maps/aurora/aurora-2_under-station.dmm
index 11faa392679..d541caecc1a 100644
--- a/maps/aurora/aurora-2_under-station.dmm
+++ b/maps/aurora/aurora-2_under-station.dmm
@@ -316,6 +316,10 @@
/obj/structure/lattice/catwalk,
/turf/template_noop,
/area/engineering/cooling)
+"Q" = (
+/obj/effect/shuttle_landmark/burglar/under,
+/turf/template_noop,
+/area/template_noop)
(1,1,1) = {"
a
@@ -9173,7 +9177,7 @@ a
a
a
a
-a
+Q
a
a
a
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 6fcf3fea95d..e67e0aaba7f 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -3225,8 +3225,8 @@
},
/obj/effect/floor_decal/industrial/outline/grey,
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/tiled{
name = "cooled floor";
@@ -4345,8 +4345,8 @@
/area/maintenance/atmos_control)
"aij" = (
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/structure/closet/crate,
/obj/random/loot,
@@ -5702,8 +5702,8 @@
/area/engineering/atmos/storage)
"akJ" = (
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/machinery/requests_console{
department = "Atmospherics";
@@ -6959,8 +6959,8 @@
dir = 5
},
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/tiled,
/area/security/brig)
@@ -22360,8 +22360,8 @@
/area/crew_quarters/heads/chief)
"aMM" = (
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/machinery/firealarm/north,
/obj/structure/filingcabinet/chestdrawer,
@@ -24774,8 +24774,8 @@
/area/journalistoffice)
"aRe" = (
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/wood,
/area/journalistoffice)
@@ -24956,8 +24956,8 @@
dir = 6
},
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/bridge/meeting_room)
@@ -27748,8 +27748,8 @@
icon_state = "0-2"
},
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/tiled,
/area/janitor)
@@ -30763,8 +30763,8 @@
/obj/item/reagent_containers/spray/cleaner,
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/tiled/white,
/area/assembly/robotics_cyborgification)
@@ -34798,8 +34798,8 @@
/obj/item/stack/cable_coil,
/obj/item/stack/cable_coil,
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/alarm{
@@ -35288,8 +35288,8 @@
department = "Chief Medical Officer's Office"
},
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/machinery/newscaster{
pixel_y = 32
@@ -36250,8 +36250,8 @@
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/tiled/white,
@@ -36439,8 +36439,8 @@
/area/medical/medbay2)
"blv" = (
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/structure/flora/pottedplant/random,
/obj/effect/floor_decal/corner_wide/green{
@@ -36507,8 +36507,8 @@
dir = 8
},
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/machinery/power/apc{
dir = 1;
@@ -38228,8 +38228,8 @@
"boJ" = (
/obj/structure/table/standard,
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/structure/sign/nosmoking_1{
pixel_y = 32
@@ -39927,8 +39927,8 @@
req_access = list(5)
},
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -46491,8 +46491,8 @@
/area/medical/surgeryobs)
"bFL" = (
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/structure/bed/chair/plastic{
dir = 4
@@ -50267,8 +50267,8 @@
/obj/effect/floor_decal/corner/red/diagonal,
/obj/item/stool/padded,
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/tiled/white,
/area/hallway/primary/aft)
@@ -50333,8 +50333,8 @@
/obj/structure/table/stone/marble,
/obj/item/reagent_containers/glass/beaker/large,
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
@@ -51608,8 +51608,8 @@
/area/chapel/main)
"bSG" = (
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -53354,8 +53354,8 @@
icon_state = "pipe-c"
},
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/machinery/papershredder,
/turf/simulated/floor/tiled,
@@ -57412,8 +57412,8 @@
pixel_y = 32
},
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate,
@@ -64113,6 +64113,10 @@
},
/turf/simulated/floor/tiled,
/area/engineering/foyer)
+"oGq" = (
+/obj/effect/shuttle_landmark/burglar/caverns,
+/turf/unsimulated/floor/asteroid/ash/rocky,
+/area/mine/unexplored)
"oGG" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -66493,8 +66497,8 @@
/area/assembly/robotics_cyborgification)
"tQm" = (
/obj/machinery/light{
- dir = 1;
- icon_state = "tube1"
+ icon_state = "tube1";
+ dir = 1
},
/turf/simulated/floor/tiled,
/area/hallway/primary/port)
@@ -96228,7 +96232,7 @@ aaa
aab
aab
aab
-aab
+oGq
aab
aab
aab
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index ffa65f24b79..33a0c2b3c40 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -25293,6 +25293,7 @@
/obj/effect/landmark{
name = "carpspawn"
},
+/obj/effect/shuttle_landmark/burglar/surface,
/turf/unsimulated/floor/asteroid/ash,
/area/mine/explored)
"Xi" = (
diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm
index cf54bc3332d..63686fe7a96 100644
--- a/maps/aurora/code/aurora.dm
+++ b/maps/aurora/code/aurora.dm
@@ -79,6 +79,7 @@
/datum/shuttle/autodock/ferry/autoreturn/ccia,
/datum/shuttle/autodock/ferry/specops/ert_aurora,
/datum/shuttle/autodock/multi/antag/skipjack_aurora,
+ /datum/shuttle/autodock/multi/antag/burglar_aurora,
/datum/shuttle/autodock/multi/antag/merc_aurora,
/datum/shuttle/autodock/ferry/legion,
/datum/shuttle/autodock/ferry/research_aurora,
diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm
index 5b4c550de4b..e88b5fd85b3 100644
--- a/maps/aurora/code/aurora_shuttles.dm
+++ b/maps/aurora/code/aurora_shuttles.dm
@@ -226,6 +226,52 @@ AURORA_ESCAPE_POD(3)
special_dock_targets = list("Phoenix Shuttle" = "specops_shuttle_fore")
landmark_flags = SLANDMARK_FLAG_AUTOSET
+//Burglar Pod
+/datum/shuttle/autodock/multi/antag/burglar_aurora
+ name = "Burglar Pod"
+ current_location = "nav_burglar_start"
+ landmark_transition = "nav_burglar_interim"
+ warmup_time = 10
+ move_time = 75
+ ceiling_type = /turf/simulated/shuttle_roof/dark
+ shuttle_area = /area/burglar_base/pod
+ destination_tags = list(
+ "nav_burglar_start",
+ "nav_burglar_surface",
+ "nav_burglar_under",
+ "nav_burglar_caverns"
+ )
+
+ announcer = "NDV Icarus"
+ arrival_message = "Attention, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not."
+ departure_message = "Attention, your guests are pulling away - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip."
+
+/obj/effect/shuttle_landmark/burglar/start
+ name = "Homebase"
+ landmark_tag = "nav_burglar_start"
+ base_turf = /turf/space
+
+/obj/effect/shuttle_landmark/burglar/interim
+ name = "In Transit"
+ landmark_tag = "nav_burglar_interim"
+ base_turf = /turf/space/transit
+
+/obj/effect/shuttle_landmark/burglar/surface
+ name = "Surface Aft of Cargo"
+ landmark_tag = "nav_burglar_surface"
+ landmark_flags = SLANDMARK_FLAG_AUTOSET
+
+/obj/effect/shuttle_landmark/burglar/under
+ name = "Under the Station"
+ landmark_tag = "nav_burglar_under"
+ landmark_flags = SLANDMARK_FLAG_AUTOSET
+ base_turf = /turf/space
+
+/obj/effect/shuttle_landmark/burglar/caverns
+ name = "Caverns by Mining"
+ landmark_tag = "nav_burglar_caverns"
+ landmark_flags = SLANDMARK_FLAG_AUTOSET
+
//Skipjack.
/datum/shuttle/autodock/multi/antag/skipjack_aurora
name = "Skipjack"