diff --git a/code/game/machinery/camera.dm b/code/game/machinery/camera.dm index f373d91f7d1..313eb9275f0 100644 --- a/code/game/machinery/camera.dm +++ b/code/game/machinery/camera.dm @@ -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 diff --git a/code/game/objects/tables_racks.dm b/code/game/objects/tables_racks.dm index 8b4b200b007..0c10b8d1d1b 100644 --- a/code/game/objects/tables_racks.dm +++ b/code/game/objects/tables_racks.dm @@ -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 \ No newline at end of file + del(src) \ No newline at end of file diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi index 5492b2bf52a..48d1fdeeac2 100644 Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ