cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into poolit

Browse Source 
Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm
This commit is contained in:
Tigercat2000
2015-06-22 13:40:07 -07:00
parent 0918ded8be 44f7ad997c
commit bcb4a9601f
104 changed files with 541 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/PDA.dm
+1 -1
View File
@@ -1293,7 +1293,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (ismob(loc))
var/mob/M = loc
M.show_message("\red Your [src] explodes!", 1)
M.show_message("<span class='danger'>Your [src] explodes!</span>", 1)
if(T)
T.hotspot_expose(700,125)