diff --git a/ModularTegustation/!extra_abnos/branch12/!tools/compass.dm b/ModularTegustation/!extra_abnos/branch12/!tools/compass.dm new file mode 100644 index 000000000000..3d7688527057 --- /dev/null +++ b/ModularTegustation/!extra_abnos/branch12/!tools/compass.dm @@ -0,0 +1,68 @@ +#define STATUS_EFFECT_COMPASS /datum/status_effect/display/compass +/obj/structure/toolabnormality/compass + name = "Predestined Compass" + desc = "A bronze compass with 8 needles." + icon_state = "compass" + icon = 'ModularTegustation/Teguicons/branch12/32x32.dmi' + var/list/active_users = list() + +/obj/structure/toolabnormality/compass/attack_hand(mob/living/carbon/human/user) + . = ..() + if(!do_after(user, 6)) + return + if(user in active_users) + active_users -= user + user.remove_status_effect(STATUS_EFFECT_COMPASS) + to_chat(user, span_userdanger("You put the compass back. You feel a lot more composed")) + else + active_users += user + user.apply_status_effect(STATUS_EFFECT_COMPASS) + to_chat(user, span_userdanger("You pick up the compass, and feel a like you can't sit still")) + +// Status Effect +/datum/status_effect/display/compass + id = "compass" + status_type = STATUS_EFFECT_UNIQUE + duration = -1 + alert_type = null + display_name = "compass" + + var/timer = 0 //How many seconds of buff do you get + var/debuffed = TRUE //Are you currently debuffed + +/datum/status_effect/display/compass/on_apply() + . = ..() + if(ishuman(owner)) + var/mob/living/carbon/human/H = owner + H.adjust_attribute_bonus(TEMPERANCE_ATTRIBUTE, -80) + + +/datum/status_effect/display/compass/tick() + . = ..() + var/mob/living/carbon/human/H = owner + if(timer > 0) + timer-- + //At timer 0, take away all the stats you've gotten + if(timer == 0 && !debuffed) + H.adjust_attribute_bonus(TEMPERANCE_ATTRIBUTE, -160) + debuffed = TRUE + + for(var/obj/machinery/computer/abnormality/V in range(2, owner)) + if(V.meltdown) + //If you're debuffed you get a free 80 Temp. As a treat. + if(debuffed) + H.adjust_attribute_bonus(TEMPERANCE_ATTRIBUTE, 160) + + //You get 60 seconds of buff after working on a meltdown console + timer = 60 + debuffed = FALSE + +/datum/status_effect/display/compass/on_remove() + . = ..() + if(ishuman(owner)) + var/mob/living/carbon/human/H = owner + if(!debuffed) + H.adjust_attribute_bonus(TEMPERANCE_ATTRIBUTE, -160) + H.adjust_attribute_bonus(TEMPERANCE_ATTRIBUTE, 80) + +#undef STATUS_EFFECT_COMPASS diff --git a/ModularTegustation/!extra_abnos/branch12/!tools/mislocation.dm b/ModularTegustation/!extra_abnos/branch12/!tools/mislocation.dm new file mode 100644 index 000000000000..e2d6ecadca7a --- /dev/null +++ b/ModularTegustation/!extra_abnos/branch12/!tools/mislocation.dm @@ -0,0 +1,25 @@ +/obj/structure/toolabnormality/mislocation + name = "Mislocation" + desc = "A lampost with a bench under." + icon_state = "mislocation" + icon = 'ModularTegustation/Teguicons/branch12/48x64.dmi' + pixel_x = -13 + base_pixel_x = -13 + density = FALSE + +/obj/structure/toolabnormality/mislocation/Crossed(atom/movable/AM, oldloc, force_stop = 0) + if(!ishuman(AM)) + return + + var/mob/living/carbon/human/user = AM + ADD_TRAIT(user, TRAIT_NODEATH, "memento_mori") + ADD_TRAIT(user, TRAIT_NOHARDCRIT, "memento_mori") + ADD_TRAIT(user, TRAIT_NOSOFTCRIT, "memento_mori") + +/obj/structure/toolabnormality/mislocation/Uncrossed(atom/movable/AM, oldloc, force_stop = 0) + if(!ishuman(AM)) + return + var/mob/living/carbon/human/user = AM + REMOVE_TRAIT(user, TRAIT_NODEATH, "memento_mori") + REMOVE_TRAIT(user, TRAIT_NOHARDCRIT, "memento_mori") + REMOVE_TRAIT(user, TRAIT_NOSOFTCRIT, "memento_mori") diff --git a/ModularTegustation/!extra_abnos/branch12/records.dm b/ModularTegustation/!extra_abnos/branch12/records.dm index 9cd06ac3095e..b9d609f9d8ef 100644 --- a/ModularTegustation/!extra_abnos/branch12/records.dm +++ b/ModularTegustation/!extra_abnos/branch12/records.dm @@ -37,6 +37,23 @@ - When used, 10 seconds till midnight would lower the qliphoth counter of 5 Abnormalities by 1.
- When you stop an ordeal all continuing ordeals will either increase in strength and reward, or decrease in reward."} +//10 Seconds to Midnight +/obj/item/paper/fluff/info/branch12/mislocation + name = "Mislocation - O-09-12-290" + info = {"

O-09-12-290


+ Name : Mislocation
+ Risk Class : Teth
+ - Employees sitting at the bench of O-09-12-290 simply refused to die, and would not die unless they left the area under the lamp post."} + +//10 Seconds to Midnight +/obj/item/paper/fluff/info/branch12/compass + name = "Predestined Compass - O-09-12-159" + info = {"

O-09-12-159


+ Name : Predestined Compass
+ Risk Class : He
+ - Employees who carried O-05-159 found themselves to be luckier when working on abnormalities under a meltdown, boosting their PE production.
+ - Employees who carried the Predestined Compass, and worked on an abnormality not suffering a qliphoth meltdown would have incredibly terrible luck."} + // -------------ZAYIN------------- // Full Wave M'aider /obj/item/paper/fluff/info/branch12/wave diff --git a/ModularTegustation/Teguicons/branch12/32x32.dmi b/ModularTegustation/Teguicons/branch12/32x32.dmi index d2590423b0e3..6a5b4052031b 100644 Binary files a/ModularTegustation/Teguicons/branch12/32x32.dmi and b/ModularTegustation/Teguicons/branch12/32x32.dmi differ diff --git a/ModularTegustation/Teguicons/branch12/48x64.dmi b/ModularTegustation/Teguicons/branch12/48x64.dmi index 07b8a36dcde3..6340735c2ba2 100644 Binary files a/ModularTegustation/Teguicons/branch12/48x64.dmi and b/ModularTegustation/Teguicons/branch12/48x64.dmi differ diff --git a/ModularTegustation/Teguicons/tegu_effects10x10.dmi b/ModularTegustation/Teguicons/tegu_effects10x10.dmi index bd550c4e98a8..91552bb9d508 100644 Binary files a/ModularTegustation/Teguicons/tegu_effects10x10.dmi and b/ModularTegustation/Teguicons/tegu_effects10x10.dmi differ diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index 30f5440aca8f..3f2beeeea2a9 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -3954,8 +3954,10 @@ #include "ModularTegustation\trusted.dm" #include "ModularTegustation\turfs.dm" #include "ModularTegustation\!extra_abnos\branch12\records.dm" +#include "ModularTegustation\!extra_abnos\branch12\!tools\compass.dm" #include "ModularTegustation\!extra_abnos\branch12\!tools\eye.dm" #include "ModularTegustation\!extra_abnos\branch12\!tools\midnight.dm" +#include "ModularTegustation\!extra_abnos\branch12\!tools\mislocation.dm" #include "ModularTegustation\!extra_abnos\branch12\he\show_goes_on.dm" #include "ModularTegustation\!extra_abnos\branch12\teth\remnant_rock.dm" #include "ModularTegustation\!extra_abnos\branch12\waw\joe_shmoe.dm"