code/game/objects, code/game/machinery merge fix

This commit is contained in:
GinjaNinja32
2015-06-02 20:18:45 +01:00
parent 314a28fa75
commit c77605265c
76 changed files with 524 additions and 520 deletions

View File

@@ -110,21 +110,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