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

Fixed the map/code issues that the body bags caused.

Browse Source 
/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-10-03 10:28:57 +00:00
parent e8c6b08419
commit 17ed3899c4
314 changed files with 9099 additions and 9118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/recycling/disposal-construction.dm
+7 -7
View File
@@ -1,6 +1,6 @@
// Disposal pipe construction
/obj/station_objects/disposalconstruct
/obj/structure/disposalconstruct
name = "disposal pipe segment"
desc = "A huge pipe segment used for constructing disposal systems."
@@ -88,11 +88,11 @@
proc/dpipetype()
switch(ptype)
if(0,1)
return /obj/station_objects/disposalpipe/segment
return /obj/structure/disposalpipe/segment
if(2,3,4)
return /obj/station_objects/disposalpipe/junction
return /obj/structure/disposalpipe/junction
if(5)
return /obj/station_objects/disposalpipe/trunk
return /obj/structure/disposalpipe/trunk
return
@@ -107,11 +107,11 @@
user << "You can only attach the pipe if the floor plating is removed."
return
var/obj/station_objects/disposalpipe/CP = locate() in T
var/obj/structure/disposalpipe/CP = locate() in T
if(CP)
update()
var/pdir = CP.dpdir
if(istype(CP, /obj/station_objects/disposalpipe/broken))
if(istype(CP, /obj/structure/disposalpipe/broken))
pdir = CP.dir
if(pdir & dpdir)
user << "There is already a pipe at that location."
@@ -139,7 +139,7 @@
if(do_after(user, 20))
update()
var/pipetype = dpipetype()
var/obj/station_objects/disposalpipe/P = new pipetype(src.loc)
var/obj/structure/disposalpipe/P = new pipetype(src.loc)
P.base_icon_state = base_state
P.dir = dir
P.dpdir = dpdir
code/WorkInProgress/recycling/disposal.dm
+36 -36
View File
@@ -16,7 +16,7 @@
var/datum/gas_mixture/air_contents // internal reservoir
var/mode = 1 // item mode 0=off 1=charging 2=charged
var/flush = 0 // true if flush handle is pulled
var/obj/station_objects/disposalpipe/trunk/trunk = null // the attached pipe trunk
var/obj/structure/disposalpipe/trunk/trunk = null // the attached pipe trunk
var/flushing = 0 // true if flushing in progress
// create a new disposal
@@ -307,7 +307,7 @@
flushing = 1
flick("disposal-flush", src)
var/obj/station_objects/disposalholder/H = new() // virtual holder object which actually
var/obj/structure/disposalholder/H = new() // virtual holder object which actually
// travels through the pipes.
@@ -339,7 +339,7 @@
// called when holder is expelled from a disposal
// should usually only occur if the pipe network is modified
proc/expel(var/obj/station_objects/disposalholder/H)
proc/expel(var/obj/structure/disposalholder/H)
var/turf/target
playsound(src, 'hiss.ogg', 50, 0, 0)
@@ -432,7 +432,7 @@
flush()
flick("toilet-flush", src)
var/obj/station_objects/disposalholder/H = new()
var/obj/structure/disposalholder/H = new()
H.init(src)
sleep(10)
playsound(src, 'disposalflush.ogg', 50, 0, 0)
@@ -447,7 +447,7 @@
// contents will be items flushed by the disposal
// this allows the gas flushed to be tracked
/obj/station_objects/disposalholder
/obj/structure/disposalholder
invisibility = 101
var/datum/gas_mixture/gas = null // gas used to flush, will appear at exit point
var/active = 0 // true if the holder is moving, otherwise inactive
@@ -470,8 +470,8 @@
var/mob/living/carbon/human/H = AM
if(H.mutations & FAT) // is a human and fat?
has_fat_guy = 1 // set flag on holder
if(istype(AM, /obj/effects/bigDelivery))
var/obj/effects/bigDelivery/T = AM
if(istype(AM, /obj/effect/bigDelivery))
var/obj/effect/bigDelivery/T = AM
src.destinationTag = T.sortTag
if(istype(AM, /obj/item/smallDelivery))
var/obj/item/smallDelivery/T = AM
@@ -495,7 +495,7 @@
// movement process, persists while holder is moving through pipes
process()
var/obj/station_objects/disposalpipe/last
var/obj/structure/disposalpipe/last
while(active)
if(has_fat_guy && prob(2)) // chance of becoming stuck per segment if contains a fat guy
active = 0
@@ -504,7 +504,7 @@
break
sleep(1) // was 1
var/obj/station_objects/disposalpipe/curr = loc
var/obj/structure/disposalpipe/curr = loc
last = curr
curr = curr.transfer(src)
if(!curr)
@@ -528,7 +528,7 @@
return null
var/fdir = turn(dir, 180) // flip the movement direction
for(var/obj/station_objects/disposalpipe/P in T)
for(var/obj/structure/disposalpipe/P in T)
if(fdir & P.dpdir) // find pipe direction mask that matches flipped dir
return P
// if no matching pipe, return null
@@ -536,7 +536,7 @@
// merge two holder objects
// used when a a holder meets a stuck holder
proc/merge(var/obj/station_objects/disposalholder/other)
proc/merge(var/obj/structure/disposalholder/other)
for(var/atom/movable/AM in other)
AM.loc = src // move everything in other holder to this one
if(ismob(AM))
@@ -566,7 +566,7 @@
// Disposal pipes
/obj/station_objects/disposalpipe
/obj/structure/disposalpipe
icon = 'disposal.dmi'
name = "disposal pipe"
desc = "An underfloor disposal pipe."
@@ -590,7 +590,7 @@
// pipe is deleted
// ensure if holder is present, it is expelled
Del()
var/obj/station_objects/disposalholder/H = locate() in src
var/obj/structure/disposalholder/H = locate() in src
if(H)
// holder was present
H.active = 0
@@ -618,15 +618,15 @@
// transfer the holder through this pipe segment
// overriden for special behaviour
//
proc/transfer(var/obj/station_objects/disposalholder/H)
proc/transfer(var/obj/structure/disposalholder/H)
var/nextdir = nextdir(H.dir)
H.dir = nextdir
var/turf/T = H.nextloc()
var/obj/station_objects/disposalpipe/P = H.findpipe(T)
var/obj/structure/disposalpipe/P = H.findpipe(T)
if(P)
// find other holder in next loc, if inactive merge it with current
var/obj/station_objects/disposalholder/H2 = locate() in P
var/obj/structure/disposalholder/H2 = locate() in P
if(H2 && !H2.active)
H.merge(H2)
@@ -665,7 +665,7 @@
// called when there is a break in the pipe
//
proc/expel(var/obj/station_objects/disposalholder/H, var/turf/T, var/direction)
proc/expel(var/obj/structure/disposalholder/H, var/turf/T, var/direction)
var/turf/target
@@ -723,11 +723,11 @@
if(remains)
for(var/D in cardinal)
if(D & dpdir)
var/obj/station_objects/disposalpipe/broken/P = new(src.loc)
var/obj/structure/disposalpipe/broken/P = new(src.loc)
P.dir = D
src.invisibility = 101 // make invisible (since we won't delete the pipe immediately)
var/obj/station_objects/disposalholder/H = locate() in src
var/obj/structure/disposalholder/H = locate() in src
if(H)
// holder was present
H.active = 0
@@ -807,7 +807,7 @@
// called when pipe is cut with welder
proc/welded()
var/obj/station_objects/disposalconstruct/C = new (src.loc)
var/obj/structure/disposalconstruct/C = new (src.loc)
switch(base_icon_state)
if("pipe-s")
C.ptype = 0
@@ -829,11 +829,11 @@
// *** TEST verb
//client/verb/dispstop()
// for(var/obj/station_objects/disposalholder/H in world)
// for(var/obj/structure/disposalholder/H in world)
// H.active = 0
// a straight or bent segment
/obj/station_objects/disposalpipe/segment
/obj/structure/disposalpipe/segment
icon_state = "pipe-s"
New()
@@ -850,7 +850,7 @@
//a three-way junction with dir being the dominant direction
/obj/station_objects/disposalpipe/junction
/obj/structure/disposalpipe/junction
icon_state = "pipe-j1"
New()
@@ -894,7 +894,7 @@
return mask & (~setbit)
//a three-way junction that sorts objects
/obj/station_objects/disposalpipe/sortjunction
/obj/structure/disposalpipe/sortjunction
desc = "An underfloor disposal pipe with a package sorting mechanism."
icon_state = "pipe-j1s"
@@ -936,15 +936,15 @@
// so go with the flow to positive direction
return posdir
transfer(var/obj/station_objects/disposalholder/H)
transfer(var/obj/structure/disposalholder/H)
var/nextdir = nextdir(H.dir, H.destinationTag)
H.dir = nextdir
var/turf/T = H.nextloc()
var/obj/station_objects/disposalpipe/P = H.findpipe(T)
var/obj/structure/disposalpipe/P = H.findpipe(T)
if(P)
// find other holder in next loc, if inactive merge it with current
var/obj/station_objects/disposalholder/H2 = locate() in P
var/obj/structure/disposalholder/H2 = locate() in P
if(H2 && !H2.active)
H.merge(H2)
@@ -960,7 +960,7 @@
//a trunk joining to a disposal bin or outlet on the same turf
/obj/station_objects/disposalpipe/trunk
/obj/structure/disposalpipe/trunk
icon_state = "pipe-t"
var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet
@@ -981,7 +981,7 @@
if (!D.trunk)
D.trunk = src
var/obj/station_objects/disposaloutlet/O = locate() in src.loc
var/obj/structure/disposaloutlet/O = locate() in src.loc
if(O)
linked = O
@@ -992,13 +992,13 @@
// if not entering from disposal bin,
// transfer to linked object (outlet or bin)
transfer(var/obj/station_objects/disposalholder/H)
transfer(var/obj/structure/disposalholder/H)
if(H.dir == DOWN) // we just entered from a disposer
return ..() // so do base transfer proc
// otherwise, go to the linked object
if(linked)
var/obj/station_objects/disposaloutlet/O = linked
var/obj/structure/disposaloutlet/O = linked
if(istype(O))
O.expel(H) // expel at outlet
else
@@ -1017,7 +1017,7 @@
return 0
// a broken pipe
/obj/station_objects/disposalpipe/broken
/obj/structure/disposalpipe/broken
icon_state = "pipe-b"
dpdir = 0 // broken pipes have dpdir=0 so they're not found as 'real' pipes
// i.e. will be treated as an empty turf
@@ -1038,7 +1038,7 @@
// the disposal outlet machine
/obj/station_objects/disposaloutlet
/obj/structure/disposaloutlet
name = "disposal outlet"
desc = "An outlet for the pneumatic disposal system."
icon = 'disposal.dmi'
@@ -1056,7 +1056,7 @@
// expel the contents of the holder object, then delete it
// called when the holder exits the outlet
proc/expel(var/obj/station_objects/disposalholder/H)
proc/expel(var/obj/structure/disposalholder/H)
flick("outlet-open", src)
playsound(src, 'warning-buzzer.ogg', 50, 0, 0)
@@ -1091,7 +1091,7 @@
return
/obj/effects/decal/cleanable/blood/gibs/pipe_eject(var/direction)
/obj/effect/decal/cleanable/blood/gibs/pipe_eject(var/direction)
var/list/dirs
if(direction)
dirs = list( direction, turn(direction, -45), turn(direction, 45))
@@ -1100,7 +1100,7 @@
src.streak(dirs)
/obj/effects/decal/cleanable/robot_debris/gib/pipe_eject(var/direction)
/obj/effect/decal/cleanable/robot_debris/gib/pipe_eject(var/direction)
var/list/dirs
if(direction)
dirs = list( direction, turn(direction, -45), turn(direction, 45))
code/WorkInProgress/recycling/sortingmachinery.dm
+13 -13
View File
@@ -1,4 +1,4 @@
/obj/effects/bigDelivery
/obj/effect/bigDelivery
desc = "A big wrapped package."
name = "large parcel"
icon = 'storage.dmi'
@@ -13,8 +13,8 @@
attack_hand(mob/user as mob)
if (src.wrapped) //sometimes items can disappear. For example, bombs. --rastaf0
src.wrapped.loc = (get_turf(src.loc))
if (istype(src.wrapped,/obj/station_objects/closet))
var/obj/station_objects/closet/O = src.wrapped
if (istype(src.wrapped,/obj/structure/closet))
var/obj/structure/closet/O = src.wrapped
O.welded = 0
del(src)
return
@@ -70,19 +70,19 @@
P.wrapped = O
O.loc = P
src.amount -= 1
else if (istype(target, /obj/station_objects/crate))
var/obj/station_objects/crate/O = target
else if (istype(target, /obj/structure/crate))
var/obj/structure/crate/O = target
if (src.amount > 3)
var/obj/effects/bigDelivery/P = new /obj/effects/bigDelivery(get_turf(O.loc))
var/obj/effect/bigDelivery/P = new /obj/effect/bigDelivery(get_turf(O.loc))
P.wrapped = O
O.loc = P
src.amount -= 3
else
user << "\blue You need more paper."
else if (istype (target, /obj/station_objects/closet))
var/obj/station_objects/closet/O = target
else if (istype (target, /obj/structure/closet))
var/obj/structure/closet/O = target
if (src.amount > 3)
var/obj/effects/bigDelivery/P = new /obj/effects/bigDelivery(get_turf(O.loc))
var/obj/effect/bigDelivery/P = new /obj/effect/bigDelivery(get_turf(O.loc))
P.wrapped = O
O.close()
O.welded = 1
@@ -149,9 +149,9 @@
user << "/blue You can only tag properly wrapped delivery packages!"
*/
attack(target as obj, mob/user as mob)
if (istype(target, /obj/effects/bigDelivery))
if (istype(target, /obj/effect/bigDelivery))
user << "\blue *TAGGED*"
var/obj/effects/bigDelivery/O = target
var/obj/effect/bigDelivery/O = target
O.sortTag = src.currTag
else if (istype(target, /obj/item/smallDelivery))
user << "\blue *TAGGED*"
@@ -183,9 +183,9 @@
flushing = 1
flick("intake-closing", src)
var/deliveryCheck = 0
var/obj/station_objects/disposalholder/H = new() // virtual holder object which actually
var/obj/structure/disposalholder/H = new() // virtual holder object which actually
// travels through the pipes.
for(var/obj/effects/bigDelivery/O in src)
for(var/obj/effect/bigDelivery/O in src)
deliveryCheck = 1
if(O.sortTag == 0)
O.sortTag = 1