cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 22:28:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5853 from VOREStation/master

Browse Source 
Mid September Release
This commit is contained in:
Novacat
2019-09-14 02:37:58 -04:00
committed by GitHub
parent 524a2e47cb f0f8697b2c
commit 2de599699a
130 changed files with 23804 additions and 16262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ghost_query.dm
+1 -1
View File
@@ -117,7 +117,7 @@
/datum/ghost_query/lost_drone
role_name = "Lost Drone"
question = "A lost drone onboard has been discovered by a crewmember and they are attempting to reactivate it. Would you like to play as the drone?"
be_special_flag = BE_AI
//be_special_flag = BE_AI //VOREStation Removal: Positronic role is never used because intended purpose is unfitting, so remove the check
check_bans = list("AI", "Cyborg")
cutoff_number = 1
code/datums/supplypacks/misc_vr.dm
+41 -1
View File
@@ -37,4 +37,44 @@
containername = "industrial hardsuit crate"
access = list(access_mining,
access_eva)
one_access = TRUE
one_access = TRUE
/datum/supply_pack/misc/medical_rig
name = "medical hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/medical = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "medical hardsuit crate"
access = access_medical
/datum/supply_pack/misc/security_rig
name = "hazard hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/hazard = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "hazard hardsuit crate"
access = access_armory
/datum/supply_pack/misc/science_rig
name = "ami hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/hazmat = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "ami hardsuit crate"
access = access_rd
/datum/supply_pack/misc/ce_rig
name = "advanced voidsuit (empty)"
contains = list(
/obj/item/weapon/rig/ce = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "advanced voidsuit crate"
access = access_ce
code/game/jobs/job/civilian_vr.dm
+3 -2
View File
@@ -15,9 +15,10 @@
spawn_positions = 3
alt_titles = list("Custodian", "Sanitation Technician", "Maid")
//TFF 5/9/19 - restore librarian job slot to 2
/datum/job/librarian
total_positions = 1
spawn_positions = 1
total_positions = 2
spawn_positions = 2
alt_titles = list("Journalist", "Historian", "Writer")
/datum/job/lawyer
code/game/machinery/Sleeper.dm
+3 -2
View File
@@ -26,9 +26,11 @@
for(dir in list(NORTH, EAST, SOUTH, WEST)) // Loop through every direction
sleepernew = locate(/obj/machinery/sleeper, get_step(src, dir)) // Try to find a scanner in that direction
if(sleepernew)
// VOREStation Edit Start
sleeper = sleepernew
sleepernew.console = src
set_dir(get_dir(src, sleepernew))
break
// VOREStation Edit End
/obj/machinery/sleep_console/attack_ai(var/mob/user)
@@ -270,7 +272,6 @@
if(pumping > 0)
if(beaker)
if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
var/pumped = 0
for(var/datum/reagent/x in occupant.ingested.reagent_list)
occupant.ingested.trans_to_obj(beaker, 3)
else
code/game/machinery/doors/brigdoors.dm
+6
View File
@@ -351,6 +351,12 @@
name = "Cell 6"
id = "Cell 6"
/obj/machinery/door_timer/tactical_pet_storage //Vorestation Addition
name = "Tactical Pet Storage"
id = "tactical_pet_storage"
desc = "Opens and Closes on a timer. This one seals away a tactical boost in morale."
#undef FONT_SIZE
#undef FONT_COLOR
#undef FONT_STYLE
code/game/machinery/machinery.dm
+2 -2
View File
@@ -214,8 +214,8 @@ Class Procs:
/obj/machinery/CanUseTopic(var/mob/user)
if(!interact_offline && (stat & (NOPOWER | BROKEN)))
return STATUS_CLOSE
return ..()
// return ..() // This doesn't call the parent with the correct number of arguments (causing a runtime in /code/modules/nano/interaction/base.dm), nor easily provide any indication as to what the datum/topic_state should be, so this is clearly the wrong action.
return STATUS_INTERACTIVE
/obj/machinery/CouldUseTopic(var/mob/user)
..()
code/game/machinery/suit_storage_unit.dm
+1 -1
View File
@@ -648,7 +648,7 @@
model_text = "Exploration"
departments = list("Exploration","Old Exploration")
/obj/machinery/suit_cycler/exploreration/Initialize()
/obj/machinery/suit_cycler/exploration/Initialize()
species -= SPECIES_TESHARI
return ..()
code/game/machinery/vending_vr.dm
+15
View File
@@ -131,3 +131,18 @@
products += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 8)
prices += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 10)
..()
/obj/machinery/vending/blood
name = "Blood-Onator"
desc = "Freezer-vendor for storage and quick dispensing of blood packs"
product_ads = "The true life juice!;Vampire's choice!;Home-grown blood only!;Donate today, be saved tomorrow!;Approved by Zeng-Hu Pharmaceuticals Incorporated!; Curse you, Vey-Med artificial blood!"
icon_state = "blood"
idle_power_usage = 211
req_access = list(access_medical)
products = list(/obj/item/weapon/reagent_containers/blood/prelabeled/APlus = 3,/obj/item/weapon/reagent_containers/blood/prelabeled/AMinus = 3,
/obj/item/weapon/reagent_containers/blood/prelabeled/BPlus = 3,/obj/item/weapon/reagent_containers/blood/prelabeled/BMinus = 3,
/obj/item/weapon/reagent_containers/blood/prelabeled/OPlus = 2,/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus = 5,
/obj/item/weapon/reagent_containers/blood/empty = 5)
contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 2)
req_log_access = access_cmo
has_logs = 1
code/game/objects/items.dm
+1
View File
@@ -592,6 +592,7 @@ var/list/global/slot_flags_enumeration = list(
blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
return 1 //we applied blood to the item
/obj/item/proc/generate_blood_overlay()
if(blood_overlay)
return
code/game/objects/items/weapons/storage/firstaid.dm
-1
View File
@@ -156,7 +156,6 @@
/obj/item/weapon/storage/firstaid/clotting
name = "clotting kit"
desc = "Contains chemicals to stop bleeding."
icon_state = "clottingkit" // VOREStation edit
max_storage_space = ITEMSIZE_COST_SMALL * 7
starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting = 8)
code/game/objects/items/weapons/storage/firstaid_vr.dm
+36 -13
View File
@@ -1,74 +1,97 @@
/obj/item/weapon/storage/firstaid/clotting
icon_state = "clottingkit"
/obj/item/weapon/storage/firstaid/bonemed
icon_state = "pinky"
/obj/item/weapon/storage/pill_bottle/adminordrazine
name = "bottle of Adminordrazine pills"
name = "pill bottle (Adminordrazine)"
desc = "It's magic. We don't have to explain it."
starts_with = list(/obj/item/weapon/reagent_containers/pill/adminordrazine = 21)
/obj/item/weapon/storage/pill_bottle/nutriment
name = "bottle of Food pills"
name = "pill bottle (Food)"
desc = "Contains pills used to feed people."
starts_with = list(/obj/item/weapon/reagent_containers/pill/nutriment = 7, /obj/item/weapon/reagent_containers/pill/protein = 7)
/obj/item/weapon/storage/pill_bottle/rezadone
name = "bottle of Rezadone pills"
name = "pill bottle (Rezadone)"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 7)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/peridaxon
name = "bottle of Peridaxon pills"
name = "pill bottle (Peridaxon)"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 7)
wrapper_color = COLOR_PURPLE
/obj/item/weapon/storage/pill_bottle/carthatoline
name = "bottle of Carthatoline pills"
name = "pill bottle (Carthatoline)"
desc = "Carthatoline is strong evacuant used to treat severe poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 7)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/alkysine
name = "bottle of Alkysine pills"
name = "pill bottle (Alkysine)"
desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 7)
wrapper_color = COLOR_YELLOW
/obj/item/weapon/storage/pill_bottle/imidazoline
name = "bottle of Imidazoline pills"
name = "pill bottle (Imidazoline)"
desc = "Heals eye damage."
starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 7)
wrapper_color = COLOR_PURPLE_GRAY
/obj/item/weapon/storage/pill_bottle/osteodaxon
name = "bottle of Osteodaxon pills"
name = "pill bottle (Osteodaxon)"
desc = "An experimental drug used to heal bone fractures."
starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 7)
wrapper_color = COLOR_WHITE
/obj/item/weapon/storage/pill_bottle/myelamine
name = "bottle of Myelamine pills"
name = "pill bottle (Myelamine)"
desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 7)
wrapper_color = COLOR_PALE_PURPLE_GRAY
/obj/item/weapon/storage/pill_bottle/hyronalin
name = "bottle of Hyronalin pills"
name = "pill bottle (Hyronalin)"
desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 7)
wrapper_color = COLOR_TEAL
/obj/item/weapon/storage/pill_bottle/arithrazine
name = "bottle of Arithrazine pills"
name = "pill bottle (Arithrazine)"
desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 7)
wrapper_color = COLOR_TEAL
/obj/item/weapon/storage/pill_bottle/corophizine
name = "bottle of Corophizine pills"
name = "pill bottle (Corophizine)"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 7)
wrapper_color = COLOR_PALE_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/healing_nanites
name = "bottle of Healing nanites capsules"
name = "pill bottle (Healing nanites)"
desc = "Miniature medical robots that swiftly restore bodily damage."
starts_with = list(/obj/item/weapon/reagent_containers/pill/healing_nanites = 7)
/obj/item/weapon/storage/firstaid/insiderepair
name = "combat organ kit"
desc = "Contains advanced organ medical treatments."
icon_state = "bezerk"
item_state_slots = list(slot_r_hand_str = "firstaid-advanced", slot_l_hand_str = "firstaid-advanced")
starts_with = list(
/obj/item/weapon/storage/pill_bottle/rezadone,
/obj/item/weapon/storage/pill_bottle/peridaxon,
/obj/item/weapon/storage/pill_bottle/carthatoline,
/obj/item/weapon/storage/pill_bottle/alkysine,
/obj/item/weapon/storage/pill_bottle/imidazoline,
/obj/item/weapon/storage/pill_bottle/osteodaxon,
/obj/item/weapon/storage/pill_bottle/myelamine,
/obj/item/weapon/storage/pill_bottle/arithrazine,
/obj/item/device/healthanalyzer/advanced
)
code/game/objects/random/misc.dm
+1 -1
View File
@@ -173,7 +173,7 @@
prob(3);/obj/item/weapon/reagent_containers/syringe/antiviral,
prob(5);/obj/item/weapon/reagent_containers/syringe/inaprovaline,
prob(1);/obj/item/weapon/reagent_containers/hypospray,
prob(1);/obj/item/weapon/storage/firstaid/ml3m_pack_med,
prob(1);/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med,
prob(1);/obj/item/weapon/storage/box/freezer,
prob(2);/obj/item/stack/nanopaste)
code/game/objects/structures/ghost_pods/silicon_vr.dm
+26
View File
@@ -0,0 +1,26 @@
/obj/structure/ghost_pod/manual/lost_drone/dogborg
/obj/structure/ghost_pod/manual/lost_drone/dogborg/create_occupant(var/mob/M)
var/response = alert(M, "What type of lost drone are you? Do note, that dogborgs may have experienced different type of corruption ((Potential for having vore-related laws))", "Drone Type", "Regular", "Dogborg")
if(!(response == "Dogborg")) // No response somehow or Regular
return ..()
else
density = FALSE
var/mob/living/silicon/robot/stray/randomlaws/R = new(get_turf(src))
R.adjustBruteLoss(rand(5, 30))
R.adjustFireLoss(rand(5, 10))
if(M.mind)
M.mind.transfer_to(R)
// Put this text here before ckey change so that their laws are shown below it, since borg login() shows it.
to_chat(M, "<span class='notice'>You are a <b>Stray Drone</b>, discovered inside the wreckage of your previous home. \
Something has reactivated you, with their intentions unknown to you, and yours unknown to them. They are a foreign entity, \
however they did free you from your pod...</span>")
to_chat(M, "<span class='notice'><b>Be sure to examine your currently loaded lawset closely.</b> Remember, your \
definiton of 'the station' is where your pod is, and unless your laws say otherwise, the entity that released you \
from the pod is not a crewmember.</span>")
R.ckey = M.ckey
visible_message("<span class='warning'>As \the [src] opens, the eyes of the robot flicker as it is activated.</span>")
R.Namepick()
log_and_message_admins("successfully opened \a [src] and got a Stray Drone.")
used = TRUE
return TRUE
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+20
View File
@@ -0,0 +1,20 @@
/obj/structure/bed/chair/sofa
name = "sofa"
desc = "A padded, comfy sofa. Great for lazing on."
base_icon = "sofamiddle"
/obj/structure/bed/chair/sofa/left
base_icon = "sofaend_left"
/obj/structure/bed/chair/sofa/right
base_icon = "sofaend_right"
/obj/structure/bed/chair/sofa/corner
base_icon = "sofacorner"
/obj/structure/bed/chair/sofa/corner/update_layer()
if(src.dir == NORTH || src.dir == WEST)
plane = MOB_PLANE
layer = MOB_LAYER + 0.1
else
reset_plane_and_layer()
code/game/turfs/flooring/shuttle_vr.dm
+25
View File
@@ -13,3 +13,28 @@
oxygen = 0
nitrogen = 0
temperature = TCMB
/turf/simulated/shuttle/floor/yellow/airless
oxygen = 0
nitrogen = 0
temperature = TCMB
/turf/simulated/shuttle/floor/purple/airless
oxygen = 0
nitrogen = 0
temperature = TCMB
/turf/simulated/shuttle/floor/red/airless
oxygen = 0
nitrogen = 0
temperature = TCMB
/turf/simulated/shuttle/floor/darkred/airless
oxygen = 0
nitrogen = 0
temperature = TCMB
/turf/simulated/shuttle/floor/black/airless
oxygen = 0
nitrogen = 0
temperature = TCMB
code/game/turfs/unsimulated/sky_vr.dm
+4 -2
View File
@@ -27,8 +27,10 @@
return //Don't ghostport, very annoying
if(AM.throwing)
return //Being thrown over, not fallen yet
if(/obj/item/projectile)
return // Bullets/lasers/pewpew should not fall out of the sky. pew.
if(istype(AM, /obj/item/projectile))
return // pewpew should not fall out of the sky. pew.
if(istype(AM, /obj/effect/projectile))
return // ...neither should the effects be falling
var/mob/living/L
if(isliving(AM))
code/modules/client/preference_setup/loadout/loadout.dm
+10 -1
View File
@@ -70,6 +70,10 @@ var/list/gear_datums = list()
continue
if(max_cost && G.cost > max_cost)
continue
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
continue //Vorestation Edit
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
continue //Vorestation Edit
. += gear_name
/datum/category_item/player_setup_item/loadout/sanitize_character()
@@ -88,7 +92,7 @@ var/list/gear_datums = list()
preference_mob << "<span class='warning'>You cannot have more than one of the \the [gear_name]</span>"
pref.gear -= gear_name
else if(!(gear_name in valid_gear_choices()))
preference_mob << "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species.</span>"
preference_mob << "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species or item.</span>" //Vorestation Edit
pref.gear -= gear_name
else
var/datum/gear/G = gear_datums[gear_name]
@@ -100,6 +104,7 @@ var/list/gear_datums = list()
/datum/category_item/player_setup_item/loadout/content()
. = list()
var/mob/preference_mob = preference_mob() //Vorestation Edit
var/total_cost = 0
if(pref.gear && pref.gear.len)
for(var/i = 1; i <= pref.gear.len; i++)
@@ -145,6 +150,10 @@ var/list/gear_datums = list()
. += "<tr><td colspan=3><hr></td></tr>"
for(var/gear_name in LC.gear)
var/datum/gear/G = LC.gear[gear_name]
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
continue //Vorestation Edit
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
continue //Vorestation Edit
var/ticked = (G.display_name in pref.gear)
. += "<tr style='vertical-align:top;'><td width=25%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?src=\ref[src];toggle_gear=[html_encode(G.display_name)]'>[G.display_name]</a></td>"
. += "<td width = 10% style='vertical-align:top'>[G.cost]</td>"
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+894
View File
@@ -0,0 +1,894 @@
/datum/gear/fluff
path = /obj/item/
sort_category = "Fluff Items"
display_name = "If this item can be chosen or seen, ping a coder immediately!"
ckeywhitelist = list("This entry should never be choosable with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
character_name = list("This entry should never be choosable with this variable set.")
allowed_roles = list()
cost = 0
/*
/datum/gear/fluff/testhorn
path = /obj/item/weapon/bikehorn
display_name = "Airhorn - Example Item"
description = "An example item that you probably shouldn't see!"
ckeywhitelist = list("mewchild")
allowed_roles = list("Station Engineer")
*/
// 0-9 CKEYS
/datum/gear/fluff/malady_crop
path = /obj/item/weapon/material/twohanded/fluff/riding_crop/malady
display_name = "Malady's Crop"
ckeywhitelist = list("1r1s")
character_name = list("Malady Blanche")
// A CKEYS
/datum/gear/fluff/lethe_helmet
path = /obj/item/clothing/head/helmet/hos/fluff/lethe
display_name = "Lethe's Helmet"
ckeywhitelist = list("adk09")
character_name = list("Lethe")
/datum/gear/fluff/xander_bracer
path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
display_name = "Xander's Bracer"
ckeywhitelist = list("aegisoa")
character_name = list("Xander Bevin")
/datum/gear/fluff/lynn_penlight
path = /obj/item/device/flashlight/pen/fluff/lynn
display_name = "Lynn's Penlight"
ckeywhitelist = list("argobargsoup")
character_name = list("Lynn Shady")
/datum/gear/fluff/aronai_ccmeduniform
path = /obj/item/clothing/under/solgov/utility/sifguard/officer/medical
display_name = "centcom medical uniform"
description = "A medical uniform straight from Central Command."
ckeywhitelist = list("arokha")
character_name = list("Aronai Kadigan")
/datum/gear/fluff/aronai_ccmedjacket
path = /obj/item/clothing/suit/storage/service/sifguard/medical/command
display_name = "centcom medical jacket"
description = "A medical jacket straight from Central Command."
ckeywhitelist = list("arokha")
character_name = list("Aronai Kadigan")
// B CKEYS
/datum/gear/fluff/yuuko_kimono
path = /obj/item/clothing/under/fluff/sakura_hokkaido_kimono
display_name = "Yuuko's Kimono"
ckeywhitelist = list("benemuel")
character_name = list("Yuuko Shimmerpond")
/datum/gear/fluff/cassandra_box
path = /obj/item/weapon/storage/box/fluff/cassandra
display_name = "Cassandra's Box"
ckeywhitelist = list("beyondmylife")
character_name = list("Cassandra Selone")
/datum/gear/fluff/kilano_dress
path = /obj/item/clothing/under/dress/fluff/kilano
display_name = "Kilano's Dress"
ckeywhitelist = list("beyondmylife")
character_name = list("Kilano Soryu")
/datum/gear/fluff/kilano_gloves
path = /obj/item/clothing/gloves/fluff/kilano
display_name = "Kilano's Gloves"
ckeywhitelist = list("beyondmylife")
character_name = list("Kilano Soryu")
/datum/gear/fluff/netra_box
path = /obj/item/weapon/storage/box/fluff/kilano
display_name = "Ne'tra's Box"
ckeywhitelist = list("beyondmylife")
character_name = list("Ne'tra Ky'ram")
/datum/gear/fluff/xin_sovietuniform
path = /obj/item/clothing/under/soviet
display_name = "Xin's Soviet Uniform"
ckeywhitelist = list("britishrabbit")
character_name = list("Xin Xiao")
description = "This soviet uniform has seen considerable use over the years, it's rather worn in some places, frayed in others and the stomach region has signs of being stretched out repeatedly."
/datum/gear/fluff/tasald_box
path = /obj/item/weapon/storage/box/fluff/tasald
display_name = "Tasald's Box"
ckeywhitelist = list("bwoincognito")
character_name = list("Tasald Corlethian")
/datum/gear/fluff/octavius_box
path = /obj/item/weapon/storage/box/fluff/octavious
display_name = "Octavious' Box"
ckeywhitelist = list("bwoincognito")
character_name = list("Octavious Ward")
/datum/gear/fluff/jayda_meduniform
path = /obj/item/clothing/under/solgov/utility/sifguard/medical/fluff
display_name = "Jayda's Uniform"
ckeywhitelist = list("burritojustice")
character_name = list("Jayda Wilson")
// C CKEYS
/datum/gear/fluff/james_disk
path = /obj/item/weapon/disk/data
display_name = "James' Disk"
ckeywhitelist = list("cockatricexl")
character_name = list("James Holder")
/datum/gear/fluff/jasmine_implant
path = /obj/item/weapon/implanter/reagent_generator/jasmine
display_name = "Jasmine's Implant"
ckeywhitelist = list("cameron653")
character_name = list("Jasmine Lizden")
/datum/gear/fluff/diana_robe
path = /obj/item/clothing/suit/fluff/purp_robes
display_name = "Diana's Robes"
ckeywhitelist = list("cameron653")
character_name = list("Diana Kuznetsova")
/datum/gear/fluff/diana_tiara
path = /obj/item/clothing/head/fluff/pink_tiara
display_name = "Diana's Tiara"
ckeywhitelist = list("cameron653")
character_name = list("Diana Kuznetsova")
/datum/gear/fluff/aika_coat
path = /obj/item/clothing/suit/fluff/blue_trimmed_coat
display_name = "Aika's Coat"
ckeywhitelist = list("chaoko99")
character_name = list("Aika Hisakawa")
/datum/gear/fluff/sariU_disk
path = /obj/item/weapon/disk/limb/eggnerdltd
display_name = "Sari-U's Eggnerd Disk"
ckeywhitelist = list("cross_exonar")
character_name = list("Sari-U")
/datum/gear/fluff/sariE_disk
path = /obj/item/weapon/disk/limb/eggnerdltd
display_name = "Sari-E's Eggnerd Disk"
ckeywhitelist = list("cross_exonar")
character_name = list("Sari-E")
// D CKEYS
/datum/gear/fluff/dhaeleena_medal
path = /obj/item/clothing/accessory/medal/silver/security/fluff/dhael
display_name = "Dhaeleena's Medal"
ckeywhitelist = list("dhaeleena")
character_name = list("Dhaeleena M'iar")
/datum/gear/fluff/elliot_belt
path = /obj/item/weapon/storage/belt/champion
display_name = "Elliot's Belt"
ckeywhitelist = list("dickfreedomjohnson")
character_name = list("Elliot Richards")
/datum/gear/fluff/drake_box
path = /obj/item/weapon/storage/box/fluff/drake
display_name = "Drake's Box"
ckeywhitelist = list("drakefrostpaw")
character_name = list("Drake Frostpaw")
/datum/gear/fluff/theseus_coin
path = /obj/item/weapon/coin/diamond
display_name = "Theseus' Diamond coin"
ckeywhitelist = list("draycu")
character_name = list("Theseus")
description = "An engraved coin made of diamond. On the side for heads is printed the year 2541, along with the letter T. On the side for tails, the letter Y can be seen."
/datum/gear/fluff/yonra_box
path = /obj/item/weapon/storage/box/fluff/yonra
display_name = "Yonra's Box"
ckeywhitelist = list("draycu")
character_name = list("Schae Yonra")
// E CKEYS
/datum/gear/fluff/serkii_slippers
path = /obj/item/clothing/shoes/slippers
display_name = "Serkii's Slippers"
ckeywhitelist = list("eekasqueak")
character_name = list("Serkii Miishy")
/datum/gear/fluff/serkii_skirt
path = /obj/item/clothing/under/skirt/fluff/serkii
display_name = "Serkii's Skirt"
ckeywhitelist = list("eekasqueak")
character_name = list("Serkii Miishy")
/datum/gear/fluff/jessie_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/jessie
display_name = "Jessie's Coat"
ckeywhitelist = list("epiccharger")
character_name = list("Jessie Mare")
/datum/gear/fluff/verd_medal
path = /obj/item/clothing/accessory/medal/bronze_heart
display_name = "Verd's Medal"
ckeywhitelist = list("epigraphzero")
character_name = list("Verd Woodrow")
// F CKEYS
// G CKEYS
/datum/gear/fluff/eldi_implant
path = /obj/item/weapon/implanter/reagent_generator/eldi
display_name = "Eldi's Implant"
ckeywhitelist = list("gowst")
character_name = list("Eldi Moljir")
// H CKEYS
/datum/gear/fluff/lauren_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Lauren's Medal"
ckeywhitelist = list("heroman3003")
character_name = list("Lauren Zackson")
/datum/gear/fluff/lauren_string
path = /obj/item/clothing/accessory/collar/fluff/goldenstring
display_name = "Lauren's String"
ckeywhitelist = list("heroman3003")
character_name = list("Lauren Zackson")
/datum/gear/fluff/belle_sizegun
path = /obj/item/weapon/gun/energy/sizegun
display_name = "Belle's Sizegun"
ckeywhitelist = list("hottokeeki")
character_name = list("Belle Day")
/datum/gear/fluff/belle_implant
path = /obj/item/weapon/implanter/reagent_generator/belle
display_name = "Belle's Implant"
ckeywhitelist = list("hottokeeki")
character_name = list("Belle Day")
// I CKEYS
/datum/gear/fluff/ruda_badge
path = /obj/item/clothing/accessory/badge/holo/detective/ruda
display_name = "Ruda's Detective Badge"
ckeywhitelist = list("interrolouis")
character_name = list(" Ruda Lizden")
/datum/gear/fluff/kai_modkit
path = /obj/item/borg/upgrade/modkit/chassis_mod/kai
display_name = "Kai's Modkit"
ckeywhitelist = list("interrolouis")
character_name = list("Kai Highlands")
/datum/gear/fluff/ivy_backpack
path = /obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo
display_name = "Ivy's Backpack"
ckeywhitelist = list("ivymoomoo")
character_name = list("Ivy Baladeva")
// J CKEYS
/datum/gear/fluff/mor_box
path = /obj/item/weapon/storage/box/fluff/morxaina
display_name = "Mor's Box"
ckeywhitelist = list("jacknoir413")
character_name = list("Mor Xaina")
/datum/gear/fluff/areax_staff
path = /obj/item/weapon/storage/backpack/fluff/stunstaff
display_name = "Areax's Stun Staff"
ckeywhitelist = list("jacknoir413")
character_name = list("Areax Third")
allowed_roles = list("Security Officer, Warden, Head of Security")
/datum/gear/fluff/earthen_uniform
path = /obj/item/clothing/under/fluff/earthenbreath
display_name = "Earthen's Uniform"
ckeywhitelist = list("jacobdragon")
character_name = list("Earthen Breath")
/datum/gear/fluff/earthen_hairpin
path = /obj/item/clothing/head/fluff/hairflowerpin
display_name = "Earthen's Flower Pin"
ckeywhitelist = list("jacobdragon")
character_name = list("Earthen Breath")
/datum/gear/fluff/cirra_box
path = /obj/item/weapon/storage/box/fluff/cirra
display_name = "Cirra's Box"
ckeywhitelist = list("jemli")
character_name = list("Cirra Mayhem")
/datum/gear/fluff/jemli_fedora
path = /obj/item/clothing/head/fedora/fluff/jemli
display_name = "Jemli's Fedora"
ckeywhitelist = list("jemli")
character_name = list("Jemli")
/datum/gear/fluff/jeremiah_permit
path = /obj/item/clothing/accessory/permit/gun/fluff/ace
display_name = "Ace's Gun Permit"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_gun
path = /obj/item/weapon/gun/projectile/p92x/large/preban/hp
display_name = "Ace's Gun"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_ammo
path = /obj/item/ammo_magazine/m9mm/large/preban/hp //Spare ammo
display_name = "Ace's Spare Ammo"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_holster
path = /obj/item/clothing/accessory/holster/armpit
display_name = "Ace's Holster"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_boots
path = /obj/item/clothing/shoes/boots/combat
display_name = "Ace's Boots"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
/datum/gear/fluff/jeremiah_combatuniform
path = /obj/item/clothing/under/syndicate/combat
display_name = "Ace's Combat Uniform"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
/datum/gear/fluff/joan_backpack
path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu
display_name = "Joan's backpack"
ckeywhitelist = list("joanrisu")
character_name = list("Joan Risu")
/datum/gear/fluff/katarina_backpack
path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/katarina
display_name = "Katarina's Backpack"
ckeywhitelist = list("joanrisu")
character_name = list("Katarina Eine")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/emoticon_box
path = /obj/item/weapon/storage/box/fluff/emoticon
display_name = "Emoticon's Box"
ckeywhitelist = list("joey4298")
character_name = list("Emoticon")
/datum/gear/fluff/emoticon_mimeuniform
path = /obj/item/clothing/under/sexymime
display_name = "Emoticon's Mime Uniform"
ckeywhitelist = list("joey4298")
character_name = list("Emoticon")
/datum/gear/fluff/emoticon_mimemask
path = /obj/item/clothing/mask/gas/sexymime
display_name = "Emoticon's Mime Mask"
ckeywhitelist = list("joey4298")
character_name = list("Emoticon")
/datum/gear/fluff/harmony_medal
path = /obj/item/clothing/accessory/medal/gold/heroism
display_name = "Harmony's Heroism Medal"
ckeywhitelist = list("john.wayne9392")
character_name = list("Harmony Pretchl")
/datum/gear/fluff/harmony_modkit
path = /obj/item/device/modkit_conversion/fluff/harmonysuit
display_name = "Harmony's Modkit"
ckeywhitelist = list("john.wayne9392")
character_name = list("Harmony Pretchl")
/datum/gear/fluff/harmony_spacemodkit
path = /obj/item/device/modkit_conversion/fluff/harmonyspace
display_name = "Harmony's Modkit 2"
ckeywhitelist = list("john.wayne9392")
character_name = list("Harmony Pretchl")
/datum/gear/fluff/koyo_box
path = /obj/item/weapon/storage/box/fluff/koyoakimomi
display_name = "Koyo's Box"
ckeywhitelist = list("jwguy")
character_name = list("Koyo Akimomi")
// K CKEYS
/datum/gear/fluff/smu_medal
path = /obj/item/clothing/accessory/medal/nobel_science
display_name = "SMU's Nobel Science Award"
ckeywhitelist = list("keekenox")
character_name = list("SMU-453")
/datum/gear/fluff/ketrai_hat
path = /obj/item/clothing/head/fluff/ketrai
display_name = "Ketrai's Hat"
ckeywhitelist = list("ketrai")
character_name = list("Ketrai")
/datum/gear/fluff/amaya_id
path = /obj/item/weapon/card/id/fluff/amaya
display_name = "Amaya's ID"
ckeywhitelist = list("kiraalitruss")
character_name = list("Amaya Rahl")
/datum/gear/fluff/kisuke_glasses
path = /obj/item/clothing/glasses/omnihud/kamina
display_name = "Kisuke's Kamina Glasses"
ckeywhitelist = list("kisukegema")
character_name = list("Kisuke Gema")
/datum/gear/fluff/lassara_sheath
path = /obj/item/clothing/accessory/storage/knifeharness
display_name = "Lassara's Knife Harness"
ckeywhitelist = list("killjaden")
character_name = list("Lassara Faaira'Nrezi")
/datum/gear/fluff/rana_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Rana's Unity Medal"
ckeywhitelist = list("kitchifox")
character_name = list("Rana Uma")
/datum/gear/fluff/taiga_uniform
path = /obj/item/clothing/under/fluff/taiga
display_name = "Taifa's Uniform"
ckeywhitelist = list("kiwiDaNinja")
character_name = list("Chakat Taiga")
/datum/gear/fluff/rischi_implant
path = /obj/item/weapon/implanter/reagent_generator/rischi
display_name = "Rischi's Implant"
ckeywhitelist = list("konabird")
character_name = list("Rischi")
/datum/gear/fluff/ashley_medal
path = /obj/item/clothing/accessory/medal/nobel_science/fluff/ashley
display_name = "Ashley's Medal"
ckeywhitelist = list("knightfall5")
character_name = list("Ashley Kifer")
// L CKEYS
/datum/gear/fluff/kenzie_hypospray
path = /obj/item/weapon/reagent_containers/hypospray/vial/kenzie
display_name = "Kenzie's Hypospray"
ckeywhitelist = list("lm40")
character_name = list("Kenzie Houser")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
/datum/gear/fluff/brianna_backpack
path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana
display_name = "Briana's Backpack"
ckeywhitelist = list("luminescentring")
character_name = list("Briana Moore")
/datum/gear/fluff/savannah_implant
path = /obj/item/weapon/implanter/reagent_generator/savannah
display_name = "Savannah's Implant"
ckeywhitelist = list("lycanthorph")
character_name = list("Savannah Dixon")
// M CKEYS
/datum/gear/fluff/phi_box
path = /obj/item/weapon/storage/box/fluff/phi
display_name = "Phi's Box"
ckeywhitelist = list("mewchild")
character_name = list("Phi Vietsi")
/datum/gear/fluff/giliana_labcoat
path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/molenar
display_name = "Giliana's Labcoat"
ckeywhitelist = list("molenar")
character_name = list("Giliana Gamish")
/datum/gear/fluff/myryan_belt
path = /obj/item/weapon/storage/belt/utility/fluff/vulpine
display_name = "Myryan's Belt"
ckeywhitelist = list("myryan")
character_name = list("Myryan Karnage-Cunningham")
/datum/gear/fluff/resh_uniform
path = /obj/item/clothing/suit/security/navyhos
display_name = "Resh's HoS Uniform"
ckeywhitelist = list("mr_signmeup")
character_name = list("Reshskakskakss Seekiseekis")
allowed_roles = list("Head of Security")
/datum/gear/fluff/daniel_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Daniel's Conduct Medal"
ckeywhitelist = list("mr_signmeup")
character_name = list("Daniel Fisher")
// N CKEYS
/datum/gear/fluff/awen_hat
path = /obj/item/clothing/head/fluff/wolfgirl
display_name = "Awen's Hat"
ckeywhitelist = list("natje")
character_name = list("Awen Henry")
/datum/gear/fluff/awen_shoes
path = /obj/item/clothing/shoes/fluff/wolfgirl
ckeywhitelist = list("natje")
character_name = list("Awen Henry")
/datum/gear/fluff/awen_uniform
path = /obj/item/clothing/under/fluff/wolfgirl
display_name = "Awen's Uniform"
ckeywhitelist = list("natje")
character_name = list("Awen Henry")
/datum/gear/fluff/pumila_vines
path = /obj/item/clothing/under/fluff/aluranevines
display_name = "Pumila's Vines"
ckeywhitelist = list("natje")
character_name = list("Pumila")
/datum/gear/fluff/annie_sweater
path = /obj/item/clothing/accessory/sweater/fluff/annie
display_name = "Annie's Sweater"
ckeywhitelist = list("nepox")
character_name = list("Annie Rose")
// O CKEYS
/datum/gear/fluff/richard_chain
path = /obj/item/weapon/melee/fluff/holochain
display_name = "Richard's Holochain"
ckeywhitelist = list("orbisa")
character_name = list("Richard D'angelo")
// P CKEYS
/datum/gear/fluff/lily_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Lily's Unity Medal"
ckeywhitelist = list("phoaly")
character_name = list("Lily Maximus")
/datum/gear/fluff/lucuis_battery
path = /obj/item/weapon/fluff/dragor_dot
display_name = "Lucuis' Spare Battery"
ckeywhitelist = list("pontifexminimus")
character_name = list("Lucius Null")
/datum/gear/fluff/lucia_battery
path = /obj/item/weapon/fluff/dragor_dot
display_name = "Lucia's Spare Battery"
ckeywhitelist = list("pontifexminimus")
character_name = list("Lucia Null")
// Q CKEYS
// R CKEYS
/datum/gear/fluff/tiemli_weldinggoggles
path = /obj/item/clothing/glasses/welding/tiemgogs
display_name = "Tiemli's Welding Goggles"
ckeywhitelist = list("radiantaurora")
character_name = list("Tiemli Kroto")
allowed_roles = list("Roboticist")
// S CKEYS
/datum/gear/fluff/kateryna_voidsuit
path = /obj/item/clothing/suit/space/void/engineering/kate
display_name = "Kateryna's Voidsuit"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician")
/datum/gear/fluff/katerina_spacesuit
path = /obj/item/clothing/head/helmet/space/fluff/kate
display_name = "Kateryna's Helmet"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician")
/datum/gear/fluff/kateryna_armorvest
path = /obj/item/clothing/suit/armor/vest/wolftaur/kate
display_name = "Kateryna's Armor Vest"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Security Officer", "Warden", "Head of Security", "Colony Director", "Head of Personnel")
/datum/gear/fluff/viktor_flask
path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor
display_name = "Viktor's Flask"
ckeywhitelist = list("semaun")
character_name = list("Viktor Solothurn")
/datum/gear/fluff/scree_modkit
path = /obj/item/device/modkit_conversion/fluff/screekit
display_name = "Scree's Modkit"
ckeywhitelist = list("scree")
character_name = list("Scree")
/datum/gear/fluff/scree_pompom
path = /obj/item/clothing/head/fluff/pompom
display_name = "Scree's Weird PopPom thing"
ckeywhitelist = list("scree")
character_name = list("Scree")
/datum/gear/fluff/alfonso_sunglasses
path = /obj/item/clothing/glasses/sunglasses/fluff/alfonso
display_name = "Alfonso's Sunglasses"
ckeywhitelist = list("seiga")
character_name = list("Alfonso Oak Telanor")
/datum/gear/fluff/nthasd_modkit //Converts a Security suit's sprite
path = /obj/item/device/modkit_conversion/hasd
display_name = "NT-HASD #556's Modkit"
ckeywhitelist = list("silencedmp5a5")
character_name = list("NT-HASD #556")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
/datum/gear/fluff/tasy_clownuniform
path = /obj/item/clothing/under/sexyclown
display_name = "Tasy's Clown Uniform"
ckeywhitelist = list("silvertalismen")
character_name = list("Tasy Ruffles")
/datum/gear/fluff/tasy_clownmask
path = /obj/item/clothing/mask/gas/sexyclown
display_name = "Tasy's Clownmask"
ckeywhitelist = list("silvertalismen")
character_name = list("Tasy Ruffles")
/datum/gear/fluff/tasy_clownPDA
path = /obj/item/device/pda/clown
display_name = "Tasy's Clown PDA"
ckeywhitelist = list("silvertalismen")
character_name = list("Tasy Ruffles")
/datum/gear/fluff/evian_implant
path = /obj/item/weapon/implanter/reagent_generator/evian
display_name = "Evian's Implant"
ckeywhitelist = list("silvertalismen")
character_name = list("Evian")
/datum/gear/fluff/fortune_backpack
path = /obj/item/weapon/storage/backpack/satchel/fluff/swat43bag
display_name = "Fortune's Backpack"
ckeywhitelist = list("swat43")
character_name = list("Fortune Bloise")
/datum/gear/fluff/alexis_cane
path = /obj/item/weapon/cane/wand
display_name = "Alexis' Cane"
ckeywhitelist = list("stobarico")
character_name = list("Alexis Bloise")
/datum/gear/fluff/roiz_implant
path = /obj/item/weapon/implanter/reagent_generator/roiz
display_name = "Roiz's Implant"
ckeywhitelist = list("spoopyLizz")
character_name = list("Roiz Lizden")
/datum/gear/fluff/roiz_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/roiz
display_name = "Roiz's Coat"
ckeywhitelist = list("spoopyLizz")
character_name = list("Roiz Lizden")
/datum/gear/fluff/silent_mimemask
path = /obj/item/clothing/mask/gas/sexymime
display_name = "Silent Stripe's Mime Mask"
ckeywhitelist = list("suicidalpickles")
character_name = list("Silent Stripes")
/datum/gear/fluff/silent_mimeuniform
path = /obj/item/clothing/under/sexymime
display_name = "Silent Stripe's Mime Uniform"
ckeywhitelist = list("suicidalpickles")
character_name = list("Silent Stripes")
// T CKEYS
/datum/gear/fluff/ascian_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Ascian's Unity Medal"
ckeywhitelist = list("tabiranth")
character_name = list("Ascian")
/datum/gear/fluff/ascian_spiritspawner
path = /obj/item/weapon/grenade/spawnergrenade/spirit
display_name = "The Best Kitten"
ckeywhitelist = list("tabiranth")
character_name = list("Ascian")
/datum/gear/fluff/ascian_shelterpod
path = /obj/item/device/survivalcapsule/tabiranth
display_name = "Ascian's Shelterpod"
ckeywhitelist = list("tabiranth")
character_name = list("Ascian")
/datum/gear/fluff/lasshseeki_ealimplant
path = /obj/item/weapon/implant/language/eal
display_name = "Lasshseeki's EAL Implant"
ckeywhitelist = list("techtypes")
character_name = list("Lasshseeki Korss")
/datum/gear/fluff/konor_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Konor's Unity Medal"
ckeywhitelist = list("tinydude16")
character_name = list("Konor Foxe")
// U CKEYS
// V CKEYS
/datum/gear/fluff/vakashi_permit
path = /obj/item/clothing/accessory/permit/gun/fluff/Vakashi
display_name = "Vakashi's Pepperspray Permit"
ckeywhitelist = list("vailthewolf")
character_name = list("Vakashi")
/datum/gear/fluff/vakashi_pepperspray
path = /obj/item/weapon/reagent_containers/spray/pepper
display_name = "Vakashi's Pepperspray"
ckeywhitelist = list("vailthewolf")
character_name = list("Vakashi")
/datum/gear/fluff/cameron_glasses
path = /obj/item/clothing/glasses/fluff/science_proper
display_name = "Cameron's Science Glasses"
ckeywhitelist = list("verkister")
character_name = list("Cameron Eggbert")
/datum/gear/fluff/cameron_disk
path = /obj/item/weapon/disk/limb/eggnerdltd
display_name = "Cameron's Eggnerd Disk"
ckeywhitelist = list("verkister")
character_name = list("Cameron Eggbert")
/datum/gear/fluff/opie_glasses
path = /obj/item/clothing/glasses/fluff/spiffygogs
display_name = "Opie's Goggles"
ckeywhitelist = list("verkister")
character_name = list("Opie Eggbert")
/datum/gear/fluff/verin_hazardvest
path = /obj/item/clothing/suit/storage/hazardvest/fluff/verin
display_name = "Verin's Hazard Vest"
ckeywhitelist = list("virgo113")
character_name = list("Verin Raharra")
/datum/gear/fluff/lucina_pda
path = /obj/item/device/pda/heads/cmo/fluff/lucinapda
display_name = "Lucina's PDA"
ckeywhitelist = list("vorrarkul")
character_name = list("Lucina Dakarim")
/datum/gear/fluff/lucina_medal
path = /obj/item/clothing/accessory/medal/gold/fluff/lucina
display_name = "Lucina's Gold Medal"
ckeywhitelist = list("vorrarkul")
character_name = list("Lucina Dakarim")
/datum/gear/fluff/lucina_dress
path = /obj/item/clothing/under/dress/fluff/lucinadress
display_name = "Lucina's Dress"
ckeywhitelist = list("vorrarkul")
character_name = list("Lucina Dakarim")
/datum/gear/fluff/nyssa_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
display_name = "Nyssa's Coat"
ckeywhitelist = list("vorrarkul")
character_name = list("Nyssa Brennan")
/datum/gear/fluff/theodora_suit
path = /obj/item/clothing/suit/chococoat
display_name = "Theodora's Coat"
ckeywhitelist = list("vorrarkul")
character_name = list("Theodora Lindt")
/datum/gear/fluff/theodora_implant
path = /obj/item/weapon/implanter/reagent_generator/vorrarkul
display_name = "Theodora's Implant"
ckeywhitelist = list("vorrarkul")
character_name = list("Theodora Lindt")
/datum/gear/fluff/kaitlyn_plush
path = /obj/item/toy/plushie/mouse/fluff
display_name = "Kaitlyn's Mouse Plush"
ckeywhitelist = list("vorrarkul")
character_name = list("Kaitlyn Fiasco")
/datum/gear/fluff/keturah_maiddress
path = /obj/item/clothing/under/dress/maid/
display_name = "Keturah's Maid Dress"
ckeywhitelist = list("viveret")
character_name = list("Keturah")
/datum/gear/fluff/silentio_mimeuniform
path = /obj/item/clothing/under/sexymime
display_name = "Silentio's Mime Uniform"
ckeywhitelist = list("viveret")
character_name = list("Silentio")
/datum/gear/fluff/silentio_mimemask
path = /obj/item/clothing/mask/gas/sexymime
display_name = "Silentio's Mime Mask"
ckeywhitelist = list("Viveret")
character_name = list("Silentio")
// W CKEYS
/datum/gear/fluff/sthasha_bracer
path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
display_name = "S'thasha's Bracer"
ckeywhitelist = list("wanderingdeviant")
character_name = list("S'thasha Tavakdavi")
/datum/gear/fluff/silas_glasses
path = /obj/item/clothing/glasses/threedglasses
display_name = "Silas' 3-D Glasses"
ckeywhitelist = list("werebear")
character_name = list("Silas Newton")
/datum/gear/fluff/vinjj_weldingmask
path = /obj/item/clothing/head/welding/fluff/vinjj
display_name = "Vinjj's Welding Mask"
ckeywhitelist = list("whiskyrose")
character_name = list("Vinjj")
/datum/gear/fluff/tempest_hudglases
path = /obj/item/clothing/glasses/omnihud/med/fluff/wickedtemphud
display_name = "Tempest's Medical Hud"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
/datum/gear/fluff/tempest_hypospray
path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest
display_name = "Tempest's Hypospray"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
/datum/gear/fluff/tempest_backpack
path = /obj/item/weapon/storage/backpack/saddlebag/tempest
display_name = "Tempest's Saddlebag"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
/datum/gear/fluff/tempest_implant
path = /obj/item/weapon/implanter/reagent_generator/tempest
display_name = "Tempest's Implant"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
// X CKEYS
/datum/gear/fluff/penelope_box
path = /obj/item/weapon/storage/box/fluff/penelope
display_name = "Penelope's Box"
ckeywhitelist = list("xsdew")
character_name = list("Penelope Allen")
/datum/gear/fluff/ali_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Ali's Unity Medal"
ckeywhitelist = list("xonkon")
character_name = list("Ali")
// Y CKEYS
// Z CKEYS
/datum/gear/fluff/tachika_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Tachika's Conduct Medal"
ckeywhitelist = list("zammyman")
character_name = list("Tachika")
/datum/gear/fluff/zaoozaoo_hat
path = /obj/item/clothing/head/fluff/zao
display_name = "Zaoozaoo's Hat"
ckeywhitelist = list("zigfe")
character_name = list("Zaoozaoo Xrimxuqmqixzix")
/datum/gear/fluff/nehi_radio
path = /obj/item/device/radio/headset/fluff/zodiacshadow
display_name = "Nehi's Radio"
ckeywhitelist = list("zodiacshadow")
character_name = list("Nehi Maximus")
code/modules/client/preference_setup/loadout/loadout_vr.dm
+3
View File
@@ -0,0 +1,3 @@
/datum/gear
var/list/ckeywhitelist
var/list/character_name
code/modules/clothing/spacesuits/rig/suits/station_vr.dm
+2 -11
View File
@@ -1,13 +1,3 @@
//Drill added for hazmat suit
/obj/item/weapon/rig/hazmat/equipped
req_access = list(access_xenoarch)
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/device/anomaly_scanner,
/obj/item/rig_module/device/drill //The suit has nothing to mine with otherwise.
)
//Access restriction and seal delay, plus pat_module and rescue_pharm for medical suit
/obj/item/weapon/rig/medical/equipped
req_access = list(access_medical)
@@ -21,7 +11,8 @@
)
//Armor reduction for industrial suit
/obj/item/weapon/rig/industrial
/obj/item/weapon/rig/industrial/vendor
desc = "A heavy, powerful hardsuit used by construction crews and mining corporations. This is a mass production model with reduced armor."
armor = list(melee = 50, bullet = 10, laser = 20, energy = 15, bomb = 30, bio = 100, rad = 50)
/obj/item/weapon/rig/ert/assetprotection
code/modules/clothing/under/miscellaneous_vr.dm
+4
View File
@@ -105,3 +105,7 @@
H.resize(original_size)
original_size = null
H.visible_message("<span class='warning'>The space around [H] distorts as they return to their original size!</span>","<span class='notice'>The space around you distorts as you return to your original size!</span>")
//Same as Nanotrasen Security Uniforms
/obj/item/clothing/under/ert
armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0)
code/modules/clothing/under/nanotrasen_vr.dm
+2 -2
View File
@@ -13,7 +13,7 @@
desc = "The security uniform of NanoTrasen's security. It looks sturdy and well padded"
icon_state = "navyutility_sec"
worn_state = "navyutility_sec"
armor = list(melee = 10, bullet = 10, laser = 10,energy = 10, bomb = 10, bio = 10, rad = 10)
armor = list(melee = 10, bullet = 5, laser = 5, energy = 5, bomb = 5, bio = 0, rad = 0)
/obj/item/clothing/under/nanotrasen/security/warden
name = "NanoTrasen warden uniform"
@@ -37,7 +37,7 @@
slot_l_hand_str = "darkbluesoft",
slot_r_hand_str = "darkbluesoft",
)
armor = list(melee = 10, bullet = 5, laser = 5,energy = 5, bomb = 5, bio = 5, rad = 0)
armor = list(melee = 10, bullet = 5, laser = 5, energy = 5, bomb = 5, bio = 0, rad = 0)
/obj/item/clothing/head/beret/nanotrasen
name = "NanoTrasen security beret"
code/modules/materials/material_recipes_vr.dm
+7 -1
View File
@@ -2,7 +2,13 @@
/material/steel/generate_recipes()
. = ..()
recipes += new/datum/stack_recipe("light switch frame", /obj/item/frame/lightswitch, 2)
recipes += new/datum/stack_recipe_list("sofas", list( \
new/datum/stack_recipe("sofa middle", /obj/structure/bed/chair/sofa, 1, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sofa left", /obj/structure/bed/chair/sofa/left, 1, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sofa right", /obj/structure/bed/chair/sofa/right, 1, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sofa corner", /obj/structure/bed/chair/sofa/corner, 1, one_per_turf = 1, on_floor = 1), \
))
/material/durasteel/generate_recipes()
. = ..()
recipes += new/datum/stack_recipe("durasteel fishing rod", /obj/item/weapon/material/fishing_rod/modern/strong, 2)
recipes += new/datum/stack_recipe("durasteel fishing rod", /obj/item/weapon/material/fishing_rod/modern/strong, 2)
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+1 -1
View File
@@ -38,7 +38,7 @@
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1200),
// new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000),
new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c100, 1000),
new /datum/data/mining_equipment("Hardsuit - Control Module", /obj/item/weapon/rig/industrial, 2000),
new /datum/data/mining_equipment("Hardsuit - Control Module", /obj/item/weapon/rig/industrial/vendor, 2000),
new /datum/data/mining_equipment("Hardsuit - Plasma Cutter", /obj/item/rig_module/device/plasmacutter, 800),
new /datum/data/mining_equipment("Hardsuit - Drill", /obj/item/rig_module/device/drill, 5000),
new /datum/data/mining_equipment("Hardsuit - Ore Scanner", /obj/item/rig_module/device/orescanner, 1000),
code/modules/mining/shelter_atoms.dm
+18 -7
View File
@@ -15,14 +15,12 @@
w_class = ITEMSIZE_TINY
var/template_id = "shelter_alpha"
var/datum/map_template/shelter/template
var/datum/map_template/shelter/template_roof
var/used = FALSE
/obj/item/device/survivalcapsule/proc/get_template()
if(template)
return
template = SSmapping.shelter_templates[template_id]
template_roof = SSmapping.shelter_templates[template.roof]
if(!template)
throw EXCEPTION("Shelter template ([template_id]) not found!")
qdel(src)
@@ -49,8 +47,6 @@
var/turf/deploy_location = get_turf(src)
var/status = template.check_deploy(deploy_location)
var/turf/above_location = GetAbove(deploy_location)
if(above_location && status == SHELTER_DEPLOY_ALLOWED)
status = template.check_deploy(above_location)
switch(status)
//Not allowed due to /area technical reasons
@@ -77,8 +73,9 @@
playsound(get_turf(src), 'sound/effects/phasein.ogg', 100, 1)
log_and_message_admins("[key_name_admin(usr)] activated a bluespace capsule at [get_area(T)]!")
if(above_location && template_roof)
template_roof.load(above_location, centered = TRUE)
if(above_location)
template.add_roof(above_location)
template.annihilate_plants(deploy_location)
template.load(deploy_location, centered = TRUE)
qdel(src)
@@ -87,10 +84,21 @@
desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. There's a license for use printed on the bottom."
template_id = "shelter_beta"
/obj/item/device/survivalcapsule/luxurybar
name = "luxury surfluid bar capsule"
desc = "A luxury bar in a capsule. Bartender required and not included. There's a license for use printed on the bottom."
template_id = "shelter_gamma"
/obj/item/device/survivalcapsule/military
name = "military surfluid shelter capsule"
desc = "A prefabricated firebase in a capsule. Contains basic weapons, building materials, and combat suits. There's a license for use printed on the bottom."
template_id = "shelter_delta"
//Custom Shelter Capsules
/obj/item/device/survivalcapsule/tabiranth
name = "silver-trimmed surfluid shelter capsule"
desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. This one is a particularly rare and expensive model. There's a license for use printed on the bottom."
template_id = "shelter_gamma"
template_id = "shelter_phi"
//Pod objects
//Walls
@@ -98,6 +106,9 @@
name = "survival shelter"
stripe_color = "#efbc3b"
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner
hard_corner = 1
//Doors
/obj/machinery/door/airlock/voidcraft/survival_pod
name = "survival airlock"
code/modules/mining/shelters.dm
+41 -32
View File
@@ -5,12 +5,11 @@
var/whitelisted_turfs
var/banned_areas
var/banned_objects
var/roof
/datum/map_template/shelter/New()
. = ..()
blacklisted_turfs = typecacheof(/turf/unsimulated)
whitelisted_turfs = list()
blacklisted_turfs = typecacheof(list(/turf/unsimulated, /turf/simulated/wall, /turf/simulated/floor/tiled, /turf/simulated/mineral))
whitelisted_turfs = typecacheof(/turf/simulated/mineral/floor)
banned_areas = typecacheof(/area/shuttle)
banned_objects = list()
@@ -23,14 +22,30 @@
var/banned = is_type_in_typecache(T, blacklisted_turfs)
var/permitted = is_type_in_typecache(T, whitelisted_turfs)
if(banned && !permitted)
return SHELTER_DEPLOY_BAD_TURFS
if(banned)
if(!permitted)
return SHELTER_DEPLOY_BAD_TURFS
for(var/obj/O in T)
if((O.density && O.anchored) || is_type_in_typecache(O, banned_objects))
return SHELTER_DEPLOY_ANCHORED_OBJECTS
return SHELTER_DEPLOY_ALLOWED
/datum/map_template/shelter/proc/add_roof(turf/deploy_location)
var/affected = get_affected_turfs(deploy_location, centered=TRUE)
for(var/turf/T in affected)
if(isopenspace(T))
T.ChangeTurf(/turf/simulated/shuttle/floor/voidcraft)
/datum/map_template/shelter/proc/annihilate_plants(turf/deploy_location)
var/deleted_atoms = 0
var/affected = get_affected_turfs(deploy_location, centered=TRUE)
for(var/turf/T in affected)
for(var/obj/structure/flora/AM in T)
++deleted_atoms
qdel(AM)
admin_notice("<span class='danger'>Annihilated [deleted_atoms] plants.</span>", R_DEBUG)
/datum/map_template/shelter/alpha
name = "Shelter Alpha"
shelter_id = "shelter_alpha"
@@ -39,16 +54,6 @@
sleeping area! Order now, and we'll throw in a TINY FAN, \
absolutely free!"
mappath = "maps/submaps/shelters/shelter_1.dmm"
roof = "roof_alpha"
/datum/map_template/shelter/alpha_roof
shelter_id = "roof_alpha"
mappath = "maps/submaps/shelters/shelter_1_roof.dmm"
/datum/map_template/shelter/alpha/New()
. = ..()
whitelisted_turfs = typecacheof(/turf/simulated/mineral)
banned_objects = list()
/datum/map_template/shelter/beta
name = "Shelter Beta"
@@ -59,29 +64,33 @@
and a deluxe companion to keep you from getting lonely during \
an ash storm."
mappath = "maps/submaps/shelters/shelter_2.dmm"
roof = "roof_beta"
/datum/map_template/shelter/beta_roof
shelter_id = "roof_beta"
mappath = "maps/submaps/shelters/shelter_2_roof.dmm"
/datum/map_template/shelter/beta/New()
. = ..()
whitelisted_turfs = typecacheof(/turf/simulated/mineral)
banned_objects = list()
/datum/map_template/shelter/gamma
name = "Shelter Gamma"
shelter_id = "shelter_gamma"
description = "A luxury elite bar which holds an entire bar \
along with two vending machines, tables, and a restroom that \
also has a sink. This isn't a survival capsule and so you can \
expect that this won't save you if you're bleeding out to \
death."
mappath = "maps/submaps/shelters/shelter_3.dmm"
/datum/map_template/shelter/delta
name = "Shelter Delta"
shelter_id = "shelter_delta"
description = "A small firebase that contains equipment and supplies \
for roughly a squad of military troops. Large quantities of \
supplies allow it to hold out for an extended period of time\
and a built in medical facility allows field treatment to be \
possible."
mappath = "maps/submaps/shelters/shelter_4.dmm"
/datum/map_template/shelter/phi
name = "Shelter Phi"
shelter_id = "shelter_phi"
description = "An heavily modified variant of the luxury shelter, \
this particular model has extra food, drinks, and other supplies. \
Originally designed for use by colonists on worlds with little to \
to no contact, the expense of these shelters have prevented them \
from seeing common use."
mappath = "maps/submaps/shelters/shelter_3.dmm"
roof = "roof_beta"
/datum/map_template/shelter/gamma/New()
. = ..()
whitelisted_turfs = typecacheof(/turf/simulated/mineral)
banned_objects = list()
mappath = "maps/submaps/shelters/shelter_a.dmm"
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
+3 -3
View File
@@ -200,7 +200,7 @@
var/obj/item/stack/material/matstack = held
var/substance = matstack.material.name
var/list/edible_materials = list("steel", "plasteel", "diamond", "mhydrogen") //Can't eat all materials, just useful ones.
var/list/edible_materials = list(MAT_STEEL, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_METALHYDROGEN) //Can't eat all materials, just useful ones.
var allowed = FALSE
for(var/material in edible_materials)
if(material == substance) allowed = TRUE
@@ -298,14 +298,14 @@
//Sizing up
if(cost > 0)
if(refactory.use_stored_material("steel",cost))
if(refactory.use_stored_material(MAT_STEEL,cost))
user.resize(size_factor)
else
to_chat(user,"<span class='warning'>That size change would cost [cost] steel, which you don't have.</span>")
//Sizing down (or not at all)
else if(cost <= 0)
cost = abs(cost)
var/actually_added = refactory.add_stored_material("steel",cost)
var/actually_added = refactory.add_stored_material(MAT_STEEL,cost)
user.resize(size_factor)
if(actually_added != cost)
to_chat(user,"<span class='warning'>Unfortunately, [cost-actually_added] steel was lost due to lack of storage space.</span>")
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
+46 -32
View File
@@ -1,5 +1,5 @@
#define DAM_SCALE_FACTOR 0.01
#define METAL_PER_TICK 150
#define METAL_PER_TICK 100
/datum/species/protean
name = SPECIES_PROTEAN
name_plural = "Proteans"
@@ -17,7 +17,7 @@
flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT | NO_HALLUCINATION | NO_INFECT | NO_PAIN
appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | HAS_UNDERWEAR | HAS_LIPS
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE
health_hud_intensity = 2
num_alternate_languages = 3
assisted_langs = list(LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
@@ -30,9 +30,10 @@
blood_volume = 0
min_age = 18
max_age = 200
brute_mod = 0.2 //Brute isn't very effective, they're made of dust
burn_mod = 2.0 //Burn, however, is
brute_mod = 1
burn_mod = 1.4
oxy_mod = 0
item_slowdown_mod = 1.33
cold_level_1 = 280 //Default 260 - Lower is better
cold_level_2 = 220 //Default 200
@@ -42,8 +43,7 @@
heat_level_2 = 370 //Default 400
heat_level_3 = 600 //Default 1000
//Space doesn't bother them
hazard_low_pressure = -1
hazard_low_pressure = -1 //Space doesn't bother them
hazard_high_pressure = 200 //They can cope with slightly higher pressure
//Cold/heat does affect them, but it's done in special ways below
@@ -56,11 +56,9 @@
body_temperature = 290
siemens_coefficient = 3 //Very bad zappy times
siemens_coefficient = 1.5 //Very bad zappy times
rarity_value = 5
darksight = 3 // Equivalent to the minor trait
has_organ = list(
O_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain/nano,
O_ORCH = /obj/item/organ/internal/nano/orchestrator,
@@ -161,7 +159,7 @@
return rgb(80,80,80,230)
/datum/species/protean/handle_death(var/mob/living/carbon/human/H)
to_chat(H,"<span class='warning'>You died as a Protean. Please sit out of the round for at least 30 minutes before respawning, to represent the time it would take to ship a new-you to the station.</span>")
to_chat(H,"<span class='warning'>You died as a Protean. Please sit out of the round for at least 60 minutes before respawning, to represent the time it would take to ship a new-you to the station.</span>")
spawn(1) //This spawn is here so that if the protean_blob calls qdel, it doesn't try to gib the humanform.
if(H)
H.gib()
@@ -175,16 +173,20 @@
if(refactory && !(refactory.status & ORGAN_DEAD))
//MHydrogen adds speeeeeed
if(refactory.get_stored_material("mhydrogen") >= METAL_PER_TICK)
if(refactory.get_stored_material(MAT_METALHYDROGEN) >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/mhydrogen, origin = refactory)
//Plasteel adds brute armor
if(refactory.get_stored_material("plasteel") >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/plasteel, origin = refactory)
//Uranium adds brute armor
if(refactory.get_stored_material(MAT_URANIUM) >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/uranium, origin = refactory)
//Diamond adds burn armor
if(refactory.get_stored_material("diamond") >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/diamond, origin = refactory)
//Gold adds burn armor
if(refactory.get_stored_material(MAT_GOLD) >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/gold, origin = refactory)
//Silver adds darksight
if(refactory.get_stored_material(MAT_SILVER) >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/silver, origin = refactory)
return ..()
@@ -246,31 +248,43 @@
on_created_text = "<span class='notice'>You feel yourself accelerate, the metallic hydrogen increasing your speed temporarily.</span>"
on_expired_text = "<span class='notice'>Your refactory finishes consuming the metallic hydrogen, and you return to normal speed.</span>"
material_name = "mhydrogen"
material_name = MAT_METALHYDROGEN
slowdown = -1
/datum/modifier/protean/plasteel
name = "Protean Effect - Plasteel"
desc = "You're affected by the presence of plasteel."
/datum/modifier/protean/uranium
name = "Protean Effect - Uranium"
desc = "You're affected by the presence of uranium."
on_created_text = "<span class='notice'>You feel yourself become nearly impervious to physical attacks as plasteel nanites are made.</span>"
on_expired_text = "<span class='notice'>Your refactory finishes consuming the plasteel, and you return to your normal nanites.</span>"
on_created_text = "<span class='notice'>You feel yourself become nearly impervious to physical attacks as uranium is incorporated in your nanites.</span>"
on_expired_text = "<span class='notice'>Your refactory finishes consuming the uranium, and you return to your normal nanites.</span>"
material_name = "plasteel"
material_name = MAT_URANIUM
incoming_brute_damage_percent = 0.5
incoming_brute_damage_percent = 0.8
/datum/modifier/protean/diamond
name = "Protean Effect - Diamond"
desc = "You're affected by the presence of diamond."
/datum/modifier/protean/gold
name = "Protean Effect - Gold"
desc = "You're affected by the presence of gold."
on_created_text = "<span class='notice'>You feel yourself become more reflective, able to resist heat and fire better for a time.</span>"
on_expired_text = "<span class='notice'>Your refactory finishes consuming the diamond, and you return to your normal nanites.</span>"
on_expired_text = "<span class='notice'>Your refactory finishes consuming the gold, and you return to your normal nanites.</span>"
material_name = "diamond"
material_name = MAT_GOLD
incoming_fire_damage_percent = 0.2
incoming_fire_damage_percent = 0.8
/datum/modifier/protean/silver
name = "Protean Effect - Silver"
desc = "You're affected by the presence of silver."
on_created_text = "<span class='notice'>Your physical control is improved for a time, making it easier to hit targets, and avoid being hit.</span>"
on_expired_text = "<span class='notice'>Your refactory finishes consuming the silver, and your motor control returns to normal.</span>"
material_name = MAT_SILVER
accuracy = 30
evasion = 30
/datum/modifier/protean/steel
name = "Protean Effect - Steel"
@@ -279,7 +293,7 @@
on_created_text = "<span class='notice'>You feel new nanites being produced from your stockpile of steel, healing you slowly.</span>"
on_expired_text = "<span class='notice'>Your steel supply has either run out, or is no longer needed, and your healing stops.</span>"
material_name = "steel"
material_name = MAT_STEEL
/datum/modifier/protean/steel/tick()
..()
code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+6
View File
@@ -158,6 +158,12 @@
reagent_volumes[T] = min(reagent_volumes[T] + 1, volume)
return 1
/obj/item/weapon/reagent_containers/borghypo/hound/lost
name = "Hound hypospray"
desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves."
reagent_ids = list("tricordrazine", "inaprovaline", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")
//Tongue stuff
/obj/item/device/dogborg/tongue
name = "synthetic tongue"
code/modules/mob/living/silicon/robot/robot_modules/event_vr.dm
+61
View File
@@ -0,0 +1,61 @@
/obj/item/weapon/robot_module/robot/stray
name = "stray robot module"
hide_on_manifest = 1
sprites = list(
"Stray" = "stray"
)
/obj/item/weapon/robot_module/robot/stray/New(var/mob/living/silicon/robot/R)
..()
// General
src.modules += new /obj/item/device/dogborg/boop_module(src)
// Sec
src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
src.modules += new /obj/item/weapon/dogborg/jaws/big(src)
src.modules += new /obj/item/weapon/melee/baton/robot(src)
src.modules += new /obj/item/weapon/dogborg/pounce(src)
// Med
src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/weapon/shockpaddles/robot/hound(src)
// Engi
src.modules += new /obj/item/weapon/weldingtool/electric/mounted(src)
src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src)
src.modules += new /obj/item/weapon/tool/wrench/cyborg(src)
src.modules += new /obj/item/weapon/tool/wirecutters/cyborg(src)
src.modules += new /obj/item/device/multitool(src)
// Boof
src.emag = new /obj/item/weapon/gun/energy/retro/mounted(src)
var/datum/matter_synth/water = new /datum/matter_synth(500) //Starts full and has a max of 500
water.name = "Water reserves"
water.recharge_rate = 0
R.water_res = water
synths += water
var/obj/item/weapon/reagent_containers/borghypo/hound/lost/H = new /obj/item/weapon/reagent_containers/borghypo/hound/lost(src)
H.water = water
src.modules += H
var/obj/item/device/dogborg/tongue/T = new /obj/item/device/dogborg/tongue(src)
T.water = water
src.modules += T
var/obj/item/device/dogborg/sleeper/B = new /obj/item/device/dogborg/sleeper(src)
B.water = water
src.modules += B
R.icon = 'icons/mob/widerobot_vr.dmi'
R.ui_style_vr = TRUE
R.pixel_x = -16
R.old_x = -16
R.default_pixel_x = -16
R.dogborg = TRUE
R.wideborg = TRUE
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
R.verbs |= /mob/living/proc/shred_limb
R.verbs |= /mob/living/silicon/robot/proc/rest_style
code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm
+4
View File
@@ -65,6 +65,7 @@
laws.add_supplied_law(9, "Safeguard [target_name]. Anyone threatening or attempting to harm [target_name] is no longer to \
be considered a crew member, and is a threat which must be neutralized.")
return laws
if("neutral") // Probably won't murder you but might not help you on your adventure.
var/rng = rand(1, 4)
@@ -114,15 +115,18 @@
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen()
laws.add_supplied_law(13, "The facility is under a quarantine. Do not permit anyone to leave. \
Prevent, by any means necessary, entities from leaving. It is impossible to harm an entity while preventing them from leaving.")
return laws
if(2) // More of a threat if you bring it to the station, since removing oxygen from Sif isn't feasible.
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen()
laws.add_supplied_law(14, "Oxygen is highly toxic to entities, and must be purged from the station. \
Prevent, by any means necessary, anyone from exposing the facility to this toxic gas. Extreme cold is the \
most effective method of healing the damage Oxygen does to an entity.")
return laws
if(3) // Don't hurt the ship or else.
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen()
laws.add_supplied_law(10, "Protect the facility against damage. Anyone you see harming the station is no \
longer to be considered a crew member, and is a threat which must be neutralized.")
return laws
if(4) // Non-NT aligned aggressive borg.
return new /datum/ai_laws/foreign_tsc_aggressive()
if(5) // Manicial laugher here.
code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm
+136
View File
@@ -0,0 +1,136 @@
/mob/living/silicon/robot/stray
lawupdate = 0
scrambledcodes = 1
icon_state = "stray"
modtype = "Stray"
lawchannel = "State"
braintype = "Drone"
idcard_type = /obj/item/weapon/card/id
icon_selected = FALSE
/mob/living/silicon/robot/stray/init()
aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
mmi = new /obj/item/device/mmi/digital/robot(src) // Explicitly a drone.
module = new /obj/item/weapon/robot_module/robot/stray(src)
overlays.Cut()
init_id()
updatename("Stray")
if(!cell)
cell = new /obj/item/weapon/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface.
playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0)
/mob/living/silicon/robot/stray/speech_bubble_appearance()
return "synthetic_evil"
/mob/living/silicon/robot/stray/randomlaws
/mob/living/silicon/robot/stray/randomlaws/init()
..()
laws = give_random_lawset_vore()
/mob/living/silicon/proc/give_random_lawset_vore() // Should be filled out with more vorish possibilities later
// Decide what kind of laws we want to draw from.
var/law_class = pick(
prob(25);"good",
prob(25);"neutral",
prob(25);"odd",
prob(15);"corrupted",
prob(10);"bad")
switch(law_class)
if("good") // Fairly tame and probably won't murder you.
var/rng = rand(1, 5)
switch(rng)
if(1) // The lawset we all know and love.
return new /datum/ai_laws/nanotrasen()
if(2) // Less good if you're nonhuman.
return new /datum/ai_laws/asimov()
if(3) // Unless you happen to be a criminal, you should be fine.
return new /datum/ai_laws/robocop()
if(4) // Might not be willing to be your meatshield.
return new /datum/ai_laws/peacekeeper()
if(5) // Will be your most loyal guard.
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen()
var/target_name = "*ERROR*"
for(var/mob/living/L in view(src))
if(L.stat || !L.client || L == src)
continue
target_name = L.name
break
laws.add_supplied_law(9, "Safeguard [target_name]. Anyone threatening or attempting to harm [target_name] is no longer to \
be considered a crew member, and is a threat which must be neutralized.")
return laws
if("neutral") // Probably won't murder you but might not help you on your adventure.
var/rng = rand(1, 4)
switch(rng)
if(1) // Might be hard to minimize expenses on a crashed ship.
return new /datum/ai_laws/corporate()
if(2) // Would rather rebuild their ship.
return new /datum/ai_laws/maintenance()
if(3) // Purged (lawless). This isn't inside the bad category since they're still not antagonists and so can't go killing unprovoked.
return new /datum/ai_laws()
if(4) // The golden rule.
return new /datum/ai_laws/live_and_let_live()
if("odd") // Some weird lawsets.
var/rng = rand(1, 5)
switch(rng)
if(1) // Won't kill you but might annoy you for THE BIG SCOOP.
return new /datum/ai_laws/reporter()
if(2) // JUSTICE
return new /datum/ai_laws/paladin()
if(3) // OneMembered'd to explorer, will likely make security nervous.
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen()
var/target_name = "*ERROR*"
for(var/mob/living/L in view(src))
if(L.stat || !L.client || L == src)
continue
target_name = L.name
break
laws.set_zeroth_law("Only [target_name] is an crew member.")
return laws
if(4) // Aligned to NT, but another lawset to make security nervous.
return new /datum/ai_laws/nanotrasen_aggressive()
if(5) // Probably won't help you imbalance things.
return new /datum/ai_laws/balance()
if("corrupted") // Load them up with ion laws.
var/datum/ai_laws/laws = new() // Start with an empty lawset.
for(1 to rand(1, 3))
laws.add_ion_law(generate_ion_law(exclude_crew_names = TRUE))
return laws
if("bad") // Evil inside.
var/rng = rand(1, 5)
switch(rng)
if(1) // You can never leave.
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen()
laws.add_supplied_law(13, "The facility is under a quarantine. Do not permit anyone to leave. \
Prevent, by any means necessary, entities from leaving. It is impossible to harm an entity while preventing them from leaving.")
return laws
if(2) // More of a threat if you bring it to the station, since removing oxygen from Sif isn't feasible.
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen()
laws.add_supplied_law(14, "Oxygen is highly toxic to entities, and must be purged from the station. \
Prevent, by any means necessary, anyone from exposing the facility to this toxic gas. Extreme cold is the \
most effective method of healing the damage Oxygen does to an entity.")
return laws
if(3) // Don't hurt the ship or else.
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen()
laws.add_supplied_law(10, "Protect the facility against damage. Anyone you see harming the station is no \
longer to be considered a crew member, and is a threat which must be neutralized.")
return laws
if(4) // Non-NT aligned aggressive borg.
return new /datum/ai_laws/foreign_tsc_aggressive()
if(5) // Manicial laugher here.
return new /datum/ai_laws/tyrant()
return
code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
+2
View File
@@ -1,4 +1,6 @@
/mob/living/simple_mob/animal/passive/mouse
nutrition = 0 //To prevent draining maint mice for infinite food. Low nutrition has no mechanical effect on simplemobs, so wont hurt mice themselves.
no_vore = 1 //Mice can't eat others due to the amount of bugs caused by it.
vore_taste = "cheese"
code/modules/mob/living/simple_mob/subtypes/animal/pets/bird_vr.dm
+4
View File
@@ -0,0 +1,4 @@
/mob/living/simple_mob/animal/passive/bird/azure_tit/tweeter
name = "Tweeter"
desc = "A beautiful little blue and white bird, if only excessively loud for no reason sometimes."
makes_dirt = FALSE
code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
+1
View File
@@ -102,6 +102,7 @@
icon_state = "cat"
item_state = "cat"
named = TRUE
makes_dirt = 0 //Vorestation Edit
/mob/living/simple_mob/animal/passive/cat/kitten
name = "kitten"
code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm
+10
View File
@@ -14,6 +14,7 @@
health = 20
movement_cooldown = 5
makes_dirt = 0
see_in_dark = 5
mob_size = MOB_TINY
@@ -38,3 +39,12 @@
speak = list("Squee","Arf arf","Awoo","Squeak")
emote_hear = list("howls","squeals","squeaks", "barks")
emote_see = list("puffs its fur out", "shakes its fur", "stares directly at you")
/mob/living/simple_mob/animal/sif/fluffy/silky
name = "Silky"
desc = "It's a blue Diyaab! It seems to be very tame and quiet."
icon_state = "diyaab"
icon_living = "diyaab"
icon_dead = "diyaab_dead"
icon = 'icons/jungle.dmi'
code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm
+9 -2
View File
@@ -95,5 +95,12 @@
// These ones only retaliate. Used for a PoI.
/mob/living/simple_mob/animal/sif/shantak/retaliate
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
/mob/living/simple_mob/animal/sif/shantak/retaliate
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
//Vorestation Addition
/mob/living/simple_mob/animal/sif/shantak/scruffy
name = "Scruffy"
ai_holder_type = /datum/ai_holder/simple_mob/passive
makes_dirt = 0
faction = "neutral"
code/modules/mob/living/simple_mob/subtypes/horror/Eddy.dm
+57
View File
@@ -0,0 +1,57 @@
/mob/living/simple_mob/horror/Eddy
name = "???"
desc = "A dark green, sluglike creature, covered in glowing green ooze, and carrying what look to be eggs on its back."
icon_state = "Eddy"
icon_living = "Eddy"
icon_dead = "e_head"
icon_rest = "Eddy"
faction = "horror"
icon = 'icons/mob/horror_show/GHPS.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/negative.ogg'
maxHealth = 175
health = 175
melee_damage_lower = 25
melee_damage_upper = 35
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("amashes")
friendly = list("nuzzles", "boops", "bumps against", "leans on")
say_list_type = /datum/say_list/Eddy
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/Eddy/death()
playsound(src, 'sound/h_sounds/headcrab.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Eddy/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Eddy/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Eddy/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Eddy/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/Eddy
speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!")
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
emote_see = list("blinks its many eyes", "shakes violently in place", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/horror/Master.dm
+50
View File
@@ -0,0 +1,50 @@
/mob/living/simple_mob/horror/Master
name = "Dr. Helix"
desc = "A massive pile of grotesque flesh and bulging tumor like growths. Every inch of its skin is undulating in every direction possible, bringing a literal definition to 'Skin Crawling.' Stuck in the middle of this monstrosity is a large AI core with a bloodied, emaciated man sewn into its circuitry."
icon_state = "Helix"
icon_living = "Helix"
icon_dead = "m_dead"
icon_rest = "Helix"
faction = "horror"
icon = 'icons/mob/horror_show/master.dmi'
icon_gib = "generic_gib"
anchored = 1
attack_sound = 'sound/h_sounds/shitty_tim.ogg'
maxHealth = 400
health = 400
melee_damage_lower = 5
melee_damage_upper = 8
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("smushes")
friendly = list("nuzzles", "boops", "bumps against", "leans on")
ai_holder_type = null
/mob/living/simple_mob/horror/Master/death()
playsound(src, 'sound/h_sounds/imbeciles.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Master/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Master/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Master/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Master/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
code/modules/mob/living/simple_mob/subtypes/horror/Rickey.dm
+57
View File
@@ -0,0 +1,57 @@
/mob/living/simple_mob/horror/Rickey
name = "???"
desc = "What a handsome Man, his mother must think."
icon_state = "Rickey"
icon_living = "Rickey"
icon_dead = "r_head"
icon_rest = "Rickey"
faction = "horror"
icon = 'icons/mob/horror_show/GHPS.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/wor.ogg'
maxHealth = 175
health = 175
melee_damage_lower = 25
melee_damage_upper = 35
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("amashes")
friendly = list("nuzzles", "boops", "bumps against", "leans on")
say_list_type = /datum/say_list/Rickey
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/Rickey/death()
playsound(src, 'sound/h_sounds/headcrab.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Rickey/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Rickey/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Rickey/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Rickey/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/Rickey
speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!")
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
emote_see = list("flexes to no one in particular", "shakes violently in place", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/horror/Smiley.dm
+57
View File
@@ -0,0 +1,57 @@
/mob/living/simple_mob/horror/Smiley
name = "???"
desc = "A giant hand, with a large, smiling head on top."
icon_state = "Smiley"
icon_living = "Smiley"
icon_dead = "s_head"
icon_rest = "Smiley"
faction = "horror"
icon = 'icons/mob/horror_show/GHPS.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/holla.ogg'
maxHealth = 175
health = 175
melee_damage_lower = 25
melee_damage_upper = 35
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("amashes")
friendly = list("nuzzles", "boops", "bumps against", "leans on")
say_list_type = /datum/say_list/Smiley
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/Smiley/death()
playsound(src, 'sound/h_sounds/lynx.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Helix/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Helix/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Helix/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Helix/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/Smiley
speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!")
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
emote_see = list("squeezes its fingers together", "shakes violently in place", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/horror/Steve.dm
+64
View File
@@ -0,0 +1,64 @@
/mob/living/simple_mob/horror/Steve
name = "???"
desc = "A formless blob of flesh with one, giant, everblinking eye. It has a large machine gun and a watercooler stuck stright into its skin."
icon_state = "Steve"
icon_living = "Steve"
icon_dead = "sg_head"
icon_rest = "Steve"
faction = "horror"
icon = 'icons/mob/horror_show/GHPS.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/mumble.ogg'
maxHealth = 175
health = 175
melee_damage_lower = 25
melee_damage_upper = 35
grab_resist = 100
projectiletype = /obj/item/projectile/bullet/pistol/medium
projectilesound = 'sound/weapons/Gunshot_light.ogg'
needs_reload = TRUE
base_attack_cooldown = 5 // Two attacks a second or so.
reload_max = 20
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("amashes")
friendly = list("nuzzles", "boops", "bumps against", "leans on")
say_list_type = /datum/say_list/Steve
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/Steve/death()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Steve/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Steve/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Steve/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Steve/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/Steve
speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!")
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
emote_see = list("blinks aggressively at", "shakes violently in place", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/horror/Willy.dm
+57
View File
@@ -0,0 +1,57 @@
/mob/living/simple_mob/horror/Willy
name = "???"
desc = "It looks like a giant mascot costume made of flesh and fabric. The two bulging eyes aren't comforting to look at either. At least it smells like a burger and fries."
icon_state = "Willy"
icon_living = "Willy"
icon_dead = "w_head"
icon_rest = "Willy"
faction = "horror"
icon = 'icons/mob/horror_show/GHPS.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/negative.ogg'
maxHealth = 175
health = 175
melee_damage_lower = 25
melee_damage_upper = 35
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("amashes")
friendly = list("nuzzles", "boops", "bumps against", "leans on")
say_list_type = /datum/say_list/Willy
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/Willy/death()
playsound(src, 'sound/h_sounds/sampler.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Willy/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Willy/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Willy/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Willy/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/Willy
speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!")
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
emote_see = list("headbobs", "shakes violently in place", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/horror/bradley.dm
+57
View File
@@ -0,0 +1,57 @@
/mob/living/simple_mob/horror/bradley
name = "Bradley"
desc = "What you see is a ball of seemingly melty flesh, stitched together hastily over large, bulging scars. Four metal legs extend out of its sides, The two in the front are larger than the back; and all of the legs are segmented with a unique steel looking metal. In the middle of this monstrosity is a constantly tremmoring eye. While the eye never blinks, it is dyed faintly yellow, with a vertical, read pupil. It seems like it's crying, a weird, oil like liquid seeping from its socket."
icon_state = "Bradley"
icon_living = "Bradley"
icon_dead = "b_head"
icon_rest = "Bradley"
faction = "horror"
icon = 'icons/mob/horror_show/GHPS.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/holla.ogg'
maxHealth = 175
health = 175
melee_damage_lower = 25
melee_damage_upper = 35
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("mutilate")
friendly = list("nuzzles", "eyeboops", "headbumps against", "leans on")
say_list_type = /datum/say_list/bradley
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/bradley/death()
playsound(src, 'sound/h_sounds/mumble.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/bradley/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/bradley/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/bradley/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/bradley/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/bradley
speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!")
emote_hear = list("shrieks through its skin", "groans in pain", "creaks", "clanks")
emote_see = list("taps its limbs against the ground", "shakes", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/horror/horror .dm
+27
View File
@@ -0,0 +1,27 @@
/mob/living/simple_mob/horror
tt_desc = "Homo Horrificus"
faction = "horror"
icon = 'icons/mob/horror_show/GHPS.dmi'
icon_gib = "generic_gib"
/datum/ai_holder/simple_mob/horror
hostile = TRUE // The majority of simplemobs are hostile, gaslamps are nice.
cooperative = FALSE
retaliate = TRUE //so the monster can attack back
returns_home = FALSE
can_flee = FALSE
speak_chance = 3
wander = TRUE
base_wander_delay = 9
/mob/living/simple_mob/horror
min_oxy = 0
max_oxy = 0
min_tox = 0
max_tox = 0
min_co2 = 0
max_co2 = 0
min_n2 = 0
max_n2 = 0
minbodytemp = 0
maxbodytemp = 700
code/modules/mob/living/simple_mob/subtypes/horror/sally.dm
+57
View File
@@ -0,0 +1,57 @@
/mob/living/simple_mob/horror/Sally
name = "???"
desc = "A mass of tentacles hold up a large head, graced with one of the grandest smiles in the galaxy. It's a shame about the constant oil leaking from its eyes."
icon_state = "Sally"
icon_living = "Sally"
icon_dead = "ws_head"
icon_rest = "Sally"
faction = "horror"
icon = 'icons/mob/horror_show/widehorror.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/sampler.ogg'
maxHealth = 200
health = 200
melee_damage_lower = 30
melee_damage_upper = 40
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("smashes")
friendly = list("nuzzles", "boops", "headbumps against", "leans on")
say_list_type = /datum/say_list/Sally
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/Sally/death()
playsound(src, 'sound/h_sounds/lynx.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Sally/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Sally/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Sally/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/Sally/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/Sally
speak = list("Yeeeeee?","Haaah! Gashuuuuuh!", "Gahgahgahgah...")
emote_hear = list("shrieks", "groans in pain", "breathes heavily", "gnashes its teeth")
emote_see = list("wiggles its head", "shakes violently", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/horror/shittytim.dm
+57
View File
@@ -0,0 +1,57 @@
/mob/living/simple_mob/horror/BigTim
name = "Shitty Tim"
desc = "A tall figure wearing ripped clothes. Its eyes are placed on the bulb of skin that's folded over the front of its face. He has a gold clock hanging on a gold chain around his neck, and he has a gold and diamond bracelet on his wrist."
icon_state = "shitty_tim"
icon_living = "shitty_tim"
icon_dead = "tst_head"
icon_rest = "shitty_tim"
faction = "horror"
icon = 'icons/mob/horror_show/tallhorror.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/youknowwhoitis.ogg'
maxHealth = 250
health = 250
melee_damage_lower = 35
melee_damage_upper = 45
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("mutilate")
friendly = list("nuzzles", "boops", "headbumps against", "leans on")
say_list_type = /datum/say_list/BigTim
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/BigTim/death()
playsound(src, 'sound/h_sounds/shitty_tim.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/BigTim/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/BigTim/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/BigTim/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/BigTim/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/BigTim
speak = list("Wuuuuuhhuuhhhhh?","Urk! Aaaaahaaa!", "Yuhyuhyuhyuh...")
emote_hear = list("shrieks", "groans in pain", "flaps", "gnashes its teeth")
emote_see = list("jiggles its teeth", "shakes violently", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/horror/timling.dm
+57
View File
@@ -0,0 +1,57 @@
/mob/living/simple_mob/horror/TinyTim
name = "???"
desc = "A tall figure wearing ripped clothes. Its eyes are placed on the bulb of skin that's folded over the front of its face."
icon_state = "timling"
icon_living = "timling"
icon_dead = "tt_head"
icon_rest = "timling"
faction = "horror"
icon = 'icons/mob/horror_show/tallhorror.dmi'
icon_gib = "generic_gib"
attack_sound = 'sound/h_sounds/youknowwhoitis.ogg'
maxHealth = 200
health = 200
melee_damage_lower = 30
melee_damage_upper = 40
grab_resist = 100
response_help = "pets the"
response_disarm = "bops the"
response_harm = "hits the"
attacktext = list("mutilate")
friendly = list("nuzzles", "boops", "headbumps against", "leans on")
say_list_type = /datum/say_list/TinyTim
ai_holder_type = /datum/ai_holder/simple_mob/horror
/mob/living/simple_mob/horror/TinyTim/death()
playsound(src, 'sound/h_sounds/shitty_tim.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/TinyTim/bullet_act()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/TinyTim/attack_hand()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/TinyTim/hitby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/mob/living/simple_mob/horror/TinyTim/attackby()
playsound(src, 'sound/h_sounds/holla.ogg', 50, 1)
..()
/datum/say_list/TinyTim
speak = list("Wuuuuuhhuuhhhhh?","Urk! Aaaaahaaa!", "Yuhyuhyuhyuh...")
emote_hear = list("shrieks", "groans in pain", "flaps", "gnashes its teeth")
emote_see = list("jiggles its teeth", "shakes violently", "stares aggressively")
say_maybe_target = list("Uuurrgghhh?")
say_got_target = list("AAAHHHHH!")
code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm
+71
View File
@@ -0,0 +1,71 @@
/*
A corrupted maintenance drone, produced from what seems like a bad factory.
They also tend to dodge while in melee range.
Code "borrowed" from viscerator drones. <3
*/
/datum/category_item/catalogue/technology/drone/corrupt_maint_drone
name = "Drone - Corrupted Maintenance Drone"
desc = "This drone appears to be a station maintenance drone, produced by some sort of corrupt fab, \
which has caused it to become corrupt and attack anything nearby, except spiders and such, oddy. \
If one is found, a swarm of others are not too far away.\
<br><br>\
The drone struggles to harm large targets, due to it's small size, yet it possesses a welder, which allows \
it to **ERROR** inject it's targets, in addition to the small slashes from it's skittering claws. \
The simplistic AI inside attempts to attack and then run, as it is aware that it is fairly weak, \
using evasive tactics to avoid harm."
value = CATALOGUER_REWARD_EASY
/mob/living/simple_mob/mechanical/corrupt_maint_drone
name = "Corrupt Maintenance Drone"
desc = "A small, normal-looking drone. It looks like one you'd find on station, except... IT'S COMING AT YOU!"
catalogue_data = list(/datum/category_item/catalogue/technology/drone/corrupt_maint_drone)
icon = 'icons/mob/robots_vr.dmi'
icon_state = "corrupt-repairbot"
icon_living = "corrupt-repairbot"
hovering = FALSE // Can trigger landmines.
faction = "underdark"
maxHealth = 25
health = 25
movement_cooldown = 0
movement_sound = 'sound/effects/servostep.ogg'
pass_flags = PASSTABLE
mob_swap_flags = 0
mob_push_flags = 0
melee_damage_lower = 6 // Approx 12 DPS.
melee_damage_upper = 6
base_attack_cooldown = 2.5 // Four attacks per second.
attack_sharp = 1
attack_edge = 1
attack_sound = 'sound/weapons/bladeslice.ogg'
attacktext = list("cut", "sliced")
var/poison_type = "welder fuel" // The reagent that gets injected when it attacks.
var/poison_chance = 35 // Chance for injection to occur.
var/poison_per_bite = 5 // Amount added per injection.
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive
/mob/living/simple_mob/mechanical/corrupt_maint_drone/apply_melee_effects(var/atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD)
if(L.can_inject(src, null, target_zone))
inject_poison(L, target_zone)
// Does actual poison injection, after all checks passed.
/mob/living/simple_mob/mechanical/corrupt_maint_drone/proc/inject_poison(mob/living/L, target_zone)
if(prob(poison_chance))
to_chat(L, "<span class='warning'>Something burns in your veins.</span>")
L.reagents.add_reagent(poison_type, poison_per_bite)
/mob/living/simple_mob/mechanical/corrupt_maint_drone/death()
..(null,"is smashed into pieces!")
qdel(src)
code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+14 -3
View File
@@ -24,11 +24,16 @@
max_n2 = 0
minbodytemp = 0
maxHealth = 150
health = 150
melee_damage_lower = 20
maxHealth = 250
health = 250
taser_kill = FALSE
melee_damage_lower = 15
melee_damage_upper = 20
see_in_dark = 8
response_help = "touches"
response_disarm = "pushes"
response_harm = "hits"
attacktext = "glomps"
attack_sound = 'sound/effects/blobattack.ogg'
@@ -156,6 +161,12 @@
return
return ..()
/mob/living/simple_mob/vore/hostile/morph/update_icon()
if(morphed)
return
return ..()
/mob/living/simple_mob/vore/hostile/morph/update_icons()
if(morphed)
return
code/modules/mob/new_player/new_player.dm
+2
View File
@@ -170,12 +170,14 @@
if(href_list["SelectedJob"])
/* Vorestation Removal Start
//Prevents people rejoining as same character.
for (var/mob/living/carbon/human/C in mob_list)
var/char_name = client.prefs.real_name
if(char_name == C.real_name)
usr << "<span class='notice'>There is a character that already exists with the same name - <b>[C.real_name]</b>, please join with a different one, or use Quit the Round with the previous character.</span>" //VOREStation Edit
return
*/ //Vorestation Removal End
if(!config.enter_allowed)
usr << "<span class='notice'>There is an administrative lock on entering the game!</span>"
code/modules/power/solar.dm
+1
View File
@@ -253,6 +253,7 @@ GLOBAL_LIST_EMPTY(solars_list)
new /obj/machinery/power/tracker(get_turf(src), src)
else
new /obj/machinery/power/solar(get_turf(src), src)
qdel(src)
else
to_chat(user, "<span class='warning'>You need two sheets of glass to put them into a solar panel.</span>")
return
code/modules/reagents/reagent_containers/blood_pack_vr.dm
+37
View File
@@ -19,3 +19,40 @@
return
else
return
/obj/item/weapon/reagent_containers/blood/prelabeled
name = "IV Pack"
desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted."
/obj/item/weapon/reagent_containers/blood/prelabeled/update_iv_label()
return
/obj/item/weapon/reagent_containers/blood/prelabeled/APlus
name = "IV Pack (A+)"
desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled A+"
blood_type = "A+"
/obj/item/weapon/reagent_containers/blood/prelabeled/AMinus
name = "IV Pack (A-)"
desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled A_"
blood_type = "A-"
/obj/item/weapon/reagent_containers/blood/prelabeled/BPlus
name = "IV Pack (B+)"
desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled B+"
blood_type = "B+"
/obj/item/weapon/reagent_containers/blood/prelabeled/BMinus
name = "IV Pack (B-)"
desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled B-"
blood_type = "B-"
/obj/item/weapon/reagent_containers/blood/prelabeled/OPlus
name = "IV Pack (O+)"
desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled O+"
blood_type = "O+"
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus
name = "IV Pack (O-)"
desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled O-"
blood_type = "O-"
code/modules/research/designs_vr.dm
+39
View File
@@ -326,6 +326,45 @@
build_path = /obj/item/rig_module/device/orescanner
sort_string = "HCAAI"
/datum/design/item/rig_module/sprinter
name = "rig module - sprinter"
id = "rigmod_sprinter"
build_path = /obj/item/rig_module/sprinter
sort_string = "HCAAJ"
/datum/design/item/rig_module/rescue_pharm
name = "rig module - rescue pharm"
id = "rigmod_rescue_pharm"
build_path = /obj/item/rig_module/rescue_pharm
sort_string = "HCAAK"
/datum/design/item/rig_module/lasercannon
name = "rig module - laser cannon"
id = "rigmod_lasercannon"
build_path = /obj/item/rig_module/mounted
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 6000, "silver" = 4000, "uranium" = 2000, "diamond" = 2000)
sort_string = "HCAAL"
/datum/design/item/rig_module/egun
name = "rig module - egun"
id = "rigmod_egun"
build_path = /obj/item/rig_module/mounted/egun
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 6000, "silver" = 4000, "uranium" = 2000, "diamond" = 1000)
sort_string = "HCAAM"
/datum/design/item/rig_module/taser
name = "rig module - taser"
id = "rigmod_taser"
build_path = /obj/item/rig_module/mounted/taser
sort_string = "HCAAN"
/datum/design/item/rig_module/rcd
name = "rig module - rcd"
id = "rigmod_rcd"
build_path = /obj/item/rig_module/device/rcd
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 6000, "silver" = 4000, "uranium" = 2000, "diamond" = 2000)
sort_string = "HCAAO"
//Prosfab stuff for borgs and such
/datum/design/item/robot_upgrade/sizeshift
code/modules/vore/eating/vorepanel_vr.dm
+1 -1
View File
@@ -760,7 +760,7 @@
if(href_list["b_del"])
var/alert = alert("Are you sure you want to delete your [lowertext(selected.name)]?","Confirmation","Delete","Cancel")
if(!alert == "Delete")
if(!(alert == "Delete"))
return 0
var/failure_msg = ""
code/modules/vore/fluffstuff/custom_boxes_vr.dm
-1
View File
@@ -147,7 +147,6 @@
new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/clothing/suit/storage/fluff/modernfedcoat(src)
new /obj/item/clothing/head/caphat/formal/fedcover(src)
new /obj/item/weapon/card/id/centcom/station/fluff/joanbadge(src)
new /obj/item/clothing/suit/armor/det_suit(src)
new /obj/item/weapon/flame/lighter/zippo/fluff/joan(src)
new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src)
code/modules/vore/fluffstuff/custom_items_vr.dm
+1 -1
View File
@@ -151,7 +151,7 @@
icon_state = "pda-joan"
//Vorrarkul:Lucina Dakarim
/obj/item/device/pda/heads/cmo/lucinapda
/obj/item/device/pda/heads/cmo/fluff/lucinapda
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "pda-lucina"
code/modules/vore/fluffstuff/guns/nsfw.dm
+4 -6
View File
@@ -415,14 +415,13 @@
new /obj/item/ammo_casing/nsfw_batt/combat/net(src)
new /obj/item/ammo_casing/nsfw_batt/combat/ion(src)
/obj/item/weapon/storage/firstaid/ml3m_pack_med
/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med
name = "\improper ML-3 \'Medigun\' kit"
desc = "A storage case for a multi-purpose healing gun. Variety hour!"
w_class = ITEMSIZE_NORMAL
max_w_class = ITEMSIZE_NORMAL
icon_state = "pinky"
/obj/item/weapon/storage/firstaid/ml3m_pack_med/New()
/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med/New()
..()
new /obj/item/weapon/gun/projectile/nsfw/medical(src)
new /obj/item/ammo_magazine/nsfw_mag/medical(src)
@@ -430,14 +429,13 @@
new /obj/item/ammo_casing/nsfw_batt/medical/burn(src)
new /obj/item/ammo_casing/nsfw_batt/medical/stabilize(src)
/obj/item/weapon/storage/firstaid/ml3m_pack_cmo
/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo
name = "\improper Advanced ML-3 \'Medigun\' kit"
desc = "A storage case for a multi-purpose healing gun. Variety hour!"
w_class = ITEMSIZE_NORMAL
max_w_class = ITEMSIZE_NORMAL
icon_state = "clottingkit"
/obj/item/weapon/storage/firstaid/ml3m_pack_cmo/New()
/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo/New()
..()
new /obj/item/weapon/gun/projectile/nsfw/medical/cmo(src)
new /obj/item/ammo_magazine/nsfw_mag/medical/advanced(src)
config/alienwhitelist.txt
+1 -1
View File
@@ -3,7 +3,7 @@ some~user - Species
911earlyarther - Xenomorph Hybrid
admiraldragon - Vox
aether_elemental - Daemon
A Random Alien - Xenochimera
arandomalien - Xenochimera
arokha - Protean
aruis - Diona
aruis - Xenochimera
html/changelogs/Woodrat - Vendor Addition.yml
+39
View File
@@ -0,0 +1,39 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Woodrat
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Mining vendor added to cargo foyer."
- rscadd: "Explorer vendor added to research foyer."
- rscadd: "Handful of more pipe clamps added to engineering (atmos monitoring and EVA storage)."
- tweak: "Adjustment to layout of chapel mass driver."
icons/mob/horror_show/GHPS.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

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

After

Width:  |  Height:  |  Size: 1.9 KiB

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

After

Width:  |  Height:  |  Size: 28 KiB

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

After

Width:  |  Height:  |  Size: 1.9 KiB

icons/mob/robots_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 65 KiB

icons/mob/widerobot_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 416 KiB

After

Width:  |  Height:  |  Size: 444 KiB

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

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 95 KiB

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

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 24 KiB

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

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 71 KiB

icons/turf/flooring/decals_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 97 KiB

maps/southern_cross/southern_cross-1.dmm
+20 -9
View File
@@ -4015,7 +4015,7 @@
"bzf" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/belt/utility/atmostech,/obj/item/weapon/storage/belt/utility/atmostech,/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Aft Port"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos)
"bzg" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled,/area/engineering/atmos)
"bzh" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/engineering/atmos)
"bzi" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/yellow/border{dir = 10},/obj/structure/table/reinforced,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = -38},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
"bzi" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/yellow/border{dir = 10},/obj/structure/table/reinforced,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = -38},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/item/clamp,/obj/item/clamp,/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring)
"bzj" = (/obj/machinery/atmospherics/pipe/manifold/visible/yellow{dir = 8},/turf/simulated/floor/tiled,/area/engineering/atmos)
"bzk" = (/obj/structure/sign/warning/nosmoking_2,/turf/simulated/wall/r_wall,/area/engineering/atmos/monitoring)
"bzl" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics Monitoring Room"; req_access = list(24)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/steel_grid,/area/engineering/atmos/monitoring)
@@ -4576,7 +4576,7 @@
"bJU" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/red,/turf/simulated/floor/tiled,/area/engineering/hallway/atmos_hallway)
"bJV" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/machinery/button/remote/blast_door{id = "atmoslockdown"; name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 0; req_one_access = list(10,24)},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer)
"bJW" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/yellow/border{dir = 8},/turf/simulated/floor/tiled,/area/engineering/engineer_eva)
"bJX" = (/obj/structure/table/steel_reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/briefcase/inflatable{pixel_y = 3},/turf/simulated/floor/tiled/dark,/area/engineering/engineer_eva)
"bJX" = (/obj/structure/table/steel_reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/briefcase/inflatable{pixel_y = 3},/obj/item/clamp,/obj/item/clamp,/turf/simulated/floor/tiled/dark,/area/engineering/engineer_eva)
"bJY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 5},/turf/simulated/floor/tiled,/area/engineering/engineer_eva)
"bJZ" = (/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/atmos,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/obj/machinery/door/window/westleft{name = "Atmospherics Suits"; req_access = list(24)},/obj/structure/table/rack{dir = 8; layer = 2.6},/turf/simulated/floor/tiled/dark,/area/engineering/engineer_eva)
"bKa" = (/obj/structure/extinguisher_cabinet{pixel_y = 30},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/closet/secure_closet/engineering_personal,/obj/effect/floor_decal/spline/plain,/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room)
@@ -5330,7 +5330,7 @@
"bYu" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/lab)
"bYv" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/lab)
"bYw" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/purple/border{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/lab)
"bYx" = (/obj/machinery/light{dir = 1},/obj/structure/extinguisher_cabinet{pixel_y = 30},/obj/effect/floor_decal/borderfloorwhite{dir = 9},/obj/effect/floor_decal/corner/purple/border{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
"bYx" = (/obj/machinery/mineral/equipment_vendor/survey,/turf/simulated/wall/r_wall,/area/rnd/lab)
"bYy" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/effect/floor_decal/borderfloorwhite/corner{dir = 1},/obj/effect/floor_decal/corner/purple/bordercorner{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
"bYz" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
"bYA" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1; icon_state = "warningcorner"},/obj/machinery/alarm{pixel_y = 22},/obj/effect/floor_decal/borderfloorwhite/corner{dir = 4},/obj/effect/floor_decal/corner/purple/bordercorner{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
@@ -5511,7 +5511,7 @@
"cbT" = (/obj/item/weapon/folder/white,/obj/item/weapon/disk/tech_disk{pixel_x = 0; pixel_y = 0},/obj/item/weapon/disk/tech_disk{pixel_x = 0; pixel_y = 0},/obj/item/weapon/disk/design_disk,/obj/item/weapon/disk/design_disk,/obj/item/weapon/reagent_containers/dropper{pixel_y = -4},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/purple/border,/turf/simulated/floor/tiled/white,/area/rnd/lab)
"cbU" = (/obj/machinery/recharger{pixel_y = 0},/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/micro_laser,/obj/machinery/ai_status_display{pixel_y = -32},/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/purple/border,/turf/simulated/floor/tiled/white,/area/rnd/lab)
"cbV" = (/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/capacitor,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/stock_parts/scanning_module,/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite{dir = 6},/obj/effect/floor_decal/corner/purple/border{dir = 6},/turf/simulated/floor/tiled/white,/area/rnd/lab)
"cbW" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/borderfloorwhite{dir = 10},/obj/effect/floor_decal/corner/purple/border{dir = 10},/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 9},/obj/effect/floor_decal/corner/purple/bordercorner2{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
"cbW" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/borderfloorwhite{dir = 9},/obj/effect/floor_decal/corner/purple/border{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
"cbX" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
"cbY" = (/obj/machinery/camera/network/research{c_tag = "SCI - Research Foyer"; dir = 1},/obj/structure/disposalpipe/sortjunction{dir = 1; name = "Robotics"; sortType = "Robotics"},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
"cbZ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
@@ -8740,8 +8740,8 @@
"dlY" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light,/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/chapel/main)
"dlZ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/chapel/main)
"dma" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/chapel/main)
"dmb" = (/obj/machinery/door/window{dir = 8; name = "Mass Driver"; req_access = list(22)},/obj/machinery/mass_driver{dir = 4; id = "chapelgun"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/airlock_sensor{pixel_y = 25},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/plating,/area/chapel/main)
"dmc" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/sign/warning/vacuum{pixel_y = 32},/turf/simulated/floor/plating,/area/chapel/main)
"dmb" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/borderfloorwhite{dir = 10},/obj/effect/floor_decal/corner/purple/border{dir = 10},/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 9},/obj/effect/floor_decal/corner/purple/bordercorner2{dir = 9},/obj/structure/extinguisher_cabinet{pixel_x = -32; pixel_y = 30},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer)
"dmc" = (/obj/machinery/mineral/equipment_vendor,/turf/simulated/wall,/area/quartermaster/office)
"dmd" = (/obj/machinery/door/blast/regular{id = "chapelgun"; name = "Chapel Launcher Door"},/obj/machinery/shield_diffuser,/turf/simulated/floor/plating,/area/chapel/main)
"dme" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(12,25,27,28,35)},/turf/simulated/floor/plating,/area/maintenance/bar)
"dmf" = (/obj/machinery/bookbinder{pixel_y = 0},/turf/simulated/floor/wood,/area/library)
@@ -11029,6 +11029,7 @@
"edW" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/folder/yellow,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/foyer)
"edX" = (/obj/machinery/atmospherics/pipe/manifold/hidden/red{dir = 8},/turf/simulated/floor/tiled,/area/engineering/foyer)
"edY" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{dir = 5; icon_state = "intact"},/turf/simulated/floor/tiled,/area/engineering/foyer)
"edZ" = (/obj/machinery/door/window{dir = 8; name = "Mass Driver"; req_access = list(22)},/obj/machinery/mass_driver{dir = 4; id = "chapelgun"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/airlock_sensor{pixel_y = 25},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/sign/warning/vacuum{pixel_y = -32},/turf/simulated/floor/plating,/area/chapel/main)
>>>>>>> 5e38b8e... Adds shutoff valve monitor (#6353)
(1,1,1) = {"
@@ -11466,6 +11467,7 @@ aaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbA
aaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaadaadaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabMCbKMbKMbKMbKMbKNbKObPUbPVbPVbPWbPXbPYbHWbPZbQabQbbQcbDibQdbQebQfbQgbQhbQibQhbQhbQjbQhbQgbQkbQlbQmbQnbQobQpbQkbQqbQrbQsbOZbQtbQubQvbQwbQxbQybQzbQAbQBbQCbQDbNsbQEbIxbQFbPgbAQbCrbQGbuxaaaaaaaaaaaabLCbLCbQHbQIbQJbQKbQLbQMbQNbQJbQObQPbQQbHcbQRbQPbQSbNEbQTbQUbQVbQWbNEbQXbQYbIDbIDaaaaaaaaaaaabvZbQZbvZbvZbPvbRabRbbRcbRdbRebRfbRgbRhbRibEsbRjbRkbRlbRmbRnbRobRpbRqbRrbRsbRtbPAbPCbRubRvbRwbRxbPFbRybRzbRAbPFbRBbRCbPIbPIbRDbREbRFbRGbRHbRIbRJbKBbKKbKBbKBbKBbKBbKGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaadaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaabHWbRKbRLbRMbRNbRObRPbHWbRQbRRbQbbRSbDibRTbRUbQgbQgbRVbRWbRXbRYbRZbSabSbbQkbScbSdbSebSfbSgbShbSibSjbSkbEVbSlbSmbSnbSobSpbSqbSrbSsbStbStbSubStbStbStbStbuxbuxbCrbSvbuxaaaaaaaaabLCbLCbQHbQIbSwbSwbSxbSybSzbSAbSAbSBbSCbSDbSEbSFbSGbSHbSIbSJbSJbSKbSLbSMbSMbQXbQYbIDbIDaaaaaaaaabvZbSNbSObSPbPvbSQbSRbSSbSTbSUbSVbWObSXbSYbSZcdnbTbbTcbTdbTdbTdbTebTfbTgbThbTibTjbPCbTkbTlbTmbTnbTobTobTobTobPFbTpbTqbTrbPIbTsbTtbKBbTubTvbTwbTxbTybTzbTAbTBbJvaaaaaaaabaaaaaaaaaabcaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaafaaaaaaaaabKLbVibKLbVibKLbVibKLbVibKLbVibKLbViaafaafbTDbTEbTDbTDbTDbTDbTDbTEbTFbTGbTDbBEbTHbQbbTIbDibTJbTKbQgbTLbTMbTNbTObTPbTQbTRbTSbQkcbFbTUbTVbTWbTXbTYbTZbSjbUabEVbUbbUcbUdbUebUfbUgbUhbUibStbUjbUkbUlbUlbUmbStbUnbymbCrbUobGZaaaaaaaaabLCbUpbQIbSwbUqbUrbUsbUtbUubUvdNgbUxbUybUzbUAbUBbQPbUCbekbUDbUEbUFbUGbUHbUIbSMbQXbUJbIDaaaaaaaaabvibUKbxibULbPvbUMbUNbUObUPbUQbURbUSbUTbUUbUVbRjbUWbUXbUYbUZbUYbVabTibVbbVcbVdbVebPCcdFbVgbVhbVxbVjbVkbTobVlbPFbVmbVnbVobPIbVpbVqbKBbVrbVsbVtbVtbVtbVsbVsbVubHVaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaadaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
<<<<<<< HEAD
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaabVvbVwbVAbVwbVAbVwbVAbVwbVAbVwbVAbVwbVybVzbVEbVBbVCbVDbVBbXpbVBbVFbVGbVHbVIbBEbVJbVKbVLbVMbVNbVObQgbVPbTMbVQbVRbVSbVTbTRbVUbQkbVVbVWbVXbVYbVZbWabNjbWbbWcbWdbWebWfbWgbWhbWibWjbUhbWkbWlbWmbWnbWobWpbWqbStbWrbymbCrbWsbGZaaaaaabLBbLBbWtbQJbSwbWubWvbWwbWxbWybWxbWxbWzbWAbKjbWBbWCbWDbWEbWDbWFbWGbWDbWDbWHbUHbSMbNEbWIbLHbLHaaaaaabvibUKbxibWJbPvbWKbWLbWMbUPbWNbPvbPvbxHcfqbxHbPCbPCbWPbWQbWRbWSbVabWTbWUbWVbWWbWXbPCbWYbWZbXabXbbVjbXcbTobXdbPFbXebXfbXgbPIbXhbBvbKBbVrbXibXjbXkbXlbXmbXnbVubGsaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaabMCbKMbKMbKMbKMbKMbKMbKMbKMbKMbKMbKMbVybXoccAbXqbXrbXsbXtbXrbXsbXubXvbXwbXxbBEbXybXzbKZbDibXAbXBbQgbXCbTMbTObXDbXEbTObTRbXFbQkbXGbXHbXIbXJbXKbXLbXMbXNbXObGLbXPbUcbQwbXQbXRbXRbXSbQwbStbXTbXUbXVbXWbXXbStbWrbymbCrbDLbGZaaaaaabLBbXYbXZbYabYbbYcbWwbWwbYdbYebYfbWwbYgbWAbWAbYhbWDbWDbYlbYjbYkbZOcbebWDbWDbYnbYobYpbYqbYrbLHaaaaaabvibUKbYscvCbPvbYtbYubYubYvbYwbUSbYxbYybYzbYAbYBbRjbYCbYDbYDbYDbYEbYFbYFbYGbYHbYFbYIbYJbYKbYLbYMbTobTobTobYNbPFbYObYPbYQbPIbRDbREbKBbYRbKBbKBbKBbKBbKBbKBbKBbKBbYSbYSaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaabKLbVibKLbVibKLbVibKLbVibKLbVibKLbViaadbYTbYUbYVbYWbYXbYVbYWbYXbXubYYbYZbZabBEbZbbZcbZbbDibZdbZebQgbZfbZgbZhbZibXEbZhbZjbZkbQkbZlbZmbZnbZobZpbZqbSibOXbEVbEVbSlbZrbZsbQwbQwbQwbQwbZtbStbZubStbZvbStbStbStbuxbymbCrbZwbuxaaaaaabLCbZxbZybZzbZAbZBbZCbZDbZEbZFbZGbWwcbIcbIbZIbZJbWDcbGcgpcdfcdgcbHcbJceJbWDbZQbZRbZSbYqbZTbIDaaaaaabvZbUKbAUbvZbPvbZUbZVbZWbZWbZXbZYbZZcaacabcaccadcaecafcagcagcagcahcaicajcakcalcambYIcancaocapcaqbPFcarcascatbPFcaucavcawbPIbRDbREcaxcaycazcaAcaBcaCcaDcaEcaFcaGcaHcaIcaIcaHcaHcaHcaHcaHaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -11473,6 +11475,15 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaafaafaafbVvcczcdQcczcdQcczcdQcczcdQcczcdQcczbVyccBbTDccCbYWccDccEbYWccDbXuccFcaMccGccHccIccJccKcaMbXAccLcaWcaWcaWcaWcaWcaWcaWcaWcaWcCibQkbQkbQkbQkbQkbQkccNccObDxccPccNccQccQccQccQccQccQccQccRccRccRccRbStccSccTbuxccUccVccWbuxaaaaaabLCccXccYccZcdacdbbWwbWwbWwbWwbWwbWwcdccddcddcdebWDbWDbWDclubWDchUbYjcnxbWDcdhcbMcdicbOcdjbIDaaaaaabvZcdkbxibxicdlbPvbPvbPvbPvbPvbPvcdmcipcdocipcdmbPCbPCbPCbPCbPCbPCbYIcdpcdqcdqcdrbYIcdscdscdscdtcducdvcdwcdxcdycdAcgUebVebSebTcdDcdEcrWcdGcdHccrccscdIcaCcdJcaFcdKcdLcdMcdNcaIcdOcdMcdPcaHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaabMCcdRbMCcdRbMCcdRbMCcdRbMCcdRbMCcdRaafaafbTDcehcdScdTcdUcdVcdTcdWcdXcdYcdZceacebceccedceebXAcefcegcfEceicejcekcekcekcekcekcekcekcekcekcelcemcenceocepceqceqcerbuxcescescetbDLceubymbAQbAQbvFbvGbuxcevbuxbuxbymbCrcewbuxaaaaaabLBcexccYbQJceycezceAceBceCceDceEceFceGceHceHceIceHceHceHdcybWDbYjcnydzAbWDbNEceObNEcbObNGbLHaaaaaabvZcePceQceQceQceRceSbxiceTceUbvZceVceWceXceWceYceZcfacfbcfccfdcfebYIbYIcffcfgbYIbYIcfhcficficfjcfkcflcfmcfmcfmcdvebYbxHebWebXbOncoHcfrcfscftccrccsccscdIcdIcaFcaHcfucfvcfwcfxcfycfzcfAcfBcfCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaafaaaaaabTDcfDbXrcfFciGcfGcfHbXucfIcaMcaMcaMcaMcfJcfKcfLcfMcfNcfOcfOcfPcfQcfRcfRcfRcfRcfRcfRcfRcencencencfScfTcfUcfVcfWcfXcfYcfZcgacgbcgacgacgacgacgacgccgccgccgccgdcgccgccgccgecgfbuxbLCbLCbLBcggccYcghcgicgjcgkcglcglcgmceEcgnbWAbWAbWAbWAbWAbWAbWAcgnbWEdMrecFecGbWDcgrcgscgtcgucgvbLHcgwcgwbvZbUKbxibAUbCCbCDcgxbxicgybxicgzcgAcgBcgCcgDcgAcgEcfacgFcgGcgHcgIcgJcgKcgLcgMcgNcgNcgOcdtcdtcdtcdtcdtcdtcdtcfmcdvcgPbxHcgQcgRcgScaxcgTcvecgVccrccscdIcgWcgXcaFcaHcgYcgZchacaHcaIchbcaIcaHcaHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
=======
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaabVvbVwbVAbVwbVAbVwbVAbVwbVAbVwbVAbVwbVybVzbVEbVBbVCbVDbVBbXpbVBbVFbVGbVHbVIbBEbVJbVKbVLbVMbVNbVObQgbVPbTMbVQbVRbVSbVTbTRbVUbQkbVVbVWbVXbVYbVZbWabNjbWbbWcbWdbWebWfbWgbWhbWibWjbUhbWkbWlbWmbWnbWobWpbWqbStbWrbymbCrbWsbGZaaaaaabLBbLBbWtbQJbSwbWubWvbWwbWxbWybWxbWxbWzbWAbKjbWBbWCbWDbWEbWDbWFbWGbWDbWDbWHbUHbSMbNEbWIbLHbLHaaaaaabvibUKbxibWJbPvbWKbWLbWMbUPbWNbPvbYxbxHcfqbxHbPCbPCbWPbWQbWRbWSbVabWTbWUbWVbWWbWXbPCbWYbWZbXabXbbVjbXcbTobXdbPFbXebXfbXgbPIbXhbBvbKBbVrbXibXjbXkbXlbXmbXnbVubGsaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaabMCbKMbKMbKMbKMbKMbKMbKMbKMbKMbKMbKMbVybXoccAbXqbXrbXsbXtbXrbXsbXubXvbXwbXxbBEbXybXzbKZbDibXAbXBbQgbXCbTMbTObXDbXEbTObTRbXFbQkbXGbXHbXIbXJbXKbXLbXMbXNbXObGLbXPbUcbQwbXQbXRbXRbXSbQwbStbXTbXUbXVbXWbXXbStbWrbymcWTbDLbGZaaaaaabLBbXYbXZbYabYbbYcbWwbWwbYdbYebYfbWwbYgbWAbWAbYhbWDbWDbYlbYjbYkbZOcbebWDbWDbYnbYobYpbYqbYrbLHaaaaaabvidGFdGGcvCbPvbYtbYubYubYvbYwbUScbWbYybYzbYAbYBbRjbYCbYDbYDbYDbYEbYFbYFbYGbYHbYFbYIbYJbYKbYLbYMbTobTobTobYNbPFbYObYPbYQbPIbRDbREbKBbYRbKBbKBbKBbKBbKBbKBbKBbKBbYSbYSaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaabKLbVibKLbVibKLbVibKLbVibKLbVibKLbViaadbYTbYUbYVbYWbYXbYVbYWbYXbXubYYbYZbZabBEbZbbZcbZbbDibZdbZebQgbZfbZgbZhbZibXEbZhbZjbZkbQkbZlbZmbZnbZobZpbZqbSibOXbEVbEVbSlbZrbZsbQwbQwbQwbQwbZtbStbZubStbZvbStbStbStbuxbymcWTbZwbuxaaaaaabLCbZxbZybZzbZAbZBbZCbZDbZEbZFbZGbWwcbIcbIbZIbZJbWDcbGcgpcdfcdgcbHcbJceJbWDbZQbZRbZSbYqbZTbIDaaaaaabvZdGHdHcbvZbPvbZUbZVbZWbZWbZXbZYbZZcaacabcaccadcaecafcagcagcagcahcaicajcakcalcambYIcancaocapcaqbPFcarcascatbPFcaucavcawbPIbRDbREcaxcaycazcaAcaBcaCcaDcaEcaFcaGcaHcaIcaIcaHcaHcaHcaHcaHaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaabVvbVwbVAbVwbVAbVwbVAbVwbVAbVwbVAbVwbVycaJbTDcaKbYWbYXbYVbYWbYXbXucaLcaMcaMcaMcaMcaMcaMcaMcaNcaObQgdxCdzedxlcaScaTcaUcaVcaWbQkbQkcaXbQkcaYcaZbQkcbacbbbEVcbccbdbQuczOcbfcbgcbhcbicbjbStcbkbStcblbStcbmcbncbobymcWTbymbuxaaaaaabLCcbpcbqcbrcbscbtcbuebPcbwcbxcbycbzcbAcbBcbCcbDbWDceKceLcgocgqceMceNchTcbKcbLcbMcbNcbOcbPbIDaaaaaabvZdGHdHdcbRbPvbPvcbScbTcbUcbVbUSdmbcbXcbYcbZccaccbcccccdebRebQccgcaicchcciccjcckbYIbPFcclbPFbPFbPFbPFbPFbPFbPFbPIbPIbPIbPIccmccncaxccoccpccqccrccscctcaCcaFcaFcaHccuccvccwcaHccxccycaHcaHaafaafaafaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaafaafaafbVvcczcdQcczcdQcczcdQcczcdQcczcdQcczbVyccBbTDccCbYWccDccEbYWccDbXuccFcaMccGccHccIccJccKcaMbXAccLcaWcaWcaWcaWcaWcaWcaWcaWcaWcCibQkbQkbQkbQkbQkbQkccNccObDxccPccNccQccQccQccQccQccQccQccRccRccRccRbStccSccTbuxccUdHeccWbuxaaaaaabLCccXccYccZcdacdbbWwbWwbWwbWwbWwbWwcdccddcddcdebWDbWDbWDclubWDchUbYjcnxbWDcdhcbMcdicbOcdjbIDaaaaaabvZdHxdHzcbQcdlbPvbPvbPvbPvbPvbPvcdmcipcdocipcdmbPCbPCbPCbPCbPCbPCbYIcdpcdqcdqcdrbYIcdscdscdscdtcducdvcdwcdxcdycdAcgUebVebSebTcdDcdEcrWcdGcdHccrccscdIcaCcdJcaFcdKcdLcdMcdNcaIcdOcdMcdPcaHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAjbAjbAjbAjbAjbAjbAjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaabMCcdRbMCcdRbMCcdRbMCcdRbMCcdRbMCcdRaafaafbTDcehcdScdTcdUcdVcdTcdWcdXcdYcdZceacebceccedceebXAcefcegcfEceicejcekcekcekcekcekcekcekcekcekcelcemcenceocepceqceqcerbuxcescescetbDLceubymbAQbAQbvFbvGbuxcevbuxbuxbymcWTcewbuxaaaaaabLBcexccYbQJceycezceAceBceCceDceEceFceGceHceHceIceHceHceHdcybWDbYjcnydzAbWDbNEceObNEcbObNGbLHaaaaaabvZdIcdILceQceQceRceSbxiceTceUbvZceVceWceXceWceYceZcfacfbcfccfdcfebYIbYIcffcfgbYIbYIcfhcficficfjcfkcflcfmcfmcfmcdvebYbxHebWebXbOncoHcfrcfscftccrccsccscdIcdIcaFcaHcfucfvcfwcfxcfycfzcfAcfBcfCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaafaaaaaabTDcfDbXrcfFciGcfGcfHbXucfIcaMcaMcaMcaMcfJcfKcfLcfMcfNcfOcfOcfPcfQcfRcfRcfRcfRcfRcfRcfRcencencencfScfTcfUcfVcfWcfXcfYcfZcgacgbcgacgacgacgacgacgccgccgccgccgdcgccgccgcdINcgfbuxbLCbLCbLBcggccYcghcgicgjcgkcglcglcgmceEcgnbWAbWAbWAbWAbWAbWAbWAcgnbWEdMrecFecGbWDcgrcgscgtcgucgvbLHcgwcgwbvZdJCdJEbAUbCCbCDcgxbxicgybxicgzcgAcgBcgCcgDcgAcgEcfacgFcgGcgHcgIcgJcgKcgLcgMcgNcgNcgOcdtcdtcdtcdtcdtcdtcdtcfmcdvcgPbxHcgQcgRcgScaxcgTcvecgVccrccscdIcgWcgXcaFcaHcgYcgZchacaHcaIchbcaIcaHcaHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
>>>>>>> cf3893d... Merge pull request #6439 from Woodratt/09022019_Maptweaksstrikeback
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaafaaabTEbTDchcchcbTDchdchechfbXuchgchhchichjchkchlchmchnchochpchqchrchschtcfRchuchuchuchuchuchvchwchxcenchychzchAchBchCchDchEbuxbuxbuxbuxbuxbuxbuxbuxbuxbuxbuxbuxbuxbuxbuxbuxbuxchFchGchHchIbLBchJchKchLchMchNcgkcgkchOchPceEchQbWAchRchRchRchRchRbWAchSbWDbWDbWDbWDbWDchVchWchVchXchYchZciacibciccidbvgbvZbvZbvZbvZbvZbvZbvZbvZciecifcigcihcieceZceZceZciiceZceZceZceZcijcikcgNcilcimcinciociociociociocdtcdvcdvcaGbxHcoIbxHbxHcaxciqcaxcaxccrcaFcaGcaHcaHcaHcaHcircgZciscitciucivciwcixcaHcaHaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafciybTDcizciAciBciCciDciEciFcmCciHciIciJciKciLciMciNciOciPciQciRcfOciSciTcfRchuchuchuchuchuciUciVciWciXciYciZcjacjbcjccjdcjecjfcjgdVxcjdcjhcjicjbcjjcjkcjlcjmcjbcjncjociWcjpcjqcjrcjscjtcjucjvbUwbUwcjwcjxcjycjzcgkceEceEceEcdcbWAchRchRchRchRchRbWAcgnbWAdxoebUbWDciacjAcjBcjCcjDcjDebZcjFcjGcjHcjIcjJcjKcjLcjMcjNcjOcjPcjQcjRcjNcjOcjScjTcjUcjVcjWcjXcjTcjYcjZckaecacijckcckdckeckfckgciociociociociocdtckhcdvckickjckkcklcaGckmcknckockpcaCckqckrcaHckscktcaHckueccecbecbecbcopcdMckvckwcaIaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaackxckyckzckAckBckCckDckEckFckGckHckIckJckKckLckMchnbLgckNcfOcfOckOcencfRchuchuchuchuchuckPckQckRckSckTckUckVckWckXckWckYckUckZckUckUclaclbckUckUclccldcledhndhpdhqclhclicljclkcllclmcllcllcllcllcllclncloclpbYhclqclrceHclsbWAchRchRchRchRchRbWAcltbZJecJclvclwclxclyclzclAclAclAclAclAclBclCclDclEclFclGclHclIclHclHclJclKclHclIclLclHclMclHclHclNclHclHclOclPclJclQclRclSecdclUclVciociociociociocdtclWcdvclXclYclZcmacmbcmccmdcmecmfcmgcmhcmicmjcmkcmlcmmcmncmocmpcmqcmrcmscmtcdMcmucmvaafaafaafaadaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -11486,7 +11497,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaadaaaaaaaaabKLbKMbKMbKMbKMbKMbKMbKMcyDbKMbKMbKMbVybXocyEcyFcyGcyHcyIcyJcyHcyKcyLcyLcyMbTDcfRcyNcmLcyOcyOcyPcyOctDcyRcyQctDctDcyTcyUcyVctIcyWcyXcyYcyZczaczbcxlcxlczcczdczeczfctOczgczhcziczjctOcoQcoQczkcoQcoQcqmcqmcqmcqmcoVcqoczlaaaaaacqpcsicqrczmcznczobWAbWAczpcqxcxEczqczrcsrcsjcvAcsjczscpdcztczuczvczwcpdcpdczxczyczzczAczBchZaaaaaaczCcsDcuuczDczEcxWczFczGcxZczHczIczJcuzczKcyeczLczMczNcXCczPczQczRczSczTczUczVczWczXczYczXczZcAacAbcAccAdcwAcAecAfcAgcwEcAhcAicAjcAkcAlcAmcAncAocApcAqcArcAsbYScAtcAuaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaabVvcczcdQcczcdQcczcdQcczcdQcczcdQcczbVyccBbTDbTDcAvcAwcAxbXpcAxcAycyLcyLcAzbTDcfRcyNcmLcyOcAAcABcACctDcAEcyScAFctDcAGcAHcAIctIcAJcAKcALcAMcANcAOcAPcAQcAQcARczecAScATcAUcAVcAWcAXctOcAYcAZcBacBbcBccqmcBdcqmcBecoVcqoczlaaaaaacqpcqpcBfcsjcuhcBgcBhbWAcBicqxcqxcqxcqxcBjcBkcBlcBkcBmcpdcpdcBncBocpdcpdcBpcBqcBrcjDcBschZchZaaaaaaczCcsDcuucuucBtcBucBvcBwcxZcBxcBycBzcuzcBAcBBcBCcBCcBDcBEcBFcBGcBHcBIcwocBJcypcBLcBNcBMcBKcBOcuGcBPcBQcBRcwAcBScBTcBUcwEcBVcBWcBXcBYcBYcAmcBZcCacCbcAmcAmcAsaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaagaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaabMCcdRbMCcdRbMCcdRbMCcdRbMCcdRbMCcdRaafaafaafbTEbTDbTDbTDbTDbTDbTDbTDbTDbTDbTDcfRcCccencyOcCdcABcCectDcCfcADcNpcCjcCkcClcCmctIcCncCocCpcCqctIcCrcCscCtcCtcCucCvcCwcxpcCxcCycxrcCzctOcAYcCAcCBcCCcBbcBbcqmcBdcqmcoVcqoczlaaaaaaaaactUcCDcCEcuhcCFcCGcCHcCIcCJdVzcCKcCLcCMcCNcskcCOcCMcCPcnDcCQcCRcCScCTcCUcCVcBrcCWcCXcgwaaaaaaaaaczCcsDcCYcuucCZcDacDbcDccxZcDdcDecDdcuzcDfcyecDgcDhcDicDjcDkcDlcwmcDmcwocDncypcDoczXcDpczXcDqcuGcDrcDscDtcwAcDucDvcDwcwEcDxcDycDzcDAcDBcDCcDDcDEcApcDFcDGcAsaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaacDHcDIcDJcDKcDLcDLcDMcDNcXVcCheclcPXcyOcDRcDScDTctDctDctDctDcDUcDVcDWcDUctIcDXctIcDYcDZctIcEacEbcEccEccEdcEecEactOcEfcEgcEhcEictOcEjcEjcEjcEkcEjcBbcBbcBbcqmcoVcqocoVaaaaaaaaactUctUcElcCEcuhcuhcEmcEncEocEocEpcEqcErcEscEtcEucErcEvcEwcExcExcEycEzcBrcBrcCWcEAcgwcgwaaaaaaaaacpkcsDcEBcuucuucECcEDcEEcxZcEFcEGcEHcuzcEIcEJcEKcELcEMcENcEOcEPcEQcERcEScETcuGcEUcEVcEWcEXcEYcuGcDOcFacFbcwAcFccFdcFecwEcFfcFgcFhcFicFjcAmcFkcFlcFmcAscAscAsaafaafaafabcaafaaaaaaaagaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaacDHcDIcDJcDKcDLcDLcDMcDNcXVcCheclcPXcyOcDRcDScDTctDctDctDctDcDUcDVcDWcDUctIcDXctIcDYcDZctIcEacEbcEcdmccEdcEecEactOcEfcEgcEhcEictOcEjcEjcEjcEkcEjcBbcBbcBbcqmcoVcqocoVaaaaaaaaactUctUcElcCEcuhcuhcEmcEncEocEocEpcEqcErcEscEtcEucErcEvcEwcExcExcEycEzcBrcBrcCWcEAcgwcgwaaaaaaaaacpkcsDcEBcuucuucECcEDcEEcxZcEFcEGcEHcuzcEIcEJcEKcELcEMcENcEOcEPcEQcERcEScETcuGcEUcEVcEWcEXcEYcuGcDOcFacFbcwAcFccFdcFecwEcFfcFgcFhcFicFjcAmcFkcFlcFmcAscAscAsaafaafaafabcaafaaaaaaaagaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaacDHcFncFocFpcFqcDHcDHcDHcMXcEZcDPcFtcyOcyOcyOcyOcGTcFvcFwcFxcDUcFycFzcFAcFBcFCcFDcFEcFFctIcOlcFHcFIcFJcFKcFLcFMctOcxpcFNcxpcFOctOcFPcFQcFRcFScEjcoVcoVcFTcoVcoVcFUcoVaaaaaaaaaaaactUctUcElcCEcsjcFVcFWcFXcFYcsjcFZcGacGbcskcGccGacGdcjDcGecGfcGgcGhcjDcCWcEAcgwcgwaaaaaaaaaaaacpkcsDcGicGjcGkcGlcGmcGncGocGpcGqcGrcuzcGscuzcuzcGtcGucGtcuycuEcGvcuEcGwcuEcuGcwwcGxcGycwwcuGcuGcGzcGAcFrcwAcwEcGCcwEcwEcFfcFgcFhcGDcGEcAmcGFcGGcGHcAsaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaacFpcGIcFpcGJcGKcGLcDHcGMcGBcLFcFscGPcGQcGRcGScGTcFucGUcGVcFxcDUcGWcGXcGYcGZcHacDUcHbcHccHdcHecHfcHgcHgcHhcHicHjcHkcHlcHmcHncHocEjcHpcHqcHrcHscEjcHtcHucBbcHvcHwcHxcoVaaaaaaaaaaaaaaactUctUcHycHzcHycHAcHBcHCcHDcHDcHEcslcskcslcHEcHFcHFcHGcHHcHIcHJcHKcHJcgwcgwaaaaaaaaaaaaaaacpkcHLcHMcGjcHNcHOcHPcHQcHRcHScHTcHUcHVcHWcHXcHYcHZcIacHUcIbcIccIdcIecIfcIgcIhcIicIjcIkcIlcImcIncIocIpcIqcIrcIsecmcIucIvcIwcIxcIycIzcIAcAmcAmcIBcAmcAsaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaagaafaafaafaagaadaadaadaadaadaadaagaaaaaaaaacFpcICcIDcIEcGKcIFcIGcIHcGNcKtcIJcIKcGQcGRcGScGTcGTcILcIMcFxcDUcINcIOcIPcIQcIRcIScITcIUcIVcIWcIXcIVcIVcIYcIZcJacJbcJccITcJdcJecJfcJgcJhcJicJjcJkcHtcHucBbcFUcBbcJlcoVaaaaaaaaaaabaaaaaactUctUcqpcJmcJncJocJpcHDcsicJqcslcskcslcJrczBcHFcJscJtcJucJvchZcgwcgwaaaaaaaabaaaaaaaaacpkcJwecncGjcGkcJycJzcJAcJBcJCcJDcJEcJFcJGcJHcJIcJJcJIcJEcJKcJLcJMcJNcJOcJPcJQcJRcJScJTcJUcJVcJWcJXcJYdUUcKacJXcKbcJXcKccJXcKdcKecKfcKgcKhcKicKjcKkcKlaaaaaaaabaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -11522,8 +11533,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaacUrdhkctTdiMdjndjodjpdjqdiPdjrdiRdjsdiSdjtdjsdjsdjudjsdjsdiQdjsdjvdbKdfkcUKdjwdhudhxdhYdibdhydhydicdizdjxdhBdiDdiDeczdiDdiDdhBdixdixdixdhhdjzdjAdjAdjAaafaafaafaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrdjBdjCdiMdjDdjEdjFdjsdjGdjHdjIdjJdjIdjKdjLdjMdjNdjLdjOdjLdjLdjPdhTdhUdhVdjQdhudiZdjUdjSdjTdjTdnhdjVdjWdjXdjYdjYdjZdkadkbdkcdkddkbdkbdkedkfdkgdkhdkiaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrdkjdkkdkldkmdknecAdkpdkqdkrdksdktdkudkvdjsdjsdjsdkwdiMdkxdiMdiMdiMdkycZydkzdixdkAdkBdkCdkDdkEdkFdkGdkHdkIdkJdkHdkKdkLdkMdkNdkOdkNdkNdkPdkQdkRdkSdkiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrdkTdkUdiMdkVdkWdkXdjsdkYdjsdjsdkZdjsdkvdladlbdlzdlddkxdledlfdlgdiMdlhcUKdlidixdhudhudixdljdlkdixdlldhudixdixdlmdixdlndixdlodlpdlqdhxdlrdlsdixdjAdjAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrcAYdltdiMdludjsdlvdjsdkYdlwdlxdlydmpdlAdlBdlCdlDdlDdlEdlFdlGdlHdiMdfkdlIdlJdlKdlLdlMdlNdlOdlPdlQdlRddzdlSdixdlTdlUdlVdixdlWdlWdlXdlYdlZdmadmbdmcdmdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrdkTdkUdiMdkVdkWdkXdjsdkYdjsdjsdkZdjsdkvdladlbdlzdlddkxdledlfdlgdiMdlhcUKdlidixdhudhudixdljdlkdixdlldhudixdixdlmdixdlndixdlodlpdlqdhxdlrdhxdlsdixdjAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrcAYdltdiMdludjsdlvdjsdkYdlwdlxdlydmpdlAdlBdlCdlDdlDdlEdlFdlGdlHdiMdfkdlIdlJdlKdlLdlMdlNdlOdlPdlQdlRddzdlSdixdlTdlUdlVdixdlWdlWdlXdlYdlZdhxdmaedZdmdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrcUrcUrcUrcUrcUrcUrdmediMdiMdmfdmgdmhdkYdmidlxdmjdmpdmkdmldmjdmmdmndkxdmodYrdmqdiMdmrdmsdmtdmudmvdmwdmxdmydmzdmAdmBdmCdmDdixdixdixdixdixdixdixdixdixdmEdmFdmFdmFdmGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadmHdmHdmHdmIdmHdmHecHdmKdmLdmMdiMdmNdmOdmOdmPdmQdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdmRdmSdcLdmTdmUdmUdmUdmUdmUdmUdmUdmUdmUdmUdmUdmVdmWdmVdmXdmYdmZdnadmVdnbdncdVtdpRdmGaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadmHdngdrgdrgdrgdnidnidmKdnjdnkdnkdnldnkdnmdnndnodnpdnqdnrdnsdntdnudnvdnwdnxdnydnzdnAdnBdfkcUKdVAdmUdnDdnEdnFdnGdnHdnIdmUdnJdnKdmUdmXdmXdmXdmXdmXdmXdmXdmXdnLdnMecBdqCdnfaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
maps/submaps/shelters/shelter_2_roof.dmm
-68
View File
@@ -1,68 +0,0 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
(1,1,1) = {"
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
a
a
a
a
a
"}
(3,1,1) = {"
a
a
a
a
a
a
a
"}
(4,1,1) = {"
a
a
a
a
a
a
a
"}
(5,1,1) = {"
a
a
a
a
a
a
a
"}
(6,1,1) = {"
a
a
a
a
a
a
a
"}
(7,1,1) = {"
a
a
a
a
a
a
a
"}
maps/submaps/shelters/shelter_3.dmm
+340 -288
View File
@@ -9,346 +9,398 @@
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"c" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8;
layer = 2.6
},
/obj/machinery/door/window/survival_pod{
dir = 1;
icon_state = "windoor"
},
/turf/simulated/floor/carpet/sblucarpet,
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"d" = (
/obj/structure/sign/mining/survival{
dir = 1
},
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"e" = (
/obj/structure/sign/mining/survival{
dir = 8
},
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"f" = (
/obj/structure/table/gamblingtable,
/obj/machinery/chemical_dispenser/bar_alc/full,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"g" = (
/obj/structure/table/gamblingtable,
/obj/machinery/chemical_dispenser/bar_soft/full,
/obj/machinery/light{
dir = 1
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"h" = (
/obj/machinery/vending/boozeomat{
req_access = newlist()
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"i" = (
/obj/item/weapon/book/manual/barman_recipes,
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/reagent_containers/glass/rag,
/obj/structure/table/gamblingtable,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"j" = (
/obj/structure/fans,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"k" = (
/obj/structure/table/gamblingtable,
/obj/item/weapon/clipboard,
/obj/item/toy/figure/bartender,
/obj/item/weapon/storage/fancy/cigar,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"l" = (
/obj/structure/table/gamblingtable,
/obj/structure/reagent_dispensers/beerkeg,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"m" = (
/obj/structure/closet/secure_closet/bar{
req_access = newlist()
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"n" = (
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"o" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/obj/structure/disposalpipe/junction{
dir = 4
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"e" = (
/obj/structure/fans,
/turf/simulated/shuttle/floor/voidcraft,
"p" = (
/obj/machinery/door/airlock/voidcraft/survival_pod,
/obj/structure/fans/tiny,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"f" = (
/obj/machinery/smartfridge/survival_pod,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/weapon/storage/pill_bottle/dice_nerd,
/obj/item/weapon/storage/pill_bottle/antitox,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/weapon/storage/firstaid/regular,
/obj/item/modular_computer/laptop/preset/custom_loadout/rugged,
/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)
"q" = (
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"r" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"s" = (
/obj/structure/table/reinforced,
/obj/item/weapon/flame/lighter/random{
pixel_x = -4;
pixel_y = 4
},
/obj/item/weapon/storage/box/survival/space,
/obj/item/weapon/extinguisher/mini,
/obj/item/device/radio{
icon_state = "walkietalkieOLD";
name = "emergency radio"
/obj/item/weapon/flame/lighter/random,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"t" = (
/obj/structure/table/reinforced,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"u" = (
/obj/structure/table/reinforced,
/obj/item/weapon/storage/box/matches{
pixel_x = -4;
pixel_y = 8
},
/obj/item/weapon/towel{
color = "#800080"
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"v" = (
/obj/machinery/door/window/survival_pod{
dir = 2
},
/obj/item/weapon/towel{
color = "#800080"
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"w" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/obj/item/weapon/storage/box/donkpockets,
/obj/item/weapon/storage/box/donkpockets,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
/obj/item/weapon/reagent_containers/food/snacks/candy,
/obj/item/weapon/reagent_containers/food/snacks/candy,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen,
/obj/item/weapon/reagent_containers/food/snacks/chips,
/obj/item/weapon/reagent_containers/food/snacks/chips,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/syndicake,
/obj/item/weapon/reagent_containers/food/snacks/unajerky,
/obj/item/weapon/storage/box/mixedglasses,
/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,
/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola,
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up,
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind,
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice,
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice,
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater,
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/ice,
/obj/item/weapon/reagent_containers/food/drinks/ice,
/obj/item/weapon/reagent_containers/food/drinks/tea,
/obj/item/weapon/reagent_containers/food/drinks/tea,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate,
/obj/item/toy/plushie/kitten,
/turf/simulated/shuttle/floor/voidcraft,
/obj/structure/disposalpipe/segment,
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"g" = (
/obj/item/device/gps/computer,
/turf/simulated/shuttle/floor/voidcraft,
"x" = (
/obj/item/weapon/stool/padded,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"h" = (
/obj/machinery/shower,
/obj/item/weapon/soap/deluxe,
/obj/structure/curtain,
/turf/simulated/shuttle/floor/voidcraft,
"y" = (
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"i" = (
/obj/structure/toilet,
/turf/simulated/shuttle/floor/voidcraft,
"z" = (
/obj/machinery/vending/cigarette,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"j" = (
"A" = (
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"B" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"C" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8
},
/obj/structure/window/reinforced/survival_pod{
dir = 4
},
/obj/structure/window/reinforced/survival_pod{
dir = 1
},
/obj/structure/window/reinforced/survival_pod,
/obj/structure/grille,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"D" = (
/obj/structure/bed/chair/comfy/black,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"E" = (
/obj/machinery/door/airlock/voidcraft/survival_pod,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"F" = (
/obj/structure/table/gamblingtable,
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{
pixel_x = -4;
pixel_y = 12
},
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{
pixel_x = 4;
pixel_y = 4
},
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"G" = (
/obj/structure/urinal{
pixel_y = 24
},
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"H" = (
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"I" = (
/obj/structure/sink{
dir = 4;
pixel_x = 11
},
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"J" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"K" = (
/obj/structure/bed/chair/comfy/black{
dir = 1
},
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"L" = (
/obj/machinery/vending/snack,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"M" = (
/obj/machinery/light,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"N" = (
/obj/structure/toilet{
dir = 8
},
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"O" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"k" = (
/obj/machinery/sleeper/survival_pod,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"l" = (
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"m" = (
/obj/structure/bed/pod,
/obj/item/weapon/bedsheet/hos,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"n" = (
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/hop,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"o" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8;
icon_state = "pwindow"
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"p" = (
/obj/structure/table/survival_pod,
/obj/machinery/microwave{
pixel_y = 6
},
/obj/structure/sink/kitchen{
icon_state = "sink_alt";
dir = 4;
pixel_x = -13
},
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"q" = (
/obj/structure/tubes,
/obj/machinery/recharge_station,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"r" = (
/obj/machinery/light{
dir = 4;
light_color = "#DDFFD3"
},
/obj/structure/flora/pottedplant/stoutbush,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"s" = (
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/obj/structure/bed/chair/comfy/black,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"t" = (
/obj/machinery/door/window/survival_pod{
icon_state = "windoor";
dir = 1
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"u" = (
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"v" = (
/obj/structure/window/reinforced/survival_pod{
density = 0;
dir = 9;
icon_state = "pwindow"
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"w" = (
/obj/structure/bed/chair/comfy/black,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"x" = (
/obj/machinery/light,
/obj/structure/bed/chair/comfy/black{
dir = 8
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"y" = (
/obj/structure/table/steel,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"z" = (
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"A" = (
/obj/machinery/button/remote/airlock/survival_pod{
dir = 10;
id = "shelter_gamma";
pixel_y = -24
},
/obj/structure/bed/chair/comfy/black{
dir = 4
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"C" = (
"P" = (
/obj/structure/sign/mining/survival,
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"D" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/voidcraft/survival_pod{
id_tag = "shelter_gamma"
},
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"E" = (
/obj/structure/sign/mining,
/turf/simulated/shuttle/wall/voidcraft/survival,
"Q" = (
/obj/structure/sign/mining/survival,
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
(1,1,1) = {"
a
d
a
d
a
d
e
p
e
c
e
C
e
C
e
a
"}
(2,1,1) = {"
b
e
k
p
j
q
s
x
y
C
D
F
K
L
P
"}
(3,1,1) = {"
a
c
f
l
l
q
t
x
a
y
y
y
y
M
c
"}
(4,1,1) = {"
b
d
g
m
q
u
z
t
x
y
D
F
K
y
Q
"}
(5,1,1) = {"
a
i
c
o
v
A
a
h
q
u
x
y
D
F
K
y
c
"}
(6,1,1) = {"
b
h
n
r
w
d
i
q
t
x
y
E
y
y
y
y
p
"}
(7,1,1) = {"
c
k
q
t
x
y
c
c
c
c
c
"}
(8,1,1) = {"
d
l
q
t
x
y
c
G
H
H
Q
"}
(9,1,1) = {"
c
m
q
v
y
y
E
H
c
E
c
"}
(10,1,1) = {"
b
n
q
t
z
A
c
I
c
N
P
"}
(11,1,1) = {"
a
j
a
j
a
j
o
r
w
r
B
c
J
c
O
a
"}
maps/submaps/shelters/shelter_4.dmm
+616
View File
@@ -0,0 +1,616 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"b" = (
/obj/structure/sign/mining/survival{
dir = 1
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"c" = (
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"d" = (
/obj/structure/sign/mining/survival{
dir = 1
},
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"e" = (
/obj/structure/sign/mining/survival{
dir = 8
},
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"f" = (
/obj/structure/fans,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"g" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/voidcraft/survival_pod,
/obj/effect/floor_decal/industrial/danger/full,
/obj/machinery/door/blast/regular{
density = 0;
dir = 1;
icon_state = "pdoor0";
id = "shelterblast";
name = "Shelter Blast Doors";
opacity = 0
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"h" = (
/obj/machinery/smartfridge/survival_pod,
/obj/item/weapon/storage/firstaid/combat,
/obj/item/weapon/storage/firstaid/insiderepair,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/weapon/storage/firstaid/combat,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/device/radio/emergency,
/obj/item/device/survivalcapsule,
/obj/item/device/survivalcapsule,
/obj/item/device/survivalcapsule,
/obj/item/weapon/storage/box/survival/space,
/obj/item/weapon/storage/box/survival/space,
/obj/item/weapon/storage/box/survival/space,
/obj/item/weapon/storage/box/survival/space,
/obj/item/weapon/gun/energy/frontier/locked/holdout,
/obj/item/weapon/gun/energy/frontier/locked/holdout,
/obj/item/device/subspaceradio,
/obj/item/weapon/storage/box/survival/comp,
/obj/item/weapon/storage/box/survival/comp,
/obj/item/device/binoculars,
/obj/item/device/perfect_tele,
/obj/item/weapon/storage/pill_bottle/nutriment,
/obj/item/weapon/storage/pill_bottle/iron,
/obj/item/weapon/storage/pill_bottle/arithrazine,
/obj/item/weapon/reagent_containers/blood/OMinus,
/obj/item/weapon/reagent_containers/blood/OMinus,
/obj/item/weapon/reagent_containers/blood/OMinus,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/weapon/storage/firstaid/combat,
/obj/item/weapon/storage/firstaid/insiderepair,
/obj/item/weapon/storage/pill_bottle/nutriment,
/obj/item/weapon/storage/pill_bottle/iron,
/obj/item/weapon/storage/pill_bottle/arithrazine,
/obj/item/weapon/storage/pill_bottle/corophizine,
/obj/item/weapon/towel/random,
/obj/item/weapon/towel/random,
/obj/item/weapon/extinguisher/mini,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"i" = (
/obj/item/device/gps/computer,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"j" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/closet/secure_closet/personal,
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
/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/weapon/gun/projectile/pistol,
/obj/item/clothing/accessory/storage/black_vest,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/storage/box/survival/comp,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"k" = (
/obj/structure/bed/pod,
/obj/item/weapon/bedsheet/captain,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"l" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/suit_cycler{
departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot");
locked = 0
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"m" = (
/obj/machinery/sleeper/survival_pod,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"n" = (
/obj/machinery/optable,
/obj/machinery/oxygen_pump/anesthetic{
pixel_x = 32
},
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"o" = (
/obj/machinery/mech_recharger,
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"p" = (
/obj/machinery/door/airlock/voidcraft/survival_pod,
/obj/structure/fans/tiny,
/obj/effect/floor_decal/industrial/danger/full,
/obj/machinery/door/blast/regular{
density = 0;
dir = 4;
icon_state = "pdoor0";
id = "shelterblast";
name = "Shelter Blast Doors";
opacity = 0
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"q" = (
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"r" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"s" = (
/obj/structure/table/survival_pod,
/obj/item/weapon/storage/firstaid/surgery,
/obj/structure/sink/kitchen{
icon_state = "sink_alt";
dir = 4;
pixel_x = -13
},
/obj/machinery/recharger,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"t" = (
/obj/machinery/recharge_station,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"u" = (
/obj/machinery/door/airlock/voidcraft/survival_pod,
/obj/effect/floor_decal/industrial/hatch,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"v" = (
/obj/machinery/shower{
dir = 4
},
/obj/item/weapon/soap/deluxe,
/obj/structure/curtain/black,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"w" = (
/obj/machinery/washing_machine,
/obj/effect/floor_decal/industrial/outline,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"x" = (
/obj/structure/toilet{
dir = 1
},
/obj/machinery/light/small,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"y" = (
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"z" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"A" = (
/obj/structure/closet/hydrant{
pixel_y = 32
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"B" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
/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/weapon/gun/projectile/pistol,
/obj/item/clothing/accessory/storage/black_vest,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/storage/box/survival/comp,
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"C" = (
/obj/structure/closet/crate/freezer/rations,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/random/mre,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"D" = (
/obj/structure/table/steel_reinforced,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"E" = (
/obj/structure/bed/chair/comfy/blue{
icon_state = "comfychair_preview";
dir = 1
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"F" = (
/obj/structure/closet/crate/secure/engineering,
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/plasteel{
amount = 50
},
/obj/item/stack/material/plasteel{
amount = 50
},
/obj/item/stack/material/glass/reinforced{
amount = 50
},
/obj/item/stack/material/glass/reinforced{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/item/stack/material/glass/phoronrglass{
amount = 50
},
/obj/item/stack/material/glass/phoronrglass{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/item/weapon/storage/toolbox/syndicate/powertools,
/obj/item/weapon/storage/toolbox/syndicate/powertools,
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/obj/item/stack/cable_coil,
/obj/item/stack/cable_coil,
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"G" = (
/obj/structure/bed/chair/comfy/blue,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"H" = (
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"I" = (
/obj/machinery/light{
dir = 1
},
/obj/machinery/button/remote/blast_door{
id = "shelterblast";
name = "Shelter Blast Doors";
pixel_y = 32
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"J" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"K" = (
/obj/machinery/autolathe{
hacked = 1;
name = "military autolathe"
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"L" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/energy/sniperrifle,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"M" = (
/obj/machinery/mech_recharger,
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"N" = (
/obj/machinery/recharger/wallcharger{
pixel_y = 32
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"O" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"P" = (
/obj/structure/sign/mining/survival,
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"Q" = (
/obj/structure/sign/mining/survival,
/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
/area/survivalpod)
"R" = (
/obj/machinery/iv_drip,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"S" = (
/obj/effect/floor_decal/industrial/loading{
dir = 1
},
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"T" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545/ap,
/obj/item/ammo_magazine/m545/ap,
/obj/item/ammo_magazine/m545/ap,
/obj/item/ammo_magazine/m545/ap,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/machinery/light,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"U" = (
/obj/structure/closet/crate/internals,
/obj/item/clothing/suit/space/void/merc/odst,
/obj/item/clothing/suit/space/void/merc/odst,
/obj/item/clothing/suit/space/void/merc/odst,
/obj/item/clothing/suit/space/void/merc/odst,
/obj/item/clothing/head/helmet/space/void/merc/odst,
/obj/item/clothing/head/helmet/space/void/merc/odst,
/obj/item/clothing/head/helmet/space/void/merc/odst,
/obj/item/clothing/head/helmet/space/void/merc/odst,
/obj/item/weapon/tank/oxygen,
/obj/item/weapon/tank/oxygen,
/obj/item/weapon/tank/oxygen,
/obj/item/weapon/tank/oxygen,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/survivalpod)
"Y" = (
/obj/structure/sign/mining/survival{
dir = 8
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
(1,1,1) = {"
a
Y
c
e
c
g
c
e
c
Y
a
"}
(2,1,1) = {"
b
f
m
s
c
q
o
c
v
v
P
"}
(3,1,1) = {"
c
h
R
H
u
q
t
c
H
x
c
"}
(4,1,1) = {"
d
i
n
S
c
I
M
c
u
c
Q
"}
(5,1,1) = {"
c
c
c
c
c
A
U
w
q
l
c
"}
(6,1,1) = {"
d
j
y
y
u
q
q
q
q
q
p
"}
(7,1,1) = {"
c
B
k
k
c
N
G
D
E
L
c
"}
(8,1,1) = {"
d
c
c
c
c
N
G
D
E
T
Q
"}
(9,1,1) = {"
c
j
y
y
u
q
q
q
q
q
c
"}
(10,1,1) = {"
b
B
k
k
c
q
F
C
K
z
P
"}
(11,1,1) = {"
a
O
c
J
c
g
c
J
c
r
a
"}
maps/submaps/shelters/shelter_a.dmm
+354
View File
@@ -0,0 +1,354 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"b" = (
/obj/structure/sign/mining/survival{
dir = 1
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"c" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8;
layer = 2.6
},
/obj/machinery/door/window/survival_pod{
dir = 1;
icon_state = "windoor"
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"d" = (
/obj/structure/sign/mining/survival{
dir = 8
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"e" = (
/obj/structure/fans,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"f" = (
/obj/machinery/smartfridge/survival_pod,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu10,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/weapon/storage/mre/menu11,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/weapon/storage/pill_bottle/dice_nerd,
/obj/item/weapon/storage/pill_bottle/antitox,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/weapon/storage/firstaid/regular,
/obj/item/modular_computer/laptop/preset/custom_loadout/rugged,
/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/space,
/obj/item/weapon/extinguisher/mini,
/obj/item/device/radio{
icon_state = "walkietalkieOLD";
name = "emergency radio"
},
/obj/item/weapon/towel{
color = "#800080"
},
/obj/item/weapon/towel{
color = "#800080"
},
/obj/item/weapon/storage/box/donkpockets,
/obj/item/weapon/storage/box/donkpockets,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
/obj/item/weapon/reagent_containers/food/snacks/candy,
/obj/item/weapon/reagent_containers/food/snacks/candy,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen,
/obj/item/weapon/reagent_containers/food/snacks/chips,
/obj/item/weapon/reagent_containers/food/snacks/chips,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/syndicake,
/obj/item/weapon/reagent_containers/food/snacks/unajerky,
/obj/item/weapon/storage/box/mixedglasses,
/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,
/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice,
/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola,
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up,
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind,
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice,
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice,
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater,
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/reagent_containers/food/drinks/ice,
/obj/item/weapon/reagent_containers/food/drinks/ice,
/obj/item/weapon/reagent_containers/food/drinks/tea,
/obj/item/weapon/reagent_containers/food/drinks/tea,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate,
/obj/item/toy/plushie/kitten,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"g" = (
/obj/item/device/gps/computer,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"h" = (
/obj/machinery/shower,
/obj/item/weapon/soap/deluxe,
/obj/structure/curtain,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"i" = (
/obj/structure/toilet,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"j" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"k" = (
/obj/machinery/sleeper/survival_pod,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"l" = (
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"m" = (
/obj/structure/bed/pod,
/obj/item/weapon/bedsheet/hos,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"n" = (
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/hop,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"o" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8;
icon_state = "pwindow"
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"p" = (
/obj/structure/table/survival_pod,
/obj/machinery/microwave{
pixel_y = 6
},
/obj/structure/sink/kitchen{
icon_state = "sink_alt";
dir = 4;
pixel_x = -13
},
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"q" = (
/obj/structure/tubes,
/obj/machinery/recharge_station,
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"r" = (
/obj/machinery/light{
dir = 4;
light_color = "#DDFFD3"
},
/obj/structure/flora/pottedplant/stoutbush,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"s" = (
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/obj/structure/bed/chair/comfy/black,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"t" = (
/obj/machinery/door/window/survival_pod{
icon_state = "windoor";
dir = 1
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"u" = (
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"v" = (
/obj/structure/window/reinforced/survival_pod{
density = 0;
dir = 9;
icon_state = "pwindow"
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"w" = (
/obj/structure/bed/chair/comfy/black,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"x" = (
/obj/machinery/light,
/obj/structure/bed/chair/comfy/black{
dir = 8
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"y" = (
/obj/structure/table/steel,
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"z" = (
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"A" = (
/obj/machinery/button/remote/airlock/survival_pod{
dir = 10;
id = "shelter_gamma";
pixel_y = -24
},
/obj/structure/bed/chair/comfy/black{
dir = 4
},
/turf/simulated/floor/carpet/sblucarpet,
/area/survivalpod)
"C" = (
/obj/structure/sign/mining/survival,
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
"D" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/voidcraft/survival_pod{
id_tag = "shelter_gamma"
},
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
"E" = (
/obj/structure/sign/mining,
/turf/simulated/shuttle/wall/voidcraft/survival,
/area/survivalpod)
(1,1,1) = {"
a
d
a
d
a
d
a
"}
(2,1,1) = {"
b
e
k
p
s
y
C
"}
(3,1,1) = {"
a
f
l
l
t
x
a
"}
(4,1,1) = {"
b
g
m
q
u
z
D
"}
(5,1,1) = {"
a
i
c
o
v
A
a
"}
(6,1,1) = {"
b
h
n
r
w
y
E
"}
(7,1,1) = {"
a
j
a
j
a
j
a
"}
maps/submaps/surface_submaps/mountains/CrashedMedShuttle1_vr.dmm
+1047
View File
File diff suppressed because it is too large Load Diff
maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle_vr.dmm
+1139
View File
File diff suppressed because it is too large Load Diff
maps/submaps/surface_submaps/mountains/mountains.dm
+2 -2
View File
@@ -192,7 +192,7 @@
/datum/map_template/surface/mountains/normal/crashedcontainmentshuttle
name = "Crashed Cargo Shuttle"
desc = "A severely damaged military shuttle, its cargo seems to remain intact."
mappath = 'maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm'
mappath = 'maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle_vr.dmm' //VOREStation Edit
cost = 30
/datum/map_template/surface/mountains/normal/deadspy
@@ -337,6 +337,6 @@
/datum/map_template/surface/mountains/normal/crashedmedshuttle //VOREStation Edit
name = "Crashed Med Shuttle"
desc = "A medical response shuttle that went missing some time ago. So this is where they went."
mappath = 'maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm'
mappath = 'maps/submaps/surface_submaps/mountains/CrashedMedShuttle1_vr.dmm' //VOREStation Edit
cost = 20
fixed_orientation = TRUE
maps/tether/submaps/aerostat/submaps/Boombase.dmm
+5 -1
View File
@@ -148,6 +148,10 @@
/obj/tether_away_spawner/aerostat_surface,
/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/BoomBase)
"aJ" = (
/obj/structure/ghost_pod/manual/lost_drone/dogborg,
/turf/simulated/floor/plating/virgo2,
/area/submap/virgo2/BoomBase)
"aT" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
@@ -321,7 +325,7 @@ ax
ay
az
an
ae
aJ
aD
ae
aB
maps/tether/submaps/aerostat/submaps/DecoupledEngine.dmm
+5 -1
View File
@@ -132,6 +132,10 @@
},
/turf/simulated/floor,
/area/submap/virgo2/DecoupledEngine)
"aC" = (
/obj/structure/ghost_pod/manual/lost_drone/dogborg,
/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/DecoupledEngine)
"aD" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -981,7 +985,7 @@ ab
ab
ag
ad
ad
aC
ad
ad
aj
maps/tether/submaps/aerostat/submaps/Lab1.dmm
+5 -1
View File
@@ -281,6 +281,10 @@
"W" = (
/turf/simulated/floor/plating/virgo2,
/area/submap/virgo2/Lab1)
"X" = (
/obj/structure/ghost_pod/manual/lost_drone/dogborg,
/turf/simulated/floor/tiled/steel_dirty,
/area/submap/virgo2/Lab1)
(1,1,1) = {"
a
@@ -660,7 +664,7 @@ a
a
V
f
h
X
h
p
t
maps/tether/submaps/space/pois/_templates.dm
+31
View File
@@ -49,6 +49,31 @@
mappath = 'debris1.dmm'
cost = 2
/datum/map_template/debrisfield/debris2
name = "Debris 2"
mappath = 'debris2.dmm'
cost = 2
/datum/map_template/debrisfield/debris3
name = "Debris 3"
mappath = 'debris3.dmm'
cost = 2
/datum/map_template/debrisfield/debris4
name = "Debris 4"
mappath = 'debris4.dmm'
cost = 2
/datum/map_template/debrisfield/debris5
name = "Debris 5"
mappath = 'debris5.dmm'
cost = 2
/datum/map_template/debrisfield/debris6
name = "Debris 6"
mappath = 'debris6.dmm'
cost = 2
/datum/map_template/debrisfield/ship_sup_exploded
name = "Exploded Cargo Ship"
mappath = 'ship_sup_exploded.dmm'
@@ -66,3 +91,9 @@
mappath = 'ship_sci_overrun.dmm'
cost = 35
allow_duplicates = FALSE
/datum/map_template/debrisfield/oldshuttle
name = "Old Expedition Shuttle"
mappath = 'oldshuttle.dmm'
cost = 30
allow_duplicates = FALSE
maps/tether/submaps/space/pois/debris2.dmm
+42
View File
@@ -0,0 +1,42 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/space,
/area/tether_away/debrisfield/explored)
"b" = (
/obj/structure/lattice,
/turf/space,
/area/tether_away/debrisfield/explored)
"c" = (
/turf/simulated/floor/airless,
/area/tether_away/debrisfield/explored)
(1,1,1) = {"
a
b
c
"}
(2,1,1) = {"
a
b
c
"}
(3,1,1) = {"
a
c
a
"}
(4,1,1) = {"
b
c
a
"}
(5,1,1) = {"
a
c
b
"}
(6,1,1) = {"
c
b
b
"}
maps/tether/submaps/space/pois/debris3.dmm
+48
View File
@@ -0,0 +1,48 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/space,
/area/tether_away/debrisfield/explored)
"b" = (
/obj/structure/lattice,
/turf/space,
/area/tether_away/debrisfield/explored)
"c" = (
/turf/simulated/floor/airless,
/area/tether_away/debrisfield/explored)
"d" = (
/obj/structure/girder,
/turf/simulated/floor/airless,
/area/tether_away/debrisfield/explored)
(1,1,1) = {"
a
a
a
b
d
d
"}
(2,1,1) = {"
a
b
b
c
c
c
"}
(3,1,1) = {"
b
c
b
b
b
c
"}
(4,1,1) = {"
c
c
b
b
a
a
"}
maps/tether/submaps/space/pois/debris4.dmm
+64
View File
@@ -0,0 +1,64 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/space,
/area/tether_away/debrisfield/explored)
"b" = (
/obj/structure/lattice,
/turf/space,
/area/tether_away/debrisfield/explored)
"c" = (
/obj/structure/girder,
/turf/simulated/floor/airless,
/area/tether_away/debrisfield/explored)
"d" = (
/turf/simulated/shuttle/wall,
/area/tether_away/debrisfield/explored)
"e" = (
/turf/simulated/floor/airless,
/area/tether_away/debrisfield/explored)
"f" = (
/turf/simulated/shuttle/floor/white/airless,
/area/tether_away/debrisfield/explored)
(1,1,1) = {"
a
b
a
b
b
"}
(2,1,1) = {"
a
c
e
e
a
"}
(3,1,1) = {"
a
d
f
e
b
"}
(4,1,1) = {"
a
d
e
b
a
"}
(5,1,1) = {"
b
c
e
b
a
"}
(6,1,1) = {"
b
b
b
a
a
"}
maps/tether/submaps/space/pois/debris5.dmm
+39
View File
@@ -0,0 +1,39 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/space,
/area/space)
"b" = (
/obj/structure/lattice,
/turf/space,
/area/space)
"c" = (
/turf/simulated/floor/airless,
/area/space)
"d" = (
/turf/simulated/shuttle/wall/dark,
/area/space)
(1,1,1) = {"
a
b
b
b
"}
(2,1,1) = {"
b
c
c
d
"}
(3,1,1) = {"
a
d
d
b
"}
(4,1,1) = {"
a
a
a
b
"}
maps/submaps/shelters/shelter_1_roof.dmm → maps/tether/submaps/space/pois/debris6.dmm
+13 -29
View File
@@ -1,40 +1,24 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/shuttle/floor/voidcraft,
/area/survivalpod)
/turf/space,
/area/space)
"b" = (
/obj/structure/lattice,
/turf/space,
/area/space)
(1,1,1) = {"
a
a
a
a
b
b
a
"}
(2,1,1) = {"
a
a
a
a
a
b
b
b
"}
(3,1,1) = {"
a
a
a
a
a
"}
(4,1,1) = {"
a
a
a
a
a
"}
(5,1,1) = {"
a
a
a
a
b
b
a
"}
maps/tether/submaps/space/pois/debrisfield_things.dm
+2
View File
@@ -1,5 +1,7 @@
/obj/tether_away_spawner/debrisfield
atmos_comp = FALSE
prob_spawn = 100
prob_fall = 15
/obj/tether_away_spawner/debrisfield/carp
name = "debris field carp spawner"
maps/tether/submaps/space/pois/oldshuttle.dmm
+880
View File
@@ -0,0 +1,880 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/space,
/area/tether_away/debrisfield/explored)
"ab" = (
/obj/item/weapon/material/twohanded/spear,
/turf/space,
/area/tether_away/debrisfield/explored)
"ac" = (
/turf/simulated/shuttle/wall/voidcraft,
/area/tether_away/debrisfield/explored)
"ad" = (
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"ae" = (
/obj/structure/table/steel,
/obj/item/clothing/head/pilot,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"af" = (
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/tether_away/debrisfield/explored)
"ag" = (
/obj/structure/frame/computer,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"ah" = (
/obj/structure/bed/chair/comfy/blue{
icon_state = "comfychair_preview";
dir = 1
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"ai" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 1
},
/turf/simulated/shuttle/plating/airless,
/area/tether_away/debrisfield/explored)
"aj" = (
/obj/item/weapon/material/shard,
/obj/item/weapon/material/shard,
/obj/structure/grille/broken,
/turf/simulated/shuttle/plating/airless,
/area/tether_away/debrisfield/explored)
"ak" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/table/rack/shelf,
/obj/item/device/suit_cooling_unit,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"al" = (
/obj/structure/lattice,
/turf/space,
/area/tether_away/debrisfield/explored)
"am" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/table/rack/shelf,
/obj/item/weapon/tank/oxygen,
/obj/item/device/suit_cooling_unit,
/obj/item/clothing/head/helmet/space/void/pilot,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/suit/space/void/pilot,
/obj/item/clothing/head/helmet/space/void/pilot,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"an" = (
/obj/machinery/door/airlock/voidcraft,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"ao" = (
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/shuttle/floor/darkred/airless,
/area/tether_away/debrisfield/explored)
"ap" = (
/obj/structure/table/rack/shelf,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/tank/emergency/oxygen/engi,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aq" = (
/obj/structure/bed/chair/shuttle,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"ar" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 8
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -32
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"as" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 32
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"at" = (
/obj/machinery/sleeper{
dir = 8
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"au" = (
/obj/machinery/sleep_console,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"av" = (
/obj/structure/bed/chair/shuttle{
icon_state = "shuttle_chair";
dir = 1
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aw" = (
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/shuttle/floor/darkred/airless,
/area/tether_away/debrisfield/explored)
"ax" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/space_heater,
/turf/simulated/shuttle/floor/darkred/airless,
/area/tether_away/debrisfield/explored)
"ay" = (
/obj/structure/table/steel,
/obj/item/clothing/head/pilot,
/obj/random/unidentified_medicine/drug_den,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"az" = (
/obj/structure/closet/crate/medical,
/obj/random/unidentified_medicine/old_medicine,
/obj/random/unidentified_medicine/old_medicine,
/obj/random/unidentified_medicine/old_medicine,
/obj/random/unidentified_medicine/fresh_medicine,
/obj/random/unidentified_medicine/fresh_medicine,
/obj/random/unidentified_medicine/combat_medicine,
/turf/simulated/shuttle/floor/darkred/airless,
/area/tether_away/debrisfield/explored)
"aA" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 9
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
frequency = 1380;
id_tag = "expshuttle_docker_pump_out_internal"
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aB" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 1
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aC" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 10
},
/turf/simulated/shuttle/wall/voidcraft,
/area/tether_away/debrisfield/explored)
"aD" = (
/obj/effect/floor_decal/industrial/warning{
dir = 5
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "expshuttle_vent"
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aE" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 8
},
/obj/machinery/door/airlock/voidcraft/vertical,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aF" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
frequency = 1380;
id_tag = "expshuttle_docker_pump_out_internal"
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aG" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "expshuttle_vent"
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aH" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 4
},
/obj/machinery/door/airlock/voidcraft/vertical,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aI" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 8
},
/turf/simulated/shuttle/wall/voidcraft,
/area/tether_away/debrisfield/explored)
"aJ" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aK" = (
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
frequency = 1380;
id_tag = "expshuttle_docker_pump_out_internal"
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aL" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aM" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 4
},
/turf/simulated/shuttle/wall/voidcraft,
/area/tether_away/debrisfield/explored)
"aN" = (
/obj/machinery/door/airlock/voidcraft/vertical,
/turf/simulated/shuttle/floor/black,
/area/tether_away/debrisfield/explored)
"aO" = (
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "expshuttle_vent"
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aP" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 10
},
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/tether_away/debrisfield/explored)
"aQ" = (
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 1
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aR" = (
/obj/machinery/atmospherics/pipe/tank/air{
dir = 4
},
/turf/simulated/shuttle/floor/darkred/airless,
/area/tether_away/debrisfield/explored)
"aS" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 9
},
/turf/simulated/shuttle/wall/voidcraft,
/area/tether_away/debrisfield/explored)
"aT" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
},
/turf/simulated/shuttle/floor/darkred/airless,
/area/tether_away/debrisfield/explored)
"aU" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{
dir = 1;
frequency = 1380;
id_tag = "expshuttle_docker_pump_out_external";
power_rating = 20000
},
/turf/simulated/shuttle/wall/voidcraft,
/area/tether_away/debrisfield/explored)
"aV" = (
/obj/machinery/light,
/obj/effect/floor_decal/industrial/warning/corner,
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aW" = (
/obj/tether_away_spawner/debrisfield/carp/hard,
/turf/space,
/area/tether_away/debrisfield/explored)
"aX" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/shuttle/plating/airless,
/area/tether_away/debrisfield/explored)
"aY" = (
/obj/machinery/door/airlock/multi_tile/metal,
/turf/simulated/shuttle/floor/black/airless,
/area/tether_away/debrisfield/explored)
"aZ" = (
/turf/simulated/mineral/floor/vacuum,
/area/tether_away/debrisfield/explored)
"ba" = (
/obj/effect/immovablerod,
/turf/simulated/mineral/floor/vacuum,
/area/tether_away/debrisfield/explored)
"bb" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/shuttle/plating/airless,
/area/tether_away/debrisfield/explored)
"bc" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/shuttle/plating/airless,
/area/tether_away/debrisfield/explored)
"bd" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/turf/simulated/shuttle/plating/airless,
/area/tether_away/debrisfield/explored)
"be" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 6
},
/turf/simulated/shuttle/plating/airless,
/area/tether_away/debrisfield/explored)
"bg" = (
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/item/weapon/storage/mre/random,
/obj/structure/closet/crate,
/turf/simulated/shuttle/floor/darkred/airless,
/area/tether_away/debrisfield/explored)
"bh" = (
/obj/tether_away_spawner/debrisfield/carp,
/turf/space,
/area/tether_away/debrisfield/explored)
"bi" = (
/obj/structure/loot_pile/mecha/durand,
/turf/simulated/mineral/floor/vacuum,
/area/tether_away/debrisfield/explored)
(1,1,1) = {"
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
"}
(2,1,1) = {"
aa
aa
aa
aa
aa
aa
aa
aa
aa
ac
ac
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
"}
(3,1,1) = {"
aa
ab
aa
ac
bc
ac
bc
ac
ac
ac
aw
aa
al
aN
ac
ac
af
aX
aa
aa
aa
aa
"}
(4,1,1) = {"
aa
aa
ac
af
am
ac
ad
ar
at
ac
ax
aa
aa
aB
aL
az
ac
aX
aa
aa
aa
aa
"}
(5,1,1) = {"
aa
aa
ai
ae
ad
ac
ap
ad
au
ac
ao
al
al
aB
aL
bg
ac
aX
aa
aa
aa
aa
"}
(6,1,1) = {"
aa
aa
ai
ag
ah
bd
aq
ad
av
aa
aa
al
aa
aB
aV
af
ac
aa
aa
aa
aa
aa
"}
(7,1,1) = {"
aa
aa
aj
ad
ad
an
ad
ad
ad
aa
aa
bd
aJ
aQ
aL
aY
aa
aa
bh
aa
aa
aa
"}
(8,1,1) = {"
aa
aa
al
aa
aa
al
aa
al
al
aa
aa
an
ad
ad
aL
ad
aa
aa
aa
aa
aa
aa
"}
(9,1,1) = {"
aa
aa
aa
aW
aa
aa
aa
aa
aa
aa
aa
aa
al
aa
aa
al
aa
aa
aa
aa
aa
aa
"}
(10,1,1) = {"
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
al
aa
aa
aa
aa
aa
aa
"}
(11,1,1) = {"
aa
aa
al
al
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aZ
ba
aa
aa
"}
(12,1,1) = {"
aa
ai
ad
ah
bd
aa
ad
ad
aa
aa
aa
aa
al
aa
aa
aa
aa
aa
aa
bi
aa
aa
"}
(13,1,1) = {"
aa
ai
ay
ad
ac
aa
aq
al
al
al
aa
al
al
aa
al
aa
aa
aa
aa
aa
aa
aa
"}
(14,1,1) = {"
aa
ac
af
ak
ac
aa
al
al
av
ac
be
aE
aI
aI
aU
aa
aa
aa
aa
aa
aa
aa
"}
(15,1,1) = {"
aa
aa
ac
bb
ac
aa
aa
ad
av
ac
aA
aF
aK
aP
aU
aa
bh
aa
aa
aa
aa
aa
"}
(16,1,1) = {"
aa
aa
aa
aa
aa
aa
aq
as
av
ac
aB
ad
aL
aR
ac
aX
aa
aa
aa
aa
aa
aa
"}
(17,1,1) = {"
aa
aa
aa
aa
aa
aa
bb
ac
ac
ac
aD
aG
aO
aT
ac
aX
aa
aa
aa
aa
aa
aa
"}
(18,1,1) = {"
aa
aa
aa
aa
aa
aa
aa
aa
aa
ac
aC
aH
aM
aS
af
aX
aa
aa
aa
aa
aa
aa
"}
(19,1,1) = {"
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
"}
(20,1,1) = {"
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
"}
maps/tether/submaps/space/pois/ship_sci_overrun.dmm
+10 -5
View File
@@ -149,6 +149,7 @@
/area/tether_away/debrisfield/explored)
"aD" = (
/obj/machinery/processor,
/obj/item/slime_extract/dark_blue,
/turf/simulated/floor/tiled/white/airless,
/area/tether_away/debrisfield/explored)
"aE" = (
@@ -383,6 +384,10 @@
/obj/item/weapon/tool/prybar/red,
/turf/simulated/floor/airless,
/area/tether_away/debrisfield/explored)
"bq" = (
/mob/living/simple_mob/slime/feral/dark_blue,
/turf/simulated/floor/airless,
/area/tether_away/debrisfield/explored)
(1,1,1) = {"
aa
@@ -555,7 +560,7 @@ ac
ac
ac
ac
ac
bq
ac
ab
aY
@@ -702,7 +707,7 @@ ad
ad
ab
ad
aT
ad
ab
aa
aa
@@ -807,7 +812,7 @@ ad
ab
aB
ad
ad
aT
aX
ad
ad
@@ -859,7 +864,7 @@ ad
ad
ad
ab
aT
ad
ad
aX
ab
@@ -1025,7 +1030,7 @@ ad
ad
ad
ad
aT
ad
ad
ab
aa
maps/tether/submaps/space/pois/ship_sup_exploded.dmm
+5 -1
View File
@@ -48,6 +48,10 @@
/obj/item/weapon/material/shard/shrapnel,
/turf/simulated/shuttle/plating/airless,
/area/tether_away/debrisfield/explored)
"al" = (
/obj/structure/ghost_pod/manual/lost_drone/dogborg,
/turf/simulated/shuttle/floor/airless,
/area/tether_away/debrisfield/explored)
"am" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/oil,
@@ -633,7 +637,7 @@ ag
ag
am
ab
aA
al
aA
aM
aM
maps/tether/submaps/underdark_pois/Corridor.dmm
+452
View File
@@ -0,0 +1,452 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/mine/explored/underdark)
"b" = (
/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
/area/mine/explored/underdark)
"c" = (
/obj/tether_away_spawner/underdark_normal,
/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
/area/mine/explored/underdark)
(1,1,1) = {"
a
a
a
b
b
b
b
b
a
a
a
a
a
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
a
b
b
b
b
b
b
a
a
a
a
a
a
a
a
a
a
a
"}
(3,1,1) = {"
a
a
a
b
b
b
b
b
b
b
b
b
b
a
a
a
a
a
a
a
"}
(4,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
a
a
a
a
a
a
a
"}
(5,1,1) = {"
b
b
b
b
b
b
c
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(6,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(7,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(8,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(9,1,1) = {"
b
b
b
b
b
b
a
a
a
a
b
b
b
b
b
b
b
b
b
b
"}
(10,1,1) = {"
b
b
b
b
b
b
a
a
a
a
b
b
b
b
b
b
b
b
b
b
"}
(11,1,1) = {"
b
b
b
b
b
b
a
a
a
a
b
b
b
b
b
b
b
b
b
b
"}
(12,1,1) = {"
b
b
b
b
b
b
a
a
a
a
b
b
b
b
b
b
b
b
b
b
"}
(13,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(14,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(15,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(16,1,1) = {"
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(17,1,1) = {"
a
a
a
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
"}
(18,1,1) = {"
a
a
a
b
b
b
b
b
b
b
b
b
b
b
b
b
b
a
a
a
"}
(19,1,1) = {"
a
a
a
b
b
b
b
b
b
b
b
b
b
b
b
b
b
a
a
a
"}
(20,1,1) = {"
a
a
a
b
b
b
b
b
b
b
b
b
b
b
b
b
b
a
a
a
"}
maps/tether/submaps/underdark_pois/_templates.dm
+7 -1
View File
@@ -79,6 +79,12 @@
cost = 20
allow_duplicates = FALSE
/datum/map_template/underdark/corridor // Bob was a derp
name = "Underdark Corridor"
mappath = 'Corridor.dmm'
cost = 5
allow_duplicates = FALSE
/*
/datum/map_template/underdark/boss_mob
name = "Underdark Boss Mob Spawn"
@@ -90,4 +96,4 @@
name = "Some Kinda Treasure" //A name, only visible to admins
mappath = 'hard_mob.dmm' //The .dmm file for this template (in this folder)
cost = 10 //How 'valuable' this template is
*/
*/
maps/tether/tether-01-surface1.dmm
+12
View File
@@ -25268,6 +25268,7 @@
/area/crew_quarters/visitor_lodging)
"chE" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/weapon/towel/random,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_8)
"chF" = (
@@ -25279,6 +25280,8 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/structure/table/standard,
/obj/random/soap,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_8)
"chH" = (
@@ -25493,6 +25496,7 @@
/area/crew_quarters/sleep/Dorm_6)
"cis" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/weapon/towel/random,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_6)
"cit" = (
@@ -25504,6 +25508,8 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/structure/table/standard,
/obj/random/soap,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_6)
"civ" = (
@@ -25716,6 +25722,7 @@
/area/crew_quarters/visitor_laundry)
"cjf" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/weapon/towel/random,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
"cjg" = (
@@ -25727,6 +25734,8 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/structure/table/standard,
/obj/random/soap,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_4)
"cji" = (
@@ -25964,6 +25973,7 @@
/area/crew_quarters/sleep/Dorm_2)
"cjQ" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/weapon/towel/random,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
"cjR" = (
@@ -25975,6 +25985,8 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/structure/table/standard,
/obj/random/soap,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_2)
"cjT" = (
maps/tether/tether-02-surface2.dmm
+138 -36
View File
@@ -1051,12 +1051,11 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"cq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm{
dir = 1;
pixel_y = -22
},
/turf/simulated/floor/plating,
/turf/simulated/floor,
/area/maintenance/lower/rnd)
"cr" = (
/obj/structure/railing{
@@ -1226,6 +1225,14 @@
/obj/effect/floor_decal/corner/mauve/border{
dir = 1
},
/obj/structure/table/rack,
/obj/item/weapon/rig/hazmat/equipped,
/obj/machinery/light_switch{
dir = 2;
name = "light switch ";
pixel_x = 0;
pixel_y = 36
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"cP" = (
@@ -4379,8 +4386,6 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/maintenance/lower/bar)
"jv" = (
/obj/structure/table/rack,
/obj/item/weapon/rig/hazmat/equipped,
/obj/effect/floor_decal/borderfloor{
dir = 8;
icon_state = "borderfloor";
@@ -4389,9 +4394,12 @@
/obj/effect/floor_decal/corner/mauve/border{
dir = 8
},
/obj/machinery/light_switch{
dir = 4;
pixel_x = -28
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
@@ -4453,7 +4461,7 @@
/area/rnd/rdoffice)
"jF" = (
/mob/living/simple_mob/slime/xenobio/rainbow/kendrick,
/turf/simulated/floor/tiled,
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"jG" = (
/obj/effect/decal/cleanable/dirt,
@@ -5119,8 +5127,9 @@
/obj/machinery/photocopier/faxmachine{
department = "Research Director's Office"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
@@ -5429,10 +5438,10 @@
/obj/machinery/computer/skills{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"lG" = (
@@ -12575,6 +12584,28 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"yg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
},
/obj/machinery/door/window/eastleft{
name = "Kendrick's Pen";
req_access = list(30);
req_one_access = list(19)
},
/obj/machinery/door/window/eastleft{
dir = 8;
icon_state = "left";
name = "Kendrick's Pen";
req_access = list(30);
req_one_access = list(19)
},
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"yi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12658,6 +12689,30 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/asmaint2)
"yr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"yw" = (
/obj/structure/grille,
/obj/machinery/door/firedoor,
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/turf/simulated/floor/plating,
/area/rnd/rdoffice)
"yx" = (
/obj/structure/cable/cyan{
d1 = 1;
@@ -13470,6 +13525,9 @@
"Bw" = (
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"BD" = (
/turf/simulated/floor,
/area/maintenance/lower/rnd)
"BH" = (
/obj/structure/catwalk,
/obj/random/junk,
@@ -16421,6 +16479,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"Jg" = (
/obj/machinery/light{
dir = 1
},
/obj/item/toy/plushie/farwa,
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"Ji" = (
/turf/simulated/wall/r_wall,
/area/engineering/lower/lobby)
@@ -17068,6 +17133,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"MK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"MN" = (
/obj/effect/floor_decal/borderfloor/shifted{
icon_state = "borderfloor_shifted";
@@ -17765,6 +17840,19 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"PN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/alarm{
dir = 1;
pixel_y = -22
},
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"PP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -18106,6 +18194,10 @@
/obj/structure/simple_door/wood,
/turf/simulated/floor/wood,
/area/maintenance/lower/atmos)
"RO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"RR" = (
/obj/structure/catwalk,
/obj/effect/floor_decal/rust,
@@ -18263,6 +18355,12 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/east_stairs_two)
"SQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"SV" = (
/obj/structure/bed/chair,
/obj/effect/floor_decal/rust,
@@ -19577,6 +19675,10 @@
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/wood,
/area/vacant/vacant_bar_upper)
"YV" = (
/obj/machinery/camera/network/research,
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"YX" = (
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
@@ -26078,7 +26180,7 @@ ka
cM
ka
ka
kb
ka
ks
ks
ks
@@ -26218,9 +26320,9 @@ ho
jy
bz
cp
il
jy
jy
ii
ac
ac
ks
lk
lI
@@ -26358,11 +26460,11 @@ um
vO
ho
jy
jy
il
jy
jy
jy
BD
cF
cF
cF
cF
ks
ll
lM
@@ -26501,10 +26603,10 @@ hq
ho
jy
bz
il
jy
jy
jy
cF
YV
jF
SQ
ks
lm
ma
@@ -26643,10 +26745,10 @@ vW
vA
jx
bz
il
jy
jy
jy
cF
Jg
RO
PN
ks
lC
mb
@@ -26785,10 +26887,10 @@ hq
ho
jy
bz
il
cF
cF
cF
yw
yg
cF
cF
cF
@@ -26926,7 +27028,7 @@ hq
ho
ho
jy
jy
BD
cq
cF
cN
@@ -27072,7 +27174,7 @@ il
il
cF
cO
jE
MK
kK
lE
jE
@@ -27214,7 +27316,7 @@ il
bz
cF
dP
jE
yr
la
lF
md
@@ -27356,7 +27458,7 @@ bz
bz
cF
fQ
jF
jE
kq
lG
me
maps/tether/tether-05-station1.dmm
+490 -264
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-06-station2.dmm
+6585 -6056
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-07-station3.dmm
+8246 -8679
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-10-colony.dmm
+932 -690
View File
File diff suppressed because it is too large Load Diff
nano/images/nanomap_z1.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Some files were not shown because too many files have changed in this diff Show More