cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Browse Source 
Conflicts:
	maps/cyberiad.dmm
This commit is contained in:
Markolie
2015-03-03 22:58:41 +01:00
parent 2774482615 54385f0197
commit 3497d4ba9e
5 changed files with 125 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/taperecorder.dm
+1 -1
View File
@@ -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 << "<span class='warning'>PZZTTPFFFT</span>"