cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 05:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes camera casings not fitting in lockers, fixes being able to delete cameras completely by moving away after wrenching them.

Browse Source 
Fixes racks being dum.

(I'm pretty tired so I'd appreciate it if someone would take a glance over this and make sure I haven't BROKEN EVERYTHING.) Compiles fine and seems to work though.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2400 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2011-10-20 03:57:38 +00:00
parent dee769888f
commit 44da35ee64
3 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/machinery/camera.dm
View File

@@ -303,13 +303,15 @@
if(do_after(user, 20))
var/obj/item/weapon/chem_grenade/case = new /obj/item/weapon/chem_grenade(src.loc)
case.name = "Camera Assembly"
case.icon = 'monitors.dmi'
//JESUS WHAT THE FUCK EVERYTHING TO DO WITH CAMERAS IS TERRIBLE FUCK
case.icon_state = "cameracase"
case.path = 2
case.state = 5
case.anchored = 1
case.circuit = new /obj/item/device/multitool
if (istype(src, /obj/machinery/camera/motion))
case.motion = 1
del(src)
del(src)
else if (istype(W, /obj/item/weapon/camera_bug))
if (!src.status)
user << "\blue Camera non-functional"
@@ -330,9 +332,10 @@
var/obj/item/weapon/chem_grenade/case = new /obj/item/weapon/chem_grenade(loc)
case.name = "Camera Assembly"
case.icon = 'monitors.dmi'
case.icon_state = "cameracase"
case.path = 2
case.state = 5
case.anchored = 1
case.circuit = new /obj/item/device/multitool
if (istype(src, /obj/machinery/camera/motion))
case.motion = 1

27
code/game/objects/tables_racks.dm
View File

@@ -277,29 +277,22 @@ TABLE AND RACK OBJECT INTERATIONS
switch(severity)
if(1.0)
del(src)
return
if(2.0)
del(src)
if(prob(50))
del(src)
return
return
new /obj/item/weapon/rack_parts(src.loc)
if(3.0)
if(prob(25))
src.icon_state = "rackbroken"
src.density = 0
return
return
else
return
return
del(src)
new /obj/item/weapon/rack_parts(src.loc)
/obj/structure/rack/blob_act()
if(prob(75))
del(src)
return
else if(prob(50))
src.icon_state = "rackbroken"
src.density = 0
new /obj/item/weapon/rack_parts(src.loc)
del(src)
return
/obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
@@ -335,10 +328,4 @@ TABLE AND RACK OBJECT INTERATIONS
return
/obj/structure/rack/meteorhit(obj/O as obj)
if(prob(75))
del(src)
return
else
src.icon_state = "rackbroken"
src.density = 0
return
del(src)