diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 972bb244221..447913d225b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -49,6 +49,11 @@ set category = "Object" set src in oview(1) + if(!usr || !isturf(usr.loc)) + return + if(usr.stat || usr.restrained()) + return + src.dir = turn(src.dir, 90) handle_rotation() return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index ca91d5e1167..c005b3593bc 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -218,7 +218,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp A.loc = T else A << "This mob is not located in the game world." - +/* /mob/dead/observer/verb/boo() set category = "Ghost" set name = "Boo!" @@ -232,7 +232,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return //Maybe in the future we can add more spooky code here! return - +*/ /mob/dead/observer/verb/toggle_alien_candidate() set name = "Toggle Be Alien Candidate" set category = "Ghost" diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 4a2857e938a..9cf96f09f97 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -18,7 +18,7 @@ return . = src.say_dead(message) - +/* for (var/mob/M in hearers(null, null)) if (!M.stat) if(M.job == "Chaplain") @@ -41,4 +41,5 @@ else M.show_message("You hear muffled speech... you can almost make out some words...", 2) // M.show_message("[stutter(message)]", 2) - playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) \ No newline at end of file + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) +*/ \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index f2450ebfd3a..47e7e91c253 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2011,7 +2011,7 @@ datum ..() return ..() - +/* //removed because of meta bullshit. this is why we can't have nice things. syndicream name = "Cream filling" id = "syndicream" @@ -2029,7 +2029,7 @@ datum ..() return ..() - +*/ cornoil name = "Corn Oil" id = "cornoil" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 52020cf4bc3..b83e288bf4d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1020,7 +1020,7 @@ New() ..() reagents.add_reagent("nutriment", 4) - reagents.add_reagent("syndicream", 2) + reagents.add_reagent("doctor_delight", 2) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato @@ -1752,7 +1752,7 @@ New() ..() reagents.add_reagent("nutriment", 8) - reagents.add_reagent("syndicream", 5) + reagents.add_reagent("doctor_delight", 5) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/appletart