Skip to content

Make the Autoloom great again. #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Darkkatana101 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make the Autoloom great again. #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions code/game/machinery/autoloom.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
name = "autoloom"
desc = "A large processing machine used to process raw biological matter, like cotton or logs. It also looks like a recycler. There's a display on the side."
icon = 'icons/obj/recycling.dmi'
icon_state = "grinder-o0"
icon_state = "loom-o1"
layer = ABOVE_ALL_MOB_LAYER // Overhead
density = TRUE
circuit = /obj/item/circuitboard/machine/autoloom
var/icon_name = "grinder-o"
var/icon_name = "loom-o"
var/eat_dir = WEST
var/process_efficiency = 0
var/static/list/can_process = typecacheof(list(
Expand All @@ -29,7 +29,7 @@
update_icon()

/obj/machinery/autoloom/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I))
if(default_deconstruction_screwdriver(user, "loom-oOpen", "loom-o0", I))
return

if(default_pry_open(I))
Expand Down Expand Up @@ -78,6 +78,7 @@

I.forceMove(loc)
if(istype(I, /obj/item/grown/log))
flick("loom-oWood", src) //Lumos Change
var/obj/item/grown/log/L = I
var/seed_modifier = 0
if(L.seed)
Expand All @@ -87,13 +88,15 @@
return

if(istype(I, /obj/item/stack/sheet/cotton))
flick("loom-oCotton", src) //Lumos Change
var/obj/item/stack/sheet/cotton/RS = I
var/tomake = round((RS.amount / 4) * process_efficiency)
new RS.loom_result(src.loc, tomake)
qdel(RS)
return

if(istype(I, /obj/item/grown/cotton))
flick("loom-oCotton", src) //Lumos Change
var/obj/item/grown/cotton/RC = I
var/cottonAmt = 1 + round(RC.seed.potency / 25)
var/newRaw = new RC.cotton_type(src.loc, cottonAmt)
Expand Down
Binary file modified icons/obj/recycling.dmi
View file
Open in desktop
Binary file not shown.