cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

These can't be material stacks if they don't have a material

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-18 10:28:18 -04:00
parent 49bbc52fc6
commit 0b858a36c8
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/game/objects/items/stacks/sheets/leather.dm
View File

@@ -1,4 +1,4 @@
/obj/item/stack/material/animalhide/human
/obj/item/stack/animalhide/human
name = "human skin"
desc = "The by-product of human farming."
singular_name = "human skin piece"
@@ -6,63 +6,63 @@
no_variants = FALSE
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/stack/material/animalhide/human
/obj/item/stack/animalhide/human
amount = 50
/obj/item/stack/material/animalhide/corgi
/obj/item/stack/animalhide/corgi
name = "corgi hide"
desc = "The by-product of corgi farming."
singular_name = "corgi hide piece"
icon_state = "sheet-corgi"
/obj/item/stack/material/animalhide/corgi
/obj/item/stack/animalhide/corgi
amount = 50
/obj/item/stack/material/animalhide/cat
/obj/item/stack/animalhide/cat
name = "cat hide"
desc = "The by-product of cat farming."
singular_name = "cat hide piece"
icon_state = "sheet-cat"
/obj/item/stack/material/animalhide/cat
/obj/item/stack/animalhide/cat
amount = 50
/obj/item/stack/material/animalhide/monkey
/obj/item/stack/animalhide/monkey
name = "monkey hide"
desc = "The by-product of monkey farming."
singular_name = "monkey hide piece"
icon_state = "sheet-monkey"
/obj/item/stack/material/animalhide/monkey
/obj/item/stack/animalhide/monkey
amount = 50
/obj/item/stack/material/animalhide/lizard
/obj/item/stack/animalhide/lizard
name = "lizard skin"
desc = "Sssssss..."
singular_name = "lizard skin piece"
icon_state = "sheet-lizard"
/obj/item/stack/material/animalhide/lizard
/obj/item/stack/animalhide/lizard
amount = 50
/obj/item/stack/material/animalhide/xeno
/obj/item/stack/animalhide/xeno
name = "alien hide"
desc = "The skin of a terrible creature."
singular_name = "alien hide piece"
icon_state = "sheet-xeno"
/obj/item/stack/material/animalhide/xeno
/obj/item/stack/animalhide/xeno
amount = 50
//don't see anywhere else to put these, maybe together they could be used to make the xenos suit?
/obj/item/stack/material/xenochitin
/obj/item/stack/xenochitin
name = "alien chitin"
desc = "A piece of the hide of a terrible creature."
singular_name = "alien hide piece"
icon = 'icons/mob/alien.dmi'
icon_state = "chitin"
/obj/item/stack/material/xenochitin
/obj/item/stack/xenochitin
amount = 50
/obj/item/xenos_claw
@@ -77,17 +77,17 @@
icon = 'icons/mob/alien.dmi'
icon_state = "weed_extract"
/obj/item/stack/material/hairlesshide
/obj/item/stack/hairlesshide
name = "hairless hide"
desc = "This hide was stripped of it's hair, but still needs tanning."
singular_name = "hairless hide piece"
icon_state = "sheet-hairlesshide"
no_variants = FALSE
/obj/item/stack/material/hairlesshide
/obj/item/stack/hairlesshide
amount = 50
/obj/item/stack/material/wetleather
/obj/item/stack/wetleather
name = "wet leather"
desc = "This leather has been cleaned but still needs to be dried."
singular_name = "wet leather piece"
@@ -96,11 +96,11 @@
var/drying_threshold_temperature = 500 //Kelvin to start drying
no_variants = FALSE
/obj/item/stack/material/wetleather
/obj/item/stack/wetleather
amount = 50
//Step one - dehairing.
/obj/item/stack/material/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/stack/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob)
if( istype(W, /obj/item/weapon/material/knife) || \
istype(W, /obj/item/weapon/material/twohanded/fireaxe) || \
istype(W, /obj/item/weapon/material/knife/machete/hatchet) )
@@ -110,13 +110,13 @@
if(do_after(user,50))
to_chat(usr, "<span class='notice'>You cut the hair from this [src.singular_name]</span>")
//Try locating an exisitng stack on the tile and add to there if possible
for(var/obj/item/stack/material/hairlesshide/HS in usr.loc)
for(var/obj/item/stack/hairlesshide/HS in usr.loc)
if(HS.amount < 50)
HS.amount++
src.use(1)
break
//If it gets to here it means it did not find a suitable stack on the tile.
var/obj/item/stack/material/hairlesshide/HS = new(usr.loc)
var/obj/item/stack/hairlesshide/HS = new(usr.loc)
HS.amount = 1
src.use(1)
else
@@ -126,7 +126,7 @@
//Step two - washing..... it's actually in washing machine code.
//Step three - drying
/obj/item/stack/material/wetleather/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/obj/item/stack/wetleather/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
if(exposed_temperature >= drying_threshold_temperature)
wetness--