Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch 12 tools 2 #2714

Merged
merged 3 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions ModularTegustation/!extra_abnos/branch12/!tools/compass.dm
Original file line number Diff line number Diff line change
@@ -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
25 changes: 25 additions & 0 deletions ModularTegustation/!extra_abnos/branch12/!tools/mislocation.dm
Original file line number Diff line number Diff line change
@@ -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")
17 changes: 17 additions & 0 deletions ModularTegustation/!extra_abnos/branch12/records.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,23 @@
- When used, 10 seconds till midnight would lower the qliphoth counter of 5 Abnormalities by 1. <br>
- 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 = {"<h1><center>O-09-12-290</center></h1> <br>
Name : Mislocation<br>
Risk Class : Teth<br>
- 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 = {"<h1><center>O-09-12-159</center></h1> <br>
Name : Predestined Compass<br>
Risk Class : He <br>
- Employees who carried O-05-159 found themselves to be luckier when working on abnormalities under a meltdown, boosting their PE production. <br>
- 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
Expand Down
Binary file modified ModularTegustation/Teguicons/branch12/32x32.dmi
Binary file not shown.
Binary file modified ModularTegustation/Teguicons/branch12/48x64.dmi
Binary file not shown.
Binary file modified ModularTegustation/Teguicons/tegu_effects10x10.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions lobotomy-corp13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down