Skip to content
This repository has been archived by the owner on Oct 15, 2023. It is now read-only.

Commit

Permalink
done?
Browse files Browse the repository at this point in the history
  • Loading branch information
AyIong committed Jun 26, 2023
1 parent 90aedf8 commit ed8b5d3
Show file tree
Hide file tree
Showing 26 changed files with 32 additions and 10 deletions.
5 changes: 3 additions & 2 deletions code/game/objects/items/stacks/rods.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
name = "metal rod"
desc = "Some rods. Can be used for building, or something."
singular_name = "metal rod"
icon_state = "rods"
icon = 'icons/obj/stacks/minerals.dmi'
icon_state = "rods-5"
item_state = "rods"
flags = CONDUCT
w_class = WEIGHT_CLASS_NORMAL
Expand Down Expand Up @@ -85,7 +86,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
name = "fireproof rods"
desc = "Жаропрочные стержни, способные выдержать жар в несколько тысяч градусов. Могут использоваться для строительства мостов над лавой."
singular_name = "fireproof rod"
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/stacks/minerals.dmi'
icon_state = "f_rods"
item_state = "f_rods"
flags = CONDUCT
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/items/stacks/sheets/leather.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/obj/item/stack/sheet/animalhide
name = "hide"
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-monkey"
desc = "Something went wrong."
origin_tech = "biotech=3"

Expand Down Expand Up @@ -95,13 +97,15 @@ GLOBAL_LIST_INIT(xeno_recipes, list (
name = "hairless hide"
desc = "This hide was stripped of it's hair, but still needs tanning."
singular_name = "hairless hide piece"
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-hairlesshide"
origin_tech = ""

/obj/item/stack/sheet/wetleather
name = "wet leather"
desc = "This leather has been cleaned but still needs to be dried."
singular_name = "wet leather piece"
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-wetleather"
origin_tech = ""
var/wetness = 30 //Reduced when exposed to high temperautres
Expand All @@ -111,6 +115,7 @@ GLOBAL_LIST_INIT(xeno_recipes, list (
name = "leather"
desc = "The by-product of mob grinding."
singular_name = "leather piece"
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-leather"
origin_tech = "materials=2"

Expand Down
21 changes: 16 additions & 5 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ GLOBAL_LIST_INIT(plasteel_recipes, list(
merge_type = /obj/item/stack/sheet/plasteel
point_value = 23

/obj/item/stack/sheet/plasteel/fifty
amount = 50

/obj/item/stack/sheet/plasteel/lowplasma
desc = "This sheet is an alloy of iron and plasma. There are an special barcode 'Low Plasma Level'"
materials = list(MAT_METAL=2000, MAT_PLASMA=400)
Expand Down Expand Up @@ -238,12 +241,14 @@ GLOBAL_LIST_INIT(wood_recipes, list(
desc = "One can only guess that this is a bunch of wood."
gender = PLURAL
singular_name = "wood plank"
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-wood"
item_state = "sheet-wood"
origin_tech = "materials=1;biotech=1"
resistance_flags = FLAMMABLE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
merge_type = /obj/item/stack/sheet/wood
sheettype = "wood"

/obj/item/stack/sheet/wood/cyborg
is_cyborg = 1
Expand Down Expand Up @@ -287,6 +292,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list(
name = "cloth"
desc = "Is it cotton? Linen? Denim? Burlap? Canvas? You can't tell."
singular_name = "cloth roll"
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-cloth"
origin_tech = "materials=2"
resistance_flags = FLAMMABLE
Expand Down Expand Up @@ -318,7 +324,8 @@ GLOBAL_LIST_INIT(durathread_recipes, list(
desc = "A fabric sown from incredibly durable threads, known for its usefulness in armor production."
singular_name = "durathread roll"
icon_state = "sheet-durathread"
item_state = "sheet-cloth"
item_state = "sheet-durathread"
icon = 'icons/obj/stacks/organic.dmi'
resistance_flags = FLAMMABLE
force = 0
throwforce = 0
Expand All @@ -333,6 +340,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list(
desc = "A bundle of raw cotton ready to be spun on the loom."
singular_name = "raw cotton ball"
icon_state = "sheet-cotton"
icon = 'icons/obj/stacks/organic.dmi'
resistance_flags = FLAMMABLE
force = 0
throwforce = 0
Expand All @@ -345,6 +353,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list(
desc = "A bundle of raw durathread ready to be spun on the loom."
singular_name = "raw durathread ball"
icon_state = "sheet-durathreadraw"
icon = 'icons/obj/stacks/organic.dmi'
merge_type = /obj/item/stack/sheet/cotton/durathread
pull_effort = 70
loom_result = /obj/item/stack/sheet/durathread
Expand Down Expand Up @@ -390,6 +399,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list(
name = "cardboard"
desc = "Large sheets of card, like boxes folded flat."
singular_name = "cardboard sheet"
icon = 'icons/obj/stacks/miscellaneous.dmi'
icon_state = "sheet-card"
item_state = "sheet-card"
origin_tech = "materials=1"
Expand Down Expand Up @@ -494,7 +504,7 @@ GLOBAL_LIST_INIT(brass_recipes, list(
singular_name = "brass sheet"
icon_state = "sheet-brass"
item_state = "sheet-brass"
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/stacks/minerals.dmi'
resistance_flags = FIRE_PROOF | ACID_PROOF
throwforce = 10
max_amount = 50
Expand Down Expand Up @@ -543,8 +553,9 @@ GLOBAL_LIST_INIT(brass_recipes, list(

/obj/item/stack/sheet/bone
name = "bones"
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "bone"
item_state = "bone"
singular_name = "bone"
desc = "Someone's been drinking their milk."
force = 7
Expand Down Expand Up @@ -665,7 +676,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list(
singular_name = "cut bamboo"
icon_state = "sheet-bamboo"
item_state = "sheet-bamboo"
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/stacks/organic.dmi'
sheettype = "bamboo"
force = 10
throwforce = 10
Expand All @@ -691,7 +702,7 @@ GLOBAL_LIST_INIT(cheese_recipes, list(
desc = "A stack of cheese that seems sturdier than regular cheese."
icon_state = "sheet-cheese"
item_state = "sheet-cheese"
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/stacks/organic.dmi'
singular_name = "reinforced cheese block"
sheettype = "cheese"
force = 5
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/items/stacks/sheets/sheets.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/obj/item/stack/sheet
name = "sheet"
icon = 'icons/obj/stacks/minerals.dmi'
lefthand_file = 'icons/mob/inhands/sheet_lefthand.dmi'
righthand_file = 'icons/mob/inhands/sheet_righthand.dmi'
w_class = WEIGHT_CLASS_NORMAL
full_w_class = WEIGHT_CLASS_NORMAL
force = 5
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/telecrystal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
desc = "It seems to be pulsing with suspiciously enticing energies."
description_antag = "Telecrystals can be activated by utilizing them on devices with an actively running uplink. They will not activate on unactivated uplinks."
singular_name = "telecrystal"
icon = 'icons/obj/telescience.dmi'
icon = 'icons/obj/stacks/minerals.dmi'
icon_state = "telecrystal"
w_class = WEIGHT_CLASS_TINY
max_amount = 50
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/legcuffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
name = "bear trap"
throw_speed = 1
throw_range = 1
icon_state = "beartrap"
icon_state = "beartrap0"
desc = "A trap used to catch bears and other legged creatures."
origin_tech = "engineering=4"
var/armed = 0
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
/obj/item/storage/box/masks
name = "sterile masks"
desc = "This box contains masks of sterility."
icon_state = "sterile"
icon_state = "sterile_box"

/obj/item/storage/box/masks/populate_contents()
for(var/I in 1 to 7)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mining/ores_coins.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
/obj/item/stack/ore
name = "rock"
icon = 'icons/obj/mining.dmi'
lefthand_file = 'icons/mob/inhands/ore_lefthand.dmi'
righthand_file = 'icons/mob/inhands/ore_righthand.dmi'
icon_state = "ore"
max_amount = 50
full_w_class = WEIGHT_CLASS_BULKY
Expand Down
Binary file added icons/mob/inhands/ore_lefthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/ore_righthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/sheet_lefthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/sheet_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/closet.dmi
Binary file not shown.
Binary file modified icons/obj/items.dmi
Binary file not shown.
Binary file modified icons/obj/machines/mining_machines.dmi
Binary file not shown.
Binary file modified icons/obj/machines/monitors.dmi
Binary file not shown.
Binary file modified icons/obj/machines/research.dmi
Binary file not shown.
Binary file modified icons/obj/machines/tcomms.dmi
Binary file not shown.
Binary file modified icons/obj/machines/terminals.dmi
Binary file not shown.
Binary file modified icons/obj/machines/vending.dmi
Binary file not shown.
Binary file added icons/obj/stacks/minerals.dmi
Binary file not shown.
Binary file added icons/obj/stacks/miscellaneous.dmi
Binary file not shown.
Binary file added icons/obj/stacks/ores.dmi
Binary file not shown.
Binary file added icons/obj/stacks/organic.dmi
Binary file not shown.
Binary file modified icons/obj/stationobjs.dmi
Binary file not shown.
Binary file modified icons/obj/stock_parts.dmi
Binary file not shown.

0 comments on commit ed8b5d3

Please sign in to comment.