cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pathfinder Update (#3777)

Browse Source 
* Pathfinder Update

- Implimented Pathfinder, Command Exploration role
- Added Deluxe Machete for Pathfinders (just a cosmetic reskin)
- Added Pathfinder's office, between expedition prep and breifing
- Expanded size of expedition shuttle
- Ported Pilot and Explorer voidsuit from Baystation
- Restored the old air tank on the expedition shuttle
- Added a couple starter shelter capsules to exploration
- The expedition shuttle now has toggled blast doors to cover the windows
- Increases pay of pilots, SARs, and Explorers
- Adds box of volunteer headsets to the Pathfinder's locker

* Polaris Merge Compatability

* Forgot some things

* Moves PF from command to science

* Requested changes Part 1

* Travis and Access Fix

* Requested changes Part 2

* Resetting Maps Part 1

* Resetting Maps Part 2

* Replaces PF office airlock

* Requested Changes Part 3

* Remove gateway access

* Changes Locker/Door Access Req

* Removes blast doors

* Pilot voidsuit crate cost tweak
This commit is contained in:
Novacat
2018-05-31 16:57:40 -04:00
committed by Aronai Sieyes
parent c89e335031
commit 5addac95ed
30 changed files with 2018 additions and 1391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/voidsuits_vr.dm
+29 -1
View File
@@ -68,4 +68,32 @@
/obj/item/clothing/head/helmet/space/void/mining = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/weapon/tank/oxygen = 3
)
)
/datum/supply_packs/voidsuits/explorer
name = "Exploration voidsuits"
contains = list(
/obj/item/clothing/suit/space/void/exploration = 3,
/obj/item/clothing/head/helmet/space/void/exploration = 3,
/obj/item/clothing/mask/breath = 3,
/obj/item/clothing/shoes/magboots = 3,
/obj/item/weapon/tank/oxygen = 3
)
cost = 50
containertype = "/obj/structure/closet/crate/secure"
containername = "Exploration voidsuit crate"
access = access_explorer
/datum/supply_packs/voidsuits/pilot
name = "Pilot voidsuits"
contains = list(
/obj/item/clothing/suit/space/void/pilot = 1,
/obj/item/clothing/head/helmet/space/void/pilot = 1,
/obj/item/clothing/mask/breath = 1,
/obj/item/clothing/shoes/magboots = 1,
/obj/item/weapon/tank/oxygen = 1
)
cost = 20
containertype = "/obj/structure/closet/crate/secure"
containername = "Pilot voidsuit crate"
access = access_pilot
code/game/jobs/jobs.dm
+1
View File
@@ -80,6 +80,7 @@ var/list/medical_positions = list(
var/list/science_positions = list(
"Research Director",
"Pathfinder", // VOREStation Edit - Added Pathfinder
"Scientist",
"Geneticist", //Part of both medical and science
"Roboticist",
code/game/machinery/suit_storage_unit_vr.dm
+45
View File
@@ -17,3 +17,48 @@
SPECIES_ZORREN_FLAT,
SPECIES_ZORREN_HIGH
)
/obj/machinery/suit_cycler/explorer
name = "Explorer suit cycler"
model_text = "Exploration"
req_access = list(access_pilot)
departments = list("Exploration","Pilot")
/obj/machinery/suit_cycler/explorer/initialize()
species -= SPECIES_TESHARI
return ..()
/obj/machinery/suit_cycler/apply_paintjob()
if(!target_species || !target_department)
return
if(target_species)
if(helmet) helmet.refit_for_species(target_species)
if(suit) suit.refit_for_species(target_species)
switch(target_department)
if("Exploration")
if(helmet)
helmet.name = "exploration voidsuit helmet"
helmet.icon_state = "helm_explorer"
helmet.item_state = "helm_explorer"
if(suit)
suit.name = "exploration voidsuit"
suit.icon_state = "void_explorer"
suit.item_state = "void_explorer"
suit.item_state_slots[slot_r_hand_str] = "wiz_voidsuit"
suit.item_state_slots[slot_l_hand_str] = "wiz_voidsuit"
if("Pilot")
if(helmet)
helmet.name = "pilot voidsuit helmet"
helmet.icon_state = "rig0_pilot"
helmet.item_state = "pilot_helm"
if(suit)
suit.name = "pilot voidsuit"
suit.icon_state = "rig-pilot"
suit.item_state = "rig-pilot"
suit.item_state_slots[slot_r_hand_str] = "sec_voidsuitTG"
suit.item_state_slots[slot_l_hand_str] = "sec_voidsuitTG"
else
return ..()
code/game/objects/items/devices/PDA/PDA_vr.dm
+5 -1
View File
@@ -2,4 +2,8 @@
default_cartridge = /obj/item/weapon/cartridge/captain
icon_state = "pda-h"
detonate = 0
// hidden = 1
// hidden = 1
/obj/item/device/pda/pathfinder
default_cartridge = /obj/item/weapon/cartridge/signal/science
icon_state = "pda-h"
code/game/objects/items/weapons/material/knives.dm
+2 -2
View File
@@ -101,7 +101,7 @@
attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
can_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
slot_flags = SLOT_BELT
default_material = "plasteel"
default_material = "plasteel" //VOREStation Edit
/obj/item/weapon/material/knife/tacknife/survival
name = "survival knife"
@@ -110,5 +110,5 @@
icon_state = "survivalknife"
item_state = "knife"
applies_material_colour = FALSE
default_material = "plasteel"
default_material = "plasteel" //VOREStation Edit
toolspeed = 2 // Use a real axe if you want to chop logs.
code/game/objects/items/weapons/material/knives_vr.dm
+6
View File
@@ -0,0 +1,6 @@
/obj/item/weapon/material/knife/machete/deluxe
name = "deluxe machete"
desc = "A fine example of a machete, with a polished blade, wooden handle and a leather cord loop."
icon = 'icons/obj/weapons_vr.dmi'
icon_state = "machetedx"
item_state = "machete"
code/game/objects/items/weapons/storage/boxes_vr.dm
+4
View File
@@ -0,0 +1,4 @@
/obj/item/weapon/storage/box/explorerkeys
name = "box of volunteer headsets"
desc = "A box full of volunteer headsets, for issuing out to exploration volunteers."
starts_with = list(/obj/item/device/radio/headset/volunteer = 7)
code/modules/client/preference_setup/occupation/occupation.dm
+1 -1
View File
@@ -54,7 +54,7 @@
if(alt_title && !(alt_title in job.alt_titles))
pref.player_alt_titles -= job.title
/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 18, list/splitJobs = list("Chief Engineer"))
/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 19, list/splitJobs = list("Chief Engineer")) //VOREStation Edit
if(!job_master)
return
code/modules/clothing/spacesuits/void/station_vr.dm
+42
View File
@@ -0,0 +1,42 @@
//Exploration
/obj/item/clothing/head/helmet/space/void/exploration
name = "exploration voidsuit helmet"
desc = "A radiation-resistant helmet made especially for exploring unknown planetary environments."
icon_state = "helm_explorer"
item_state = "helm_explorer"
armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70)
light_overlay = "helmet_light_dual" //explorer_light
/obj/item/clothing/suit/space/void/exploration
name = "exploration voidsuit"
desc = "A lightweight, radiation-resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments."
icon_state = "void_explorer"
armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon,/obj/item/weapon/shovel)
/obj/item/clothing/suit/space/void/exploration/prepared
helmet = /obj/item/clothing/head/helmet/space/void/exploration
boots = /obj/item/clothing/shoes/magboots
//Pilot
/obj/item/clothing/head/helmet/space/void/pilot
desc = "An atmos resistant helmet for space and planet exploration."
name = "pilot voidsuit helmet"
icon_state = "rig0_pilot"
item_state = "pilot_helm"
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 50)
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
light_overlay = "helmet_light_dual"
/obj/item/clothing/suit/space/void/pilot
desc = "An atmos resistant voidsuit for space and planet exploration."
icon_state = "rig-pilot"
item_state = "rig-pilot"
name = "pilot voidsuit"
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 50)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/weapon/rcd)
/obj/item/clothing/suit/space/void/pilot/prepared
helmet = /obj/item/clothing/head/helmet/space/void/pilot
boots = /obj/item/clothing/shoes/magboots
icons/mob/hud_jobs_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

icons/mob/ties_vr.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 297 B

icons/obj/clothing/ties_vr.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 469 B

icons/obj/weapons_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

maps/southern_cross/items/encryptionkey_sc.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/device/encryptionkey/pilot
name = "pilot's encryption key"
icon_state = "com_cypherkey"
channels = list("Explorer" = 1) //VOREStation Edit
channels = list("Supply" = 1, "Explorer" = 1)
/obj/item/device/encryptionkey/explorer
name = "explorer radio encryption key"
maps/southern_cross/items/encryptionkey_vr.dm
+3
View File
@@ -0,0 +1,3 @@
/obj/item/device/encryptionkey/pilot
icon_state = "cypherkey"
channels = list("Explorer" = 1)
maps/southern_cross/items/headset_sc.dm
+5 -8
View File
@@ -1,32 +1,30 @@
/obj/item/device/radio/headset/pilot
name = "pilot's headset"
desc = "A headset used by pilots, has access to supply and explorer channels."
desc = "A headset used by pilots, has access to the explorer channel." //VOREStation Edit
icon_state = "pilot_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/device/encryptionkey/pilot
adhoc_fallback = TRUE //VOREStation Edit
/obj/item/device/radio/headset/pilot/alt
name = "pilot's bowman headset"
desc = "A bowman headset used by pilots, has access to supply and explorer channels."
desc = "A bowman headset used by pilots, has access to the explorer channel." //VOREStation Edit
icon_state = "pilot_headset_alt"
/obj/item/device/radio/headset/pilot/alt
name = "pilot's bowman headset"
desc = "A bowman headset used by pilots, has access to supply and explorer channels."
desc = "A bowman headset used by pilots, has access to the explorer channel." //VOREStation Edit
icon_state = "pilot_headset_alt"
/obj/item/device/radio/headset/explorer
name = "explorer's headset"
desc = "Headset used by explorers for exploring. Access to the explorer channel."
desc = "Headset used by explorers for exploring. Access to explorer and science channels." //VOREStation Edit
icon_state = "exp_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/device/encryptionkey/explorer
adhoc_fallback = TRUE //VOREStation Edit
/obj/item/device/radio/headset/explorer/alt
name = "explorer's bowman headset"
desc = "Bowman headset used by explorers for exploring. Access to the explorer channel."
desc = "Bowman headset used by explorers for exploring. Access to explorer and science channels." //VOREStation Edit
icon_state = "exp_headset_alt"
/obj/item/device/radio/headset/sar
@@ -35,7 +33,6 @@
icon_state = "sar_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/device/encryptionkey/sar
adhoc_fallback = TRUE //VOREStation Edit
/obj/item/device/radio/headset/sar/alt
name = "sar radio bowman headset"
maps/southern_cross/items/headset_vr.dm
+6
View File
@@ -0,0 +1,6 @@
/obj/item/device/radio/headset/volunteer
name = "volunteer's headset"
desc = "A headset used by volunteers to expedition teams, has access to the exploration channel."
icon_state = "pilot_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/device/encryptionkey/pilot
maps/southern_cross/job/outfits.dm
+1 -1
View File
@@ -62,4 +62,4 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
pda_slot = slot_l_store
id_type = /obj/item/weapon/card/id/medical/sar
id_pda_assignment = "Search and Rescue"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
maps/southern_cross/job/outfits_vr.dm
+17
View File
@@ -0,0 +1,17 @@
/decl/hierarchy/outfit/job/pathfinder
name = OUTFIT_JOB_NAME("Pathfinder")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
l_ear = /obj/item/device/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/pathfinder
id_type = /obj/item/weapon/card/id/science/head/pathfinder
id_pda_assignment = "Pathfinder"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
/decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
permit.set_name(H.real_name)
maps/southern_cross/southern_cross_jobs.dm
+10 -10
View File
@@ -77,10 +77,10 @@ var/const/access_explorer = 43
faction = "Station"
total_positions = 2
spawn_positions = 2
supervisors = "the head of personnel"
supervisors = "the pathfinder and the head of personnel" //VOREStation Edit
selection_color = "#515151"
idtype = /obj/item/weapon/card/id/civilian/pilot
economic_modifier = 4
economic_modifier = 5 //VOREStation Edit
access = list(access_pilot) //VOREStation Edit
minimal_access = list(access_pilot) //VOREStation Edit
outfit_type = /decl/hierarchy/outfit/job/pilot
@@ -91,12 +91,12 @@ var/const/access_explorer = 43
department = "Science" //VOREStation Edit
department_flag = MEDSCI //VOREStation Edit
faction = "Station"
total_positions = 3 //VOREStation Edit
spawn_positions = 3 //VOREStation Edit
supervisors = "the research director" //VOREStation Edit
total_positions = 2 //VOREStation Edit
spawn_positions = 2 //VOREStation Edit
supervisors = "the pathfinder and the research director" //VOREStation Edit
selection_color = "#633D63" //VOREStation Edit
idtype = /obj/item/weapon/card/id/civilian/explorer
economic_modifier = 4
economic_modifier = 6 //VOREStation Edit
access = list(access_pilot, access_explorer, access_research) //VOREStation Edit
minimal_access = list(access_pilot, access_explorer, access_research) //VOREStation Edit
outfit_type = /decl/hierarchy/outfit/job/explorer2
@@ -112,12 +112,12 @@ var/const/access_explorer = 43
department = "Medical"
department_flag = MEDSCI
faction = "Station"
total_positions = 2 //VOREStation Edit
spawn_positions = 2 //VOREStation Edit
supervisors = "the chief medical officer"
total_positions = 2
spawn_positions = 2
supervisors = "the pathfinder and the chief medical officer" //VOREStation Edit
selection_color = "#013D3B" //VOREStation Edit
idtype = /obj/item/weapon/card/id/medical
economic_modifier = 4
economic_modifier = 6 //VOREStation Edit
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer)
outfit_type = /decl/hierarchy/outfit/job/medical/sar
maps/southern_cross/southern_cross_jobs_vr.dm
+24
View File
@@ -0,0 +1,24 @@
var/const/PATHFINDER =(1<<13) //VOREStation Edit - Added Pathfinder
/obj/item/weapon/card/id/science/head/pathfinder
desc = "A card which represents discovery of the unknown."
assignment = "Pathfinder"
rank = "Pathfinder"
job_access_type = /datum/job/pathfinder
/datum/job/pathfinder
title = "Pathfinder"
flag = PATHFINDER
department = "Science"
department_flag = MEDSCI
faction = "Station"
total_positions = 1
spawn_positions = 1
supervisors = "the research director"
selection_color = "#AD6BAD"
idtype = /obj/item/weapon/card/id/science/head/pathfinder
economic_modifier = 7
access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_research)
minimal_access = list(access_pilot, access_explorer, access_research)
outfit_type = /decl/hierarchy/outfit/job/pathfinder
maps/southern_cross/structures/closets/misc.dm
+1
View File
@@ -99,6 +99,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
/obj/item/weapon/storage/belt/medical/emt,
/obj/item/weapon/material/knife/tacknife/survival, //VOREStation Add,
/obj/item/clothing/mask/gas,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
/obj/item/clothing/shoes/boots/winter/explorer,
maps/southern_cross/structures/closets/misc_vr.dm
+37
View File
@@ -0,0 +1,37 @@
/obj/structure/closet/secure_closet/pathfinder
name = "pathfinder locker"
icon = 'icons/obj/closet_vr.dmi'
icon_state = "secureexp1"
icon_closed = "secureexp"
icon_locked = "secureexp1"
icon_opened = "secureexpopen"
icon_broken = "secureexpbroken"
icon_off = "secureexpoff"
req_access = list(access_explorer)
starts_with = list(
/obj/item/clothing/under/explorer,
/obj/item/clothing/suit/storage/hooded/explorer,
/obj/item/clothing/mask/gas/explorer,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
/obj/item/device/radio/headset/explorer,
/obj/item/device/flashlight,
/obj/item/device/gps/explorer,
/obj/item/weapon/storage/box/flare,
/obj/item/weapon/storage/box/explorerkeys,
/obj/item/device/geiger,
/obj/item/weapon/cell/device,
/obj/item/device/radio,
/obj/item/stack/marker_beacon/thirty,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/material/knife/machete/deluxe,
/obj/item/clothing/accessory/holster/machete,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2)
/obj/structure/closet/secure_closet/explorer/initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack
else
starts_with += /obj/item/weapon/storage/backpack/satchel/norm
return ..()
maps/tether/submaps/aerostat/aerostat.dmm
+43 -43
View File
@@ -5166,13 +5166,13 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
@@ -5302,19 +5302,19 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
@@ -5443,13 +5443,13 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
@@ -5585,20 +5585,20 @@ aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
@@ -5739,7 +5739,7 @@ cv
cv
cv
cv
cv
aw
aw
aw
aw
@@ -6023,7 +6023,7 @@ cv
cv
cv
cv
aw
cv
aw
aw
aw
@@ -6308,7 +6308,7 @@ cv
cv
cv
cv
aw
cv
aw
aw
aw
maps/tether/submaps/alienship/alienship.dmm
+105 -105
View File
@@ -7901,7 +7901,7 @@ af
af
ae
ae
ac
ae
ag
ag
ar
@@ -9164,18 +9164,18 @@ ac
ac
ab
ab
aa
aa
aa
aa
ac
af
ac
aa
aa
aa
aa
ab
ac
ac
ag
ak
ag
ac
ac
ac
ac
ac
ab
ac
ac
@@ -9305,20 +9305,20 @@ ac
ac
ab
ab
aa
ac
ac
af
af
af
af
af
af
af
af
af
af
ac
ac
ag
ak
ag
ac
ac
ac
ac
ac
ab
ab
ac
ac
@@ -9446,23 +9446,23 @@ ac
ac
ab
ab
aa
ac
ac
af
af
af
af
af
af
af
af
aE
aE
aE
aE
aE
aE
aE
aE
af
af
ac
ac
ab
ab
ac
ac
ae
@@ -9587,7 +9587,6 @@ ac
ac
ab
ab
aa
ac
ac
af
@@ -9600,12 +9599,13 @@ ae
ae
ae
ae
af
af
ae
aE
uA
uA
ac
ac
ab
ab
ac
ac
ac
@@ -9728,7 +9728,6 @@ ac
ab
ab
ab
aa
ac
ac
af
@@ -9738,14 +9737,15 @@ ae
ae
ae
ae
ae
ae
ae
ae
ae
uA
uA
ac
ah
ah
ah
ah
ah
ah
DW
af
aR
ac
ab
ab
@@ -9869,24 +9869,24 @@ ab
ab
ab
aa
aa
ac
ac
af
af
ae
ae
ae
ae
ae
ah
ah
ah
ah
ah
ah
DW
af
ah
ah
ah
ah
ah
ah
ah
aE
aR
ac
aa
@@ -10012,7 +10012,6 @@ aa
aa
aa
ac
ac
af
af
ah
@@ -10028,6 +10027,7 @@ ah
ah
ah
ah
ah
aE
aR
ac
@@ -10155,7 +10155,7 @@ aa
aa
ac
af
af
ae
ah
ah
ah
@@ -10723,7 +10723,7 @@ aa
aa
ac
af
af
ae
ah
ah
ah
@@ -10864,7 +10864,6 @@ aa
aa
aa
ac
ac
af
af
ah
@@ -10880,6 +10879,7 @@ ah
ah
ah
ah
ah
aE
aR
ac
@@ -11005,24 +11005,24 @@ ab
ab
ab
aa
aa
ac
ac
af
af
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
ae
ae
ae
ae
ae
ah
ah
ah
ah
ah
ah
ah
af
aR
ac
aa
@@ -11148,7 +11148,6 @@ ac
ab
ab
ab
aa
ac
ac
af
@@ -11158,14 +11157,15 @@ ae
ae
ae
ae
ae
ae
ae
ae
ae
ah
ah
ah
ah
ah
ah
ah
af
af
ac
aR
ac
ab
ab
@@ -11291,7 +11291,6 @@ ac
ac
ab
ab
aa
ac
ac
af
@@ -11304,12 +11303,13 @@ ae
ae
ae
ae
ae
ae
af
af
ac
ac
ab
ab
ac
ac
ac
@@ -11434,23 +11434,23 @@ ac
ac
ab
ab
aa
ac
ac
af
af
ae
ae
ae
ae
ae
ae
ae
ae
af
af
af
af
af
af
af
uA
ac
ac
ab
ab
ac
ac
ae
@@ -11577,20 +11577,20 @@ ac
ac
ab
ab
aa
ac
ac
af
af
af
af
af
af
af
af
af
uA
ac
ac
ag
aj
ag
ac
ac
ac
ac
ac
ab
ab
ac
ac
@@ -11720,18 +11720,18 @@ ac
ac
ab
ab
aa
aa
aa
aa
ac
af
ac
aa
aa
aa
aa
ab
ac
ac
ag
aj
ag
ac
ac
ac
ac
ac
ab
ac
ac
maps/tether/submaps/beach/beach.dmm
+28 -28
View File
@@ -8480,13 +8480,13 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
aa
aa
aa
@@ -8616,12 +8616,12 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
@@ -8757,7 +8757,7 @@ aa
aa
aa
aa
aa
bm
bm
bm
bm
@@ -9609,7 +9609,7 @@ aa
aa
aa
aa
aa
bm
bm
bm
bm
@@ -9752,12 +9752,12 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
@@ -9900,13 +9900,13 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
aa
aa
aa
maps/tether/submaps/tether_ships.dmm
+458 -458
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-05-station1.dmm
+1133 -732
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether_areas2.dm
+3
View File
@@ -447,6 +447,9 @@
/area/tether/station/explorer_meeting
name = "\improper Explorer Meeting Room"
/area/tether/station/pathfinder_office
name = "\improper Pathfinder's Office"
/area/shuttle/excursion
name = "\improper Excursion Shuttle"
icon_state = "shuttle2"
vorestation.dme
+8
View File
@@ -1112,6 +1112,7 @@
#include "code\game\objects\items\weapons\material\gravemarker.dm"
#include "code\game\objects\items\weapons\material\kitchen.dm"
#include "code\game\objects\items\weapons\material\knives.dm"
#include "code\game\objects\items\weapons\material\knives_vr.dm"
#include "code\game\objects\items\weapons\material\material_armor.dm"
#include "code\game\objects\items\weapons\material\material_weapons.dm"
#include "code\game\objects\items\weapons\material\misc.dm"
@@ -1129,6 +1130,7 @@
#include "code\game\objects\items\weapons\storage\belt.dm"
#include "code\game\objects\items\weapons\storage\bible.dm"
#include "code\game\objects\items\weapons\storage\boxes.dm"
#include "code\game\objects\items\weapons\storage\boxes_vr.dm"
#include "code\game\objects\items\weapons\storage\briefcase.dm"
#include "code\game\objects\items\weapons\storage\fancy.dm"
#include "code\game\objects\items\weapons\storage\firstaid.dm"
@@ -1573,6 +1575,7 @@
#include "code\modules\clothing\spacesuits\void\merc.dm"
#include "code\modules\clothing\spacesuits\void\military_vr.dm"
#include "code\modules\clothing\spacesuits\void\station.dm"
#include "code\modules\clothing\spacesuits\void\station_vr.dm"
#include "code\modules\clothing\spacesuits\void\void.dm"
#include "code\modules\clothing\spacesuits\void\void_vr.dm"
#include "code\modules\clothing\spacesuits\void\wizard.dm"
@@ -2876,16 +2879,21 @@
#include "maps\RandomZLevels\snowfield.dm"
#include "maps\RandomZLevels\zoo.dm"
#include "maps\southern_cross\southern_cross_jobs.dm"
#include "maps\southern_cross\southern_cross_jobs_vr.dm"
#include "maps\southern_cross\items\encryptionkey_sc.dm"
#include "maps\southern_cross\items\encryptionkey_vr.dm"
#include "maps\southern_cross\items\headset_sc.dm"
#include "maps\southern_cross\items\headset_vr.dm"
#include "maps\southern_cross\items\clothing\sc_accessory.dm"
#include "maps\southern_cross\items\clothing\sc_suit.dm"
#include "maps\southern_cross\items\clothing\sc_under.dm"
#include "maps\southern_cross\job\outfits.dm"
#include "maps\southern_cross\job\outfits_vr.dm"
#include "maps\southern_cross\loadout\loadout_head.dm"
#include "maps\southern_cross\loadout\loadout_suit.dm"
#include "maps\southern_cross\loadout\loadout_uniform.dm"
#include "maps\southern_cross\structures\closets\misc.dm"
#include "maps\southern_cross\structures\closets\misc_vr.dm"
#include "maps\submaps\_readme.dm"
#include "maps\submaps\engine_submaps\engine.dm"
#include "maps\submaps\engine_submaps\engine_areas.dm"