cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Applied Aranclanos's patch. http://www.nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10099

Browse Source 
Fixes issue 928 
Fixes issue 936

Remove a small bit of code rot in robot_items.dm


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4768 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rockdtben@gmail.com
2012-09-28 23:13:50 +00:00
parent eb10f04ea3
commit 4d236debd8
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/items/robot/robot_items.dm
View File

@@ -148,13 +148,13 @@
else
disabled = 0
if(!isrobot(user)|| disabled == 1) return
if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock))) return
var/mob/living/silicon/robot/R = user
var/obj/item/weapon/cell/cell = R.cell
if(!cell) return
if(istype(A, /turf))
if((istype(A, /turf) || istype(A, /obj/machinery/door/airlock)))
switch(mode)
if(1)
if(istype(A, /turf/space))
@@ -166,7 +166,7 @@
if(istype(A, /turf/simulated/floor))
if(!cell.use(90)) return
user << "Building Wall (3)..."
user << "Building Wall ..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
activate()
@@ -180,7 +180,6 @@
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50))
activate()
if(locate(/obj/machinery/door) in get_turf(src)) return
var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock( A )
T.autoclose = 1
return
@@ -195,9 +194,6 @@
A:ReplaceWithPlating()
return
if(istype(A, /turf/simulated/wall/r_wall)) //by order of muskets -pete
return
if(istype(A, /turf/simulated/floor))
user << "Deconstructing Floor..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
@@ -210,7 +206,7 @@
user << "Deconstructing Airlock..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50))
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
activate()
del(A)
return
return

7
code/game/objects/items/weapons/RCD.dm
View File

@@ -107,7 +107,6 @@ RCD
if(!disabled && matter >= 10)
spark_system.set_up(5, 0, src)
src.spark_system.start()
if(locate(/obj/machinery/door) in get_turf(src)) return
var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock( A )
var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src))
if(killthis)
@@ -119,7 +118,9 @@ RCD
desc = "A RCD. It currently holds [matter]/30 matter-units."
return
else if(mode == 3 && (istype(A, /turf) || istype(A, /obj/machinery/door/airlock) ) )
if(istype(A, /turf/simulated/wall) && !istype(A, /turf/simulated/wall/r_wall) && matter >= 4)
if(istype(A, /turf/simulated/wall/r_wall))
return
if(istype(A, /turf/simulated/wall) && matter >= 4)
user << "Deconstructing Wall (4)..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 40))
@@ -131,8 +132,6 @@ RCD
matter -= 4
desc = "A RCD. It currently holds [matter]/30 matter-units."
return
if(istype(A, /turf/simulated/wall/r_wall))
return
if(istype(A, /turf/simulated/floor) && matter >= 5)
user << "Deconstructing Floor (5)..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)