mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 04:28:12 +01:00
Merge branch 'master' into aprilfools
This commit is contained in:
Heroman
+12
-6
@@ -301,7 +301,7 @@ var/global/list/PDA_Manifest = list()
|
||||
manifest_inject(H)
|
||||
return
|
||||
|
||||
/datum/datacore/proc/manifest_modify(var/name, var/assignment)
|
||||
/datum/datacore/proc/manifest_modify(var/name, var/assignment, var/rank)
|
||||
ResetPDAManifest()
|
||||
var/datum/data/record/foundrecord
|
||||
var/real_title = assignment
|
||||
@@ -315,11 +315,17 @@ var/global/list/PDA_Manifest = list()
|
||||
var/list/all_jobs = get_job_datums()
|
||||
|
||||
for(var/datum/job/J in all_jobs)
|
||||
var/list/alttitles = get_alternate_titles(J.title)
|
||||
if(!J) continue
|
||||
if(assignment in alttitles)
|
||||
real_title = J.title
|
||||
if(J.title == rank) //If we have a rank, just default to using that.
|
||||
real_title = rank
|
||||
break
|
||||
else if(J.title == assignment)
|
||||
real_title = assignment
|
||||
break
|
||||
else
|
||||
var/list/alttitles = get_alternate_titles(J.title)
|
||||
if(assignment in alttitles)
|
||||
real_title = J.title
|
||||
break
|
||||
|
||||
if(foundrecord)
|
||||
foundrecord.fields["rank"] = assignment
|
||||
@@ -332,7 +338,7 @@ var/global/list/PDA_Manifest = list()
|
||||
var/datum/job/J = SSjob.get_job(H.mind.assigned_role)
|
||||
hidden = J?.offmap_spawn
|
||||
|
||||
/* Note: Due to cached_character_icon, a number of emergent properties occur due to the initialization
|
||||
/* Note: Due to cached_character_icon, a number of emergent properties occur due to the initialization
|
||||
* order of readied-up vs latejoiners. Namely, latejoiners will get a uniform in their datacore picture, but readied-up will
|
||||
* not. This is due to the fact that SSticker calls data_core.manifest_inject() inside of ticker/proc/create_characters(),
|
||||
* but does not equip them until ticker/proc/equip_characters(), which is called later. So, this proc is literally called before
|
||||
|
||||
@@ -157,7 +157,7 @@
|
||||
switch(action)
|
||||
if("modify")
|
||||
if(modify)
|
||||
data_core.manifest_modify(modify.registered_name, modify.assignment)
|
||||
data_core.manifest_modify(modify.registered_name, modify.assignment, modify.rank)
|
||||
modify.name = "[modify.registered_name]'s ID Card ([modify.assignment])"
|
||||
if(ishuman(usr))
|
||||
modify.forceMove(get_turf(src))
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
card.rank = newjob.title
|
||||
card.assignment = newassignment
|
||||
card.name = text("[card.registered_name]'s ID Card ([card.assignment])")
|
||||
data_core.manifest_modify(card.registered_name, card.assignment)
|
||||
data_core.manifest_modify(card.registered_name, card.assignment, card.rank)
|
||||
card.last_job_switch = world.time
|
||||
callHook("reassign_employee", list(card))
|
||||
newjob.current_positions++
|
||||
@@ -203,7 +203,7 @@
|
||||
card.rank = ptojob.title
|
||||
card.assignment = ptojob.title
|
||||
card.name = text("[card.registered_name]'s ID Card ([card.assignment])")
|
||||
data_core.manifest_modify(card.registered_name, card.assignment)
|
||||
data_core.manifest_modify(card.registered_name, card.assignment, card.rank)
|
||||
card.last_job_switch = world.time
|
||||
callHook("reassign_employee", list(card))
|
||||
var/mob/living/carbon/human/H = usr
|
||||
|
||||
@@ -312,14 +312,14 @@
|
||||
|
||||
writer.assignment = t1
|
||||
writer.name = text("[writer.registered_name]'s ID Card ([writer.assignment])")
|
||||
data_core.manifest_modify(writer.registered_name, writer.assignment)
|
||||
data_core.manifest_modify(writer.registered_name, writer.assignment, writer.rank)
|
||||
callHook("reassign_employee", list(writer))
|
||||
|
||||
if("reg" in href_list)
|
||||
if(auth)
|
||||
writer.registered_name = href_list["reg"]
|
||||
writer.name = text("[writer.registered_name]'s ID Card ([writer.assignment])")
|
||||
data_core.manifest_modify(writer.registered_name, writer.assignment)
|
||||
data_core.manifest_modify(writer.registered_name, writer.assignment, writer.rank)
|
||||
callHook("reassign_employee", list(writer))
|
||||
|
||||
computer.updateUsrDialog()
|
||||
|
||||
@@ -552,3 +552,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac
|
||||
loc_network = "unkthree"
|
||||
/obj/item/device/perfect_tele/frontier/unknown/four
|
||||
loc_network = "unkfour"
|
||||
/obj/item/device/perfect_tele/frontier/unknown/five
|
||||
loc_network = "unkfive"
|
||||
/obj/item/device/perfect_tele/frontier/unknown/six
|
||||
loc_network = "unksix"
|
||||
|
||||
@@ -527,6 +527,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
if(equipment)
|
||||
if(charjob)
|
||||
job_master.EquipRank(new_character, charjob, 1)
|
||||
new_character.mind.assigned_role = charjob
|
||||
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
|
||||
//equip_custom_items(new_character) //VOREStation Removal
|
||||
|
||||
//If desired, add records.
|
||||
@@ -534,7 +536,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
data_core.manifest_inject(new_character)
|
||||
|
||||
//A redraw for good measure
|
||||
new_character.update_icons_all()
|
||||
new_character.regenerate_icons()
|
||||
|
||||
//If we're announcing their arrival
|
||||
if(announce)
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
var/violent_breakthrough = TRUE // If false, the AI is not allowed to destroy things like windows or other structures in the way. Requires above var to be true.
|
||||
|
||||
var/stand_ground = FALSE // If true, the AI won't try to get closer to an enemy if out of range.
|
||||
|
||||
|
||||
// This does the actual attacking.
|
||||
/datum/ai_holder/proc/engage_target()
|
||||
ai_log("engage_target() : Entering.", AI_LOG_DEBUG)
|
||||
@@ -293,7 +293,7 @@
|
||||
|
||||
// Kill common obstacle in the way like tables.
|
||||
var/obj/structure/obstacle = locate(/obj/structure, problem_turf)
|
||||
if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
|
||||
if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille) || istype(obstacle, /obj/effect/weaversilk/wall)) //VOREStation Edit: spdr
|
||||
ai_log("destroy_surroundings() : Attacking generic structure.", AI_LOG_INFO)
|
||||
return melee_attack(obstacle)
|
||||
|
||||
|
||||
@@ -7,6 +7,29 @@
|
||||
anchored = 1
|
||||
density = 0
|
||||
|
||||
/obj/effect/weaversilk/ex_act(severity)
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/effect/weaversilk/attackby(var/obj/item/weapon/W, var/mob/user)
|
||||
user.setClickCooldown(user.get_attack_speed(W))
|
||||
|
||||
if(W.force)
|
||||
visible_message("<span class='warning'>\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/weaversilk/bullet_act(var/obj/item/projectile/Proj)
|
||||
..()
|
||||
if(Proj.get_structure_damage())
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/weaversilk/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/weaversilk/attack_generic(mob/user as mob, var/damage)
|
||||
if(damage)
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/weaversilk/attack_hand(mob/user as mob)
|
||||
..()
|
||||
if(user.a_intent == I_HURT)
|
||||
@@ -82,11 +105,11 @@
|
||||
"<b>You hear a squishy noise!</b>"
|
||||
)
|
||||
set_dir(L.dir)
|
||||
can_buckle = 1
|
||||
can_buckle = TRUE
|
||||
buckle_mob(L)
|
||||
L.Stun(1 SECOND)
|
||||
L.Stun(1)
|
||||
to_chat(L, "<span class='danger'>The sticky fibers of \the [src] ensnare, trapping you in place!</span>")
|
||||
trap_active = 0
|
||||
trap_active = FALSE
|
||||
can_buckle = initial(can_buckle)
|
||||
desc += " Actually, it looks like it's been all spent."
|
||||
..()
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
if("modify")
|
||||
if(computer && computer.card_slot)
|
||||
if(id_card)
|
||||
data_core.manifest_modify(id_card.registered_name, id_card.assignment)
|
||||
data_core.manifest_modify(id_card.registered_name, id_card.assignment, id_card.rank)
|
||||
computer.proc_eject_id(usr)
|
||||
. = TRUE
|
||||
if("terminate")
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
// Map template for spawning the shuttle
|
||||
/datum/map_template/om_ships/syndicatecarrier
|
||||
name = "OM Ship - Mercenary Ship (New Z)"
|
||||
name = "OM Ship - Generic Cruiser (New Z)"
|
||||
desc = "Mercenary Ship."
|
||||
mappath = 'mercship.dmm'
|
||||
|
||||
|
||||
@@ -501,6 +501,171 @@
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/tabiranth)
|
||||
"ay" = (
|
||||
/obj/machinery/smartfridge/survival_pod,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/device/perfect_tele,
|
||||
/obj/item/weapon/storage/belt/utility/chief/full,
|
||||
/obj/item/weapon/storage/belt/utility/chief/full,
|
||||
/obj/item/weapon/storage/belt/utility/chief/full,
|
||||
/obj/item/weapon/storage/belt/utility/chief/full,
|
||||
/obj/item/weapon/storage/belt/security/tactical,
|
||||
/obj/item/weapon/storage/belt/security/tactical,
|
||||
/obj/item/weapon/storage/belt/security/tactical,
|
||||
/obj/item/weapon/storage/belt/security/tactical,
|
||||
/obj/item/weapon/storage/belt/medical/emt,
|
||||
/obj/item/weapon/storage/belt/medical/emt,
|
||||
/obj/item/weapon/storage/belt/medical/emt,
|
||||
/obj/item/weapon/storage/belt/medical/emt,
|
||||
/obj/item/weapon/storage/backpack/ert/commander,
|
||||
/obj/item/weapon/storage/backpack/ert/engineer,
|
||||
/obj/item/weapon/storage/backpack/ert/engineer,
|
||||
/obj/item/weapon/storage/backpack/ert/medical,
|
||||
/obj/item/weapon/storage/backpack/ert/medical,
|
||||
/obj/item/weapon/storage/backpack/ert/security,
|
||||
/obj/item/weapon/storage/backpack/ert/security,
|
||||
/obj/item/weapon/storage/backpack/ert/security,
|
||||
/obj/item/weapon/storage/backpack/ert/security,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/projectile/pistol,
|
||||
/obj/item/weapon/gun/projectile/pistol,
|
||||
/obj/item/weapon/gun/projectile/pistol,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact/flash,
|
||||
/obj/item/ammo_magazine/m9mm/compact/flash,
|
||||
/obj/item/ammo_magazine/m9mm/compact/flash,
|
||||
/obj/item/ammo_magazine/m9mm/compact/rubber,
|
||||
/obj/item/ammo_magazine/m9mm/compact/rubber,
|
||||
/obj/item/ammo_magazine/m9mm/compact/rubber,
|
||||
/obj/item/ammo_magazine/m9mm/compact/practice,
|
||||
/obj/item/ammo_magazine/m9mm/compact/practice,
|
||||
/obj/item/ammo_magazine/m9mm/compact/practice,
|
||||
/obj/item/clothing/glasses/thermal,
|
||||
/obj/item/clothing/glasses/thermal,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/night,
|
||||
/obj/item/clothing/glasses/night,
|
||||
/obj/item/clothing/glasses/night,
|
||||
/obj/item/clothing/glasses/night,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxurybar,
|
||||
/obj/item/device/survivalcapsule/luxurybar,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/clothing/suit/space/void/refurb/officer,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid,
|
||||
/obj/item/weapon/gun/magnetic/railgun/automatic,
|
||||
/obj/item/weapon/gun/magnetic/railgun/automatic,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/shuttle/tabiranth)
|
||||
"aA" = (
|
||||
/obj/machinery/atmospherics/portables_connector,
|
||||
/obj/machinery/portable_atmospherics/canister/air{
|
||||
@@ -719,168 +884,6 @@
|
||||
/obj/machinery/sleeper/survival_pod,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/shuttle/tabiranth)
|
||||
"aO" = (
|
||||
/obj/machinery/smartfridge/survival_pod,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/clothing/under/ert,
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/weapon/storage/box/survival/comp{
|
||||
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
|
||||
},
|
||||
/obj/item/device/perfect_tele,
|
||||
/obj/item/weapon/storage/belt/utility/chief/full,
|
||||
/obj/item/weapon/storage/belt/utility/chief/full,
|
||||
/obj/item/weapon/storage/belt/utility/chief/full,
|
||||
/obj/item/weapon/storage/belt/utility/chief/full,
|
||||
/obj/item/weapon/storage/belt/security/tactical,
|
||||
/obj/item/weapon/storage/belt/security/tactical,
|
||||
/obj/item/weapon/storage/belt/security/tactical,
|
||||
/obj/item/weapon/storage/belt/security/tactical,
|
||||
/obj/item/weapon/storage/belt/medical/emt,
|
||||
/obj/item/weapon/storage/belt/medical/emt,
|
||||
/obj/item/weapon/storage/belt/medical/emt,
|
||||
/obj/item/weapon/storage/belt/medical/emt,
|
||||
/obj/item/weapon/storage/backpack/ert/commander,
|
||||
/obj/item/weapon/storage/backpack/ert/engineer,
|
||||
/obj/item/weapon/storage/backpack/ert/engineer,
|
||||
/obj/item/weapon/storage/backpack/ert/medical,
|
||||
/obj/item/weapon/storage/backpack/ert/medical,
|
||||
/obj/item/weapon/storage/backpack/ert/security,
|
||||
/obj/item/weapon/storage/backpack/ert/security,
|
||||
/obj/item/weapon/storage/backpack/ert/security,
|
||||
/obj/item/weapon/storage/backpack/ert/security,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/cell/hyper,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/projectile/pistol,
|
||||
/obj/item/weapon/gun/projectile/pistol,
|
||||
/obj/item/weapon/gun/projectile/pistol,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact,
|
||||
/obj/item/ammo_magazine/m9mm/compact/flash,
|
||||
/obj/item/ammo_magazine/m9mm/compact/flash,
|
||||
/obj/item/ammo_magazine/m9mm/compact/flash,
|
||||
/obj/item/ammo_magazine/m9mm/compact/rubber,
|
||||
/obj/item/ammo_magazine/m9mm/compact/rubber,
|
||||
/obj/item/ammo_magazine/m9mm/compact/rubber,
|
||||
/obj/item/ammo_magazine/m9mm/compact/practice,
|
||||
/obj/item/ammo_magazine/m9mm/compact/practice,
|
||||
/obj/item/ammo_magazine/m9mm/compact/practice,
|
||||
/obj/item/clothing/glasses/thermal,
|
||||
/obj/item/clothing/glasses/thermal,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/graviton,
|
||||
/obj/item/clothing/glasses/night,
|
||||
/obj/item/clothing/glasses/night,
|
||||
/obj/item/clothing/glasses/night,
|
||||
/obj/item/clothing/glasses/night,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/device/binoculars,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/clothing/mask/gas/half,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/elite,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxury,
|
||||
/obj/item/device/survivalcapsule/luxurybar,
|
||||
/obj/item/device/survivalcapsule/luxurybar,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double,
|
||||
/obj/item/clothing/suit/space/void/refurb/officer,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/shuttle/tabiranth)
|
||||
"aP" = (
|
||||
/obj/machinery/telecomms/allinone,
|
||||
/turf/simulated/floor/bluegrid,
|
||||
@@ -1377,7 +1380,7 @@
|
||||
/obj/item/device/radio/uplink,
|
||||
/obj/item/device/spaceflare,
|
||||
/obj/item/device/spaceflare,
|
||||
/obj/item/device/perfect_tele/frontier/unknown/four,
|
||||
/obj/item/device/perfect_tele/frontier/unknown/six,
|
||||
/obj/item/device/healthanalyzer/phasic,
|
||||
/obj/item/device/bluespaceradio/tether_prelinked,
|
||||
/obj/item/weapon/cat_box,
|
||||
@@ -1871,7 +1874,7 @@ av
|
||||
aA
|
||||
aF
|
||||
ad
|
||||
aO
|
||||
ay
|
||||
aC
|
||||
bb
|
||||
ac
|
||||
|
||||
@@ -102,6 +102,10 @@
|
||||
/obj/effect/floor_decal/industrial/outline/blue,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/barracks)
|
||||
"aq" = (
|
||||
/obj/machinery/telecomms/relay/preset/tether,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/atmos)
|
||||
"ax" = (
|
||||
/obj/structure/shuttle/engine/propulsion{
|
||||
dir = 4
|
||||
@@ -298,10 +302,6 @@
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/hallways_aft)
|
||||
"cL" = (
|
||||
/obj/machinery/telecomms/allinone/ert,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/atmos)
|
||||
"cO" = (
|
||||
/obj/machinery/computer/operating,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
@@ -734,7 +734,7 @@
|
||||
/obj/mecha/combat/gygax/serenity,
|
||||
/obj/effect/floor_decal/industrial/outline,
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
description_fluff = "\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR.";
|
||||
description_fluff = "\\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR.";
|
||||
dir = 4;
|
||||
id = "NRV_MECHS";
|
||||
name = "MECH BAY CONTROL";
|
||||
@@ -1168,10 +1168,6 @@
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/ship/ert/mech_bay)
|
||||
"kd" = (
|
||||
/obj/item/device/multitool/tether_buffered,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/atmos)
|
||||
"kf" = (
|
||||
/obj/structure/table/rack/steel,
|
||||
/obj/item/weapon/gun/projectile/automatic/pdw,
|
||||
@@ -5402,7 +5398,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
description_fluff = "\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR.";
|
||||
description_fluff = "\\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR.";
|
||||
dir = 1;
|
||||
id = "NRV_DELTA";
|
||||
name = "DELTA ACCESS CONTROL";
|
||||
@@ -6813,10 +6809,6 @@
|
||||
/obj/structure/curtain/open/bed,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/ert/commander)
|
||||
"Wd" = (
|
||||
/obj/machinery/telecomms/relay,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/atmos)
|
||||
"Wj" = (
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 8
|
||||
@@ -13444,8 +13436,8 @@ pV
|
||||
kP
|
||||
kP
|
||||
rS
|
||||
Wd
|
||||
kd
|
||||
aq
|
||||
gA
|
||||
CT
|
||||
qR
|
||||
pV
|
||||
@@ -14013,7 +14005,7 @@ ls
|
||||
ls
|
||||
ls
|
||||
Lm
|
||||
cL
|
||||
gA
|
||||
DQ
|
||||
Ip
|
||||
pV
|
||||
|
||||
@@ -49,40 +49,40 @@
|
||||
|
||||
//TFF 26/12/19 - Sub-areas for the APCs.
|
||||
/area/tether_away/guttersite/engines
|
||||
name = "POI - Gutter Engineering"
|
||||
name = "Gutter - Gutter Engineering"
|
||||
|
||||
/area/tether_away/guttersite/security
|
||||
name = "POI - Gutter Security and Holding"
|
||||
name = "Gutter - Gutter Security and Holding"
|
||||
|
||||
/area/tether_away/guttersite/docking
|
||||
name = "POI - Gutter Docks"
|
||||
name = "Gutter - Gutter Docks"
|
||||
|
||||
/area/tether_away/guttersite/office
|
||||
name = "POI - Gutter Offices"
|
||||
name = "Gutter - Gutter Offices"
|
||||
|
||||
/area/tether_away/guttersite/atmos
|
||||
name = "POI - Gutter Atmospherics"
|
||||
name = "Gutter - Gutter Atmospherics"
|
||||
|
||||
/area/tether_away/guttersite/maint
|
||||
name = "POI - Gutter Maintenance"
|
||||
name = "Gutter - Gutter Maintenance"
|
||||
|
||||
/area/tether_away/guttersite/vault
|
||||
name = "POI - Gutter Vault"
|
||||
name = "Gutter - Gutter Vault"
|
||||
|
||||
/area/tether_away/guttersite/bridge
|
||||
name = "POI - Gutter Bridge"
|
||||
name = "Gutter - Gutter Bridge"
|
||||
|
||||
/area/tether_away/guttersite/walkway
|
||||
name = "POI - Gutter Walkway"
|
||||
name = "Gutter - Gutter Walkway"
|
||||
|
||||
/area/tether_away/guttersite/medbay
|
||||
name = "POI - Gutter Medbay"
|
||||
name = "Gutter - Gutter Medbay"
|
||||
|
||||
/area/tether_away/guttersite/commons
|
||||
name = "POI - Gutter Commons"
|
||||
name = "Gutter - Gutter Commons"
|
||||
|
||||
/area/tether_away/guttersite/storage
|
||||
name = "POI - Gutter Tool Storage"
|
||||
name = "Gutter - Gutter Tool Storage"
|
||||
|
||||
/area/tether_away/guttersite/teleporter
|
||||
name = "POI - Gutter Teleporter"
|
||||
name = "Gutter - Gutter Teleporter"
|
||||
@@ -0,0 +1,9 @@
|
||||
/datum/map_template/admin_use/old_mercenary
|
||||
name = "Special Area - Old Merc Base"
|
||||
desc = "So much red!"
|
||||
mappath = 'maps/submaps/admin_use_vr/mercbase.dmm'
|
||||
|
||||
/datum/map_template/admin_use/ert
|
||||
name = "Special Area - ERT"
|
||||
desc = "ERT Base."
|
||||
mappath = 'maps/submaps/admin_use_vr/ert_base.dmm'
|
||||
@@ -57,6 +57,7 @@
|
||||
|
||||
#include "../../submaps/admin_use_vr/ert.dm"
|
||||
#include "../../submaps/admin_use_vr/mercship.dm"
|
||||
#include "../../submaps/admin_use_vr/guttersite.dm"
|
||||
|
||||
/datum/map_template/admin_use/ert
|
||||
name = "Special Area - ERT"
|
||||
@@ -78,11 +79,6 @@
|
||||
desc = "Prepare tae be boarded, arr!"
|
||||
mappath = 'maps/submaps/admin_use_vr/kk_mercship.dmm'
|
||||
|
||||
/datum/map_template/admin_use/old_mercenary
|
||||
name = "Special Area - Old Merc Base"
|
||||
desc = "So much red!"
|
||||
mappath = 'maps/submaps/admin_use_vr/mercbase.dmm'
|
||||
|
||||
/datum/map_template/admin_use/skipjack
|
||||
name = "Special Area - Skipjack Base"
|
||||
desc = "Stinky!"
|
||||
@@ -103,6 +99,11 @@
|
||||
desc = "Sneaky"
|
||||
mappath = 'maps/submaps/admin_use_vr/dojo.dmm'
|
||||
|
||||
/datum/map_template/admin_use/guttersite
|
||||
name = "Special Area - Guttersite"
|
||||
desc = "A space for bad guys to hang out"
|
||||
mappath = 'maps/submaps/admin_use_vr/guttersite.dmm'
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//Rogue Mines Stuff
|
||||
|
||||
@@ -130,30 +131,6 @@
|
||||
flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER
|
||||
z = Z_LEVEL_ROGUEMINE_2
|
||||
|
||||
/datum/map_template/tether_lateload/tether_roguemines3
|
||||
name = "Asteroid Belt 3"
|
||||
desc = "Mining, but rogue. Zone 3"
|
||||
mappath = 'maps/submaps/rogue_mines_vr/rogue_mine3.dmm'
|
||||
|
||||
associated_map_datum = /datum/map_z_level/tether_lateload/roguemines3
|
||||
|
||||
/datum/map_z_level/tether_lateload/roguemines3
|
||||
name = "Belt 3"
|
||||
flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER
|
||||
z = Z_LEVEL_ROGUEMINE_3
|
||||
|
||||
/datum/map_template/tether_lateload/tether_roguemines4
|
||||
name = "Asteroid Belt 4"
|
||||
desc = "Mining, but rogue. Zone 4"
|
||||
mappath = 'maps/submaps/rogue_mines_vr/rogue_mine4.dmm'
|
||||
|
||||
associated_map_datum = /datum/map_z_level/tether_lateload/roguemines4
|
||||
|
||||
/datum/map_z_level/tether_lateload/roguemines4
|
||||
name = "Belt 4"
|
||||
flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER
|
||||
z = Z_LEVEL_ROGUEMINE_4
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
/// Away Missions
|
||||
#if AWAY_MISSION_TEST
|
||||
@@ -164,7 +141,6 @@
|
||||
#include "../../expedition_vr/aerostat/surface.dmm"
|
||||
#include "../../expedition_vr/space/debrisfield.dmm"
|
||||
#include "../../expedition_vr/space/fueldepot.dmm"
|
||||
#include "../../expedition_vr/space/guttersite.dmm"
|
||||
#endif
|
||||
|
||||
#include "../../expedition_vr/beach/_beach.dm"
|
||||
@@ -248,7 +224,6 @@
|
||||
#include "../../expedition_vr/space/_fueldepot.dm"
|
||||
#include "../../submaps/pois_vr/debris_field/_templates.dm"
|
||||
#include "../../submaps/pois_vr/debris_field/debrisfield_things.dm"
|
||||
#include "../../expedition_vr/space/_guttersite.dm"
|
||||
/datum/map_template/tether_lateload/away_debrisfield
|
||||
name = "Debris Field - Z1 Space"
|
||||
desc = "The Virgo 3 Debris Field away mission."
|
||||
@@ -274,17 +249,6 @@
|
||||
name = "Away Mission - Fuel Depot"
|
||||
z = Z_LEVEL_FUELDEPOT
|
||||
|
||||
/datum/map_template/tether_lateload/away_guttersite
|
||||
name = "Gutter Site - Z1 Space"
|
||||
desc = "The Virgo Erigone Space Away Site."
|
||||
mappath = 'maps/expedition_vr/space/guttersite.dmm'
|
||||
associated_map_datum = /datum/map_z_level/tether_lateload/away_guttersite
|
||||
|
||||
/datum/map_z_level/tether_lateload/away_guttersite
|
||||
name = "Away Mission - Gutter Site"
|
||||
z = Z_LEVEL_GUTTERSITE
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
// Gateway submaps go here
|
||||
|
||||
|
||||
+25392
-25126
File diff suppressed because it is too large
Load Diff
+216
-236
@@ -27194,10 +27194,10 @@
|
||||
},
|
||||
/area/hallway/lower/third_south)
|
||||
"aUq" = (
|
||||
/obj/structure/shuttle/engine/propulsion,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/carry,
|
||||
/area/shuttle/tether)
|
||||
/obj/effect/floor_decal/rust/part_rusted1,
|
||||
/obj/machinery/atmospherics/binary/pump,
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aUr" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4;
|
||||
@@ -27246,12 +27246,16 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/public_garden_three)
|
||||
"aUx" = (
|
||||
/obj/machinery/atmospherics/unary/engine{
|
||||
dir = 1
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/carry,
|
||||
/area/shuttle/tourbus/engines)
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aUy" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/airlock/glass_command{
|
||||
@@ -27322,6 +27326,15 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/triage)
|
||||
"aUE" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/closet/emergsuit_wall{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aUF" = (
|
||||
/obj/effect/floor_decal/borderfloor,
|
||||
/obj/effect/floor_decal/corner/lime/border,
|
||||
@@ -27396,6 +27409,22 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/public_garden_three)
|
||||
"aUN" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
name = "south bump";
|
||||
pixel_y = -28;
|
||||
req_access = list();
|
||||
req_one_access = list(11,67)
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/white/orangecorner,
|
||||
/area/shuttle/tourbus/cockpit)
|
||||
"aUO" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 6
|
||||
@@ -27420,6 +27449,13 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/chemistry)
|
||||
"aUQ" = (
|
||||
/obj/structure/handrail{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/plating/eris/under,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aUR" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
@@ -27687,6 +27723,15 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/lobby)
|
||||
"aVm" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow,
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aVn" = (
|
||||
/obj/structure/bed/chair{
|
||||
dir = 1
|
||||
@@ -27907,6 +27952,21 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/surface_three_hall)
|
||||
"aVF" = (
|
||||
/obj/machinery/embedded_controller/radio/simple_docking_controller{
|
||||
dir = 8;
|
||||
frequency = 1380;
|
||||
id_tag = "tourbus_docker";
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aVG" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1
|
||||
@@ -27945,6 +28005,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/security/upperhall)
|
||||
"aVJ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aVK" = (
|
||||
/obj/effect/floor_decal/corner/lightgrey{
|
||||
dir = 10
|
||||
@@ -27967,6 +28031,18 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/security/upperhall)
|
||||
"aVM" = (
|
||||
/obj/machinery/atmospherics/portables_connector{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/red,
|
||||
/obj/machinery/portable_atmospherics/canister/phoron,
|
||||
/obj/machinery/door/window/southleft{
|
||||
dir = 1;
|
||||
req_one_access = list(19,43,67)
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/bluecorner,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aVN" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
@@ -28096,6 +28172,22 @@
|
||||
},
|
||||
/turf/simulated/wall,
|
||||
/area/tether/surfacebase/security/upperhall)
|
||||
"aWc" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/door/window/southright{
|
||||
dir = 1;
|
||||
req_one_access = list(19,43,67)
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/bluecorner,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aWd" = (
|
||||
/obj/effect/landmark/start{
|
||||
name = "Medical Doctor"
|
||||
@@ -28477,6 +28569,39 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/storage)
|
||||
"aWK" = (
|
||||
/obj/machinery/power/smes/buildable{
|
||||
charge = 500000
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/bluecorner,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aWL" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
pixel_x = -28;
|
||||
req_access = list();
|
||||
req_one_access = list(11,67)
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aWM" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/grass,
|
||||
@@ -28508,6 +28633,20 @@
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/surface_three_hall)
|
||||
"aWP" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 4;
|
||||
icon_state = "pdoor0";
|
||||
id = "tourbus_windows";
|
||||
name = "Shuttle Blast Doors";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aWQ" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 1
|
||||
@@ -28581,6 +28720,14 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/security/processing)
|
||||
"aWX" = (
|
||||
/obj/machinery/shipsensors{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/plating/eris/under,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aWY" = (
|
||||
/obj/structure/bed/chair{
|
||||
dir = 1
|
||||
@@ -28600,6 +28747,17 @@
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/security/upperhall)
|
||||
"aXa" = (
|
||||
/obj/machinery/door/airlock/glass{
|
||||
req_one_access = list(19,43,67)
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/techmaint_panels,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aXb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -29062,6 +29220,11 @@
|
||||
/obj/item/weapon/implantcase/chem,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/rnd/research_storage)
|
||||
"aXI" = (
|
||||
/obj/structure/shuttle/engine/propulsion,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/carry,
|
||||
/area/shuttle/tether)
|
||||
"aXJ" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
@@ -29109,6 +29272,13 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/lower/third_south)
|
||||
"aXN" = (
|
||||
/obj/machinery/atmospherics/unary/engine{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/carry,
|
||||
/area/shuttle/tourbus/general)
|
||||
"aXP" = (
|
||||
/obj/structure/disposalpipe/up{
|
||||
dir = 8
|
||||
@@ -37953,31 +38123,6 @@
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/security/hos)
|
||||
"dGZ" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"dJm" = (
|
||||
/obj/machinery/door/airlock/glass{
|
||||
req_one_access = list(19,43,67)
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/techmaint_panels,
|
||||
/area/shuttle/tourbus/cockpit)
|
||||
"dKj" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/effect/floor_decal/borderfloor/corner{
|
||||
@@ -38349,26 +38494,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/surface_three_hall)
|
||||
"fru" = (
|
||||
/obj/machinery/embedded_controller/radio/simple_docking_controller{
|
||||
dir = 8;
|
||||
frequency = 1380;
|
||||
id_tag = "tourbus_docker";
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
name = "south bump";
|
||||
pixel_y = -28
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"fxh" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
@@ -38461,24 +38586,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/surface_three_hall)
|
||||
"fYr" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
pixel_x = -28
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/engines)
|
||||
"gae" = (
|
||||
/obj/structure/bed/chair{
|
||||
dir = 4
|
||||
@@ -38850,20 +38957,6 @@
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/tether/surfacebase/shuttle_pad)
|
||||
"hCB" = (
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"hEt" = (
|
||||
/obj/structure/bed/chair{
|
||||
dir = 8
|
||||
@@ -39017,20 +39110,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/crew_quarters/panic_shelter)
|
||||
"iqb" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/structure/closet/emergsuit_wall{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"isl" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
@@ -39699,18 +39778,6 @@
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/research/researchdivision)
|
||||
"kBF" = (
|
||||
/obj/machinery/atmospherics/portables_connector{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/red,
|
||||
/obj/machinery/portable_atmospherics/canister/phoron,
|
||||
/obj/machinery/door/window/southleft{
|
||||
dir = 1;
|
||||
req_one_access = list(19,43,67)
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/bluecorner,
|
||||
/area/shuttle/tourbus/engines)
|
||||
"kCW" = (
|
||||
/obj/structure/filingcabinet/chestdrawer,
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
@@ -39996,21 +40063,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/security/upperhall)
|
||||
"lCq" = (
|
||||
/obj/structure/handrail{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/plating/eris/under,
|
||||
/area/shuttle/tourbus/cockpit)
|
||||
"lFc" = (
|
||||
/obj/effect/floor_decal/rust/part_rusted1,
|
||||
/obj/machinery/atmospherics/binary/pump,
|
||||
/obj/structure/cable{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/golden,
|
||||
/area/shuttle/tourbus/general)
|
||||
"lFG" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/item/device/flashlight/lamp/green{
|
||||
@@ -40728,20 +40780,6 @@
|
||||
/obj/effect/floor_decal/spline/plain,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/security/iaa/officeb)
|
||||
"oLR" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
name = "south bump";
|
||||
pixel_y = -28
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/white/orangecorner,
|
||||
/area/shuttle/tourbus/cockpit)
|
||||
"oMh" = (
|
||||
/obj/machinery/power/apc{
|
||||
dir = 8;
|
||||
@@ -41175,20 +41213,6 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/security/hos)
|
||||
"qom" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/door/blast/regular{
|
||||
density = 0;
|
||||
dir = 4;
|
||||
icon_state = "pdoor0";
|
||||
id = "tourbus_windows";
|
||||
name = "Shuttle Blast Doors";
|
||||
opacity = 0
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty,
|
||||
/area/shuttle/tourbus/engines)
|
||||
"qoL" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 5
|
||||
@@ -41223,9 +41247,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/lower/third_south)
|
||||
"qwm" = (
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/tourbus/engines)
|
||||
"qze" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
@@ -41341,10 +41362,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/security/hos)
|
||||
"qWU" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/tourbus/engines)
|
||||
"qXD" = (
|
||||
/obj/structure/bed/chair/comfy/black,
|
||||
/obj/machinery/button/windowtint{
|
||||
@@ -41739,22 +41756,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/tether/surfacebase/shuttle_pad)
|
||||
"sGV" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/door/window/southright{
|
||||
dir = 1;
|
||||
req_one_access = list(19,43,67)
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/bluecorner,
|
||||
/area/shuttle/tourbus/engines)
|
||||
"sJv" = (
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
@@ -42050,19 +42051,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/security/iaa/officeb)
|
||||
"tLv" = (
|
||||
/obj/machinery/power/smes/buildable{
|
||||
charge = 500000
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/bluecorner,
|
||||
/area/shuttle/tourbus/engines)
|
||||
"tPE" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/weapon/book/manual/security_space_law,
|
||||
@@ -43252,14 +43240,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/surface_three_hall)
|
||||
"xXf" = (
|
||||
/obj/machinery/shipsensors{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/plating/eris/under,
|
||||
/area/shuttle/tourbus/cockpit)
|
||||
"xXZ" = (
|
||||
/obj/structure/railing,
|
||||
/turf/simulated/open,
|
||||
@@ -54366,17 +54346,17 @@ aJn
|
||||
aKa
|
||||
aKU
|
||||
aKU
|
||||
lCq
|
||||
jvK
|
||||
jvK
|
||||
jvK
|
||||
aUQ
|
||||
jHw
|
||||
jHw
|
||||
jHw
|
||||
bkN
|
||||
jHw
|
||||
jML
|
||||
jHw
|
||||
jpB
|
||||
qWU
|
||||
aUx
|
||||
aVJ
|
||||
aXN
|
||||
aKU
|
||||
aOI
|
||||
aPb
|
||||
@@ -54511,14 +54491,14 @@ aKU
|
||||
jvK
|
||||
jvK
|
||||
kdx
|
||||
jvK
|
||||
jHw
|
||||
cnN
|
||||
mDf
|
||||
eiO
|
||||
cnZ
|
||||
fYr
|
||||
qwm
|
||||
qwm
|
||||
aWL
|
||||
jHw
|
||||
jHw
|
||||
aKU
|
||||
aOI
|
||||
aPb
|
||||
@@ -54652,15 +54632,15 @@ aKU
|
||||
aKU
|
||||
ddn
|
||||
eCG
|
||||
oLR
|
||||
jvK
|
||||
aUN
|
||||
jHw
|
||||
oPm
|
||||
kmK
|
||||
xOa
|
||||
dVW
|
||||
kun
|
||||
kBF
|
||||
qom
|
||||
aVM
|
||||
aWP
|
||||
aKU
|
||||
avs
|
||||
aKj
|
||||
@@ -54795,14 +54775,14 @@ aKU
|
||||
ddn
|
||||
pNk
|
||||
vrU
|
||||
dJm
|
||||
aXa
|
||||
kiw
|
||||
kcC
|
||||
eGv
|
||||
lFc
|
||||
dGZ
|
||||
sGV
|
||||
qom
|
||||
aUq
|
||||
aVm
|
||||
aWc
|
||||
aWP
|
||||
aKU
|
||||
aOI
|
||||
aPb
|
||||
@@ -54937,14 +54917,14 @@ aKU
|
||||
ddn
|
||||
pwF
|
||||
hlF
|
||||
jvK
|
||||
jHw
|
||||
uhm
|
||||
gUL
|
||||
rbR
|
||||
hCB
|
||||
aUx
|
||||
wQf
|
||||
tLv
|
||||
qom
|
||||
aWK
|
||||
aWP
|
||||
aKU
|
||||
aOI
|
||||
aPb
|
||||
@@ -55079,14 +55059,14 @@ aKU
|
||||
jvK
|
||||
jvK
|
||||
ivq
|
||||
jvK
|
||||
jHw
|
||||
rzV
|
||||
fcg
|
||||
tcW
|
||||
iqb
|
||||
fru
|
||||
qwm
|
||||
qwm
|
||||
aUE
|
||||
aVF
|
||||
jHw
|
||||
jHw
|
||||
aKU
|
||||
aOK
|
||||
aKj
|
||||
@@ -55218,17 +55198,17 @@ aJn
|
||||
aKa
|
||||
aKU
|
||||
aKU
|
||||
xXf
|
||||
jvK
|
||||
jvK
|
||||
jvK
|
||||
aWX
|
||||
jHw
|
||||
jHw
|
||||
jHw
|
||||
wyi
|
||||
jHw
|
||||
caw
|
||||
jHw
|
||||
gHh
|
||||
qWU
|
||||
aUx
|
||||
aVJ
|
||||
aXN
|
||||
aKU
|
||||
aOI
|
||||
aKj
|
||||
@@ -57213,7 +57193,7 @@ aNk
|
||||
uSA
|
||||
aNJ
|
||||
aNP
|
||||
aUq
|
||||
aXI
|
||||
aKU
|
||||
abg
|
||||
aOk
|
||||
@@ -57355,7 +57335,7 @@ aNl
|
||||
aNl
|
||||
aNK
|
||||
aNP
|
||||
aUq
|
||||
aXI
|
||||
aKU
|
||||
abg
|
||||
aOk
|
||||
@@ -57497,7 +57477,7 @@ aNm
|
||||
aNl
|
||||
aNK
|
||||
aNP
|
||||
aUq
|
||||
aXI
|
||||
aKU
|
||||
abg
|
||||
aOk
|
||||
|
||||
+483
-480
File diff suppressed because it is too large
Load Diff
@@ -106,7 +106,7 @@
|
||||
icon_state = "vacant_site"
|
||||
|
||||
/area/centcom/simulated
|
||||
dynamic_lighting = 1
|
||||
dynamic_lighting = 0
|
||||
|
||||
/area/centcom/simulated/terminal
|
||||
name = "\improper Docking Terminal"
|
||||
@@ -1386,9 +1386,6 @@
|
||||
/area/shuttle/tourbus/cockpit
|
||||
name = "\improper Tour Bus Cockpit"
|
||||
|
||||
/area/shuttle/tourbus/engines
|
||||
name = "\improper Tour Bus Engines"
|
||||
|
||||
/area/shuttle/medivac
|
||||
requires_power = 1
|
||||
icon_state = "shuttle2"
|
||||
@@ -1553,6 +1550,12 @@ area/shuttle/mining_outpost/shuttle
|
||||
/area/unknown/dorm4
|
||||
name = "Unknown Dorm 4"
|
||||
|
||||
/area/unknown/dorm5
|
||||
name = "Unknown Dorm 5"
|
||||
|
||||
/area/unknown/dorm6
|
||||
name = "Unknown Dorm 6"
|
||||
|
||||
// ERT/Deathsquad Shuttle
|
||||
/area/shuttle/specialops/centcom
|
||||
name = "Special Operations Shuttle - Centcom"
|
||||
|
||||
@@ -15,16 +15,13 @@
|
||||
#define Z_LEVEL_OFFMAP2 14
|
||||
#define Z_LEVEL_ROGUEMINE_1 15
|
||||
#define Z_LEVEL_ROGUEMINE_2 16
|
||||
#define Z_LEVEL_ROGUEMINE_3 17
|
||||
#define Z_LEVEL_ROGUEMINE_4 18
|
||||
#define Z_LEVEL_BEACH 19
|
||||
#define Z_LEVEL_BEACH_CAVE 20
|
||||
#define Z_LEVEL_AEROSTAT 21
|
||||
#define Z_LEVEL_AEROSTAT_SURFACE 22
|
||||
#define Z_LEVEL_DEBRISFIELD 23
|
||||
#define Z_LEVEL_GUTTERSITE 24
|
||||
#define Z_LEVEL_FUELDEPOT 25
|
||||
#define Z_LEVEL_GATEWAY 26
|
||||
#define Z_LEVEL_BEACH 17
|
||||
#define Z_LEVEL_BEACH_CAVE 18
|
||||
#define Z_LEVEL_AEROSTAT 19
|
||||
#define Z_LEVEL_AEROSTAT_SURFACE 20
|
||||
#define Z_LEVEL_DEBRISFIELD 21
|
||||
#define Z_LEVEL_FUELDEPOT 22
|
||||
#define Z_LEVEL_GATEWAY 23
|
||||
|
||||
//Camera networks
|
||||
#define NETWORK_TETHER "Tether"
|
||||
@@ -53,8 +50,8 @@
|
||||
|
||||
use_overmap = TRUE
|
||||
overmap_z = Z_LEVEL_MISC
|
||||
overmap_size = 35
|
||||
overmap_event_areas = 34
|
||||
overmap_size = 50
|
||||
overmap_event_areas = 44
|
||||
usable_email_tlds = list("virgo.nt")
|
||||
|
||||
zlevel_datum_type = /datum/map_z_level/tether
|
||||
@@ -193,9 +190,7 @@
|
||||
belter_docked_z = list(Z_LEVEL_SPACE_HIGH)
|
||||
belter_transit_z = list(Z_LEVEL_MISC)
|
||||
belter_belt_z = list(Z_LEVEL_ROGUEMINE_1,
|
||||
Z_LEVEL_ROGUEMINE_2,
|
||||
Z_LEVEL_ROGUEMINE_3,
|
||||
Z_LEVEL_ROGUEMINE_4)
|
||||
Z_LEVEL_ROGUEMINE_2)
|
||||
|
||||
//TFF 16/4/20 - mining outpost shuttle defines
|
||||
mining_station_z = list(Z_LEVEL_SPACE_HIGH)
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
/obj/effect/overmap/visitable/ship/landable/excursion
|
||||
name = "Excursion Shuttle"
|
||||
desc = "The traditional Excursion Shuttle. NT Approved!"
|
||||
vessel_mass = 10000
|
||||
vessel_mass = 8000
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
shuttle = "Excursion Shuttle"
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
warmup_time = 0
|
||||
current_location = "tourbus_dock"
|
||||
docking_controller_tag = "tourbus_docker"
|
||||
shuttle_area = list(/area/shuttle/tourbus/cockpit, /area/shuttle/tourbus/general, /area/shuttle/tourbus/engines)
|
||||
shuttle_area = list(/area/shuttle/tourbus/cockpit, /area/shuttle/tourbus/general)
|
||||
fuel_consumption = 1
|
||||
move_direction = NORTH
|
||||
|
||||
@@ -244,14 +244,14 @@
|
||||
current_location = "tether_medivac_dock"
|
||||
docking_controller_tag = "medivac_docker"
|
||||
shuttle_area = list(/area/shuttle/medivac/cockpit, /area/shuttle/medivac/general, /area/shuttle/medivac/engines)
|
||||
fuel_consumption = 1
|
||||
fuel_consumption = 2
|
||||
move_direction = EAST
|
||||
|
||||
// The 'ship' of the excursion shuttle
|
||||
/obj/effect/overmap/visitable/ship/landable/medivac
|
||||
name = "Medivac Shuttle"
|
||||
desc = "A medical evacuation shuttle."
|
||||
vessel_mass = 3000
|
||||
vessel_mass = 4000
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
shuttle = "Medivac Shuttle"
|
||||
fore_dir = EAST
|
||||
@@ -269,14 +269,14 @@
|
||||
current_location = "tether_securiship_dock"
|
||||
docking_controller_tag = "securiship_docker"
|
||||
shuttle_area = list(/area/shuttle/securiship/cockpit, /area/shuttle/securiship/general, /area/shuttle/securiship/engines)
|
||||
fuel_consumption = 1
|
||||
fuel_consumption = 2
|
||||
move_direction = NORTH
|
||||
|
||||
// The 'ship' of the excursion shuttle
|
||||
/obj/effect/overmap/visitable/ship/landable/securiship
|
||||
name = "Securiship Shuttle"
|
||||
desc = "A security transport ship."
|
||||
vessel_mass = 3000
|
||||
vessel_mass = 4000
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
shuttle = "Securiship Shuttle"
|
||||
fore_dir = EAST
|
||||
|
||||
@@ -5,12 +5,8 @@
|
||||
// Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels.
|
||||
/obj/machinery/telecomms/relay/preset/tether
|
||||
id = "Tether Relay"
|
||||
listening_level = Z_LEVEL_SURFACE_LOW
|
||||
autolinkers = list("tether_relay")
|
||||
|
||||
/obj/machinery/telecomms/relay/preset/centcom/tether
|
||||
listening_level = Z_LEVEL_SURFACE_LOW
|
||||
|
||||
// #### Hub ####
|
||||
/obj/machinery/telecomms/hub/preset/tether
|
||||
id = "Hub"
|
||||
|
||||
+1
-1
@@ -2663,6 +2663,7 @@
|
||||
#include "code\modules\mob\living\carbon\human\species\station\station_special_abilities_vr.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\station_special_vr.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\station_vr.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\teshari.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\xenochimera_hud_vr.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\xenochimera_trait_vr.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_blob.dm"
|
||||
@@ -2674,7 +2675,6 @@
|
||||
#include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_objs.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_recipies.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\station\teshari.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\virtual_reality\avatar.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\virtual_reality\opaque_form.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_powers.dm"
|
||||
|
||||
Reference in New Issue
Block a user