From 0e9191cdd418afe37f1448412469caa2f5b75b1f Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Thu, 27 Dec 2018 17:01:40 +0000 Subject: [PATCH 01/10] Adds the cuffs to the code and the map --- code/game/objects/effects/spawners/lootdrop.dm | 1 + code/game/objects/items/toys.dm | 15 +++++++++++++++ .../crates_lockers/closets/secure/miscjobs.dm | 1 + 3 files changed, 17 insertions(+) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 048396e4eed..dfe2d433be2 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -98,6 +98,7 @@ /obj/item/poster/random_contraband = 10, /obj/item/crowbar = 10, /obj/item/crowbar/red = 10, + /obj/item/restraints/handcuffs/toy = 5, /obj/item/extinguisher = 90, //obj/item/gun/projectile/revolver/russian = 1, //disabled until lootdrop is a proper world proc. /obj/item/hand_labeler = 10, diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index e672ff14b10..8da3e6d7a0a 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1650,3 +1650,18 @@ obj/item/toy/cards/deck/syndicate/black icon_state = "conch" use_action = "pulls the string" possible_answers = list("Yes.", "No.", "Try asking again.", "Nothing.", "I don't think so.", "Neither.", "Maybe someday.") + +/* + *Fake cuffs (honk honk) + */ + +/obj/item/restraints/handcuffs/toy + name = "handcuffs" + desc = "Toy handcuffs. Plastic and extremely cheaply made." + gender = PLURAL + icon = 'icons/obj/items.dmi' + icon_state = "handcuff" + slot_flags = SLOT_BELT + throwforce = 0 + w_class = WEIGHT_CLASS_SMALL + breakouttime = 0 //Deciseconds = 60s = 1 minutes \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm index 135d4da1d49..58d8ad970f8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm @@ -20,6 +20,7 @@ new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src) new /obj/item/toy/crayon/rainbow(src) new /obj/item/seeds/banana(src) + new /obj/item/restraints/handcuffs/toy(src) From ac2d3396d6e5db175267a4e657f5c54c1b3852f1 Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Thu, 27 Dec 2018 20:20:19 +0000 Subject: [PATCH 02/10] Removes redundancies, makes exception for clumsiness --- code/game/objects/items/toys.dm | 6 ------ code/game/objects/items/weapons/handcuffs.dm | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8da3e6d7a0a..16ae7e685a1 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1656,12 +1656,6 @@ obj/item/toy/cards/deck/syndicate/black */ /obj/item/restraints/handcuffs/toy - name = "handcuffs" desc = "Toy handcuffs. Plastic and extremely cheaply made." - gender = PLURAL - icon = 'icons/obj/items.dmi' - icon_state = "handcuff" - slot_flags = SLOT_BELT throwforce = 0 - w_class = WEIGHT_CLASS_SMALL breakouttime = 0 //Deciseconds = 60s = 1 minutes \ No newline at end of file diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 070e058b2d0..ebcb36e46ea 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -23,7 +23,7 @@ if(!istype(C)) return - if(CLUMSY in user.mutations && prob(50)) + if(CLUMSY in user.mutations && prob(50) && !istype(src, /obj/item/restraints/handcuffs/toy)) to_chat(user, "Uh... how do those things work?!") apply_cuffs(user,user) From a4df95add6a551a5956ed92ee736930e22d50a23 Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Thu, 27 Dec 2018 20:21:36 +0000 Subject: [PATCH 03/10] removes pointless comment that I somehow missed I'm a dum dum --- code/game/objects/items/toys.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 16ae7e685a1..ef9ea04109c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1658,4 +1658,4 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/restraints/handcuffs/toy desc = "Toy handcuffs. Plastic and extremely cheaply made." throwforce = 0 - breakouttime = 0 //Deciseconds = 60s = 1 minutes \ No newline at end of file + breakouttime = 0 \ No newline at end of file From a0c9724d28beb4e560e7a5cf977d823329f7edd4 Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Fri, 28 Dec 2018 20:13:09 +0000 Subject: [PATCH 04/10] Update toys.dm --- code/game/objects/items/toys.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index ef9ea04109c..9b3c9836c15 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1658,4 +1658,5 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/restraints/handcuffs/toy desc = "Toy handcuffs. Plastic and extremely cheaply made." throwforce = 0 - breakouttime = 0 \ No newline at end of file + breakouttime = 0 + ignoreclumsy == true \ No newline at end of file From 5dae4072abe9e87297ba8d0ac76951eb4217fd32 Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Sat, 29 Dec 2018 20:34:00 +0000 Subject: [PATCH 05/10] put in the brackets to fix the cluimsy thing --- code/game/objects/items/weapons/handcuffs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index ebcb36e46ea..ad7b47fda22 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -23,7 +23,7 @@ if(!istype(C)) return - if(CLUMSY in user.mutations && prob(50) && !istype(src, /obj/item/restraints/handcuffs/toy)) + if((CLUMSY in user.mutations) && prob(50) && !istype(src, /obj/item/restraints/handcuffs/toy)) to_chat(user, "Uh... how do those things work?!") apply_cuffs(user,user) From 58033afc8a160f827e3055046e8a20f688189b34 Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Sat, 29 Dec 2018 21:07:21 +0000 Subject: [PATCH 06/10] changes the code to be not as snowflake --- code/game/objects/items/toys.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 3 ++- code/modules/mob/pulling.dm | 0 paradise.dme | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 code/modules/mob/pulling.dm diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 9b3c9836c15..0c742d49236 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1659,4 +1659,4 @@ obj/item/toy/cards/deck/syndicate/black desc = "Toy handcuffs. Plastic and extremely cheaply made." throwforce = 0 breakouttime = 0 - ignoreclumsy == true \ No newline at end of file + ignoresClumsy = TRUE \ No newline at end of file diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index ad7b47fda22..e030454f7f2 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -15,6 +15,7 @@ breakouttime = 600 //Deciseconds = 60s = 1 minutes var/cuffsound = 'sound/weapons/handcuffs.ogg' var/trashtype = null //For disposable cuffs + var/ignoresClumsy = FALSE /obj/item/restraints/handcuffs/attack(mob/living/carbon/C, mob/user) if(!user.IsAdvancedToolUser()) @@ -23,7 +24,7 @@ if(!istype(C)) return - if((CLUMSY in user.mutations) && prob(50) && !istype(src, /obj/item/restraints/handcuffs/toy)) + if((CLUMSY in user.mutations) && prob(50) && (ignoresClumsy == FALSE)) to_chat(user, "Uh... how do those things work?!") apply_cuffs(user,user) diff --git a/code/modules/mob/pulling.dm b/code/modules/mob/pulling.dm new file mode 100644 index 00000000000..e69de29bb2d diff --git a/paradise.dme b/paradise.dme index f04d4909f96..26abd0e2665 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1612,6 +1612,7 @@ #include "code\modules\mob\mob_helpers.dm" #include "code\modules\mob\mob_movement.dm" #include "code\modules\mob\mob_transformation_simple.dm" +#include "code\modules\mob\pulling.dm" #include "code\modules\mob\say.dm" #include "code\modules\mob\status_procs.dm" #include "code\modules\mob\transform_procs.dm" From 6e21f6a7812e648df46357240246d309522c3104 Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Sat, 29 Dec 2018 22:51:58 +0000 Subject: [PATCH 07/10] tiny little code tidy --- code/game/objects/items/weapons/handcuffs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index e030454f7f2..7c26e5c405e 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -24,7 +24,7 @@ if(!istype(C)) return - if((CLUMSY in user.mutations) && prob(50) && (ignoresClumsy == FALSE)) + if((CLUMSY in user.mutations) && prob(50) && (!ignoresClumsy)) to_chat(user, "Uh... how do those things work?!") apply_cuffs(user,user) From a1d93c747dd53184bbb1cd4b19059ccac3e4df25 Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Mon, 31 Dec 2018 00:46:56 +0000 Subject: [PATCH 08/10] I deleted pulling.dm I hope this doesnt break everything --- code/modules/mob/pulling.dm | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 code/modules/mob/pulling.dm diff --git a/code/modules/mob/pulling.dm b/code/modules/mob/pulling.dm deleted file mode 100644 index e69de29bb2d..00000000000 From 99c5ce10da5299c91b2da8fb0abcd187b49e15fb Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Mon, 31 Dec 2018 00:49:25 +0000 Subject: [PATCH 09/10] Delete pulling.dm again? --- code/modules/mob/pulling.dm | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 code/modules/mob/pulling.dm diff --git a/code/modules/mob/pulling.dm b/code/modules/mob/pulling.dm deleted file mode 100644 index e69de29bb2d..00000000000 From 57a4b8ef520027f97ac682be7d4def457dc0fee7 Mon Sep 17 00:00:00 2001 From: Mithrandalf Date: Mon, 31 Dec 2018 00:51:41 +0000 Subject: [PATCH 10/10] Update paradise.dme --- paradise.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/paradise.dme b/paradise.dme index 26abd0e2665..f04d4909f96 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1612,7 +1612,6 @@ #include "code\modules\mob\mob_helpers.dm" #include "code\modules\mob\mob_movement.dm" #include "code\modules\mob\mob_transformation_simple.dm" -#include "code\modules\mob\pulling.dm" #include "code\modules\mob\say.dm" #include "code\modules\mob\status_procs.dm" #include "code\modules\mob\transform_procs.dm"