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

All hail glorious leader tigercat
This commit is contained in:
Crazylemon64
2016-07-08 00:16:28 -07:00
928 changed files with 8857 additions and 8457 deletions
+2 -2
View File
@@ -19,8 +19,8 @@
if(stat & (BROKEN | NOPOWER))
return 1
if (!Adjacent(user))
if (!issilicon(user) && !isobserver(user))
if(!Adjacent(user))
if(!issilicon(user) && !isobserver(user))
user.unset_machine()
user << browse(null, "window=library")
return 1
+2 -2
View File
@@ -435,7 +435,7 @@
return
if(bibledelay)
for (var/mob/V in hearers(src))
for(var/mob/V in hearers(src))
V.show_message("<b>[src]</b>'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
else
bibledelay = 1
@@ -456,7 +456,7 @@
return
var/obj/item/weapon/book/B = new newbook.path(loc)
if (!newbook.programmatic)
if(!newbook.programmatic)
B.name = "Book: [newbook.title]"
B.title = newbook.title
B.author = newbook.author
+1 -1
View File
@@ -70,7 +70,7 @@
if("brute")
health -= O.force * 0.75
else
if (health <= 0)
if(health <= 0)
visible_message("<span class=warning>The bookcase is smashed apart!</span>")
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))