shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

Browse Source
This commit is contained in:
Ghommie
2019-12-06 20:09:35 +01:00
parent 6484eea339 0598c35d70
commit 542c9007ee
1029 changed files with 34299 additions and 143444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
+7
View File
@@ -191,6 +191,12 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
null, \
new/datum/stack_recipe_list("pews", list(
new /datum/stack_recipe("pew (middle)", /obj/structure/chair/pew, 3, one_per_turf = TRUE, on_floor = TRUE),\
new /datum/stack_recipe("pew (left)", /obj/structure/chair/pew/left, 3, one_per_turf = TRUE, on_floor = TRUE),\
new /datum/stack_recipe("pew (right)", /obj/structure/chair/pew/right, 3, one_per_turf = TRUE, on_floor = TRUE),\
)),
null, \
new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
@@ -614,6 +620,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
new /datum/stack_recipe("large trash cart", /obj/structure/closet/crate/bin,50),\
new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2)))
/obj/item/stack/sheet/plastic
code/game/objects/items/stacks/stack.dm
+8 -8
View File
@@ -76,23 +76,23 @@
. = ..()
/obj/item/stack/examine(mob/user)
..()
. = ..()
if (is_cyborg)
if(singular_name)
to_chat(user, "There is enough energy for [get_amount()] [singular_name]\s.")
. += "There is enough energy for [get_amount()] [singular_name]\s."
else
to_chat(user, "There is enough energy for [get_amount()].")
. += "There is enough energy for [get_amount()]."
return
if(singular_name)
if(get_amount()>1)
to_chat(user, "There are [get_amount()] [singular_name]\s in the stack.")
. += "There are [get_amount()] [singular_name]\s in the stack."
else
to_chat(user, "There is [get_amount()] [singular_name] in the stack.")
. += "There is [get_amount()] [singular_name] in the stack."
else if(get_amount()>1)
to_chat(user, "There are [get_amount()] in the stack.")
. += "There are [get_amount()] in the stack."
else
to_chat(user, "There is [get_amount()] in the stack.")
to_chat(user, "<span class='notice'>Alt-click to take a custom amount.</span>")
. += "There is [get_amount()] in the stack."
. += "<span class='notice'>Alt-click to take a custom amount.</span>"
/obj/item/stack/proc/get_amount()
if(is_cyborg)
code/game/objects/items/stacks/tiles/tile_types.dm
+58
View File
@@ -73,6 +73,64 @@
turf_type = /turf/open/floor/grass
resistance_flags = FLAMMABLE
//Fairygrass
/obj/item/stack/tile/fairygrass
name = "fairygrass tile"
singular_name = "fairygrass floor tile"
desc = "A patch of odd, glowing blue grass."
icon_state = "tile_fairygrass"
item_state = "tile-fairygrass"
turf_type = /turf/open/floor/grass/fairy
resistance_flags = FLAMMABLE
color = "#33CCFF"
/obj/item/stack/tile/fairygrass/white
name = "white fairygrass tile"
singular_name = "white fairygrass floor tile"
desc = "A patch of odd, glowing white grass."
turf_type = /turf/open/floor/grass/fairy/white
color = "#FFFFFF"
/obj/item/stack/tile/fairygrass/red
name = "red fairygrass tile"
singular_name = "red fairygrass floor tile"
desc = "A patch of odd, glowing red grass."
turf_type = /turf/open/floor/grass/fairy/red
color = "#FF3333"
/obj/item/stack/tile/fairygrass/yellow
name = "yellow fairygrass tile"
singular_name = "yellow fairygrass floor tile"
desc = "A patch of odd, glowing yellow grass."
turf_type = /turf/open/floor/grass/fairy/yellow
color = "#FFFF66"
/obj/item/stack/tile/fairygrass/green
name = "green fairygrass tile"
singular_name = "green fairygrass floor tile"
desc = "A patch of odd, glowing green grass."
turf_type = /turf/open/floor/grass/fairy/green
color = "#99FF99"
/obj/item/stack/tile/fairygrass/blue
name = "blue fairygrass tile"
singular_name = "blue fairygrass floor tile"
desc = "A patch of odd, glowing blue grass."
turf_type = /turf/open/floor/grass/fairy/blue
/obj/item/stack/tile/fairygrass/purple
name = "purple fairygrass tile"
singular_name = "purple fairygrass floor tile"
desc = "A patch of odd, glowing purple grass."
turf_type = /turf/open/floor/grass/fairy/purple
color = "#D966FF"
/obj/item/stack/tile/fairygrass/pink
name = "pink fairygrass tile"
singular_name = "pink fairygrass floor tile"
desc = "A patch of odd, glowing pink grass."
turf_type = /turf/open/floor/grass/fairy/pink
color = "#FFB3DA"
//Wood
/obj/item/stack/tile/wood