From 63ed98a3b3949b22aafbb9e722298fe3b8e1b21e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 28 Mar 2019 19:32:59 -0400 Subject: [PATCH 1/8] Delete honk.dmi --- modular_citadel/icons/obj/honk.dmi | Bin 324 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 modular_citadel/icons/obj/honk.dmi diff --git a/modular_citadel/icons/obj/honk.dmi b/modular_citadel/icons/obj/honk.dmi deleted file mode 100644 index 950a0c784baa9fe8a872c0cc42480e1b56060d15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvl>na**8>L*Ad S_k9Oiz~JfX=d#Wzp$P!zBYPGA From f0df7e4805b55f897a442bdc020ed28ef80dfdcc Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 28 Mar 2019 19:33:18 -0400 Subject: [PATCH 2/8] Add files via upload --- modular_citadel/icons/obj/honk.dmi | Bin 0 -> 427 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modular_citadel/icons/obj/honk.dmi diff --git a/modular_citadel/icons/obj/honk.dmi b/modular_citadel/icons/obj/honk.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e605c646f83548bb717c647ff2123c9e29bd5e15 GIT binary patch literal 427 zcmV;c0aX5pP)=5t$G05s81M8PjFGXVdZ7C|A7 z?PCA{00DGTPE!Ct=GbNc004k`R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo` zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSI5P*RB_qEmPl<~& zC9|j)C}_yVnO2mTn+jpWl_uqsrWO|@CZ}fP=VhlB;Zm=x;OgfBb_)RTdn+)Ihuv(w!Cz}ZV~?xhF0 z_8_lSjt4pWdAz-^$I)OvuMhXVkB0j5gb$$gF)j$e`xoIt{S?6MKLYGO{D*7)cy1nx V1S*tM8h-!)002ovPDHLkV1ly+v&#Sg literal 0 HcmV?d00001 From 2ecc532c48bdd5f37698dbe2222a291b5c2d8ff0 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 28 Mar 2019 19:40:28 -0400 Subject: [PATCH 3/8] Update honk.dm --- modular_citadel/code/game/objects/items/honk.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/game/objects/items/honk.dm b/modular_citadel/code/game/objects/items/honk.dm index 9deb8aec30..0bac323714 100644 --- a/modular_citadel/code/game/objects/items/honk.dm +++ b/modular_citadel/code/game/objects/items/honk.dm @@ -3,4 +3,11 @@ desc = "A shiny bike horn handcrafted in the artisan workshops of Mars, with superior kevlar-reinforced rubber bulb attached to a polished plasteel reed horn." attack_verb = list("elegantly HONKED") icon = 'modular_citadel/icons/obj/honk.dmi' - icon_state = "silverhorn" \ No newline at end of file + icon_state = "silverhorn" + +/obj/item/bikehorn/bluespacehonker + name = "bluespace bike horn" + desc = "A normal bike horn colored blue and has bluespace dust held in to reed horn allowing for silly honks through space and time, into your in childhood." + attack_verb = list("HONKED in bluespace", "HONKED", "quantumly HONKED") + icon = 'modular_citadel/icons/obj/honk.dmi' + icon_state = "bluespacehonker" From c2039e4b623878f9c291ded2284a2b8b78f014d8 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 28 Mar 2019 19:47:26 -0400 Subject: [PATCH 4/8] Update recipes.dm --- code/modules/crafting/recipes.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 750b172286..2cbd4396dd 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -435,6 +435,15 @@ result = /obj/item/extendohand category = CAT_MISC +/datum/crafting_recipe/bluespacehonker + name = "Bluespace Bike horn" + result = /obj/item/bikehorn/bluespacehonker + time = 10 + reqs = list(/obj/item/stack/ore/bluespace_crystalt = 1, + /obj/item/toy/crayon/blue = 1, + /obj/item/bikehorn = 1) + category = CAT_MISC + /datum/crafting_recipe/chemical_payload name = "Chemical Payload (C4)" result = /obj/item/bombcore/chemical From dcfbcbae6d3eaada81f3051cd209f15ccbf87a90 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 28 Mar 2019 19:49:50 -0400 Subject: [PATCH 5/8] woops forgot the moodlit --- modular_citadel/code/game/objects/items/honk.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modular_citadel/code/game/objects/items/honk.dm b/modular_citadel/code/game/objects/items/honk.dm index 0bac323714..47b9df7f10 100644 --- a/modular_citadel/code/game/objects/items/honk.dm +++ b/modular_citadel/code/game/objects/items/honk.dm @@ -11,3 +11,7 @@ attack_verb = list("HONKED in bluespace", "HONKED", "quantumly HONKED") icon = 'modular_citadel/icons/obj/honk.dmi' icon_state = "bluespacehonker" + +/obj/item/bikehorn/bluespacehonker/attack(mob/living/carbon/M, mob/living/carbon/user) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "bshonk", /datum/mood_event/bshonk) + return ..() From bcfe33a35ed0c5cfee37255f48f82fe8bf8424c3 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 28 Mar 2019 19:52:54 -0400 Subject: [PATCH 6/8] Update generic_positive_events.dm --- code/datums/mood_events/generic_positive_events.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 2422c5ea56..d4018cdb67 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -33,6 +33,11 @@ mood_change = 2 timeout = 2400 +/datum/mood_event/bshonk + description = "Quantum mechanics can be fun and silly to! Honk!\n" + mood_change = 6 + timeout = 4800 + /datum/mood_event/perform_cpr description = "It feels good to save a life.\n" mood_change = 6 From 7cb747185757e82bd39c4260e5e0cfbab55e895c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 28 Mar 2019 23:16:21 -0400 Subject: [PATCH 7/8] Update recipes.dm --- code/modules/crafting/recipes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 2cbd4396dd..0a7395f517 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -439,7 +439,7 @@ name = "Bluespace Bike horn" result = /obj/item/bikehorn/bluespacehonker time = 10 - reqs = list(/obj/item/stack/ore/bluespace_crystalt = 1, + reqs = list(/obj/item/stack/ore/bluespace_crystal = 1, /obj/item/toy/crayon/blue = 1, /obj/item/bikehorn = 1) category = CAT_MISC From b5ddeb9343f4b6d5fdf38c173047942c78be5362 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 30 Mar 2019 14:33:19 -0400 Subject: [PATCH 8/8] Update code/datums/mood_events/generic_positive_events.dm Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> --- code/datums/mood_events/generic_positive_events.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index d4018cdb67..6989744fe3 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -34,7 +34,7 @@ timeout = 2400 /datum/mood_event/bshonk - description = "Quantum mechanics can be fun and silly to! Honk!\n" + description = "Quantum mechanics can be fun and silly, too! Honk!\n" mood_change = 6 timeout = 4800