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

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	code/modules/mob/mob_defines.dm
This commit is contained in:
Ren Erthilo
2012-04-04 20:19:23 +01:00
parent d4d509faee 0e4690938b
commit ebebfaabb3
42 changed files with 923 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/magic/library.dm
+1 -1
View File
@@ -140,7 +140,7 @@
for(var/obj/item/weapon/book/b in src.contents)
books.Add(b)
if(books.len)
var/obj/item/weapon/book/choice = input("Which book would you like to remove from the shelf?") in books|null as obj|null
var/obj/item/weapon/book/choice = input("Which book would you like to remove from the shelf?") as null|anything in books
if(choice)
choice.loc = src.loc
else