diff --git a/code/game/objects/radio/electropack.dm b/code/game/objects/radio/electropack.dm index 97140addd7e..013b3fe2529 100644 --- a/code/game/objects/radio/electropack.dm +++ b/code/game/objects/radio/electropack.dm @@ -30,7 +30,7 @@ user.show_message("\blue The electric pads have been exposed!") else user.show_message("\blue The electric pads have been reinserted!") - src.add_fingerprint(user) + //src.add_fingerprint(user) else if (istype(W, /obj/item/clothing/head/helmet)) var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) @@ -118,7 +118,9 @@ if (M.moved_recently && M.last_move) step(M, M.last_move) M.show_message("\red You feel a sharp shock!") - + var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread + s.set_up(3, 1, M) + s.start() if (M.weakened < 10) M.weakened = 10 diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index 34c7d452c22..592b2720052 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -188,6 +188,9 @@ flick("e_chairs", src) flick("e_chairos", src.overl) + var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread + s.set_up(12, 1, src) + s.start() for(var/mob/living/M in src.loc) M.burn_skin(85) M << "\red You feel a deep shock course through your body!" diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 38f3fe138eb..9b7bc036f66 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index 4ff21ff6cc4..8c26cd6b30c 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -194,7 +194,7 @@ "adL" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/prison/medical) "adM" = (/obj/machinery/bot/medbot,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/camera{c_tag = "Medbay"; dir = 1; network = "Prison Station"},/obj/machinery/camera{c_tag = "Prison Medbay"; dir = 1; network = "Warden"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/prison/medical) "adN" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/prison/medical) -"adO" = (/obj/table,/obj/item/weapon/storage/firstaid/o2{pixel_x = 0; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/prison/medical) +"adO" = (/obj/table,/obj/item/weapon/storage/firstaid/o2{pixel_x = 0; pixel_y = 0},/obj/item/device/radio/electropack,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/prison/medical) "adP" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/floor,/area/prison/cell_block/B) "adQ" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/prison/cell_block/B) "adR" = (/obj/stool{pixel_y = 8},/obj/machinery/camera{c_tag = "Cell Block B Cell 3"; dir = 1; network = "Prison Station"},/turf/simulated/floor/plating,/area/prison/cell_block/B) @@ -5769,7 +5769,7 @@ "cgW" = (/obj/stool/bed,/obj/item/weapon/bedsheet,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) "cgX" = (/obj/table,/obj/item/weapon/gun/projectile/automatic/mini_uzi,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) "cgY" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) -"cgZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) +"cgZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) "cha" = (/obj/stool,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) "chb" = (/obj/rack,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile/shotgun/combat,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) "chc" = (/obj/rack,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile/silenced,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) @@ -5897,7 +5897,7 @@ "cju" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 1},/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership) "cjv" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced,/obj/window/reinforced{dir = 1},/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership) "cjw" = (/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) -"cjx" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area/syndicate_mothership) +"cjx" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area/syndicate_mothership) "cjy" = (/obj/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "cjz" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership) "cjA" = (/obj/stool/chair{dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) @@ -6863,7 +6863,7 @@ "cBY" = (/turf/unsimulated/floor{dir = 1; icon_state = "chapel"},/area/wizard_station) "cBZ" = (/turf/unsimulated/floor{dir = 4; icon_state = "chapel"},/area/wizard_station) "cCa" = (/obj/item/weapon/spacecash,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) -"cCb" = (/mob/living/carbon/metroid{desc = "A tamed other thing. Very smart looking."; icon = 'icons/obj/otherthing.dmi'; icon_state = "otherthing"; name = "Tamed Otherthing"; toxloss = 0; voice_message = "gurgles"; voice_name = "otherthing"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"cCb" = (/mob/living/carbon/metroid{desc = "A tamed other thing. Very smart looking."; icon = 'otherthing.dmi'; icon_state = "otherthing"; name = "Tamed Otherthing"; toxloss = 0; voice_message = "gurgles"; voice_name = "otherthing"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cCc" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/unsimulated/floor,/area/wizard_station) "cCd" = (/obj/stool,/turf/unsimulated/floor{dir = 2; icon_state = "carpetside"},/area/wizard_station) "cCe" = (/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station)