Merge pull request #9806 from TheFurryFeline/TFF-Fix_Dem_Stairs

Fix Stairs objpath
This commit is contained in:
Novacat
2021-02-27 11:45:29 -05:00
committed by GitHub
36 changed files with 63808 additions and 63611 deletions
-5
View File
@@ -183,11 +183,6 @@ var/global/datum/controller/subsystem/ticker/ticker
if(adm["total"] == 0)
send2adminirc("A round has started with no admins online.")
/* supply_controller.process() //Start the supply shuttle regenerating points -- TLE // handled in scheduler
master_controller.process() //Start master_controller.process()
lighting_controller.process() //Start processing DynamicAreaLighting updates
*/
current_state = GAME_STATE_PLAYING
Master.SetRunLevel(RUNLEVEL_GAME)
+7
View File
@@ -0,0 +1,7 @@
#define GOAL_GENERAL "Common Goal"
#define GOAL_MEDICAL "Medical Goal"
#define GOAL_SECURITY "Security Goal"
#define GOAL_ENGINEERING "Engineering Goal"
#define GOAL_CARGO "Cargo Goal"
#define GOAL_RESEARCH "Research Goal"
+99
View File
@@ -0,0 +1,99 @@
GLOBAL_LIST(department_goals)
GLOBAL_LIST(active_department_goals)
/hook/startup/proc/initializeDepartmentGoals()
GLOB.department_goals = list(GOAL_GENERAL, GOAL_MEDICAL, GOAL_SECURITY, GOAL_ENGINEERING, GOAL_CARGO, GOAL_RESEARCH)
GLOB.active_department_goals = list(GOAL_GENERAL, GOAL_MEDICAL, GOAL_SECURITY, GOAL_ENGINEERING, GOAL_CARGO, GOAL_RESEARCH)
for(var/category in GLOB.department_goals)
GLOB.department_goals[category] = list()
for(var/subtype in subtypesof(/datum/goal))
var/datum/goal/SG = new subtype()
if(SG.name == "goal")
continue
if(SG.category == category)
GLOB.department_goals[category] |= SG
for(var/category in GLOB.active_department_goals)
GLOB.active_department_goals[category] = list()
var/list/cat_goals = GLOB.department_goals[category]
var/goal_count = rand(2,4)
for(var/count = 1 to goal_count)
var/datum/goal/G
if(LAZYLEN(cat_goals))
G = pick(cat_goals)
if(G)
G.active_goal = TRUE
cat_goals -= G
GLOB.active_department_goals[category] |= G
/hook/roundend/proc/checkDepartmentGoals()
for(var/category in GLOB.active_department_goals)
var/list/cat_goals = GLOB.active_department_goals[category]
to_world("<span class='filter_system'><b>[category]</b></span>")
if(!LAZYLEN(cat_goals))
to_world("<span class='filter_system'>There were no assigned goals!</span>")
else
for(var/datum/goal/G in cat_goals)
var/success = G.check_completion()
to_world("<span class='filter_system'>[success ? "<span class='notice'>[G.name]</span>" : "<span class='warning'>[G.name]</span>"]</span>")
to_world("<span class='filter_system'>[G.goal_text]</span>")
/datum/goal
var/name = "goal"
var/goal_text = "Do nothing! Congratulations."
var/active_goal = FALSE
var/category = GOAL_GENERAL
/datum/goal/proc/check_completion()
return FALSE
/datum/goal/common
name = "goal"
goal_text = "Congratulations, you still do nothing."
/datum/goal/medical
name = "goal"
goal_text = "Congratulations, you still do nothing."
category = GOAL_MEDICAL
/datum/goal/security
name = "goal"
goal_text = "Congratulations, you still do nothing."
category = GOAL_SECURITY
/datum/goal/engineering
name = "goal"
goal_text = "Congratulations, you still do nothing."
category = GOAL_ENGINEERING
/datum/goal/cargo
name = "goal"
goal_text = "Congratulations, you still do nothing."
category = GOAL_CARGO
/datum/goal/research
name = "goal"
goal_text = "Congratulations, you still do nothing."
category = GOAL_RESEARCH
+57
View File
@@ -0,0 +1,57 @@
/*
* lbnesquik - Github
* Provided massive components of this. Polaris PR #5720.
*/
//This is for the round end stats system.
//roundstat is used for easy finding of the variables, if you ever want to delete all of this,
//just search roundstat and you'll find everywhere this thing reaches into.
//It used to be bazinga but it only fly with microwaves.
GLOBAL_VAR_INIT(cans_opened_roundstat, 0)
GLOBAL_VAR_INIT(lights_switched_on_roundstat, 0)
GLOBAL_VAR_INIT(turbo_lift_floors_moved_roundstat, 0)
GLOBAL_VAR_INIT(lost_limbs_shift_roundstat, 0)
GLOBAL_VAR_INIT(seed_planted_shift_roundstat, 0)
GLOBAL_VAR_INIT(step_taken_shift_roundstat, 0)
GLOBAL_VAR_INIT(destroyed_research_items_roundstat, 0)
GLOBAL_VAR_INIT(items_sold_shift_roundstat, 0)
GLOBAL_VAR_INIT(disposals_flush_shift_roundstat, 0)
GLOBAL_VAR_INIT(rocks_drilled_roundstat, 0)
GLOBAL_VAR_INIT(mech_destroyed_roundstat, 0)
/hook/roundend/proc/RoundTrivia()//bazinga
var/list/valid_stats_list = list() //This is to be populated with the good shit
if(GLOB.lost_limbs_shift_roundstat > 1)
valid_stats_list.Add("[GLOB.lost_limbs_shift_roundstat] limbs left their owners bodies this shift, oh no!")
else if(GLOB.destroyed_research_items_roundstat > 13)
valid_stats_list.Add("[GLOB.destroyed_research_items_roundstat] objects were destroyed in the name of Science! Keep it up!")
else if(GLOB.mech_destroyed_roundstat > 1)
valid_stats_list.Add("[GLOB.mech_destroyed_roundstat] mechs were destroyed this shift. What did you do?")
else if(GLOB.seed_planted_shift_roundstat > 20)
valid_stats_list.Add("[GLOB.seed_planted_shift_roundstat] were planted according to our sensors this shift.")
if(GLOB.rocks_drilled_roundstat > 80)
valid_stats_list.Add("Our strong miners pulverized a whole [GLOB.rocks_drilled_roundstat] piles of pathetic rubble.")
else if(GLOB.items_sold_shift_roundstat > 15)
valid_stats_list.Add("The vending machines sold [GLOB.items_sold_shift_roundstat] items today.")
else if(GLOB.step_taken_shift_roundstat > 900)
valid_stats_list.Add("The employees walked a total of [GLOB.step_taken_shift_roundstat] steps for this shift! It should put them on the road to fitness!")
if(GLOB.cans_opened_roundstat > 0)
valid_stats_list.Add("[GLOB.cans_opened_roundstat] cans were drank today!")
else if(GLOB.lights_switched_on_roundstat > 0)
valid_stats_list.Add("[GLOB.lights_switched_on_roundstat] light switches were flipped today!")
else if(GLOB.turbo_lift_floors_moved_roundstat > 20)
valid_stats_list.Add("The elevator moved up [GLOB.turbo_lift_floors_moved_roundstat] floors today!")
else if(GLOB.disposals_flush_shift_roundstat > 40)
valid_stats_list.Add("The disposal system flushed a whole [GLOB.disposals_flush_shift_roundstat] times for this shift. We should really invest in waste treatement.")
if(LAZYLEN(valid_stats_list))
to_world("<B>Shift trivia!</B>")
for(var/body in valid_stats_list)
to_world("[body]")
+11 -1
View File
@@ -186,4 +186,14 @@
/datum/category_item/underwear/undershirt/pinkblack_tshirt
name = "Pink and Black T-Shirt"
icon_state = "pinkblack_tshirt"
icon_state = "pinkblack_tshirt"
/datum/category_item/underwear/undershirt/turtle
name = "Turtleneck"
icon_state = "turtleneck"
has_color = TRUE
/datum/category_item/underwear/undershirt/sleevelessturtle
name = "Turtleneck, Sleeveless"
icon_state = "sleevelessturtle"
has_color = TRUE
+1
View File
@@ -68,6 +68,7 @@
L.updateicon()
area.power_change()
GLOB.lights_switched_on_roundstat++
/obj/machinery/light_switch/power_change()
+1 -1
View File
@@ -572,7 +572,7 @@ GLOBAL_LIST_EMPTY(vending_products)
vend_ready = 1
currently_vending = null
SStgui.update_uis(src)
GLOB.items_sold_shift_roundstat++
/obj/machinery/vending/proc/do_logging(datum/stored_item/vending_product/R, mob/user, var/vending = 0)
if(user.GetIdCard())
+2
View File
@@ -322,6 +322,8 @@
if(smoke_possible) //Just making sure nothing is running.
qdel(smoke_system)
GLOB.mech_destroyed_roundstat++
QDEL_NULL(pr_int_temp_processor)
QDEL_NULL(pr_inertial_movement)
QDEL_NULL(pr_give_air)
+22 -22
View File
@@ -75,61 +75,61 @@
<center><h1>Food for Dummies 2</h1></center>
<h5>Penned by Ali Big</h5>
<p><b>Hello Newbie</b>, congratz on deciding to make food! This guide assumes you know absolutely nothing, so fret not, the information here will help you prepare food for your hungry crewmates!</p>
<h3>Workspace prep:</h3>
<h3>Workspace prep:</h3>
This step is simple: merely go to the Grill, Oven, and Fryer and turn everything on so you do not need to wait for them to warm up later; they wont start a fire unless food is left in them unchecked. It is also highly suggested to lay out at least a few Measuring Cups on the counters for ease of use.
<h3>Basic ingredient prep:</h3>
<h3>Basic ingredient prep:</h3>
In the lockers and fridges, you have all your needed supplies for this guide, so look through them and familiarize yourself! This guide will only use ingredients you already have access to, so don't worry about missing items!
<h2>Part 1: How to Create Various Essential Ingredients with What You Have</h2>
<h3>Dough Creation:</h3>
<h3>Dough Creation:</h3>
The basis for a large quantity of meals. Simply take an Egg, crack it into a Beaker or Measuring Cup, and then add 10 units of Flour to create Dough.
<h3>Dough Creation part 2:</h3>
<h3>Dough Creation part 2:</h3>
With Dough, you can make a wide variety of base ingredients. Flattening it with a Rolling Pin makes Flat Dough. Flat Dough can be cooked in a Microwave for Flatbread, or if one adds Water and Flour in with the Flat Dough in the Microwave you get a Tortilla. Water can be obtained by filling a Cup at the Sink or Soda Machine.
<h3>Dough Creation Part 3:</h3>
<h3>Dough Creation Part 3:</h3>
Alternatively, Flat Dough can be cut with a Knife to make Dough Slices, and those can be cut to make Spaghetti.
<h3>Cheese Creation:</h3>
<h3>Cheese Creation:</h3>
A common topping. Take a bottle of Universal Enzyme, put it in a Beaker or Measuring Cup, and add Milk until a Cheese Wheel pops out. Then cut the Cheese Wheel with a Knife to make Cheese Wedges, all recipes use Wedges not the full Wheel.
<h3>Tofu Creation:</h3>
Same as cheese, but with Soymilk!
<h3>Meatball Creation:</h3>
<h3>Meatball Creation:</h3>
Mix Animal protein and Flour, to create Animal Protein grind down some Meat in the grinder, then remove the beaker and add Flour.
<h3>Meat Uses:</h3>
<h3>Meat Uses:</h3>
Full pieces of Meat can be cut for Raw Cutlets, which can be cut once more to make Raw Bacon. Though be sure not to cut all of your meat, plenty of recipes need a full uncut piece!
<h2>Part 2: Putting It All Together</h2>
<p>Now that you know the fundamentals of how to make the base ingredients, here are some fairly easy recipes to put them together into something enjoyable for the crew.</p>
<h4>Warning: recipes are upscale able, so you can add multiple of the same ingredients in the same ratio to cook lots of food at once!</h4>
<h4>Warning: recipes are upscale able, so you can add multiple of the same ingredients in the same ratio to cook lots of food at once!</h4>
<h4>Warning: do not try and cook multiple recipes at once as it is very likely it will default to a different recipe or will just cook the one and just "grill, bake, etc." the rest of the ingredients.</h4>
<h2>Burgers:</h2>
<h2>Burgers:</h2>
<b>The cornerstone of basic food:</b> to prepare these, microwave a piece of Dough to get a bun and grab a piece of Meat. Open the Grill, remove the Rack, and add both Bun and Meat to the Rack. Then, place the Rack back into the Grill to cook and remove it once finished. If you feel fancy, you can add cheese afterwards for a cheeseburger.
<h2>Meat Pie:</h2>
<h2>Meat Pie:</h2>
Flat Dough and Meat in an Oven Pan, same way you use the Grill; take the Pan out, put the ingredients in, and place it back to cook. Simple, but very good looking and tasty!
<h2>Burritos:</h2>
<h2>Burritos:</h2>
Burritos: A personal favorite due to flexibility of options: Use a Tortilla as a base for all of these. For a Chili one, add 2 Meatballs and 1 Space Spice (found near the Flour) to the Microwave; very simple and filling! Add a Cheese Wedge instead of the spice to make a queso burrito. For a Breakfast Wrap, add a whole Egg, Cooked Bacon (Raw Bacon cooked in the Microwave), and Cheese in with the Tortilla. For Vegan Burritos, just cook a Tortilla and Tofu together in the Microwave.
<h2>Tacos:</h2>
<h2>Tacos:</h2>
Use a tortilla then 1 cooked Cutlet, and a Cheese Wedge. Very easy to mass produce, great in a pinch!
<h2>Cheesy Nachos:</h2>
<h2>Cheesy Nachos:</h2>
Tortilla, Cheese and 1 unit of Salt in the microwave, the perfect Finger Food!
<h2>Spaghetti:</h2>
<h2>Spaghetti:</h2>
Without Tomatos from Botany it's not going to be the flashiest, but one can make Boiled Spaghetti with Spaghetti and Water in the Microwave. Kitsune Udon can be made with Spaghetti, Egg Yolk (crack egg in beaker then add to microwave), and Tofu. Spaghetti and Meatballs can be made by doing the Boiled Spaghetti Recipe and adding 2 Meatballs; adding 4 Meatballs into the initial mix makes Spesslaw. Lastly, Spaghetti, Milk, and Cheese in the Oven makes Macaroni and Cheese.
<h2>Steak:</h2>
For the pure meat eaters, just add Meat, 1 Salt, and 1 Pepper into the grill for them, and try not to cry as they use up all your Meat quickly. (There's a second Meat Locker in the freezer room if you do run out!)
<h2>Donk Pockets:</h2>
<h2>Donk Pockets:</h2>
Dough and Meatball in the Microwave, though we already have plenty lying around the station.
<h2>Eggs:</h2>
<h2>Eggs:</h2>
Fried Egg, 1 Egg 1 Salt, 1 Pepper in a Microwave. Bacon and Eggs if you combine Cooked Bacon and Fried Egg in the Microwave. Great way to start the shift!
<h2>Part 3: Final Notes</h2>
<p>These recipes only scratch the surface, but it's all things that can be done with what is pre-provided. If you have a partner in Botany, feel free to request more meat or any other supplies to try new recipes!</p>
<p>These recipes only scratch the surface, but it's all things that can be done with what is pre-provided. If you have a partner in Botany, feel free to request more meat or any other supplies to try new recipes!</p>
<p>The Fryer, CondiMaster3000, and other nearby devices have been deliberately left out of this guide; as you get more advanced feel free to experiment with them, though be careful with the Fryer especially as it's the #1 source of fires for learning chefs, myself included. The one other machine that is worth understanding is the <b>Gibber</b> in the freezer room. If you are delivered fish or such they can be gibbed for extra Meat, though you may need to butcher the parts with a Knife afterwards to get usable Meat! Though if the meat is purple or comes from Koi or Spacecarp <b>do not directly serve it to crew!</b> It contains toxins that are better taken care of by other departments. </p>
<p>Some wonderful websites share recipes and tips for learning chefs on the Extranet! Look on your PDA or preferred device at https://wiki.vore-station.net/Guide_to_Food_and_Drink and https://vore-station.net/infodump/recipes_food.html for further tips, though do note the latter is more accurate in regard to recipes. Happy cooking!</p>
<h4>Pro Tips:</h4>
<h4>((The Food Bags in the Chef's Closet are great for moving a lot of food at once!))</h4>
<h4>((The Food Bags in the Chef's Closet are great for moving a lot of food at once!))</h4>
<h4>((Stay out of the Freezer if you're Cold Blooded!))</h4>
<h4>((The websites linked above are also on our stations wiki. Which is always in need of helping heads to fix it up. The recipes listed on the web link may not be fully accurate so please don't be afraid to pop into the discord wiki channel and lend a hand!))</h4>
</body>
</html>
"}
//accurate as of 2/17/21
/obj/item/weapon/book/manual//bar_guide
//accurate as of 2/23/21
/obj/item/weapon/book/manual/bar_guide
name = "How to Alcohol (And other Drinks)"
desc = "A helpful guide to the world of barkeeping."
icon_state = "bar-guide"
@@ -213,7 +213,7 @@
1 part Beer, 2 parts Ale
<h3>Whiskey Cola:</h3>
2 parts Whiskey, 1 part Space Cola
<h3>Binman Bliss:
<h3>Binman Bliss:</h3>
1 part Sake, 1 part Tequila
<h1>High Alcohol</h1>
+2 -2
View File
@@ -148,7 +148,7 @@ var/list/flooring_types
icon_base = "grass_sif"
build_type = /obj/item/stack/tile/grass/sif
has_base_range = 1
/decl/flooring/grass/sif/forest
name = "thick growth"
desc = "A natural moss that has adapted to the sheer cold climate."
@@ -379,7 +379,7 @@ var/list/flooring_types
/decl/flooring/linoleum
name = "linoleum"
desc = "It's like the 2390's all over again."
desc = "It's like the 2090's all over again." // VOREStation Lore Edit - we're not past 2390's yet
icon = 'icons/turf/flooring/linoleum.dmi'
icon_base = "lino"
can_paint = 1
+1 -6
View File
@@ -57,12 +57,8 @@
// Create robolimbs for chargen.
populate_robolimb_list()
//Must be done now, otherwise ZAS zones and lighting overlays need to be recreated.
//createRandomZlevel() //VOREStation Removal: Deprecated
master_controller = new /datum/controller/game_controller()
Master.Initialize(10, FALSE, TRUE)
Master.Initialize(10, FALSE)
spawn(1)
master_controller.setup()
@@ -408,7 +404,6 @@ var/world_topic_spam_protect_time = world.timeofday
to_world("<span class='boldannounce'>Rebooting world immediately due to host request</span>")
else
Master.Shutdown() //run SS shutdowns
//processScheduler.stop() //VOREStation Removal
for(var/client/C in GLOB.clients)
if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
C << link("byond://[config.server]")
@@ -130,14 +130,40 @@
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
siemens_coefficient = 0.5
icon = 'icons/obj/clothing/hats_vr.dmi'
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
var/away_planes = null
plane_slots = list(slot_head)
var/hud_active = 1
var/activation_sound = 'sound/items/nif_click.ogg'
/obj/item/clothing/head/helmet/space/void/responseteam/verb/toggle()
set category = "Object"
set name = "Toggle Mark 7 Suit HUD"
set src in usr
if(usr.canmove && !usr.stat && !usr.restrained())
if(src.hud_active)
away_planes = enables_planes
enables_planes = null
to_chat(usr, "You disable the inbuilt heads-up display.")
hud_active = 0
else
enables_planes = away_planes
away_planes = null
to_chat(usr, "You enable the inbuilt heads-up display.")
hud_active = 1
usr << activation_sound
usr.recalculate_vis()
/obj/item/clothing/head/helmet/space/void/responseteam/command
name = "Mark VII-C Emergency Response Team Commander Helmet"
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED,VIS_AUGMENTED)
/obj/item/clothing/head/helmet/space/void/responseteam/medical
name = "Mark VII-M Emergency Medical Response Helmet"
icon_state = "erthelmet_m"
item_state = "erthelmet_m"
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_AUGMENTED)
/obj/item/clothing/head/helmet/space/void/responseteam/engineer
name = "Mark VII-E Emergency Engineering Response Helmet"
@@ -148,6 +174,7 @@
name = "Mark VII-S Emergency Security Response Helmet"
icon_state = "erthelmet_s"
item_state = "erthelmet_s"
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_WANTED,VIS_AUGMENTED)
/obj/item/clothing/head/helmet/space/void/responseteam/janitor
name = "Mark VII-J Emergency Cleanup Response Helmet"
+1
View File
@@ -44,6 +44,7 @@
/obj/item/weapon/reagent_containers/food/drinks/proc/open(mob/user)
playsound(src,"canopen", rand(10,50), 1)
GLOB.cans_opened_roundstat++
to_chat(user, "<span class='notice'>You open [src] with an audible pop!</span>")
flags |= OPENCONTAINER
+3 -2
View File
@@ -17,10 +17,10 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/Initialize(var/mapload, var/planttype)
. = ..()
if(!dried_type)
dried_type = type
pixel_x = rand(-5.0, 5)
pixel_y = rand(-5.0, 5)
@@ -292,6 +292,7 @@
if(seed.get_trait(TRAIT_SPREAD) > 0)
to_chat(user, "<span class='notice'>You plant the [src.name].</span>")
new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed)
GLOB.seed_planted_shift_roundstat++
qdel(src)
return
@@ -44,6 +44,7 @@
/obj/item/seeds/watermelonseed = 3,
/obj/item/seeds/wheatseed = 3,
/obj/item/seeds/whitebeetseed = 3,
/obj/item/seeds/wurmwoad = 3,
/obj/item/seeds/shrinkshroom = 3,
/obj/item/seeds/megashroom = 3)
@@ -101,5 +102,6 @@
/obj/item/seeds/watermelonseed = 3,
/obj/item/seeds/wheatseed = 3,
/obj/item/seeds/whitebeetseed = 3,
/obj/item/seeds/wurmwoad = 3,
/obj/item/seeds/shrinkshroom = 3,
/obj/item/seeds/megashroom = 3)
+2
View File
@@ -204,6 +204,8 @@
qdel(S)
GLOB.seed_planted_shift_roundstat++
check_health()
update_icon()
+2
View File
@@ -556,6 +556,8 @@ turf/simulated/mineral/floor/light_corner
for (var/i = 1 to mineral.result_amount - mined_ore)
DropMineral()
GLOB.rocks_drilled_roundstat++
//destroyed artifacts have weird, unpleasant effects
//make sure to destroy them before changing the turf though
if(artifact_find && artifact_fail)
@@ -913,3 +913,8 @@ mob/observer/dead/MayRespawn(var/feedback = 0)
to_chat(src, "<span class='ghostalert'><a href=?src=[REF(src)];reenter=1>(Click to re-enter)</a></span>")
if(sound)
SEND_SOUND(src, sound(sound))
/mob/observer/dead/verb/respawn()
set name = "Respawn"
set category = "Ghost"
src.abandon_mob()
@@ -252,6 +252,7 @@
return
var/S = pick(footstep_sounds)
GLOB.step_taken_shift_roundstat++
if(!S) return
// Play every 20 steps while walking, for the sneak
@@ -36,11 +36,13 @@
data["drones"] = list()
for(var/mob/living/silicon/robot/drone/D in mob_list)
if(D.z != z)
//VOREStation Edit - multiz lol
if(!(D.z in using_map.get_map_levels(z, TRUE, 0)))
continue
//VOREStation Edit - multiz lol
if(D.foreign_droid)
continue
data["drones"].Add(list(list(
"name" = D.real_name,
"active" = D.stat != 2,
@@ -171,7 +171,7 @@
else if(T.dead) //It's probably dead otherwise.
T.remove_dead(user)
else
to_chat(user, "Harvesting \a [target] is not the purpose of this tool. The [src] is for plants being grown.")
to_chat(user, "Harvesting \a [target] is not the purpose of this tool. [src] is for plants being grown.")
// A special tray for the service droid. Allow droid to pick up and drop items as if they were using the tray normally
// Click on table to unload, click on item to load. Otherwise works identically to a tray.
+2
View File
@@ -856,6 +856,8 @@ Note that amputating the affected organ does in fact remove the infection from t
else if(disintegrate == DROPLIMB_EDGE && nonsolid) //VOREStation Add End
disintegrate = DROPLIMB_BLUNT //splut
GLOB.lost_limbs_shift_roundstat++
switch(disintegrate)
if(DROPLIMB_EDGE)
if(!clean)
+2 -1
View File
@@ -31,7 +31,7 @@
// find the attached trunk (if present) and init gas resvr.
/obj/machinery/disposal/Initialize()
. = ..()
trunk = locate() in loc
if(!trunk)
mode = 0
@@ -480,6 +480,7 @@
playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0)
last_sound = world.time
sleep(5) // wait for animation to finish
GLOB.disposals_flush_shift_roundstat++
H.init(src, air_contents) // copy the contents of disposer to holder
+2
View File
@@ -164,6 +164,8 @@
doors_closing = 0 // The doors weren't open, so they are done closing
GLOB.turbo_lift_floors_moved_roundstat++
var/area/turbolift/origin = locate(current_floor.area_ref)
if(target_floor == current_floor)
+1
View File
@@ -82,6 +82,7 @@ varonis - Xenochimera
verkister - Xenochimera
verysoft - Black-Eyed Shadekin
vitoras - Protean
voidalynx - Black-Eyed Shadekin
voidalynx - Protean
wickedtemp - Shadekin Empathy
xioen - Diona
Binary file not shown.

Before

Width:  |  Height:  |  Size: 727 KiB

After

Width:  |  Height:  |  Size: 727 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

+12 -12
View File
@@ -462,6 +462,10 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating/eris/under/airless,
/area/talon/maintenance/deckone_starboard_fore_wing)
"bb" = (
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/eris/steel,
/area/talon/deckone/central_hallway)
"bc" = (
/obj/structure/catwalk,
/obj/structure/handrail{
@@ -1553,6 +1557,10 @@
},
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/talon/deckone/medical)
"dh" = (
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled/eris/steel,
/area/talon/deckone/central_hallway)
"dj" = (
/obj/structure/table/standard,
/obj/item/weapon/storage/box/handcuffs,
@@ -2227,10 +2235,6 @@
},
/turf/simulated/floor/tiled/eris/dark/cyancorner,
/area/talon/deckone/starboard_solar)
"kE" = (
/obj/structure/stairs/west,
/turf/simulated/floor/tiled/eris/steel,
/area/talon/deckone/central_hallway)
"kG" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -2554,10 +2558,6 @@
/obj/item/clothing/accessory/holster/waist,
/turf/simulated/floor/tiled/eris/white/danger,
/area/talon/deckone/armory)
"oe" = (
/obj/structure/stairs/east,
/turf/simulated/floor/tiled/eris/steel,
/area/talon/deckone/central_hallway)
"oh" = (
/obj/effect/shuttle_landmark{
landmark_tag = "talon_aft";
@@ -15159,7 +15159,7 @@ Pg
dH
Bj
Ae
kE
dh
iT
sz
tr
@@ -15566,7 +15566,7 @@ UP
aM
xK
aM
oe
bb
Nc
YK
YK
@@ -16134,7 +16134,7 @@ gR
aO
nN
aO
kE
dh
DO
yo
yo
@@ -16579,7 +16579,7 @@ kw
fJ
Bj
Jw
oe
bb
AU
IW
Zq
+114 -80
View File
@@ -366,6 +366,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/medical/paramed)
"aaI" = (
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralstairwell)
"aaJ" = (
/obj/structure/table/woodentable,
/obj/item/weapon/folder/white,
@@ -1418,6 +1422,11 @@
/obj/machinery/vending/loadout,
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_laundry)
"acA" = (
/obj/structure/railing,
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralstairwell)
"acB" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -1682,6 +1691,10 @@
/obj/machinery/camera/network/medbay,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/lowerhall)
"ada" = (
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_one)
"adb" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 9
@@ -1741,6 +1754,10 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/medical/mentalhealth)
"adg" = (
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"adh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
@@ -2086,6 +2103,13 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologyaccess)
"adH" = (
/obj/structure/railing{
dir = 8
},
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
"adI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -2990,9 +3014,12 @@
/turf/simulated/wall,
/area/tether/surfacebase/medical/lowerhall)
"aeV" = (
/obj/structure/stairs/north,
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
/obj/structure/railing{
dir = 4
},
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
"aeW" = (
/turf/simulated/wall,
/area/storage/primary)
@@ -4015,6 +4042,9 @@
name = "north bump";
pixel_y = 28
},
/mob/living/simple_mob/vore/aggressive/rat{
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
},
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"agR" = (
@@ -6366,9 +6396,9 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_one)
"akX" = (
/obj/structure/stairs/north,
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_one)
/area/rnd/hallway)
"akY" = (
/obj/structure/railing{
dir = 8
@@ -6710,6 +6740,10 @@
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"alr" = (
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"als" = (
/obj/effect/floor_decal/techfloor{
dir = 6
@@ -6865,6 +6899,15 @@
/obj/structure/railing{
dir = 4
},
/obj/structure/disposalpipe/broken,
/obj/effect/floor_decal/techfloor/hole{
dir = 4
},
/obj/effect/floor_decal/techfloor/hole/right{
dir = 4
},
/obj/effect/decal/cleanable/filth,
/obj/effect/landmark/teleplumb_exit,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"alE" = (
@@ -7782,6 +7825,11 @@
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/sink{
dir = 8;
pixel_x = -12;
pixel_y = 2
},
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"ang" = (
@@ -9234,7 +9282,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/xenoflora)
"apw" = (
/obj/structure/stairs/south,
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/north_stairs_one)
"apx" = (
@@ -9631,6 +9679,10 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/lower/vacant_site)
"aqk" = (
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
"aql" = (
/obj/structure/catwalk,
/turf/simulated/floor/plating,
@@ -10928,6 +10980,10 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/locker)
"asw" = (
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"asx" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -11809,6 +11865,10 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/tether/surfacebase/tram)
"auf" = (
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/surfacebase/outside/outside1)
"aug" = (
/obj/structure/cable/green{
d1 = 2;
@@ -12151,6 +12211,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/solars)
"auI" = (
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/surfacebase/outside/outside1)
"auK" = (
/turf/simulated/wall,
/area/maintenance/lower/solars)
@@ -15148,10 +15212,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
"ayY" = (
/obj/structure/stairs/east,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralstairwell)
"ayZ" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -15557,11 +15617,6 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralstairwell)
"azF" = (
/obj/structure/stairs/east,
/obj/structure/railing,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralstairwell)
"azG" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'CRUSH WARNING'.";
@@ -17901,10 +17956,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals9,
/turf/simulated/floor/tiled/monotile,
/area/rnd/hallway)
"aDL" = (
/obj/structure/stairs/north,
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"aDM" = (
/obj/structure/ladder/up,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -21710,10 +21761,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"aKq" = (
/obj/structure/stairs/north,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"aKr" = (
/obj/structure/railing,
/obj/effect/floor_decal/borderfloor{
@@ -21788,10 +21835,6 @@
/obj/item/weapon/beach_ball/holoball,
/turf/simulated/floor/plating,
/area/maintenance/lower/research)
"aKA" = (
/obj/structure/stairs/south,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
"aKB" = (
/obj/structure/railing{
dir = 8
@@ -29313,10 +29356,6 @@
/obj/structure/curtain/open/shower,
/turf/simulated/floor/plating,
/area/crew_quarters/sleep/maintDorm1)
"aZv" = (
/obj/structure/stairs/south,
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"aZw" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plating,
@@ -29522,14 +29561,6 @@
/obj/item/weapon/bedsheet/mimedouble,
/turf/simulated/floor/plating,
/area/crew_quarters/sleep/maintDorm1)
"baF" = (
/obj/structure/stairs/east,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/surfacebase/outside/outside1)
"baG" = (
/obj/structure/stairs/west,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/surfacebase/outside/outside1)
"baK" = (
/obj/structure/bed/chair/comfy/black{
dir = 8
@@ -31969,7 +32000,6 @@
/turf/simulated/floor/tiled/freezer,
/area/tether/surfacebase/security/brig/bathroom)
"emK" = (
/mob/living/simple_mob/animal/passive/mimepet,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
@@ -31978,6 +32008,7 @@
d2 = 2;
icon_state = "1-2"
},
/mob/living/simple_mob/animal/passive/mimepet,
/turf/simulated/floor/carpet/bcarpet,
/area/tether/surfacebase/funny/mimeoffice)
"eow" = (
@@ -32191,6 +32222,10 @@
dir = 10
},
/area/looking_glass/lg_1)
"fgm" = (
/obj/structure/sign/biohazard,
/turf/simulated/wall,
/area/tether/surfacebase/funny/mimeoffice)
"fiP" = (
/obj/machinery/door/airlock/engineering{
name = "Civilian West Substation";
@@ -32314,6 +32349,15 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor,
/area/tether/surfacebase/security/gasstorage)
"fDO" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"fFb" = (
/obj/machinery/fitness/punching_bag/clown,
/turf/simulated/floor/plating,
@@ -36012,13 +36056,6 @@
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/mimeoffice)
"rww" = (
/obj/structure/stairs/south,
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
"rxq" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -37507,13 +37544,6 @@
/obj/random/mre,
/turf/simulated/floor/carpet/bcarpet,
/area/tether/surfacebase/funny/mimeoffice)
"wRe" = (
/obj/structure/stairs/south,
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
"wUW" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -37629,6 +37659,10 @@
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"xik" = (
/obj/structure/sign/biohazard,
/turf/simulated/wall,
/area/maintenance/lower/trash_pit)
"xnn" = (
/obj/machinery/holoposter,
/turf/simulated/wall,
@@ -41082,7 +41116,7 @@ ajO
adK
aep
adK
aeV
adg
aeo
afq
adK
@@ -42300,9 +42334,9 @@ aad
aad
aad
baq
baF
baF
baF
auf
auf
auf
baq
aad
aad
@@ -43351,7 +43385,7 @@ akr
akx
akE
bdH
akX
ada
akN
aly
alN
@@ -44856,9 +44890,9 @@ aad
aad
aad
baq
baG
baG
baG
auI
auI
auI
baq
aad
aad
@@ -45626,7 +45660,7 @@ vSS
tTC
iqO
xVX
rww
adH
odn
aah
aah
@@ -45662,7 +45696,7 @@ abv
abm
ajW
aDf
aDL
akX
aDg
aFe
aDg
@@ -45768,7 +45802,7 @@ mvM
fLB
dMu
jIc
wRe
aeV
odn
aah
aah
@@ -45804,7 +45838,7 @@ abv
abm
ajX
aDf
aDL
akX
aDg
aFe
aDg
@@ -48086,7 +48120,7 @@ aHv
aIf
aIN
aIh
aKq
alr
aJI
aLC
acv
@@ -48228,7 +48262,7 @@ aHv
aCl
aIO
aIh
aKq
alr
aJI
aLC
aMm
@@ -48402,7 +48436,7 @@ aHx
aTZ
aTZ
aTZ
aZv
asw
aVn
aah
aah
@@ -48544,7 +48578,7 @@ aYm
aHy
aYF
aTZ
aZv
asw
aVn
aah
aah
@@ -49932,7 +49966,7 @@ aBL
aBb
aCy
aIh
aKq
alr
aJI
aJI
aMs
@@ -50074,7 +50108,7 @@ aBQ
aCp
aCz
aIh
aKq
alr
aJI
aJI
aMs
@@ -51068,7 +51102,7 @@ agM
ayG
aJd
ayG
aKA
aqk
aLg
aLM
aMx
@@ -51210,7 +51244,7 @@ agM
aeM
aJd
ayG
aKA
aqk
aLg
aLM
aLM
@@ -52859,8 +52893,8 @@ auq
ady
ayd
aff
ayY
azF
aaI
acA
axP
aeF
axK
@@ -53019,7 +53053,7 @@ ahq
ajP
akY
anq
aaU
xik
gnH
aaU
aaU
@@ -53161,7 +53195,7 @@ ahr
ajR
alu
anr
abJ
fDO
abM
abJ
abJ
@@ -53303,7 +53337,7 @@ ahz
ajZ
alD
anL
lry
fgm
ruj
lry
lry
@@ -53585,7 +53619,7 @@ bbj
aaU
aaU
aaU
aaU
xik
aBo
lry
tHb
+124 -160
View File
@@ -1014,6 +1014,12 @@
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppernorthstairwell{
name = "\improper North Medical Stairwell"
})
"abv" = (
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppernorthstairwell{
name = "\improper North Medical Stairwell"
})
@@ -1112,6 +1118,13 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/recoveryward)
"abC" = (
/obj/structure/railing,
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppernorthstairwell{
name = "\improper North Medical Stairwell"
})
"abD" = (
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
@@ -1371,11 +1384,12 @@
name = "\improper North Medical Stairwell"
})
"abW" = (
/obj/structure/stairs/east,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppernorthstairwell{
name = "\improper North Medical Stairwell"
})
/obj/structure/railing{
dir = 1
},
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"abX" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -1654,12 +1668,10 @@
/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/resleeving)
"acw" = (
/obj/structure/stairs/east,
/obj/structure/railing,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppernorthstairwell{
name = "\improper North Medical Stairwell"
})
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"acx" = (
/obj/machinery/vending/medical{
dir = 8
@@ -5087,12 +5099,12 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"aib" = (
/obj/structure/stairs/east,
/obj/structure/railing{
dir = 1
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
/area/tether/surfacebase/public_garden_two)
"aic" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
@@ -5885,10 +5897,9 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"aji" = (
/obj/structure/stairs/east,
/obj/structure/railing,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside2)
"ajj" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 10
@@ -6974,10 +6985,10 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"akV" = (
/obj/structure/stairs/west,
/obj/structure/railing{
dir = 1
},
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"akW" = (
@@ -7494,7 +7505,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/tether/surfacebase/medical/morgue)
"alM" = (
/obj/structure/stairs/west,
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"alN" = (
@@ -10858,12 +10869,9 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
"arq" = (
/obj/structure/stairs/south,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
/area/tether/surfacebase/north_staires_two)
"arr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/floor_decal/borderfloor{
@@ -12551,9 +12559,9 @@
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"auh" = (
/obj/structure/stairs/south,
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside2)
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
"aui" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloor{
@@ -14740,6 +14748,13 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"ayo" = (
/obj/structure/railing{
dir = 4
},
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
"ayp" = (
/obj/effect/catwalk_plated/dark,
/turf/simulated/open,
@@ -15722,9 +15737,9 @@
/turf/simulated/open,
/area/tether/surfacebase/north_staires_two)
"aAE" = (
/obj/structure/stairs/north,
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/north_staires_two)
/area/rnd/staircase/secondfloor)
"aAF" = (
/obj/structure/railing{
dir = 8
@@ -16311,16 +16326,13 @@
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"aBT" = (
/obj/structure/stairs/north,
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/east_stairs_two)
"aBU" = (
/obj/structure/stairs/north,
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/southhall)
"aBV" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -16895,7 +16907,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"aCU" = (
/obj/structure/stairs/west,
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled/techfloor,
/area/chapel/main)
"aCV" = (
@@ -22898,6 +22910,19 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"aOv" = (
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 8
},
/obj/structure/window/basic{
dir = 1
},
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aOw" = (
/obj/machinery/light_switch{
dir = 4;
@@ -23002,6 +23027,29 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/east_stairs_two)
"aOJ" = (
/obj/structure/railing{
dir = 1
},
/obj/structure/window/basic{
dir = 1
},
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aOK" = (
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 4
},
/obj/structure/window/basic{
dir = 1
},
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aOL" = (
/obj/effect/floor_decal/corner_techfloor_grid{
dir = 9
@@ -24106,10 +24154,6 @@
/obj/random/tool,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"aRk" = (
/obj/structure/stairs/south,
/turf/simulated/floor/tiled,
/area/rnd/staircase/secondfloor)
"aRl" = (
/obj/machinery/requests_console{
department = "Science";
@@ -28197,10 +28241,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/east_stairs_two)
"aZv" = (
/obj/structure/stairs/east,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/east_stairs_two)
"aZC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -31382,13 +31422,6 @@
/obj/item/device/flashlight/lamp/green,
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
"bhJ" = (
/obj/structure/railing{
dir = 4
},
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/tether/surfacebase/fish_farm)
"bhK" = (
/obj/machinery/door/blast/regular{
density = 0;
@@ -33384,10 +33417,6 @@
temperature = 80
},
/area/tcommsat/chamber)
"blF" = (
/obj/structure/stairs/west,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/southhall)
"blG" = (
/turf/simulated/floor/tiled,
/area/tether/surfacebase/southhall)
@@ -33568,42 +33597,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"blW" = (
/obj/structure/stairs/north,
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 8
},
/obj/structure/window/basic{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"blX" = (
/obj/structure/stairs/north,
/obj/structure/railing{
dir = 1
},
/obj/structure/window/basic{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"blY" = (
/obj/structure/stairs/north,
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 4
},
/obj/structure/window/basic{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"blZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
@@ -34202,14 +34195,6 @@
/obj/machinery/door/airlock/maintenance/medical,
/turf/simulated/floor/tiled/techfloor,
/area/tether/surfacebase/medical/breakroom)
"bpL" = (
/obj/effect/decal/cleanable/filth,
/obj/item/weapon/bone/skull,
/mob/living/simple_mob/vore/aggressive/rat{
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
},
/turf/simulated/floor/water/indoors,
/area/tether/surfacebase/fish_farm)
"bpO" = (
/obj/structure/railing{
dir = 4
@@ -34380,14 +34365,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/north)
"fFF" = (
/obj/structure/railing{
dir = 4
},
/obj/structure/catwalk,
/obj/effect/decal/cleanable/filth,
/turf/simulated/floor/plating,
/area/tether/surfacebase/fish_farm)
"fIS" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/table/glass,
@@ -34399,14 +34376,6 @@
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/fish_farm)
"fWy" = (
/obj/structure/railing{
dir = 1
},
/obj/structure/catwalk,
/obj/structure/closet/crate/trashcart,
/turf/simulated/floor/plating,
/area/tether/surfacebase/fish_farm)
"glx" = (
/obj/structure/cable/orange{
d1 = 16;
@@ -34665,15 +34634,15 @@
/obj/item/weapon/flame/lighter/zippo/moff,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"sKR" = (
/obj/structure/disposalpipe/broken,
/obj/effect/decal/cleanable/filth,
/obj/effect/landmark/teleplumb_exit,
/turf/simulated/floor/water/indoors,
"swg" = (
/obj/structure/railing,
/obj/structure/catwalk,
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/fish_farm)
"sLx" = (
/obj/effect/decal/cleanable/filth,
/obj/item/weapon/bone,
/obj/effect/floor_decal/techfloor{
dir = 4
},
@@ -34765,7 +34734,6 @@
dir = 8
},
/obj/structure/catwalk,
/obj/effect/decal/cleanable/filth,
/turf/simulated/floor/plating,
/area/tether/surfacebase/fish_farm)
"uHy" = (
@@ -34798,10 +34766,6 @@
},
/turf/simulated/floor/water/indoors,
/area/tether/surfacebase/fish_farm)
"vje" = (
/obj/structure/sign/biohazard,
/turf/simulated/wall,
/area/tether/surfacebase/fish_farm)
"voE" = (
/obj/effect/floor_decal/corner_techfloor_grid,
/obj/effect/floor_decal/corner_techfloor_grid{
@@ -38314,7 +38278,7 @@ aac
arl
asq
arl
auh
aji
aac
aac
adt
@@ -40157,7 +40121,7 @@ anf
aog
apq
aqw
arq
aib
ast
atG
ass
@@ -40168,9 +40132,9 @@ adt
adt
adt
azs
awN
bhJ
fFF
ayw
ayw
ayw
azs
adt
adt
@@ -40310,10 +40274,10 @@ adt
adt
adt
azs
axO
bpL
sKR
vje
ayw
ayw
ayw
azs
adt
adt
adt
@@ -40384,7 +40348,7 @@ bfL
bkQ
blo
blM
blW
aOv
bme
bfL
bfL
@@ -40452,7 +40416,7 @@ adt
adt
adt
azs
axO
swg
sLx
uFL
azs
@@ -40526,7 +40490,7 @@ bkJ
bkR
blp
blN
blX
aOJ
bfL
bfL
bfL
@@ -40668,7 +40632,7 @@ bfL
bkS
blq
blO
blY
aOK
bmf
bfL
bfL
@@ -40881,7 +40845,7 @@ azs
awN
flk
gGm
vje
azs
aBd
aCn
aDk
@@ -41022,7 +40986,7 @@ adt
azs
axO
viY
fWy
bOW
azs
azq
aAw
@@ -42043,7 +42007,7 @@ aOg
aOW
aPE
aOY
aRk
aAE
aRM
aSv
aHE
@@ -42185,7 +42149,7 @@ aOh
aOX
aOY
aOY
aRk
aAE
aRM
aty
aug
@@ -43414,8 +43378,8 @@ aeS
afG
agy
ahn
aib
aji
abW
acw
ahn
all
amo
@@ -45424,7 +45388,7 @@ aoO
ayW
azA
ayW
aAE
arq
aBk
aBP
aCC
@@ -45566,7 +45530,7 @@ ayE
ayW
azA
ayW
aAE
arq
aBl
aBQ
aCD
@@ -46988,7 +46952,7 @@ azG
aAi
aAH
aAJ
aBT
auh
aCI
aDz
aEi
@@ -47130,7 +47094,7 @@ azH
aAj
aAI
aAJ
aBU
ayo
aCJ
aDA
aBo
@@ -47668,8 +47632,8 @@ aab
aab
aab
aar
abW
acw
abv
abC
acx
aaH
aaO
@@ -48728,8 +48692,8 @@ aXi
aXP
aYz
aUc
aZv
aZv
aBT
aBT
aNo
aLX
aLX
@@ -50464,8 +50428,8 @@ mDn
ekH
glx
blh
blF
blF
aBU
aBU
blh
abn
aab
File diff suppressed because it is too large Load Diff
+24 -24
View File
@@ -5323,7 +5323,7 @@
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
"ajo" = (
/obj/structure/stairs/west,
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"ajp" = (
@@ -7948,6 +7948,10 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor,
/area/engineering/hallway)
"aou" = (
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"aov" = (
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -7977,6 +7981,14 @@
},
/turf/simulated/wall/r_wall,
/area/engineering/hallway)
"aoz" = (
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled,
/area/engineering/foyer)
"aoA" = (
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_one)
"aoB" = (
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
@@ -8007,6 +8019,10 @@
/obj/structure/table,
/turf/simulated/floor/plating,
/area/maintenance/abandonedlibrary)
"aoD" = (
/obj/structure/stairs/spawner/west,
/turf/simulated/floor,
/area/vacant/vacant_restaurant_lower)
"aoE" = (
/obj/random/junk,
/obj/effect/decal/cleanable/cobweb,
@@ -10693,10 +10709,6 @@
},
/turf/simulated/floor,
/area/maintenance/station/spacecommandmaint)
"auk" = (
/obj/structure/stairs/west,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"aul" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central1{
dir = 4
@@ -13228,10 +13240,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel_grid,
/area/tether/station/stairs_one)
"ayy" = (
/obj/structure/stairs/south,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_one)
"ayz" = (
/obj/structure/bed/chair/comfy/brown{
dir = 1
@@ -19366,10 +19374,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/foyer)
"bgF" = (
/obj/structure/stairs/east,
/turf/simulated/floor/tiled,
/area/engineering/foyer)
"bhc" = (
/obj/structure/extinguisher_cabinet{
dir = 4;
@@ -20708,10 +20712,6 @@
},
/turf/simulated/floor,
/area/vacant/vacant_restaurant_lower)
"bZT" = (
/obj/structure/stairs/west,
/turf/simulated/floor,
/area/vacant/vacant_restaurant_lower)
"bZZ" = (
/obj/structure/bed/chair,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -29668,8 +29668,8 @@ bZv
bZv
bZH
bYP
bZT
bZT
aoD
aoD
awu
awu
awu
@@ -30497,7 +30497,7 @@ art
avh
aen
atQ
auk
aou
bZi
aJx
aJx
@@ -31655,7 +31655,7 @@ aws
fjd
oFB
axR
ayy
aoA
aws
bQa
aws
@@ -31797,7 +31797,7 @@ aws
iIr
lCi
axR
ayy
aoA
aws
bQa
aws
@@ -32213,8 +32213,8 @@ aoJ
ams
aQX
bYt
bgF
bgF
aoz
aoz
aYg
agU
acp
+38 -47
View File
@@ -2481,7 +2481,7 @@
/turf/simulated/wall,
/area/maintenance/evahallway)
"dB" = (
/obj/structure/stairs/north,
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled,
/area/tether/exploration/staircase)
"dC" = (
@@ -2894,11 +2894,11 @@
/obj/effect/floor_decal/techfloor{
dir = 8
},
/obj/structure/stairs/north,
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/bluegrid,
/area/ai_upload)
"el" = (
/obj/structure/stairs/north,
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/bluegrid,
/area/ai_upload)
"em" = (
@@ -3100,7 +3100,7 @@
/obj/effect/floor_decal/techfloor{
dir = 4
},
/obj/structure/stairs/north,
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/bluegrid,
/area/ai_upload)
"eB" = (
@@ -3615,14 +3615,9 @@
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
"fo" = (
/obj/effect/floor_decal/techfloor{
dir = 4
},
/obj/machinery/atmospherics/pipe/zpipe/up/supply{
dir = 8
},
/turf/simulated/floor/bluegrid,
/area/ai_upload)
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled,
/area/security/brig/visitation)
"fp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -3767,9 +3762,9 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/staircase)
"fB" = (
/obj/structure/stairs/south,
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled,
/area/security/brig/visitation)
/area/security/security_cell_hallway)
"fC" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -5270,9 +5265,13 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/staircase)
"hU" = (
/obj/structure/stairs/west,
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1)
"hV" = (
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
@@ -9093,8 +9092,7 @@
/area/ai_upload_foyer)
"nk" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
dir = 8
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
@@ -9239,13 +9237,6 @@
/turf/simulated/floor/plating,
/area/storage/tech)
"nx" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1)
"ny" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
@@ -9253,6 +9244,10 @@
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1)
"ny" = (
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"nz" = (
/obj/machinery/light_switch{
dir = 8;
@@ -9356,6 +9351,10 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"nK" = (
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"nM" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -12368,10 +12367,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/ai_monitored/storage/eva)
"un" = (
/obj/structure/stairs/north,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"uo" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -14255,7 +14250,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/biostorage)
"xQ" = (
/obj/structure/stairs/west,
/turf/simulated/sky/virgo3b/west,
/turf/simulated/floor/tiled/white,
/area/medical/biostorage)
"xR" = (
@@ -15309,10 +15304,6 @@
},
/turf/simulated/floor/wood,
/area/medical/surgery_hallway)
"Ak" = (
/obj/structure/stairs/west,
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"Al" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 4
@@ -27836,7 +27827,7 @@ af
XR
UT
BV
fB
fo
fX
gw
gw
@@ -27978,7 +27969,7 @@ af
bN
ep
BV
fB
fo
fX
gw
gw
@@ -28003,7 +27994,7 @@ rO
sw
tc
sw
un
ny
uP
vn
vN
@@ -28145,7 +28136,7 @@ rP
sw
tc
sw
un
ny
uP
vo
eP
@@ -29545,8 +29536,8 @@ cR
aS
gW
gV
hU
hU
fB
fB
aj
ja
kj
@@ -30858,8 +30849,8 @@ ze
zt
zL
xb
Ak
Ak
nK
nK
AK
Ba
Bv
@@ -35804,11 +35795,11 @@ hl
DI
RX
DL
hU
nk
nk
nk
nx
nx
nx
ny
oY
sW
ef
@@ -35929,7 +35920,7 @@ ac
ac
dZ
eA
fo
fS
fS
gr
dZ
+3 -1
View File
@@ -410,6 +410,9 @@
#include "code\datums\repositories\decls.dm"
#include "code\datums\repositories\repository.dm"
#include "code\datums\repositories\unique.dm"
#include "code\datums\roundstats\_defines_local.dm"
#include "code\datums\roundstats\departmentgoal.dm"
#include "code\datums\roundstats\roundstats.dm"
#include "code\datums\supplypacks\atmospherics.dm"
#include "code\datums\supplypacks\contraband.dm"
#include "code\datums\supplypacks\contraband_vr.dm"
@@ -2014,7 +2017,6 @@
#include "code\modules\clothing\under\jobs\engineering.dm"
#include "code\modules\clothing\under\jobs\medsci.dm"
#include "code\modules\clothing\under\jobs\security.dm"
#include "code\modules\clothing\under\jobs\security_vr.dm"
#include "code\modules\clothing\under\xenos\seromi.dm"
#include "code\modules\clothing\under\xenos\vox.dm"
#include "code\modules\customitems\item_spawning.dm"