cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'bay12-upstream/master' into development

Browse Source
This commit is contained in:
skull132
2016-10-07 00:58:39 +03:00
parent 3a13ae1b17 442c2c1659
commit 87e041aa75
1594 changed files with 53994 additions and 48590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+8 -7
View File
@@ -11,12 +11,13 @@
/obj/item/stack
gender = PLURAL
origin_tech = "materials=1"
origin_tech = list(TECH_MATERIAL = 1)
var/list/datum/stack_recipe/recipes
var/singular_name
var/amount = 1
var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
var/stacktype //determines whether different stack types can merge
var/build_type = null //used when directly applied to a turf
var/uses_charge = 0
var/list/charge_costs = null
var/list/datum/matter_synth/synths = null
@@ -39,7 +40,7 @@
/obj/item/stack/examine(mob/user)
if(..(user, 1))
if(!uses_charge)
user << "There are [src.amount] [src.singular_name]\s in the stack."
user << "There [src.amount == 1 ? "is" : "are"] [src.amount] [src.singular_name]\s in the stack."
else
user << "There is enough charge for [get_amount()]."
@@ -107,21 +108,21 @@
if (!can_use(required))
if (produced>1)
user << "\red You haven't got enough [src] to build \the [produced] [recipe.title]\s!"
user << "<span class='warning'>You haven't got enough [src] to build \the [produced] [recipe.title]\s!</span>"
else
user << "\red You haven't got enough [src] to build \the [recipe.title]!"
user << "<span class='warning'>You haven't got enough [src] to build \the [recipe.title]!</span>"
return
if (recipe.one_per_turf && (locate(recipe.result_type) in user.loc))
user << "\red There is another [recipe.title] here!"
user << "<span class='warning'>There is another [recipe.title] here!</span>"
return
if (recipe.on_floor && !isfloor(user.loc))
user << "\red \The [recipe.title] must be constructed on the floor!"
user << "<span class='warning'>\The [recipe.title] must be constructed on the floor!</span>"
return
if (recipe.time)
user << "\blue Building [recipe.title] ..."
user << "<span class='notice'>Building [recipe.title] ...</span>"
if (!do_after(user, recipe.time))
return