diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 8477205a84a..888524853d6 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -39,7 +39,7 @@ return /obj/item/device/taperecorder/emag_act(user as mob) - if(!emagged == 0) + if(emagged == 0) emagged = 1 recording = 0 user << "PZZTTPFFFT" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index b55626d3c9b..374b86eea8d 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -553,7 +553,7 @@ /obj/item/weapon/paper/armory name = "paper- 'Armory Inventory'" - info = "4 Deployable Barriers
4 Portable Flashers
1 Mechanical Toolbox
2 Boxes of Spare Handcuffs
1 Box of Flashbangs
1 Box of Spare R.O.B.U.S.T. Cartridges
1 Tracking Implant Kit
1 Chemical Implant Kit
1 Box of Tear Gas Grenades
1 Explosive Ordnance Disposal Suit
1 Biohazard Suit
3 Gas Masks
1 Lockbox of Loyalty Implants
1 Ion Rifle
3 Sets of Riot Equipment
2 Sets of Security Hardsuits
1 Ablative Armor Vest
3 Bulletproof Vests
3 Helmets

2 Riot Shotguns
2 Boxes of Beanbag Shells
3 Laser Guns
3 Energy Guns
3 Advanced Tasers" + info = "4 Deployable Barriers
4 Portable Flashers
1 Mechanical Toolbox
2 Boxes of Spare Handcuffs
1 Box of Flashbangs
1 Box of Spare R.O.B.U.S.T. Cartridges
1 Tracking Implant Kit
1 Chemical Implant Kit
1 Box of Tear Gas Grenades
1 Explosive Ordnance Disposal Suit
1 Biohazard Suit
6 Gas Masks
1 Lockbox of Loyalty Implants
1 Ion Rifle
3 Sets of Riot Equipment
2 Sets of Security Hardsuits
1 Ablative Armor Vest
3 Bulletproof Vests
3 Helmets

2 Riot Shotguns
2 Boxes of Beanbag Shells
3 Laser Guns
3 Energy Guns
3 Advanced Tasers" /obj/item/weapon/paper/firingrange name = "paper- 'Firing Range Instructions'" diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index 8c2039f996f..8cd78f72c55 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -6983,7 +6983,7 @@ "cEo" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{icon_state = "dark"},/area/storage/secure) "cEp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{icon_state = "dark"},/area/storage/secure) "cEq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{icon_state = "dark"},/area/storage/secure) -"cEr" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{id = "Secure Storage"; name = "Secure Storage Blast Doors"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating,/area/storage/secure) +"cEr" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{id = "Secure Storage"; name = "Secure Storage Blast Doors"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plating,/area/storage/secure) "cEs" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor,/area/engine/engineering) "cEt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor,/area/engine/engineering) "cEu" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4; initialize_directions = 11; level = 1},/turf/simulated/floor,/area/engine/engineering)