shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"

Browse Source 
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
This commit is contained in:
kevinz000
2020-02-05 23:50:41 -07:00
parent 3a47e49cb3
commit 927b9d0622
8 changed files with 13 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/library/lib_items.dm
View File

@@ -129,14 +129,6 @@
choice.forceMove(drop_location())
update_icon()
/obj/structure/bookcase/attack_ghost(mob/dead/observer/user as mob)
if(contents.len && in_range(user, src))
var/obj/item/book/choice = input("Which book would you like to read?") as null|obj in contents
if(choice)
if(!istype(choice)) //spellbook, cult tome, or the one weird bible storage
to_chat(user,"A mysterious force is keeping you from reading that.")
return
choice.attack_self(user)
/obj/structure/bookcase/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/mineral/wood(loc, 4)
@@ -212,9 +204,8 @@
return
if(dat)
user << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book[window_size != null ? ";size=[window_size]" : ""]")
if(istype(user, /mob/living))
user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd)
user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd)
onclose(user, "book")
else
to_chat(user, "<span class='notice'>This book is completely blank!</span>")
@@ -320,9 +311,6 @@
else
..()
/obj/item/book/attack_ghost(mob/user)
attack_self(user)
/*
* Barcode Scanner

2
code/modules/mob/dead/observer/observer.dm
View File

@@ -796,7 +796,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
update_icon()
/mob/dead/observer/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
return IsAdminGhost(usr) || (M.ghost_flags & INTERACT_GHOST_READ)
return IsAdminGhost(usr)
/mob/dead/observer/is_literate()
return 1

12
code/modules/mob/mob_helpers.dm
View File

@@ -402,18 +402,6 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return
return TRUE
/proc/canGhostWrite(var/mob/A, var/obj/target, var/desc="", var/allow_all=FALSE)
if(allow_all & TRUE)
if(!target.GetComponent(/datum/component/anti_magic))
return 1
if(IsAdminGhost(A))
if (desc != "")
log_admin("GHOST: [key_name(A)] [desc] ([target.name] at [loc_name(target)])")
else
log_admin("GHOST: [key_name(A)] fucked with the [target.name] at [loc_name(target)]")
return 1
return 0
/proc/offer_control(mob/M)
to_chat(M, "Control of your mob has been offered to dead players.")
if(usr)