From 7e9ec438345281b6fcaad39f1f9c82a8655460fd Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 28 Jun 2019 02:33:23 -0400 Subject: [PATCH 1/5] Revert "Automatic changelog generation for PR #8738 [ci skip]" This reverts commit f3712660ceae4e7438b1efef0170da6c2dbeafb8. --- html/changelogs/AutoChangeLog-pr-8738.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-8738.yml diff --git a/html/changelogs/AutoChangeLog-pr-8738.yml b/html/changelogs/AutoChangeLog-pr-8738.yml deleted file mode 100644 index f0e48a77b5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-8738.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie (original PR by ShizCalev)" -delete-after: True -changes: - - bugfix: "Pineapple haters/lovers will get/no longer get pineapple pizzas respectively from infinite pizza boxes." From 81b9f94511914250695823836e5d17c36383eba7 Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 28 Jun 2019 02:33:42 -0400 Subject: [PATCH 2/5] Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]"" This reverts commit 7e9ec438345281b6fcaad39f1f9c82a8655460fd. --- html/changelogs/AutoChangeLog-pr-8738.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8738.yml diff --git a/html/changelogs/AutoChangeLog-pr-8738.yml b/html/changelogs/AutoChangeLog-pr-8738.yml new file mode 100644 index 0000000000..f0e48a77b5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8738.yml @@ -0,0 +1,4 @@ +author: "Ghommie (original PR by ShizCalev)" +delete-after: True +changes: + - bugfix: "Pineapple haters/lovers will get/no longer get pineapple pizzas respectively from infinite pizza boxes." From 3fcc884ab5cc72899cb223cc73a82d7045454c4e Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 28 Jun 2019 08:19:49 -0400 Subject: [PATCH 3/5] Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""" This reverts commit 81b9f94511914250695823836e5d17c36383eba7. --- html/changelogs/AutoChangeLog-pr-8738.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-8738.yml diff --git a/html/changelogs/AutoChangeLog-pr-8738.yml b/html/changelogs/AutoChangeLog-pr-8738.yml deleted file mode 100644 index f0e48a77b5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-8738.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie (original PR by ShizCalev)" -delete-after: True -changes: - - bugfix: "Pineapple haters/lovers will get/no longer get pineapple pizzas respectively from infinite pizza boxes." From 1386161aff88397b671f76c84625a387612ac349 Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 28 Jun 2019 08:20:06 -0400 Subject: [PATCH 4/5] Revert "Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]"""" This reverts commit 3fcc884ab5cc72899cb223cc73a82d7045454c4e. --- html/changelogs/AutoChangeLog-pr-8738.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8738.yml diff --git a/html/changelogs/AutoChangeLog-pr-8738.yml b/html/changelogs/AutoChangeLog-pr-8738.yml new file mode 100644 index 0000000000..f0e48a77b5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8738.yml @@ -0,0 +1,4 @@ +author: "Ghommie (original PR by ShizCalev)" +delete-after: True +changes: + - bugfix: "Pineapple haters/lovers will get/no longer get pineapple pizzas respectively from infinite pizza boxes." From 555c1adf67eae71dc78a1c36c3c353551ca0e427 Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 28 Jun 2019 08:20:59 -0400 Subject: [PATCH 5/5] fix per kevs request --- code/game/objects/items/storage/book.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 4b210f2f79..6b8369974d 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -139,7 +139,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", else if(iscarbon(M)) var/mob/living/carbon/C = M if(!istype(C.head, /obj/item/clothing/head)) - C.adjustBrainLoss(25, 150) + C.adjustBrainLoss(10, 80) to_chat(C, "You feel dumber.") if(smack)