From f2b1d55b37a726999c4d2a05d870b0ea1f705bcc Mon Sep 17 00:00:00 2001 From: datlo Date: Tue, 22 Jan 2019 01:21:32 +0000 Subject: [PATCH 1/5] Add force to books, extra to space law --- code/game/objects/items/weapons/manuals.dm | 1 + code/modules/library/lib_items.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index a83a09d639c..4d36c640784 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -796,6 +796,7 @@ name = "Space Law" desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." icon_state = "bookSpaceLaw" + force = 4 //advanced magistrate tactics author = "Nanotrasen" title = "Space Law" dat = {" diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index dd7f591e3b7..991061d5ef7 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -167,6 +167,7 @@ icon_state ="book" throw_speed = 1 throw_range = 5 + force = 2 w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) attack_verb = list("bashed", "whacked", "educated") burn_state = FLAMMABLE From 9a7147423e00e6f2c864a8a07b4520a484a231fe Mon Sep 17 00:00:00 2001 From: datlo Date: Tue, 22 Jan 2019 01:41:24 +0000 Subject: [PATCH 2/5] added throwforce --- code/game/objects/items/weapons/manuals.dm | 1 + code/modules/library/lib_items.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 4d36c640784..87c0d54e317 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -797,6 +797,7 @@ desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." icon_state = "bookSpaceLaw" force = 4 //advanced magistrate tactics + throwforce = 4 //throw the book at em author = "Nanotrasen" title = "Space Law" dat = {" diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 991061d5ef7..f893657ded7 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -168,6 +168,7 @@ throw_speed = 1 throw_range = 5 force = 2 + throwforce = 2 w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) attack_verb = list("bashed", "whacked", "educated") burn_state = FLAMMABLE From 7ca01a7c34c16015a7758d75c159488c39c436ca Mon Sep 17 00:00:00 2001 From: datlo Date: Tue, 22 Jan 2019 04:21:01 +0000 Subject: [PATCH 3/5] add harmless help intent attacks --- code/modules/library/lib_items.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index f893657ded7..03d610406fa 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -170,7 +170,7 @@ force = 2 throwforce = 2 w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) - attack_verb = list("bashed", "whacked", "educated") + attack_verb = list("bashed", "whacked") burn_state = FLAMMABLE var/dat // Actual page content @@ -285,6 +285,14 @@ else return ..() +/obj/item/book/attack(mob/M, mob/living/user) + if(user.a_intent == INTENT_HELP) + force = 0 + attack_verb = list("educated") + else + force = initial(force) + attack_verb = list("bashed", "whacked") + ..() /* * Barcode Scanner From fc18cdf72d024c19d32d7f10abf5800097430a91 Mon Sep 17 00:00:00 2001 From: datlo Date: Wed, 23 Jan 2019 14:23:21 +0000 Subject: [PATCH 4/5] remove throwforce on space law --- code/game/objects/items/weapons/manuals.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 87c0d54e317..4d36c640784 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -797,7 +797,6 @@ desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." icon_state = "bookSpaceLaw" force = 4 //advanced magistrate tactics - throwforce = 4 //throw the book at em author = "Nanotrasen" title = "Space Law" dat = {" From 9844da2ed0c9438d6a9124f371a17a10bcffaf1b Mon Sep 17 00:00:00 2001 From: datlo Date: Wed, 23 Jan 2019 14:23:55 +0000 Subject: [PATCH 5/5] remove throwforce on books --- code/modules/library/lib_items.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 03d610406fa..b50433c51a9 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -168,7 +168,6 @@ throw_speed = 1 throw_range = 5 force = 2 - throwforce = 2 w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) attack_verb = list("bashed", "whacked") burn_state = FLAMMABLE