cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Huge disposals update- most of the station has been repiped. Engineering and atmospherics now have disposals.

Browse Source 
Mail delivery via disposals should now go to the correct locations.
Fixed the lack of t-ray sprites for the sort junctions.
Fixed issue 225. The delay shouldn't be a problem for actual atmos techs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2684 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2011-12-14 18:19:31 +00:00
parent 3f5b76aff0
commit 04a7eab2c6
5 changed files with 8522 additions and 8510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
code/game/machinery/pipe/pipe_dispenser.dm
View File

@@ -5,6 +5,7 @@
density = 1
anchored = 1
var/unwrenched = 0
var/wait = 0
/obj/machinery/pipedispenser/attack_paw(user as mob)
return src.attack_hand(user)
@@ -49,16 +50,20 @@
usr.machine = src
src.add_fingerprint(usr)
if(href_list["make"])
var/p_type = text2num(href_list["make"])
var/p_dir = text2num(href_list["dir"])
var/obj/item/pipe/P = new (/*usr.loc*/ src.loc, pipe_type=p_type, dir=p_dir)
P.update()
if(!wait)
var/p_type = text2num(href_list["make"])
var/p_dir = text2num(href_list["dir"])
var/obj/item/pipe/P = new (/*usr.loc*/ src.loc, pipe_type=p_type, dir=p_dir)
P.update()
wait = 1
spawn(10)
wait = 0
if(href_list["makemeter"])
new /obj/item/pipe_meter(/*usr.loc*/ src.loc)
/* for(var/mob/M in viewers(1, src))
if ((M.client && M.machine == src))
src.attack_hand(M)*/
if(!wait)
new /obj/item/pipe_meter(/*usr.loc*/ src.loc)
wait = 1
spawn(15)
wait = 0
return
/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob)
@@ -128,23 +133,24 @@
usr.machine = src
src.add_fingerprint(usr)
if(href_list["dmake"])
var/p_type = text2num(href_list["dmake"])
var/obj/structure/disposalconstruct/C = new (src.loc)
switch(p_type)
if(0)
C.ptype = 0
if(1)
C.ptype = 1
if(2)
C.ptype = 2
if(3)
C.ptype = 4
if(4)
C.ptype = 5
if(!wait)
var/p_type = text2num(href_list["dmake"])
var/obj/structure/disposalconstruct/C = new (src.loc)
switch(p_type)
if(0)
C.ptype = 0
if(1)
C.ptype = 1
if(2)
C.ptype = 2
if(3)
C.ptype = 4
if(4)
C.ptype = 5
C.update()
usr << browse(null, "window=pipedispenser")
usr.machine = null
C.update()
wait = 1
spawn(15)
wait = 0
return

17
code/modules/recycling/sortingmachinery.dm
View File

@@ -103,15 +103,18 @@
desc = "Used to set the destination of properly wrapped packages."
icon_state = "forensic0"
var/currTag = 0
var/list/locationList = list(
"Disposals", "Bartender's Workspace", "Cafeteria", "Cargo Bay", "Chapel Office",
"Chemistry", "Chief Medical Officer's Office", "Crew Quarters Toilets", "Fitness",
"Head of Personnel's Office", "Head of Security's Office", "Hydroponics",
"Janitor's Closet", "Kitchen", "Library", "Locker Room", "Locker Toilets", "Medbay",
"Quartermaster's Office", "Research Director's Office", "Research Lab", "Robotics",
"Security", "Surgery", "Theatre", "Tool Storage")
var/list/locationList = list("Disposals",
"Cargo Bay", "QM Office", "Engineering", "CE Office",
"Atmospherics", "Security", "HoS Office", "Medbay",
"CMO Office", "Chemistry", "Research", "RD Office",
"Robotics", "HoP Office", "Library", "Chapel", "Theatre",
"Bar", "Kitchen", "Hydroponics", "Janitor Closet",)
//The whole system for the sorttype var is determined based on the order of this list,
//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude
//If you don't want to fuck up disposals, add to this list, and don't change the order.
//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete
w_class = 1
item_state = "electronic"
flags = FPRINT | TABLEPASS | ONBELT | CONDUCT