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

/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
+2 -2
View File
@@ -26,8 +26,8 @@
/obj/machinery/mineral/unloading_machine/process()
if (src.output && src.input)
if (locate(/obj/station_objects/ore_box, input.loc))
var/obj/station_objects/ore_box/BOX = locate(/obj/station_objects/ore_box, input.loc)
if (locate(/obj/structure/ore_box, input.loc))
var/obj/structure/ore_box/BOX = locate(/obj/structure/ore_box, input.loc)
var/i = 0
for (var/obj/item/weapon/ore/O in BOX.contents)
BOX.contents -= O
+4 -4
View File
@@ -1,7 +1,7 @@
/**********************Light************************/
//this item is intended to give the effect of entering the mine, so that light gradually fades
/obj/effects/light_emitter
/obj/effect/light_emitter
name = "Light-emtter"
anchored = 1
unacidable = 1
@@ -9,7 +9,7 @@
/**********************Miner Lockers**************************/
/obj/station_objects/secure_closet/miner
/obj/structure/secure_closet/miner
name = "Miner's Equipment"
icon_state = "miningsec1"
icon_closed = "miningsec"
@@ -18,7 +18,7 @@
icon_off = "miningsecoff"
req_access = list(access_mining)
/obj/station_objects/secure_closet/miner/New()
/obj/structure/secure_closet/miner/New()
..()
sleep(2)
new /obj/item/device/analyzer(src)
@@ -220,7 +220,7 @@ proc/move_mining_shuttle()
/**********************Mining car (Crate like thing, not the rail car)**************************/
/obj/station_objects/crate/miningcar
/obj/structure/crate/miningcar
desc = "A mining car. This one doesn't work on rails, but has to be dragged."
name = "Mining car (not for rails)"
icon = 'storage.dmi'
+1 -1
View File
@@ -186,7 +186,7 @@
var/old_dir = dir
for(var/direction in cardinal)
for(var/obj/effects/glowshroom/shroom in get_step(src,direction))
for(var/obj/effect/glowshroom/shroom in get_step(src,direction))
if(!shroom.floor) //shrooms drop to the floor
shroom.floor = 1
shroom.icon_state = "glowshroomf"
+4 -4
View File
@@ -37,14 +37,14 @@
/**********************Ore box**************************/
/obj/station_objects/ore_box
/obj/structure/ore_box
icon = 'mining.dmi'
icon_state = "orebox"
name = "Ore Box"
desc = "It's heavy"
density = 1
/obj/station_objects/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/ore))
src.contents += W;
if (istype(W, /obj/item/weapon/satchel))
@@ -52,7 +52,7 @@
user << "\blue You empty the satchel into the box."
return
/obj/station_objects/ore_box/attack_hand(obj, mob/user as mob)
/obj/structure/ore_box/attack_hand(obj, mob/user as mob)
var/amt_gold = 0
var/amt_silver = 0
var/amt_diamond = 0
@@ -107,7 +107,7 @@
user << browse("[dat]", "window=orebox")
return
/obj/station_objects/ore_box/Topic(href, href_list)
/obj/structure/ore_box/Topic(href, href_list)
if(..())
return
usr.machine = src