cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 12:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #4607 from Aryn/master"

Browse Source 
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
This commit is contained in:
Mloc-Hibernia
2014-03-24 13:54:11 +00:00
parent 46f753b3ee
commit dc97a2502a
43 changed files with 325 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+14 -14
View File
@@ -21,7 +21,7 @@
if(!opened) // if closed, any item at the crate's loc is put in the contents
for(var/obj/item/I in src.loc)
if(I.density || I.anchored || I == src) continue
I.setloc(src)
I.loc = src
/obj/structure/closet/alter_health()
return get_turf(src)
@@ -44,13 +44,13 @@
/obj/structure/closet/proc/dump_contents()
//Cham Projector Exception
for(var/obj/effect/dummy/chameleon/AD in src)
AD.setloc(src.loc)
AD.loc = src.loc
for(var/obj/I in src)
I.setloc(src.loc)
I.loc = src.loc
for(var/mob/M in src)
M.setloc(src.loc)
M.loc = src.loc
if(M.client)
M.client.eye = M.client.mob
M.client.perspective = MOB_PERSPECTIVE
@@ -85,14 +85,14 @@
for(var/obj/effect/dummy/chameleon/AD in src.loc)
if(itemcount >= storage_capacity)
break
AD.setloc(src)
AD.loc = src
itemcount++
for(var/obj/item/I in src.loc)
if(itemcount >= storage_capacity)
break
if(!I.anchored)
I.setloc(src)
I.loc = src
itemcount++
for(var/mob/M in src.loc)
@@ -107,7 +107,7 @@
M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src
M.setloc(src)
M.loc = src
itemcount++
src.icon_state = src.icon_closed
@@ -130,19 +130,19 @@
switch(severity)
if(1)
for(var/atom/movable/A as mob|obj in src)//pulls everything out of the locker and hits it with an explosion
A.setloc(src.loc)
A.loc = src.loc
A.ex_act(severity++)
del(src)
if(2)
if(prob(50))
for (var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
A.ex_act(severity++)
del(src)
if(3)
if(prob(5))
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
A.ex_act(severity++)
del(src)
@@ -151,7 +151,7 @@
..()
if(health <= 0)
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
del(src)
return
@@ -160,14 +160,14 @@
if(user.wall_smash)
visible_message("\red [user] destroys the [src]. ")
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
del(src)
// this should probably use dump_contents()
/obj/structure/closet/blob_act()
if(prob(75))
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
del(src)
/obj/structure/closet/meteorhit(obj/O as obj)
@@ -197,7 +197,7 @@
return
usr.drop_item()
if(W)
W.setloc(src.loc)
W.loc = src.loc
else if(istype(W, /obj/item/weapon/packageWrap))
return
else if(istype(W, /obj/item/weapon/weldingtool))
code/game/objects/structures/crates_lockers/crates.dm
+8 -8
View File
@@ -33,7 +33,7 @@
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
for(var/obj/O in src)
O.setloc(get_turf(src))
O.loc = get_turf(src)
icon_state = icon_opened
src.opened = 1
return 1
@@ -55,7 +55,7 @@
var/obj/structure/stool/bed/B = O
if(B.buckled_mob)
continue
O.setloc(src)
O.loc = src
itemcount++
icon_state = icon_closed
@@ -68,7 +68,7 @@
return
user.drop_item()
if(W)
W.setloc(src.loc)
W.loc = src.loc
else if(istype(W, /obj/item/weapon/packageWrap))
return
else if(istype(W, /obj/item/weapon/cable_coil))
@@ -84,7 +84,7 @@
if(rigged)
user << "<span class='notice'>You attach [W] to [src].</span>"
user.drop_item()
W.setloc(src)
W.loc = src
return
else if(istype(W, /obj/item/weapon/wirecutters))
if(rigged)
@@ -424,12 +424,12 @@
continue
if(!S.anchored)
found = 1
S.setloc(src)
S.loc = src
break
if(!found)
for(var/obj/machinery/M in src.loc)
if(!M.anchored)
M.setloc(src)
M.loc = src
break
return
@@ -452,12 +452,12 @@
continue
if(!S.anchored)
found = 1
S.setloc(src)
S.loc = src
break
if(!found)
for(var/obj/machinery/M in src.loc)
if(!M.anchored)
M.setloc(src)
M.loc = src
break
return
code/game/objects/structures/crates_lockers/largecrate.dm
+1 -1
View File
@@ -15,7 +15,7 @@
new /obj/item/stack/sheet/wood(src)
var/turf/T = get_turf(src)
for(var/obj/O in contents)
O.setloc(T)
O.loc = T
user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
"<span class='notice'>You pry open \the [src].</span>", \
"<span class='notice'>You hear splitting wood.</span>")
code/game/objects/structures/morgue.dm
+16 -16
View File
@@ -34,21 +34,21 @@
switch(severity)
if(1.0)
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
ex_act(severity)
del(src)
return
if(2.0)
if (prob(50))
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
ex_act(severity)
del(src)
return
if(3.0)
if (prob(5))
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
ex_act(severity)
del(src)
return
@@ -64,7 +64,7 @@
if (src.connected)
for(var/atom/movable/A as mob|obj in src.connected.loc)
if (!( A.anchored ))
A.setloc(src)
A.loc = src
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
//src.connected = null
del(src.connected)
@@ -78,7 +78,7 @@
src.connected.connected = src
src.icon_state = "morgue0"
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.connected.loc)
A.loc = src.connected.loc
src.connected.icon_state = "morguet"
src.connected.dir = src.dir
else
@@ -114,7 +114,7 @@
src.connected.connected = src
src.icon_state = "morgue0"
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.connected.loc)
A.loc = src.connected.loc
//Foreach goto(106)
src.connected.icon_state = "morguet"
else
@@ -144,7 +144,7 @@
if (src.connected)
for(var/atom/movable/A as mob|obj in src.loc)
if (!( A.anchored ))
A.setloc(src.connected)
A.loc = src.connected
//Foreach goto(26)
src.connected.connected = null
src.connected.update()
@@ -161,7 +161,7 @@
return
if (!ismob(user) || user.stat || user.lying || user.stunned)
return
O.setloc(src.loc)
O.loc = src.loc
if (user != O)
for(var/mob/B in viewers(user, 3))
if ((B.client && !( B.blinded )))
@@ -199,21 +199,21 @@
switch(severity)
if(1.0)
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
ex_act(severity)
del(src)
return
if(2.0)
if (prob(50))
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
ex_act(severity)
del(src)
return
if(3.0)
if (prob(5))
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.loc)
A.loc = src.loc
ex_act(severity)
del(src)
return
@@ -238,7 +238,7 @@
if ((src.connected) && (src.locked == 0))
for(var/atom/movable/A as mob|obj in src.connected.loc)
if (!( A.anchored ))
A.setloc(src)
A.loc = src
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
//src.connected = null
del(src.connected)
@@ -252,7 +252,7 @@
src.connected.connected = src
src.icon_state = "crema0"
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.connected.loc)
A.loc = src.connected.loc
src.connected.icon_state = "cremat"
else
//src.connected = null
@@ -286,7 +286,7 @@
src.connected.connected = src
src.icon_state = "crema0"
for(var/atom/movable/A as mob|obj in src)
A.setloc(src.connected.loc)
A.loc = src.connected.loc
//Foreach goto(106)
src.connected.icon_state = "cremat"
else
@@ -360,7 +360,7 @@
if (src.connected)
for(var/atom/movable/A as mob|obj in src.loc)
if (!( A.anchored ))
A.setloc(src.connected)
A.loc = src.connected
//Foreach goto(26)
src.connected.connected = null
src.connected.update()
@@ -377,7 +377,7 @@
return
if (!ismob(user) || user.stat || user.lying || user.stunned)
return
O.setloc(src.loc)
O.loc = src.loc
if (user != O)
for(var/mob/B in viewers(user, 3))
if ((B.client && !( B.blinded )))
code/game/objects/structures/safe.dm
+2 -2
View File
@@ -36,7 +36,7 @@ FLOOR SAFES
return
if(I.w_class + space <= maxspace)
space += I.w_class
I.setloc(src)
I.loc = src
/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear)
@@ -147,7 +147,7 @@ FLOOR SAFES
if(I.w_class + space <= maxspace)
space += I.w_class
user.drop_item()
I.setloc(src)
I.loc = src
user << "<span class='notice'>You put [I] in [src].</span>"
updateUsrDialog()
return
code/game/objects/structures/transit_tubes.dm
+7 -7
View File
@@ -49,7 +49,7 @@
/obj/structure/transit_tube_pod/Del()
for(var/atom/movable/AM in contents)
AM.setloc(loc)
AM.loc = loc
..()
@@ -60,7 +60,7 @@ obj/structure/ex_act(severity)
switch(severity)
if(1.0)
for(var/atom/movable/AM in contents)
AM.setloc(loc)
AM.loc = loc
AM.ex_act(severity++)
del(src)
@@ -68,7 +68,7 @@ obj/structure/ex_act(severity)
if(2.0)
if(prob(50))
for(var/atom/movable/AM in contents)
AM.setloc(loc)
AM.loc = loc
AM.ex_act(severity++)
del(src)
@@ -105,7 +105,7 @@ obj/structure/ex_act(severity)
AM << "<span class='warning'>The tube's support pylons block your way.</span>"
return ..()
else
AM.setloc(src.loc)
AM.loc = src.loc
AM << "<span class='info'>You slip under the tube.</span>"
@@ -118,7 +118,7 @@ obj/structure/ex_act(severity)
if(!pod_moving && icon_state == "open" && istype(AM, /mob))
for(var/obj/structure/transit_tube_pod/pod in loc)
if(!pod.moving && pod.dir in directions())
AM.setloc(pod)
AM.loc = pod
return
@@ -412,7 +412,7 @@ obj/structure/ex_act(severity)
if(istype(mob, /mob) && mob.client)
// If the pod is not in a tube at all, you can get out at any time.
if(!(locate(/obj/structure/transit_tube) in loc))
mob.setloc(loc)
mob.loc = loc
mob.client.Move(get_step(loc, direction), direction)
//if(moving && istype(loc, /turf/space))
@@ -425,7 +425,7 @@ obj/structure/ex_act(severity)
if(!station.pod_moving)
if(direction == station.dir)
if(station.icon_state == "open")
mob.setloc(loc)
mob.loc = loc
mob.client.Move(get_step(loc, direction), direction)
else
code/game/objects/structures/watercloset.dm
+2 -2
View File
@@ -31,7 +31,7 @@
if(ishuman(user))
user.put_in_hands(I)
else
I.setloc(get_turf(src))
I.loc = get_turf(src)
user << "<span class='notice'>You find \an [I] in the cistern.</span>"
w_items -= I.w_class
return
@@ -84,7 +84,7 @@
user << "<span class='notice'>The cistern is full.</span>"
return
user.drop_item()
I.setloc(src)
I.loc = src
w_items += I.w_class
user << "You carefully place \the [I] into the cistern."
return