Merge pull request #3328 from Mloc/master

Bugfixes.
This commit is contained in:
Chinsky
2013-07-21 16:42:29 -07:00
4 changed files with 7 additions and 0 deletions
@@ -186,6 +186,7 @@
changeling.geneticdamage = 30
src.dna = chosen_dna
src.real_name = chosen_dna.real_name
src.flavor_text = ""
updateappearance(src, src.dna.uni_identity)
domutcheck(src, null)
+2
View File
@@ -20,6 +20,8 @@
action(atom/target)
if(!action_checks(target)) return
if(!cargo_holder) return
if(istype(target, /obj/structure/stool)) return
if(istype(target,/obj))
var/obj/O = target
if(!O.anchored)
+1
View File
@@ -3,6 +3,7 @@
set category = "Fun"
set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
set hidden = 1
if(alert("Are you sure you want to run [cinematic]?","Confirmation","Yes","No")=="No") return
if(!ticker) return
switch(cinematic)
if("explosion")
+3
View File
@@ -10,6 +10,9 @@
announceWhen = rand(50, 60)
releaseWhen = rand(20, 30)
src.startWhen = src.releaseWhen-1
src.endWhen = src.releaseWhen+1
/datum/event/prison_break/announce()
if(prisonAreas && prisonAreas.len > 0)