FIXED: inconsistencies with stack item names.

CHANGE: stacks are gender = PLURAL by default because it fits.

Conflicts:
	code/game/objects/items/stacks/stack.dm
This commit is contained in:
Kyrah Abattoir
2013-11-24 00:14:46 +01:00
committed by Mloc-Argent
parent 2f0a0243e9
commit 7315b75cca
8 changed files with 12 additions and 11 deletions

View File

@@ -1,5 +1,5 @@
/obj/item/stack/rods
name = "metal rods"
name = "metal rod"
desc = "Some rods. Can be used for building, or something."
singular_name = "metal rod"
icon_state = "rods"
@@ -63,4 +63,4 @@
usr << "\blue You assemble a grille"
F.add_fingerprint(usr)
use(2)
return
return

View File

@@ -1,5 +1,5 @@
/obj/item/stack/light_w
name = "wired glass tiles"
name = "wired glass tile"
singular_name = "wired glass floor tile"
desc = "A glass tile, which is wired, somehow."
icon_state = "glass_wire"

View File

@@ -18,7 +18,7 @@ Mineral Sheets
* Sandstone
*/
/obj/item/stack/sheet/mineral/sandstone
name = "sandstone bricks"
name = "sandstone brick"
desc = "This appears to be a combination of both sand and stone."
singular_name = "sandstone brick"
icon_state = "sheet-sandstone"

View File

@@ -135,7 +135,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
)
/obj/item/stack/sheet/wood
name = "wooden planks"
name = "wooden plank"
desc = "One can only guess that this is a bunch of wood."
singular_name = "wood plank"
icon_state = "sheet-wood"

View File

@@ -9,6 +9,7 @@
* Stacks
*/
/obj/item/stack
gender = PLURAL
origin_tech = "materials=1"
var/list/datum/stack_recipe/recipes
var/singular_name

View File

@@ -1,5 +1,5 @@
/obj/item/stack/tile/light
name = "light tiles"
name = "light tile"
singular_name = "light floor tile"
desc = "A floor tile, made out off glass. It produces light."
icon_state = "tile_e"

View File

@@ -1,5 +1,5 @@
/obj/item/stack/tile/plasteel
name = "floor tiles"
name = "floor tile"
singular_name = "floor tile"
desc = "Those could work as a pretty decent throwing weapon"
icon_state = "tile"
@@ -42,4 +42,4 @@
S.ChangeTurf(/turf/simulated/floor/plating)
// var/turf/simulated/floor/W = S.ReplaceWithFloor()
// W.make_plating()
return
return

View File

@@ -9,7 +9,7 @@
* Grass
*/
/obj/item/stack/tile/grass
name = "grass tiles"
name = "grass tile"
singular_name = "grass floor tile"
desc = "A patch of grass like they often use on golf courses"
icon_state = "tile_grass"
@@ -26,7 +26,7 @@
* Wood
*/
/obj/item/stack/tile/wood
name = "wood floor tiles"
name = "wood floor tile"
singular_name = "wood floor tile"
desc = "an easy to fit wood floor tile"
icon_state = "tile-wood"
@@ -52,4 +52,4 @@
throw_speed = 5
throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT
max_amount = 60
max_amount = 60