You vomit up your [O.name]") //no "vomit up your the heart"
+ O.forceMove(drop_location())
+ if(prob(20))
+ O.animate_atom_living()
+ if(9 to 10)
+ ForceContractDisease(new/datum/disease/gastrolosis())
+ to_chat(src, "Oh, I actually feel quite alright!")
+ else
+ switch(rand(0,5))
+ if(0)
+ gib()
+ if(1)
+ dust()
+
+ if(2)
+ death()
+ petrify(INFINITY)
+ if(3)
+ if(prob(95))
+ var/obj/item/bodypart/BP = get_bodypart(pick(BODY_ZONE_CHEST,BODY_ZONE_HEAD))
+ if(BP)
+ BP.dismember()
+ else
+ gib()
+ else
+ set_species(/datum/species/dullahan)
+ if(4)
+ visible_message("[src]'s skin melts off!", "Your skin melts off!")
+ spawn_gibs()
+ set_species(/datum/species/skeleton)
+ if(prob(90))
+ addtimer(CALLBACK(src, .proc/death), 30)
+ if(mind)
+ mind.hasSoul = FALSE
+ if(5)
+ to_chat(src, "LOOK UP!")
+ addtimer(CALLBACK(src, .proc/something_horrible_mindmelt), 30)
+
+
+/mob/living/carbon/human/proc/something_horrible_mindmelt()
+ if(!HAS_TRAIT(src, TRAIT_BLIND))
+ var/obj/item/organ/eyes/eyes = locate(/obj/item/organ/eyes) in internal_organs
+ if(!eyes)
+ return
+ eyes.Remove(src)
+ qdel(eyes)
+ visible_message("[src] looks up and their eyes melt away!", "='userdanger'>I understand now.")
+ addtimer(CALLBACK(src, .proc/adjustBrainLoss, 200), 20)
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index e25baf18ea2..4f5cc583357 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -148,5 +148,5 @@
if(isliving(user))
var/mob/living/L = user
- if(L.has_trait(TRAIT_EMOTEMUTE))
+ if(HAS_TRAIT(L, TRAIT_EMOTEMUTE))
return FALSE
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
index 2eb76f924e2..7fd7b8c526d 100644
--- a/code/datums/ert.dm
+++ b/code/datums/ert.dm
@@ -56,7 +56,7 @@
/datum/ert/janitor
roles = list(/datum/antagonist/ert/janitor, /datum/antagonist/ert/janitor/heavy)
- leader_role = /datum/outfit/ert/janitor/heavy
+ leader_role = /datum/antagonist/ert/janitor/heavy
teamsize = 4
opendoors = FALSE
rename_team = "Janitor"
diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm
index 4c2659e37a2..27c483bc12a 100644
--- a/code/datums/explosion.dm
+++ b/code/datums/explosion.dm
@@ -221,7 +221,6 @@ GLOBAL_LIST_EMPTY(explosions)
if(!I.anchored)
var/throw_range = rand(throw_dist, max_range)
var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
- I.throw_speed = EXPLOSION_THROW_SPEED //Temporarily change their throw_speed for embedding purposes (Reset when it finishes throwing, regardless of hitting anything)
I.throw_at(throw_at, throw_range, EXPLOSION_THROW_SPEED)
//wait for the lists to repop
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index 3ff0d04c692..c9e96d6bc1f 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -27,8 +27,8 @@
for(var/line in testmerge)
var/datum/tgs_revision_information/test_merge/tm = line
- msg += "Test merge active of PR #[tm.number] commit [tm.commit]"
- SSblackbox.record_feedback("associative", "testmerged_prs", 1, list("number" = "[tm.number]", "commit" = "[tm.commit]", "title" = "[tm.title]", "author" = "[tm.author]"))
+ msg += "Test merge active of PR #[tm.number] commit [tm.pull_request_commit]"
+ SSblackbox.record_feedback("associative", "testmerged_prs", 1, list("number" = "[tm.number]", "commit" = "[tm.pull_request_commit]", "title" = "[tm.title]", "author" = "[tm.author]"))
if(commit && commit != originmastercommit)
msg += "HEAD: [commit]"
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 1f78eeec079..7a8d772d4d4 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -56,7 +56,7 @@
var/area/A = get_area(curturf)
var/area/B = get_area(destturf)
- if(!forced && (teleatom.has_trait(TRAIT_NO_TELEPORT) || A.noteleport || B.noteleport))
+ if(!forced && (HAS_TRAIT(teleatom, TRAIT_NO_TELEPORT) || A.noteleport || B.noteleport))
return FALSE
if(SEND_SIGNAL(destturf, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, curturf, destturf))
diff --git a/code/datums/helper_datums/topic_input.dm b/code/datums/helper_datums/topic_input.dm
deleted file mode 100644
index 3e43905f1fe..00000000000
--- a/code/datums/helper_datums/topic_input.dm
+++ /dev/null
@@ -1,62 +0,0 @@
-/datum/topic_input
- var/href
- var/list/href_list
-
-/datum/topic_input/New(thref,list/thref_list)
- href = thref
- href_list = thref_list.Copy()
- return
-
-/datum/topic_input/proc/get(i)
- return listgetindex(href_list,i)
-
-/datum/topic_input/proc/getAndLocate(i)
- var/t = get(i)
- if(t)
- t = locate(t)
- if (istext(t))
- t = null
- return t || null
-
-/datum/topic_input/proc/getNum(i)
- var/t = get(i)
- if(t)
- t = text2num(t)
- return isnum(t) ? t : null
-
-/datum/topic_input/proc/getObj(i)
- var/t = getAndLocate(i)
- return isobj(t) ? t : null
-
-/datum/topic_input/proc/getMob(i)
- var/t = getAndLocate(i)
- return ismob(t) ? t : null
-
-/datum/topic_input/proc/getTurf(i)
- var/t = getAndLocate(i)
- return isturf(t) ? t : null
-
-/datum/topic_input/proc/getAtom(i)
- return getType(i, /atom)
-
-/datum/topic_input/proc/getArea(i)
- var/t = getAndLocate(i)
- return isarea(t) ? t : null
-
-/datum/topic_input/proc/getStr(i)//params should always be text, but...
- var/t = get(i)
- return istext(t) ? t : null
-
-/datum/topic_input/proc/getType(i,type)
- var/t = getAndLocate(i)
- return istype(t,type) ? t : null
-
-/datum/topic_input/proc/getPath(i)
- var/t = get(i)
- if(t)
- t = text2path(t)
- return ispath(t) ? t : null
-
-/datum/topic_input/proc/getList(i)
- var/t = getAndLocate(i)
- return islist(t) ? t : null
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index 46e583eb572..9c61ea81b3c 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -12,7 +12,12 @@
/mob/camera/aiEye/remote/holo/setLoc()
. = ..()
var/obj/machinery/holopad/H = origin
- H.move_hologram(eye_user, loc)
+ H?.move_hologram(eye_user, loc)
+
+/obj/machinery/holopad/remove_eye_control(mob/living/user)
+ if(user.client)
+ user.reset_perspective(null)
+ user.remote_control = null
//this datum manages it's own references
@@ -54,11 +59,6 @@
/datum/holocall/Destroy()
QDEL_NULL(hangup)
- var/user_good = !QDELETED(user)
- if(user_good)
- user.reset_perspective()
- user.remote_control = null
-
if(!QDELETED(eye))
QDEL_NULL(eye)
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index 21999eeda65..7b69da07778 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -28,7 +28,9 @@ GLOBAL_LIST_INIT(huds, list(
ANTAG_HUD_CLOCKWORK = new/datum/atom_hud/antag(),
ANTAG_HUD_BROTHER = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_HIVE = new/datum/atom_hud/antag/hidden(),
- ANTAG_HUD_OBSESSED = new/datum/atom_hud/antag/hidden()
+ ANTAG_HUD_OBSESSED = new/datum/atom_hud/antag/hidden(),
+ ANTAG_HUD_FUGITIVE = new/datum/atom_hud/antag(),
+ ANTAG_HUD_HIVEAWAKE = new/datum/atom_hud/antag()
))
/datum/atom_hud
diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm
index c305b1c2541..fb8acbe2e49 100644
--- a/code/datums/martial/cqc.dm
+++ b/code/datums/martial/cqc.dm
@@ -72,6 +72,7 @@
D.apply_damage(10, A.dna.species.attack_type)
log_combat(A, D, "kicked (CQC)")
if(D.IsParalyzed() && !D.stat)
+ log_combat(A, D, "knocked out (Head kick)(CQC)")
D.visible_message("[A] kicks [D]'s head, knocking [D.p_them()] out!", \
"[A] kicks your head, knocking you out!")
playsound(get_turf(A), 'sound/weapons/genhit1.ogg', 50, 1, -1)
@@ -82,7 +83,8 @@
/datum/martial_art/cqc/proc/Pressure(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!can_use(A))
return FALSE
- D.visible_message("[A] forces their arm on [D]'s neck!")
+ log_combat(A, D, "pressured (CQC)")
+ D.visible_message("[A] punches [D]'s neck!")
D.adjustStaminaLoss(60)
playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1)
return TRUE
@@ -93,6 +95,7 @@
if(!can_use(A))
return FALSE
if(!D.stat)
+ log_combat(A, D, "restrained (CQC)")
D.visible_message("[A] locks [D] into a restraining position!", \
"[A] locks you into a restraining position!")
D.adjustStaminaLoss(20)
@@ -105,6 +108,7 @@
if(!can_use(A))
return FALSE
if(!D.stat)
+ log_combat(A, D, "consecutive CQC'd (CQC)")
D.visible_message("[A] strikes [D]'s abdomen, neck and back consecutively", \
"[A] strikes your abdomen, neck and back consecutively!")
playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, 1, -1)
@@ -116,20 +120,21 @@
return TRUE
/datum/martial_art/cqc/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
- if(!can_use(A))
- return FALSE
- add_to_streak("G",D)
- if(check_streak(A,D))
- return TRUE
- if(A.grab_state >= GRAB_AGGRESSIVE)
+ if(A==D)
+ return FALSE //prevents grabbing yourself
+ if(A.a_intent == INTENT_GRAB)
+ add_to_streak("G",D)
+ if(check_streak(A,D)) //doing combos is prioritized over upgrading grabs
+ return TRUE
D.grabbedby(A, 1)
- else
- A.start_pulling(D, supress_message = TRUE)
- if(A.pulling)
- D.stop_pulling()
+ if(A.grab_state == GRAB_PASSIVE)
+ D.drop_all_held_items()
+ A.grab_state = GRAB_AGGRESSIVE //Instant agressive grab if on grab intent
log_combat(A, D, "grabbed", addition="aggressively")
- A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab
-
+ D.visible_message("[A] violently grabs [D]!", \
+ "[A] violently grabs you!")
+ else
+ D.grabbedby(A, 1)
return TRUE
/datum/martial_art/cqc/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -185,6 +190,7 @@
playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
log_combat(A, D, "disarmed (CQC)", "[I ? " grabbing \the [I]" : ""]")
if(restraining && A.pulling == D)
+ log_combat(A, D, "knocked out (Chokehold)(CQC)")
D.visible_message("[A] puts [D] into a chokehold!", \
"[A] puts you into a chokehold!")
D.SetSleeping(400)
@@ -203,8 +209,8 @@
to_chat(usr, "You try to remember some of the basics of CQC.")
to_chat(usr, "Slam: Grab Harm. Slam opponent into the ground, knocking them down.")
- to_chat(usr, "CQC Kick: Disarm Harm Harm. Knocks opponent away. Knocks out stunned or knocked down opponents.")
- to_chat(usr, "Restrain: Grab Grab. Locks opponents into a restraining position, disarm to knock them out with a choke hold.")
+ to_chat(usr, "CQC Kick: Harm Harm. Knocks opponent away. Knocks out stunned or knocked down opponents.")
+ to_chat(usr, "Restrain: Grab Grab. Locks opponents into a restraining position, disarm to knock them out with a chokehold.")
to_chat(usr, "Pressure: Disarm Grab. Decent stamina damage.")
to_chat(usr, "Consecutive CQC: Disarm Disarm Harm. Mainly offensive move, huge damage and decent stamina damage.")
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 1ae54936f5f..a6a5bbe4a5d 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -38,6 +38,7 @@
/datum/martial_art/the_sleeping_carp/proc/wristWrench(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D.stat && !D.IsStun() && !D.IsParalyzed())
+ log_combat(A, D, "wrist wrenched (Sleeping Carp)")
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \
"[A] grabs your wrist and violently wrenches it to the side!")
@@ -47,23 +48,29 @@
D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
D.Stun(60)
return 1
- log_combat(A, D, "wrist wrenched (Sleeping Carp)")
+
return basic_hit(A,D)
/datum/martial_art/the_sleeping_carp/proc/backKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
- if(A.dir == D.dir && !D.stat && !D.IsParalyzed())
- A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- D.visible_message("[A] kicks [D] in the back!", \
- "[A] kicks you in the back, making you stumble and fall!")
- step_to(D,get_step(D,D.dir),1)
- D.Paralyze(80)
- playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
- return 1
- log_combat(A, D, "back-kicked (Sleeping Carp)")
+ if(!D.stat && !D.IsParalyzed())
+ if(A.dir == D.dir)
+ log_combat(A, D, "back-kicked (Sleeping Carp)")
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+ D.visible_message("[A] kicks [D] in the back!", \
+ "[A] kicks you in the back, making you stumble and fall!")
+ step_to(D,get_step(D,D.dir),1)
+ D.Paralyze(80)
+ playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
+ return 1
+ else
+ log_combat(A, D, "missed a back-kick (Sleeping Carp) on")
+ D.visible_message("[A] tries to kick [D] in the back, but misses!", \
+ "[A] tries to kick you in the back, but misses!")
return basic_hit(A,D)
/datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D.stat && !D.IsParalyzed())
+ log_combat(A, D, "stomach kneed (Sleeping Carp)")
A.do_attack_animation(D, ATTACK_EFFECT_KICK)
D.visible_message("[A] knees [D] in the stomach!", \
"[A] winds you with a knee in the stomach!")
@@ -72,11 +79,11 @@
D.Stun(40)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
return 1
- log_combat(A, D, "stomach kneed (Sleeping Carp)")
return basic_hit(A,D)
/datum/martial_art/the_sleeping_carp/proc/headKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D.stat && !D.IsParalyzed())
+ log_combat(A, D, "head kicked (Sleeping Carp)")
A.do_attack_animation(D, ATTACK_EFFECT_KICK)
D.visible_message("[A] kicks [D] in the head!", \
"[A] kicks you in the jaw!")
@@ -85,41 +92,37 @@
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
D.Stun(80)
return 1
- log_combat(A, D, "head kicked (Sleeping Carp)")
return basic_hit(A,D)
/datum/martial_art/the_sleeping_carp/proc/elbowDrop(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!(D.mobility_flags & MOBILITY_STAND))
+ log_combat(A, D, "elbow dropped (Sleeping Carp)")
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
D.visible_message("[A] elbow drops [D]!", \
- "[A] piledrives you with their elbow!")
+ "[A] piledrives you with their elbow!")
if(D.stat)
D.death() //FINISH HIM!
D.apply_damage(50, A.dna.species.attack_type, BODY_ZONE_CHEST)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 75, 1, -1)
return 1
- log_combat(A, D, "elbow dropped (Sleeping Carp)")
return basic_hit(A,D)
/datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
- add_to_streak("G",D)
- if(check_streak(A,D))
- return 1
- if(A.grab_state >= GRAB_AGGRESSIVE)
+ if(A==D)
+ return 0 //prevents grabbing yourself
+ if(A.a_intent == INTENT_GRAB)
+ add_to_streak("G",D)
+ if(check_streak(A,D)) //doing combos is prioritized over upgrading grabs
+ return 1
D.grabbedby(A, 1)
- else
- A.start_pulling(D, supress_message = TRUE)
- if(A.pulling)
+ if(A.grab_state == GRAB_PASSIVE)
D.drop_all_held_items()
- D.stop_pulling()
- if(A.a_intent == INTENT_GRAB)
- log_combat(A, D, "grabbed", addition="aggressively")
- D.visible_message("[A] violently grabs [D]!", \
- "[A] violently grabs you!")
- A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab
- else
- log_combat(A, D, "grabbed", addition="passively")
- A.grab_state = GRAB_PASSIVE
+ A.grab_state = GRAB_AGGRESSIVE //Instant agressive grab if on grab intent
+ log_combat(A, D, "grabbed", addition="aggressively")
+ D.visible_message("[A] violently grabs [D]!", \
+ "[A] violently grabs you!")
+ else
+ D.grabbedby(A, 1)
return 1
/datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -181,7 +184,7 @@
/obj/item/twohanded/bostaff/attack(mob/target, mob/living/user)
add_fingerprint(user)
- if((user.has_trait(TRAIT_CLUMSY)) && prob(50))
+ if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
to_chat(user, "You club yourself over the head with [src].")
user.Paralyze(60)
if(ishuman(user))
diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index 03f812c9c08..4c2c4e76a17 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -192,7 +192,7 @@
if (T && isturf(T))
if (!D.stat)
D.emote("scream")
- D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human/.Paralyze, 20))
+ D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human.proc/Paralyze, 20))
log_combat(A, D, "has thrown with wrestling")
return 0
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index b73bfd4ffab..a12ebd90c11 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -64,6 +64,8 @@
var/force_escaped = FALSE // Set by Into The Sunset command of the shuttle manipulator
+ var/list/learned_recipes //List of learned recipe TYPES.
+
/datum/mind/New(var/key)
src.key = key
soulOwner = src
diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm
index 5a9880bb5d7..1ba31342d3c 100644
--- a/code/datums/mood_events/drink_events.dm
+++ b/code/datums/mood_events/drink_events.dm
@@ -5,19 +5,19 @@
/datum/mood_event/quality_nice
description = "That drink wasn't bad at all.\n"
mood_change = 1
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/quality_good
description = "That drink was pretty good.\n"
mood_change = 2
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/quality_verygood
description = "That drink was great!\n"
mood_change = 3
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/quality_fantastic
description = "That drink was amazing!\n"
mood_change = 4
- timeout = 1200
+ timeout = 2 MINUTES
diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm
index 6e86fd02c6a..aa4d89d799c 100644
--- a/code/datums/mood_events/drug_events.dm
+++ b/code/datums/mood_events/drug_events.dm
@@ -5,16 +5,16 @@
/datum/mood_event/smoked
description = "I have had a smoke recently.\n"
mood_change = 2
- timeout = 3600
+ timeout = 6 MINUTES
/datum/mood_event/wrong_brand
description = "I hate that brand of cigarettes.\n"
mood_change = -2
- timeout = 3600
+ timeout = 6 MINUTES
/datum/mood_event/overdose
mood_change = -8
- timeout = 3000
+ timeout = 5 MINUTES
/datum/mood_event/overdose/add_effects(drug_name)
description = "I think I took a bit too much of that [drug_name]\n"
@@ -50,11 +50,11 @@
/datum/mood_event/happiness_drug_good_od
description = "YES! YES!! YES!!!\n"
mood_change = 100
- timeout = 300
+ timeout = 30 SECONDS
special_screen_obj = "mood_happiness_good"
/datum/mood_event/happiness_drug_bad_od
description = "NO! NO!! NO!!!\n"
mood_change = -100
- timeout = 300
+ timeout = 30 SECONDS
special_screen_obj = "mood_happiness_bad"
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index 213d9789509..daca0678052 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -17,7 +17,7 @@
/datum/mood_event/burnt_thumb
description = "I shouldn't play with lighters...\n"
mood_change = -1
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/cold
description = "It's way too cold in here.\n"
@@ -30,46 +30,42 @@
/datum/mood_event/creampie
description = "I've been creamed. Tastes like pie flavor.\n"
mood_change = -2
- timeout = 1800
+ timeout = 3 MINUTES
/datum/mood_event/slipped
description = "I slipped. I should be more careful next time...\n"
mood_change = -2
- timeout = 1800
+ timeout = 3 MINUTES
/datum/mood_event/eye_stab
description = "I used to be an adventurer like you, until I took a screwdriver to the eye.\n"
mood_change = -4
- timeout = 1800
+ timeout = 3 MINUTES
/datum/mood_event/delam //SM delamination
description = "Those God damn engineers can't do anything right...\n"
mood_change = -2
- timeout = 2400
+ timeout = 4 MINUTES
/datum/mood_event/depression
description = "I feel sad for no particular reason.\n"
mood_change = -9
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/shameful_suicide //suicide_acts that return SHAME, like sord
description = "I can't even end it all!\n"
mood_change = -10
- timeout = 600
+ timeout = 60 SECONDS
/datum/mood_event/dismembered
description = "AHH! I WAS USING THAT LIMB!\n"
mood_change = -8
- timeout = 2400
-
-/datum/mood_event/noshoes
- description = "I am a disgrace to comedy everywhere!\n"
- mood_change = -5
+ timeout = 4 MINUTES
/datum/mood_event/tased
description = "There's no \"z\" in \"taser\". It's in the zap.\n"
mood_change = -3
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/embedded
description = "Pull it out!\n"
@@ -78,7 +74,7 @@
/datum/mood_event/table
description = "Someone threw me on a table!\n"
mood_change = -2
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/table/add_effects()
if(ishuman(owner))
@@ -103,7 +99,7 @@
/datum/mood_event/epilepsy //Only when the mutation causes a seizure
description = "I should have paid attention to the epilepsy warning.\n"
mood_change = -3
- timeout = 3000
+ timeout = 5 MINUTES
/datum/mood_event/nyctophobia
description = "It sure is dark around here...\n"
@@ -116,7 +112,7 @@
/datum/mood_event/healsbadman
description = "I feel like I'm held together by flimsy string, and could fall apart at any moment!\n"
mood_change = -4
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/jittery
description = "I'm nervous and on edge and I can't stand still!!\n"
@@ -125,27 +121,27 @@
/datum/mood_event/vomit
description = "I just threw up. Gross.\n"
mood_change = -2
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/vomitself
description = "I just threw up all over myself. This is disgusting.\n"
mood_change = -4
- timeout = 1800
+ timeout = 3 MINUTES
/datum/mood_event/painful_medicine
description = "Medicine may be good for me but right now it stings like hell.\n"
mood_change = -5
- timeout = 600
+ timeout = 60 SECONDS
/datum/mood_event/spooked
description = "The rattling of those bones...It still haunts me.\n"
mood_change = -4
- timeout = 2400
+ timeout = 4 MINUTES
/datum/mood_event/loud_gong
description = "That loud gong noise really hurt my ears!\n"
mood_change = -3
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/notcreeping
description = "The voices are not happy, and they painfully contort my thoughts into getting back on task.\n"
@@ -153,7 +149,6 @@
timeout = 30
hidden = TRUE
-
/datum/mood_event/notcreepingsevere//not hidden since it's so severe
description = "THEY NEEEEEEED OBSESSIONNNN!!\n"
mood_change = -30
@@ -166,10 +161,22 @@
var/unhinged = uppertext(unstable.Join(""))//example Tinea Luxor > TINEA LUXORRRR (with randomness in how long that slur is)
description = "THEY NEEEEEEED [unhinged]!!\n"
-/datum/mood_event/idiot_shower
- description = "I showered with my clothes on, I'm a fucking idiot.\n"
- mood_change = -3
- timeout = 900
+/datum/mood_event/sapped
+ description = "Some unexplainable sadness is consuming me...\n"
+ mood_change = -15
+ timeout = 90 SECONDS
+
+/datum/mood_event/back_pain
+ description = "Bags never sit right on my back, this hurts like hell!\n"
+ mood_change = -15
+
+/datum/mood_event/sad_empath
+ description = "Someone seems upset...\n"
+ mood_change = -2
+ timeout = 60 SECONDS
+
+/datum/mood_event/sad_empath/add_effects(mob/sadtarget)
+ description = "[sadtarget.name] seems upset...\n"
//These are unused so far but I want to remember them to use them later
/datum/mood_event/cloned_corpse
diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
index f6fb64550e5..f9e7097ace2 100644
--- a/code/datums/mood_events/generic_positive_events.dm
+++ b/code/datums/mood_events/generic_positive_events.dm
@@ -1,32 +1,48 @@
/datum/mood_event/hug
description = "Hugs are nice.\n"
mood_change = 1
- timeout = 1200
+ timeout = 2 MINUTES
+
+/datum/mood_event/betterhug
+ description = "Someone was very nice to me.\n"
+ mood_change = 3
+ timeout = 5 MINUTES
+
+/datum/mood_event/betterhug/add_effects(mob/friend)
+ description = "[friend.name] was very nice to me.\n"
+
+/datum/mood_event/besthug
+ description = "Someone is great to be around, they make me feel so happy!\n"
+ mood_change = 5
+ timeout = 5 MINUTES
+
+/datum/mood_event/besthug/add_effects(mob/friend)
+ description = "[friend.name] is great to be around, [friend.p_they()] makes me feel so happy!\n"
/datum/mood_event/arcade
description = "I beat the arcade game!\n"
mood_change = 3
- timeout = 3000
+ timeout = 5 MINUTES
/datum/mood_event/blessing
description = "I've been blessed.\n"
mood_change = 3
- timeout = 3000
+ timeout = 5 MINUTES
/datum/mood_event/book_nerd
description = "I have recently read a book.\n"
mood_change = 3
- timeout = 3000
+ timeout = 5 MINUTES
/datum/mood_event/exercise
description = "Working out releases those endorphins!\n"
mood_change = 3
- timeout = 3000
+ timeout = 5 MINUTES
/datum/mood_event/pet_animal
description = "Animals are adorable! I can't stop petting them!\n"
mood_change = 3
- timeout = 3000
+ timeout = 5 MINUTES
/datum/mood_event/pet_animal/add_effects(mob/animal)
description = "\The [animal.name] is adorable! I can't stop petting [animal.p_them()]!\n"
@@ -34,12 +50,12 @@
/datum/mood_event/honk
description = "Maybe clowns aren't so bad after all. Honk!\n"
mood_change = 2
- timeout = 2400
+ timeout = 4 MINUTES
/datum/mood_event/perform_cpr
description = "It feels good to save a life.\n"
mood_change = 6
- timeout = 3000
+ timeout = 5 MINUTES
/datum/mood_event/oblivious
description = "What a lovely day.\n"
@@ -48,7 +64,7 @@
/datum/mood_event/jolly
description = "I feel happy for no particular reason.\n"
mood_change = 6
- timeout = 1200
+ timeout = 2 MINUTES
/datum/mood_event/focused
description = "I have a goal, and I will reach it, whatever it takes!\n" //Used for syndies, nukeops etc so they can focus on their goals
@@ -65,7 +81,7 @@
/datum/mood_event/creeping
description = "The voices have released their hooks on my mind! I feel free again!\n" //creeps get it when they are around their obsession
mood_change = 18
- timeout = 30
+ timeout = 3 SECONDS
hidden = TRUE
/datum/mood_event/revolution
@@ -85,7 +101,7 @@
/datum/mood_event/goodmusic
description = "There is something soothing about this music.\n"
mood_change = 3
- timeout = 600
+ timeout = 60 SECONDS
/datum/mood_event/chemical_euphoria
description = "Heh...hehehe...hehe...\n"
@@ -94,13 +110,18 @@
/datum/mood_event/chemical_laughter
description = "Laughter really is the best medicine! Or is it?\n"
mood_change = 4
- timeout = 1800
+ timeout = 3 MINUTES
/datum/mood_event/chemical_superlaughter
description = "*WHEEZE*\n"
mood_change = 12
- timeout = 1800
+ timeout = 3 MINUTES
/datum/mood_event/religiously_comforted
- description = "You are comforted by the presence of a holy person."
+ description = "You are comforted by the presence of a holy person.\n"
mood_change = 3
+ timeout = 5 MINUTES
+
+/datum/mood_event/clownshoes
+ description = "The shoes are a clown's legacy, I never want to take them off!\n"
+ mood_change = 5
diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm
index 914763225d0..2b97d3181ad 100644
--- a/code/datums/mood_events/needs_events.dm
+++ b/code/datums/mood_events/needs_events.dm
@@ -70,22 +70,22 @@
/datum/mood_event/favorite_food
description = "I really enjoyed eating that.\n"
mood_change = 3
- timeout = 2400
+ timeout = 4 MINUTES
/datum/mood_event/gross_food
description = "I really didn't like that food.\n"
mood_change = -2
- timeout = 2400
+ timeout = 4 MINUTES
/datum/mood_event/disgusting_food
description = "That food was disgusting!\n"
mood_change = -4
- timeout = 2400
+ timeout = 4 MINUTES
/datum/mood_event/nice_shower
description = "I have recently had a nice shower.\n"
mood_change = 2
- timeout = 1800
+ timeout = 3 MINUTES
/datum/mood_event/fresh_laundry
description = "There's nothing like the feeling of a freshly laundered jumpsuit.\n"
diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm
index 6d0f9dd47da..cc79ec42fc6 100644
--- a/code/datums/mutations.dm
+++ b/code/datums/mutations.dm
@@ -28,6 +28,7 @@
var/scrambled = FALSE //Wheter we can read it if it's active. To avoid cheesing with mutagen
var/class //Decides player accesibility, sorta
var/list/conflicts //any mutations that might conflict. put mutation typepath defines in here. make sure to enter it both ways (so that A conflicts with B, and B with A)
+ var/allow_transfer //Do we transfer upon cloning?
//MUT_NORMAL - A mutation that can be activated and deactived by completing a sequence
//MUT_EXTRA - A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before it's name in the mutation section of the dna console
//MUT_OTHER Cannot be interacted with by players through normal means. I.E. wizards mutate
@@ -96,9 +97,6 @@
/datum/mutation/human/proc/on_ranged_attack(atom/target)
return
-/datum/mutation/human/proc/on_move(new_loc)
- return
-
/datum/mutation/human/proc/on_life()
return
@@ -182,7 +180,7 @@
qdel(src)
/datum/mutation/human/proc/grant_spell()
- if(!power || !owner)
+ if(!ispath(power) || !owner)
return FALSE
power = new power()
diff --git a/code/datums/mutations/_combined.dm b/code/datums/mutations/_combined.dm
index d11e0a6681e..ea3b5e4a852 100644
--- a/code/datums/mutations/_combined.dm
+++ b/code/datums/mutations/_combined.dm
@@ -17,6 +17,10 @@
required = "/datum/mutation/human/strong; /datum/mutation/human/radioactive"
result = HULK
+/datum/generecipe/x_ray
+ required = "/datum/mutation/human/thermal; /datum/mutation/human/radioactive"
+ result = /datum/mutation/human/thermal/x_ray
+
/datum/generecipe/mindread
required = "/datum/mutation/human/antenna; /datum/mutation/human/paranoia"
result = MINDREAD
diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm
index 517cccdda43..b90295e064c 100644
--- a/code/datums/mutations/actions.dm
+++ b/code/datums/mutations/actions.dm
@@ -19,16 +19,17 @@
text_lose_indication = "Your sense of smell goes back to normal."
power = /obj/effect/proc_holder/spell/targeted/olfaction
instability = 30
+ synchronizer_coeff = 1
var/reek = 200
/datum/mutation/human/olfaction/on_life()
var/hygiene_now = owner.hygiene
if(hygiene_now < 100 && prob(5))
- owner.adjust_disgust(rand(3,5))
+ owner.adjust_disgust(GET_MUTATION_SYNCHRONIZER(src) * (rand(3,5)))
if(hygiene_now < HYGIENE_LEVEL_DIRTY && prob(50))
to_chat(owner,"You get a whiff of your stench and feel sick!")
- owner.adjust_disgust(rand(5,10))
+ owner.adjust_disgust(GET_MUTATION_SYNCHRONIZER(src) * rand(5,10))
if(hygiene_now < HYGIENE_LEVEL_NORMAL && reek >= HYGIENE_LEVEL_NORMAL)
to_chat(owner,"Your inhumanly strong nose picks up a faint odor. Maybe you should shower soon.")
diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm
index 06278224da5..f49c847f42d 100644
--- a/code/datums/mutations/antenna.dm
+++ b/code/datums/mutations/antenna.dm
@@ -30,7 +30,7 @@
if(linked_radio)
linked_radio.Destroy()
-/datum/mutation/human/antenna/New()
+/datum/mutation/human/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))//-MUTATIONS_LAYER+1
@@ -98,7 +98,7 @@
else
to_chat(user, "You can't find a mind to read inside of [M].")
-/datum/mutation/human/mindreader/New()
+/datum/mutation/human/mindreader/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index 78589278a23..b3cee91681b 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -116,12 +116,12 @@
/datum/mutation/human/clumsy/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- owner.add_trait(TRAIT_CLUMSY, GENETIC_MUTATION)
+ ADD_TRAIT(owner, TRAIT_CLUMSY, GENETIC_MUTATION)
/datum/mutation/human/clumsy/on_losing(mob/living/carbon/human/owner)
if(..())
return
- owner.remove_trait(TRAIT_CLUMSY, GENETIC_MUTATION)
+ REMOVE_TRAIT(owner, TRAIT_CLUMSY, GENETIC_MUTATION)
//Tourettes causes you to randomly stand in place and shout.
@@ -158,12 +158,12 @@
/datum/mutation/human/deaf/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- owner.add_trait(TRAIT_DEAF, GENETIC_MUTATION)
+ ADD_TRAIT(owner, TRAIT_DEAF, GENETIC_MUTATION)
/datum/mutation/human/deaf/on_losing(mob/living/carbon/human/owner)
if(..())
return
- owner.remove_trait(TRAIT_DEAF, GENETIC_MUTATION)
+ REMOVE_TRAIT(owner, TRAIT_DEAF, GENETIC_MUTATION)
//Monified turns you into a monkey.
@@ -177,11 +177,11 @@
/datum/mutation/human/race/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- . = owner.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
+ . = owner.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_KEEPSE)
/datum/mutation/human/race/on_losing(mob/living/carbon/monkey/owner)
if(owner && istype(owner) && owner.stat != DEAD && (owner.dna.mutations.Remove(src)))
- . = owner.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
+ . = owner.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_KEEPSE)
/datum/mutation/human/glow
name = "Glowy"
@@ -227,12 +227,12 @@
/datum/mutation/human/insulated/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- owner.add_trait(TRAIT_SHOCKIMMUNE, "genetics")
+ ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, "genetics")
/datum/mutation/human/insulated/on_losing(mob/living/carbon/human/owner)
if(..())
return
- owner.remove_trait(TRAIT_SHOCKIMMUNE, "genetics")
+ REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "genetics")
/datum/mutation/human/fire
name = "Fiery Sweat"
@@ -267,6 +267,9 @@
text_lose_indication = "The space around you settles back to normal."
difficulty = 18//high so it's hard to unlock and abuse
instability = 10
+ synchronizer_coeff = 1
+ energy_coeff = 1
+ power_coeff = 1
var/warpchance = 0
/datum/mutation/human/badblink/on_life()
@@ -278,13 +281,13 @@
"[owner]'s torso starts folding inside out until it vanishes from reality, taking [owner] with it.",
"One moment, you see [owner]. The next, [owner] is gone.")
owner.visible_message(warpmessage, "You feel a wave of nausea as you fall through reality!")
- var/warpdistance = rand(10,15)
+ var/warpdistance = rand(10,15) * GET_MUTATION_POWER(src)
do_teleport(owner, get_turf(owner), warpdistance, channel = TELEPORT_CHANNEL_FREE)
- owner.adjust_disgust((warpchance * warpdistance))
+ owner.adjust_disgust(GET_MUTATION_SYNCHRONIZER(src) * (warpchance * warpdistance))
warpchance = 0
owner.visible_message("[owner] appears out of nowhere!")
else
- warpchance += 0.25
+ warpchance += 0.25 * GET_MUTATION_ENERGY(src)
/datum/mutation/human/acidflesh
name = "Acidic Flesh"
diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm
index d8ee7728a78..a6fd5cab3ec 100644
--- a/code/datums/mutations/chameleon.dm
+++ b/code/datums/mutations/chameleon.dm
@@ -13,11 +13,12 @@
if(..())
return
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move)
/datum/mutation/human/chameleon/on_life()
owner.alpha = max(0, owner.alpha - 25)
-/datum/mutation/human/chameleon/on_move()
+/datum/mutation/human/chameleon/proc/on_move()
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
/datum/mutation/human/chameleon/on_attack_hand(atom/target, proximity)
@@ -29,3 +30,4 @@
if(..())
return
owner.alpha = 255
+ UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
diff --git a/code/datums/mutations/cold.dm b/code/datums/mutations/cold.dm
index 7ef451fcae5..cd10c2b38f7 100644
--- a/code/datums/mutations/cold.dm
+++ b/code/datums/mutations/cold.dm
@@ -5,6 +5,7 @@
text_gain_indication = "Your hand feels cold."
instability = 10
difficulty = 10
+ synchronizer_coeff = 1
power = /obj/effect/proc_holder/spell/targeted/conjure_item/snow
/obj/effect/proc_holder/spell/targeted/conjure_item/snow
@@ -23,6 +24,7 @@
text_gain_indication = "Your hand feels cold."
instability = 20
difficulty = 12
+ synchronizer_coeff = 1
power = /obj/effect/proc_holder/spell/aimed/cryo
/obj/effect/proc_holder/spell/aimed/cryo
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index 683f5b72593..f1ee74127bf 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -14,8 +14,8 @@
/datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- owner.add_trait(TRAIT_STUNIMMUNE, TRAIT_HULK)
- owner.add_trait(TRAIT_PUSHIMMUNE, TRAIT_HULK)
+ ADD_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK)
+ ADD_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK)
owner.update_body_parts()
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
@@ -31,8 +31,8 @@
/datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner)
if(..())
return
- owner.remove_trait(TRAIT_STUNIMMUNE, TRAIT_HULK)
- owner.remove_trait(TRAIT_PUSHIMMUNE, TRAIT_HULK)
+ REMOVE_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK)
+ REMOVE_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK)
owner.update_body_parts()
SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk")
diff --git a/code/datums/mutations/radioactive.dm b/code/datums/mutations/radioactive.dm
index 95e19ccb81f..00155ad0a17 100644
--- a/code/datums/mutations/radioactive.dm
+++ b/code/datums/mutations/radioactive.dm
@@ -6,12 +6,13 @@
time_coeff = 5
instability = 5
difficulty = 8
+ power_coeff = 1
/datum/mutation/human/radioactive/on_life()
- radiation_pulse(owner, 20)
+ radiation_pulse(owner, 20 * GET_MUTATION_POWER(src))
-/datum/mutation/human/radioactive/New()
+/datum/mutation/human/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "radiation", -MUTATIONS_LAYER))
diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm
index fba82b1074d..c8f58eaf7b8 100644
--- a/code/datums/mutations/sight.dm
+++ b/code/datums/mutations/sight.dm
@@ -34,29 +34,37 @@
owner.cure_blind(GENETIC_MUTATION)
-//X-ray Vision lets you see through walls.
-/datum/mutation/human/x_ray
- name = "X Ray Vision"
- desc = "A strange genome that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb
+/datum/mutation/human/thermal
+ name = "Thermal Vision"
+ desc = "The user of this genome can visually percieve the unique human thermal signature."
quality = POSITIVE
difficulty = 18
- text_gain_indication = "The walls suddenly disappear!"
+ text_gain_indication = "You can see the heat rising off of your skin..."
time_coeff = 2
instability = 25
+ var/visionflag = TRAIT_THERMAL_VISION
-/datum/mutation/human/x_ray/on_acquiring(mob/living/carbon/human/owner)
+/datum/mutation/human/thermal/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- owner.add_trait(TRAIT_XRAY_VISION, GENETIC_MUTATION)
+ ADD_TRAIT(owner, visionflag, GENETIC_MUTATION)
owner.update_sight()
-/datum/mutation/human/x_ray/on_losing(mob/living/carbon/human/owner)
+/datum/mutation/human/thermal/on_losing(mob/living/carbon/human/owner)
if(..())
return
- owner.remove_trait(TRAIT_XRAY_VISION, GENETIC_MUTATION)
+ REMOVE_TRAIT(owner, visionflag, GENETIC_MUTATION)
owner.update_sight()
+//X-ray Vision lets you see through walls.
+/datum/mutation/human/thermal/x_ray
+ name = "X Ray Vision"
+ desc = "A strange genome that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb
+ text_gain_indication = "The walls suddenly disappear!"
+ instability = 35
+ locked = TRUE
+ visionflag = TRAIT_XRAY_VISION
//Laser Eyes lets you shoot lasers from your eyes!
/datum/mutation/human/laser_eyes
@@ -69,12 +77,13 @@
layer_used = FRONT_MUTATIONS_LAYER
limb_req = BODY_ZONE_HEAD
-/datum/mutation/human/laser_eyes/New()
+/datum/mutation/human/laser_eyes/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
- visual_indicators |= mutable_appearance('icons/effects/genetics.dmi', "lasereyes", -FRONT_MUTATIONS_LAYER)
+ if(!(type in visual_indicators))
+ visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "lasereyes", -FRONT_MUTATIONS_LAYER))
/datum/mutation/human/laser_eyes/get_visual_indicator()
- return visual_indicators[1]
+ return visual_indicators[type][1]
/datum/mutation/human/laser_eyes/on_ranged_attack(atom/target, mouseparams)
if(owner.a_intent == INTENT_HARM)
diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm
index 58525cecaa8..a77694c6f79 100644
--- a/code/datums/mutations/space_adaptation.dm
+++ b/code/datums/mutations/space_adaptation.dm
@@ -1,14 +1,14 @@
//Cold Resistance gives your entire body an orange halo, and makes you immune to the effects of vacuum and cold.
/datum/mutation/human/space_adaptation
name = "Space Adaptation"
- desc = "A strange mutation that renders the host immune to the vacuum if space. Will still need an oxygen supply."
+ desc = "A strange mutation that renders the host immune to the vacuum of space. Will still need an oxygen supply."
quality = POSITIVE
difficulty = 16
text_gain_indication = "Your body feels warm!"
time_coeff = 5
instability = 30
-/datum/mutation/human/space_adaptation/New()
+/datum/mutation/human/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER))
@@ -19,12 +19,12 @@
/datum/mutation/human/space_adaptation/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- owner.add_trait(TRAIT_RESISTCOLD, "space_adaptation")
- owner.add_trait(TRAIT_RESISTLOWPRESSURE, "space_adaptation")
+ ADD_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation")
+ ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation")
/datum/mutation/human/space_adaptation/on_losing(mob/living/carbon/human/owner)
if(..())
return
- owner.remove_trait(TRAIT_RESISTCOLD, "space_adaptation")
- owner.remove_trait(TRAIT_RESISTLOWPRESSURE, "space_adaptation")
+ REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation")
+ REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation")
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 330066d441a..5e3f59dd714 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -33,12 +33,12 @@
/datum/mutation/human/mute/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- owner.add_trait(TRAIT_MUTE, GENETIC_MUTATION)
+ ADD_TRAIT(owner, TRAIT_MUTE, GENETIC_MUTATION)
/datum/mutation/human/mute/on_losing(mob/living/carbon/human/owner)
if(..())
return
- owner.remove_trait(TRAIT_MUTE, GENETIC_MUTATION)
+ REMOVE_TRAIT(owner, TRAIT_MUTE, GENETIC_MUTATION)
/datum/mutation/human/smile
@@ -72,6 +72,7 @@
message = replacetext(message," murder "," tease ")
message = replacetext(message," ugly "," beautiful ")
message = replacetext(message," douchbag "," nice guy ")
+ message = replacetext(message," douchebag "," nice guy ")
message = replacetext(message," whore "," lady ")
message = replacetext(message," nerd "," smart guy ")
message = replacetext(message," moron "," fun person ")
@@ -108,12 +109,12 @@
/datum/mutation/human/unintelligible/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- owner.add_trait(TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
+ ADD_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
/datum/mutation/human/unintelligible/on_losing(mob/living/carbon/human/owner)
if(..())
return
- owner.remove_trait(TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
+ REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
/datum/mutation/human/swedish
name = "Swedish"
@@ -195,10 +196,11 @@
message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo "))
message = replacetext(message," out of "," outta ")
message = replacetext(message," thank you "," thank you, thank you very much ")
+ message = replacetext(message," thanks "," thank you, thank you very much ")
message = replacetext(message," what are you "," whatcha ")
message = replacetext(message," yes ",pick(" sure", "yea "))
message = replacetext(message," faggot "," square ")
- message = replacetext(message," muh valids "," getting my kicks ")
+ message = replacetext(message," muh valids "," my kicks ")
return trim(message)
@@ -219,3 +221,4 @@
..()
owner.grant_language(/datum/language/common)
owner.remove_language(/datum/language/beachbum)
+
diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm
index 49c39d59f54..41f21592149 100644
--- a/code/datums/mutations/telekinesis.dm
+++ b/code/datums/mutations/telekinesis.dm
@@ -8,7 +8,7 @@
limb_req = BODY_ZONE_HEAD
instability = 30
-/datum/mutation/human/telekinesis/New()
+/datum/mutation/human/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER))
diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm
index 2b6ce442689..33bfb4eaa55 100644
--- a/code/datums/mutations/touch.dm
+++ b/code/datums/mutations/touch.dm
@@ -31,7 +31,7 @@
/obj/item/melee/touch_attack/shock/afterattack(atom/target, mob/living/carbon/user, proximity)
if(iscarbon(target))
var/mob/living/carbon/C = target
- if(C.electrocute_act(15, src, 1, FALSE, FALSE, FALSE, FALSE, FALSE))//doesnt stun. never let this stun
+ if(C.electrocute_act(15, user, 1, FALSE, FALSE, FALSE, FALSE, FALSE))//doesnt stun. never let this stun
C.dropItemToGround(C.get_active_held_item())
C.dropItemToGround(C.get_inactive_held_item())
C.confused += 15
@@ -42,7 +42,7 @@
return ..()
else if(isliving(target))
var/mob/living/L = target
- L.electrocute_act(15, src, 1, FALSE, FALSE, FALSE, FALSE)
+ L.electrocute_act(15, user, 1, FALSE, FALSE, FALSE, FALSE)
L.visible_message("[user] electrocutes [target]!","[user] electrocutes you!")
return ..()
else
diff --git a/code/datums/outputs.dm b/code/datums/outputs.dm
index d1bee4d5b58..4ae8e70917d 100644
--- a/code/datums/outputs.dm
+++ b/code/datums/outputs.dm
@@ -4,11 +4,12 @@
var/text = ""
var/list/sounds = 'sound/items/airhorn.ogg' //can be either a sound path or a WEIGHTED list, put multiple for random selection between sounds
var/mutable_appearance/vfx = list('icons/sound_icon.dmi',"circle", HUD_LAYER) //syntax: icon, icon_state, layer
+ var/cooldown = 100 //ms
/datum/outputs/New()
vfx = mutable_appearance(vfx[1],vfx[2],vfx[3])
-/datum/outputs/proc/send_info(mob/receiver, turf/turf_source, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE)
+/datum/outputs/proc/send_info(mob/receiver, turf/turf_source, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, last_played_time)
var/sound/sound_output
//Pick sound
if(islist(sounds))
@@ -67,7 +68,11 @@
sound_output.y = 1
sound_output.falloff = (falloff ? falloff : FALLOFF_SOUNDS)
- receiver.display_output(sound_output, vfx, text, turf_source, vol, vary, frequency, falloff, channel, pressure_affected)
+ if(world.time >= last_played_time + cooldown)
+ receiver.display_output(sound_output, vfx, text, turf_source, vol, vary, frequency, falloff, channel, pressure_affected)
+ . = TRUE //start cooling down text
+ else
+ receiver.display_output(sound_output, vfx, , turf_source, vol, vary, frequency, falloff, channel, pressure_affected) //changing the text takes more cpu time than a single if check
/datum/outputs/bikehorn
text = "You hear a HONK."
@@ -106,4 +111,4 @@
/datum/outputs/squelch
text = "You hear a horrendous squelching sound."
- sounds = 'sound/effects/blobattack.ogg'
+ sounds = 'sound/effects/blobattack.ogg'
\ No newline at end of file
diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm
index 6b947d8e841..183b2235be3 100644
--- a/code/datums/progressbar.dm
+++ b/code/datums/progressbar.dm
@@ -1,7 +1,9 @@
#define PROGRESSBAR_HEIGHT 6
+#define PROGRESSBAR_ANIMATION_TIME 5
/datum/progressbar
var/goal = 1
+ var/last_progress = 0
var/image/bar
var/shown = 0
var/mob/user
@@ -26,11 +28,13 @@
var/list/bars = user.progressbars[bar.loc]
bars.Add(src)
listindex = bars.len
- bar.pixel_y = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1))
+ bar.pixel_y = 0
+ bar.alpha = 0
+ animate(bar, pixel_y = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1)), alpha = 255, time = PROGRESSBAR_ANIMATION_TIME, easing = SINE_EASING)
/datum/progressbar/proc/update(progress)
if (!user || !user.client)
- shown = 0
+ shown = FALSE
return
if (user.client != client)
if (client)
@@ -39,16 +43,21 @@
user.client.images += bar
progress = CLAMP(progress, 0, goal)
+ last_progress = progress
bar.icon_state = "prog_bar_[round(((progress / goal) * 100), 5)]"
if (!shown)
user.client.images += bar
- shown = 1
+ shown = TRUE
/datum/progressbar/proc/shiftDown()
--listindex
- bar.pixel_y -= PROGRESSBAR_HEIGHT
+ bar.pixel_y = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1))
+ var/dist_to_travel = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1)) - PROGRESSBAR_HEIGHT
+ animate(bar, pixel_y = dist_to_travel, time = PROGRESSBAR_ANIMATION_TIME, easing = SINE_EASING)
/datum/progressbar/Destroy()
+ if(last_progress != goal)
+ bar.icon_state = "[bar.icon_state]_fail"
for(var/I in user.progressbars[bar.loc])
var/datum/progressbar/P = I
if(P != src && P.listindex > listindex)
@@ -59,9 +68,15 @@
if(!bars.len)
LAZYREMOVE(user.progressbars, bar.loc)
- if (client)
- client.images -= bar
- qdel(bar)
+ animate(bar, alpha = 0, time = PROGRESSBAR_ANIMATION_TIME)
+ addtimer(CALLBACK(src, .proc/remove_from_client), PROGRESSBAR_ANIMATION_TIME, TIMER_CLIENT_TIME)
+ QDEL_IN(bar, PROGRESSBAR_ANIMATION_TIME * 2) //for garbage collection safety
. = ..()
-#undef PROGRESSBAR_HEIGHT
\ No newline at end of file
+/datum/progressbar/proc/remove_from_client()
+ if(client)
+ client.images -= bar
+ client = null
+
+#undef PROGRESSBAR_ANIMATION_TIME
+#undef PROGRESSBAR_HEIGHT
diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm
index 5fb777f9c57..949e63dc6a7 100644
--- a/code/datums/radiation_wave.dm
+++ b/code/datums/radiation_wave.dm
@@ -9,7 +9,9 @@
var/can_contaminate
/datum/radiation_wave/New(atom/_source, dir, _intensity=0, _range_modifier=RAD_DISTANCE_COEFFICIENT, _can_contaminate=TRUE)
- source = _source
+
+ source = "[_source] \[[REF(_source)]\]"
+
master_turf = get_turf(_source)
move_dir = dir
diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm
index ce9d6d448c7..57ef7701e32 100644
--- a/code/datums/saymode.dm
+++ b/code/datums/saymode.dm
@@ -27,7 +27,7 @@
switch(M.lingcheck())
if (LINGHIVE_LING)
var/mob/living/L = M
- if (!L.has_trait(CHANGELING_HIVEMIND_MUTE))
+ if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE))
to_chat(M, msg)
if(LINGHIVE_LINK)
to_chat(M, msg)
@@ -35,7 +35,7 @@
if(prob(40))
to_chat(M, "We can faintly sense an outsider trying to communicate through the hivemind...")
if(LINGHIVE_LING)
- if (user.has_trait(CHANGELING_HIVEMIND_MUTE))
+ if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE))
to_chat(user, "The poison in the air hinders our ability to interact with the hivemind.")
return FALSE
var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
@@ -52,7 +52,7 @@
to_chat(M, msg)
if(LINGHIVE_LING)
var/mob/living/L = M
- if (!L.has_trait(CHANGELING_HIVEMIND_MUTE))
+ if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE))
to_chat(M, msg)
if(LINGHIVE_OUTSIDER)
if(prob(40))
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 33bbab65718..f36190073e5 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -152,6 +152,10 @@
port_id = "pirate"
can_be_bought = FALSE
+/datum/map_template/shuttle/hunter
+ port_id = "hunter"
+ can_be_bought = FALSE
+
/datum/map_template/shuttle/ruin //For random shuttles in ruins
port_id = "ruin"
can_be_bought = FALSE
@@ -199,6 +203,13 @@
Has medical facilities."
credit_cost = 5000
+/datum/map_template/shuttle/emergency/pod
+ suffix = "pod"
+ name = "Emergency Pods"
+ description = "We did not expect an evacuation this quickly. All we have available is two escape pods."
+ admin_notes = "For player punishment."
+ can_be_bought = FALSE
+
/datum/map_template/shuttle/emergency/russiafightpit
suffix = "russiafightpit"
name = "Mother Russia Bleeds"
@@ -209,9 +220,9 @@
/datum/map_template/shuttle/emergency/meteor
suffix = "meteor"
name = "Asteroid With Engines Strapped To It"
- description = "A hollowed out asteroid with engines strapped to it. Due to its size and difficulty in steering it, this shuttle may damage the docking area."
+ description = "A hollowed out asteroid with engines strapped to it, the hollowing procedure makes it very difficult to hijack but is very expensive. Due to its size and difficulty in steering it, this shuttle may damage the docking area."
admin_notes = "This shuttle will likely crush escape, killing anyone there."
- credit_cost = -5000
+ credit_cost = 15000
movement_force = list("KNOCKDOWN" = 3, "THROW" = 2)
/datum/map_template/shuttle/emergency/luxury
@@ -285,6 +296,12 @@
credit_cost = 4000
description = "A fairly standard shuttle, though larger and slightly better equipped than the Box Station variant."
+/datum/map_template/shuttle/emergency/kilo
+ suffix = "kilo"
+ name = "Kilo Station Emergency Shuttle"
+ credit_cost = 5000
+ description = "A fully functional shuttle including a complete infirmary, storage facilties and regular amenities."
+
/datum/map_template/shuttle/emergency/mini
suffix = "mini"
name = "Ministation emergency shuttle"
@@ -392,6 +409,11 @@
name = "fancy transport ferry"
description = "At some point, someone upgraded the ferry to have fancier flooring... and fewer seats."
+/datum/map_template/shuttle/ferry/kilo
+ suffix = "kilo"
+ name = "kilo transport ferry"
+ description = "Standard issue CentCom Ferry for Kilo pattern stations. Includes additional equipment and rechargers."
+
/datum/map_template/shuttle/whiteship/box
suffix = "box"
name = "Hospital Ship"
@@ -420,6 +442,10 @@
suffix = "box"
name = "supply shuttle (Box)"
+/datum/map_template/shuttle/cargo/kilo
+ suffix = "kilo"
+ name = "supply shuttle (Kilo)"
+
/datum/map_template/shuttle/cargo/birdboat
suffix = "birdboat"
name = "supply shuttle (Birdboat)"
@@ -468,6 +494,10 @@
suffix = "basic"
name = "basic syndicate infiltrator"
+/datum/map_template/shuttle/infiltrator/advanced
+ suffix = "basic"
+ name = "advanced syndicate infiltrator"
+
/datum/map_template/shuttle/cargo/delta
suffix = "delta"
name = "cargo ferry (Delta)"
@@ -476,14 +506,30 @@
suffix = "delta"
name = "mining shuttle (Delta)"
+/datum/map_template/shuttle/mining/kilo
+ suffix = "kilo"
+ name = "mining shuttle (Kilo)"
+
+/datum/map_template/shuttle/mining/large
+ suffix = "large"
+ name = "mining shuttle (Large)"
+
/datum/map_template/shuttle/labour/delta
suffix = "delta"
name = "labour shuttle (Delta)"
+/datum/map_template/shuttle/labour/kilo
+ suffix = "kilo"
+ name = "labour shuttle (Kilo)"
+
/datum/map_template/shuttle/arrival/delta
suffix = "delta"
name = "arrival shuttle (Delta)"
+/datum/map_template/shuttle/arrival/kilo
+ suffix = "kilo"
+ name = "arrival shuttle (Kilo)"
+
/datum/map_template/shuttle/arrival/pubby
suffix = "pubby"
name = "arrival shuttle (Pubby)"
@@ -516,6 +562,14 @@
suffix = "default"
name = "pirate ship (Default)"
+/datum/map_template/shuttle/hunter/space_cop
+ suffix = "space_cop"
+ name = "Police Spacevan"
+
+/datum/map_template/shuttle/hunter/russian
+ suffix = "russian"
+ name = "Russian Cargo Ship"
+
/datum/map_template/shuttle/ruin/caravan_victim
suffix = "caravan_victim"
name = "Small Freighter"
diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm
index ebbe08c5251..91a81247598 100644
--- a/code/datums/spawners_menu.dm
+++ b/code/datums/spawners_menu.dm
@@ -38,11 +38,15 @@
if(..())
return
- var/spawner_ref = pick(GLOB.mob_spawners[params["name"]])
- var/obj/effect/mob_spawn/MS = locate(spawner_ref) in GLOB.poi_list
- if(!MS)
+ var/group_name = params["name"]
+ if(!group_name || !(group_name in GLOB.mob_spawners))
+ return
+ var/list/spawnerlist = GLOB.mob_spawners[group_name]
+ if(!spawnerlist.len)
+ return
+ var/obj/effect/mob_spawn/MS = pick(spawnerlist)
+ if(!istype(MS) || !(MS in GLOB.poi_list))
return
-
switch(action)
if("jump")
if(MS)
@@ -51,4 +55,4 @@
if("spawn")
if(MS)
MS.attack_ghost(owner)
- . = TRUE
\ No newline at end of file
+ . = TRUE
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index c10e65e95eb..acea0772d14 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -292,6 +292,7 @@
var/mob/living/carbon/C = owner
for(var/X in C.bodyparts)
var/obj/item/bodypart/BP = X
+ BP.max_damage *= 10
BP.brute_dam *= 10
BP.burn_dam *= 10
owner.toxloss *= 10
@@ -308,6 +309,7 @@
last_staminaloss = owner.getStaminaLoss()
owner.log_message("gained blood-drunk stun immunity", LOG_ATTACK)
owner.add_stun_absorption("blooddrunk", INFINITY, 4)
+ ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "blooddrunk");
owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1)
/datum/status_effect/blooddrunk/tick() //multiply the effect of healing by 10
@@ -377,12 +379,14 @@
var/obj/item/bodypart/BP = X
BP.brute_dam *= 0.1
BP.burn_dam *= 0.1
+ BP.max_damage /= 10
owner.toxloss *= 0.1
owner.oxyloss *= 0.1
owner.cloneloss *= 0.1
owner.staminaloss *= 0.1
owner.updatehealth()
owner.log_message("lost blood-drunk stun immunity", LOG_ATTACK)
+ REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "blooddrunk");
if(islist(owner.stun_absorption) && owner.stun_absorption["blooddrunk"])
owner.stun_absorption -= "blooddrunk"
@@ -401,12 +405,12 @@
owner.spin(duration,1)
animate(owner, color = oldcolor, time = duration, easing = EASE_IN)
addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), duration)
- playsound(owner, 'sound/weapons/fwoosh.wav', 75, 0)
+ playsound(owner, 'sound/weapons/fwoosh.ogg', 75, 0)
return ..()
/datum/status_effect/sword_spin/tick()
- playsound(owner, 'sound/weapons/fwoosh.wav', 75, 0)
+ playsound(owner, 'sound/weapons/fwoosh.ogg', 75, 0)
var/obj/item/slashy
slashy = owner.get_active_held_item()
for(var/mob/living/M in orange(1,owner))
@@ -466,13 +470,13 @@
/datum/status_effect/hippocraticOath/on_apply()
//Makes the user passive, it's in their oath not to harm!
- owner.add_trait(TRAIT_PACIFISM, "hippocraticOath")
+ ADD_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath")
var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
H.add_hud_to(owner)
return ..()
/datum/status_effect/hippocraticOath/on_remove()
- owner.remove_trait(TRAIT_PACIFISM, "hippocraticOath")
+ REMOVE_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath")
var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
H.remove_hud_from(owner)
@@ -568,12 +572,28 @@
alert_type = /obj/screen/alert/status_effect/regenerative_core
/datum/status_effect/regenerative_core/on_apply()
- owner.add_trait(TRAIT_IGNOREDAMAGESLOWDOWN, "regenerative_core")
+ ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "regenerative_core")
owner.adjustBruteLoss(-25)
owner.adjustFireLoss(-25)
- owner.remove_CC()
+ owner.remove_CC()
owner.bodytemperature = BODYTEMP_NORMAL
return TRUE
/datum/status_effect/regenerative_core/on_remove()
- owner.remove_trait(TRAIT_IGNOREDAMAGESLOWDOWN, "regenerative_core")
+ REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id)
+
+/datum/status_effect/antimagic
+ id = "antimagic"
+ duration = 10 SECONDS
+ examine_text = "They seem to be covered in a dull, grey aura."
+
+/datum/status_effect/antimagic/on_apply()
+ owner.visible_message("[owner] is coated with a dull aura!")
+ ADD_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
+ //glowing wings overlay
+ playsound(owner, 'sound/weapons/fwoosh.ogg', 75, 0)
+ return ..()
+
+/datum/status_effect/antimagic/on_remove()
+ REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT)
+ owner.visible_message("[owner]'s dull aura fades away...")
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 2f3b3a1eb68..f6d6d038d41 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -82,6 +82,43 @@
desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are."
icon_state = "asleep"
+//STASIS
+/datum/status_effect/incapacitating/stasis
+ id = "stasis"
+ duration = -1
+ tick_interval = 10
+ alert_type = /obj/screen/alert/status_effect/stasis
+ var/last_dead_time
+
+/datum/status_effect/incapacitating/stasis/proc/update_time_of_death()
+ if(last_dead_time)
+ var/delta = world.time - last_dead_time
+ var/new_timeofdeath = owner.timeofdeath + delta
+ owner.timeofdeath = new_timeofdeath
+ owner.tod = station_time_timestamp(wtime=new_timeofdeath)
+ last_dead_time = null
+ if(owner.stat == DEAD)
+ last_dead_time = world.time
+
+/datum/status_effect/incapacitating/stasis/on_creation(mob/living/new_owner, set_duration, updating_canmove)
+ . = ..()
+ update_time_of_death()
+
+/datum/status_effect/incapacitating/stasis/tick()
+ update_time_of_death()
+
+/datum/status_effect/incapacitating/stasis/on_remove()
+ update_time_of_death()
+ return ..()
+
+/datum/status_effect/incapacitating/stasis/be_replaced()
+ update_time_of_death()
+ return ..()
+
+/obj/screen/alert/status_effect/stasis
+ name = "Stasis"
+ desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring."
+ icon_state = "stasis"
//GOLEM GANG
@@ -92,11 +129,11 @@
alert_type = /obj/screen/alert/status_effect/strandling
/datum/status_effect/strandling/on_apply()
- owner.add_trait(TRAIT_MAGIC_CHOKE, "dumbmoron")
+ ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
return ..()
/datum/status_effect/strandling/on_remove()
- owner.remove_trait(TRAIT_MAGIC_CHOKE, "dumbmoron")
+ REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
return ..()
/obj/screen/alert/status_effect/strandling
@@ -121,11 +158,11 @@
. = ..()
/datum/status_effect/pacify/on_apply()
- owner.add_trait(TRAIT_PACIFISM, "status_effect")
+ ADD_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
return ..()
/datum/status_effect/pacify/on_remove()
- owner.remove_trait(TRAIT_PACIFISM, "status_effect")
+ REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
//OTHER DEBUFFS
/datum/status_effect/pacify
@@ -141,11 +178,11 @@
. = ..()
/datum/status_effect/pacify/on_apply()
- owner.add_trait(TRAIT_PACIFISM, "status_effect")
+ ADD_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
return ..()
/datum/status_effect/pacify/on_remove()
- owner.remove_trait(TRAIT_PACIFISM, "status_effect")
+ REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
/datum/status_effect/his_wrath //does minor damage over time unless holding His Grace
id = "his_wrath"
@@ -581,16 +618,16 @@
alert_type = null
/datum/status_effect/gonbolaPacify/on_apply()
- owner.add_trait(TRAIT_PACIFISM, "gonbolaPacify")
- owner.add_trait(TRAIT_MUTE, "gonbolaMute")
- owner.add_trait(TRAIT_JOLLY, "gonbolaJolly")
+ ADD_TRAIT(owner, TRAIT_PACIFISM, "gonbolaPacify")
+ ADD_TRAIT(owner, TRAIT_MUTE, "gonbolaMute")
+ ADD_TRAIT(owner, TRAIT_JOLLY, "gonbolaJolly")
to_chat(owner, "You suddenly feel at peace and feel no need to make any sudden or rash actions...")
return ..()
/datum/status_effect/gonbolaPacify/on_remove()
- owner.remove_trait(TRAIT_PACIFISM, "gonbolaPacify")
- owner.remove_trait(TRAIT_MUTE, "gonbolaMute")
- owner.remove_trait(TRAIT_JOLLY, "gonbolaJolly")
+ REMOVE_TRAIT(owner, TRAIT_PACIFISM, "gonbolaPacify")
+ REMOVE_TRAIT(owner, TRAIT_MUTE, "gonbolaMute")
+ REMOVE_TRAIT(owner, TRAIT_JOLLY, "gonbolaJolly")
/datum/status_effect/trance
id = "trance"
@@ -615,7 +652,7 @@
if(!iscarbon(owner))
return FALSE
RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize)
- owner.add_trait(TRAIT_MUTE, "trance")
+ ADD_TRAIT(owner, TRAIT_MUTE, "trance")
if(!owner.has_quirk(/datum/quirk/monochromatic))
owner.add_client_colour(/datum/client_colour/monochrome)
owner.visible_message("[stun ? "[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point." : ""]", \
@@ -629,7 +666,7 @@
/datum/status_effect/trance/on_remove()
UnregisterSignal(owner, COMSIG_MOVABLE_HEAR)
- owner.remove_trait(TRAIT_MUTE, "trance")
+ REMOVE_TRAIT(owner, TRAIT_MUTE, "trance")
owner.dizziness = 0
if(!owner.has_quirk(/datum/quirk/monochromatic))
owner.remove_client_colour(/datum/client_colour/monochrome)
@@ -655,7 +692,7 @@
if(prob(15))
switch(rand(1,5))
if(1)
- if(owner.mobility_flags & MOBILITY_MOVE)
+ if((owner.mobility_flags & MOBILITY_MOVE) && isturf(owner.loc))
to_chat(owner, "Your leg spasms!")
step(owner, pick(GLOB.cardinals))
if(2)
@@ -701,3 +738,49 @@
to_chat(owner, "Your arm spasms!")
owner.log_message("threw [I] due to a Muscle Spasm", LOG_ATTACK)
owner.throw_item(pick(targets))
+
+/datum/status_effect/dna_melt
+ id = "dna_melt"
+ duration = 600
+ status_type = STATUS_EFFECT_REPLACE
+ alert_type = /obj/screen/alert/status_effect/dna_melt
+ var/kill_either_way = FALSE //no amount of removing mutations is gonna save you now
+
+/datum/status_effect/dna_melt/on_creation(mob/living/new_owner, set_duration, updating_canmove)
+ . = ..()
+ to_chat(new_owner, "My body can't handle the mutations! I need to get my mutations removed fast!")
+
+/datum/status_effect/dna_melt/on_remove()
+ if(!ishuman(owner))
+ owner.gib() //fuck you in particular
+ return
+ var/mob/living/carbon/human/H = owner
+ H.something_horrible(kill_either_way)
+
+/obj/screen/alert/status_effect/dna_melt
+ name = "Genetic Breakdown"
+ desc = "I don't feel so good. Your body can't handle the mutations! You have one minute to remove your mutations, or you will be met with a horrible fate."
+ icon_state = "dna_melt"
+
+/datum/status_effect/go_away
+ id = "go_away"
+ duration = 100
+ status_type = STATUS_EFFECT_REPLACE
+ tick_interval = 1
+ alert_type = /obj/screen/alert/status_effect/go_away
+ var/direction
+
+/datum/status_effect/go_away/on_creation(mob/living/new_owner, set_duration, updating_canmove)
+ . = ..()
+ direction = pick(NORTH, SOUTH, EAST, WEST)
+ new_owner.setDir(direction)
+
+/datum/status_effect/go_away/tick()
+ owner.AdjustStun(1, ignore_canstun = TRUE)
+ var/turf/T = get_step(owner, direction)
+ owner.forceMove(T)
+
+/obj/screen/alert/status_effect/go_away
+ name = "TO THE STARS AND BEYOND!"
+ desc = "I must go, my people need me!"
+ icon_state = "high"
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index 646087e8532..df270e998c1 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -79,8 +79,55 @@
/datum/status_effect/throat_soothed/on_apply()
. = ..()
- owner.add_trait(TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
+ ADD_TRAIT(owner, TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
/datum/status_effect/throat_soothed/on_remove()
. = ..()
- owner.remove_trait(TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
+ REMOVE_TRAIT(owner, TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
+
+/datum/status_effect/bounty
+ id = "bounty"
+ status_type = STATUS_EFFECT_UNIQUE
+ var/mob/living/rewarded
+
+/datum/status_effect/bounty/on_creation(mob/living/new_owner, mob/living/caster)
+ . = ..()
+ if(.)
+ rewarded = caster
+
+/datum/status_effect/bounty/on_apply()
+ to_chat(owner, "You hear something behind you talking... You have been marked for death by [rewarded]. If you die, they will be rewarded.")
+ playsound(owner, 'sound/weapons/shotgunpump.ogg', 75, 0)
+ return ..()
+
+/datum/status_effect/bounty/tick()
+ if(owner.stat == DEAD)
+ rewards()
+ qdel(src)
+
+/datum/status_effect/bounty/proc/rewards()
+ if(rewarded && rewarded.mind && rewarded.stat != DEAD)
+ to_chat(owner, "You hear something behind you talking... Bounty claimed.")
+ playsound(owner, 'sound/weapons/shotgunshot.ogg', 75, 0)
+ to_chat(rewarded, "You feel a surge of mana flow into you!")
+ for(var/obj/effect/proc_holder/spell/spell in rewarded.mind.spell_list)
+ spell.charge_counter = spell.charge_max
+ spell.recharging = FALSE
+ spell.update_icon()
+ rewarded.adjustBruteLoss(-25)
+ rewarded.adjustFireLoss(-25)
+ rewarded.adjustToxLoss(-25)
+ rewarded.adjustOxyLoss(-25)
+ rewarded.adjustCloneLoss(-25)
+
+/datum/status_effect/bugged //Lets another mob hear everything you can
+ id = "bugged"
+ duration = -1
+ status_type = STATUS_EFFECT_MULTIPLE
+ alert_type = null
+ var/mob/living/listening_in
+
+/datum/status_effect/bugged/on_creation(mob/living/new_owner, mob/living/tracker)
+ . = ..()
+ if(.)
+ listening_in = tracker
diff --git a/code/datums/traits.dm b/code/datums/traits.dm
deleted file mode 100644
index 15715c3c888..00000000000
--- a/code/datums/traits.dm
+++ /dev/null
@@ -1,75 +0,0 @@
-/datum/proc/add_trait(trait, source)
- LAZYINITLIST(status_traits)
-
- if(!status_traits[trait])
- status_traits[trait] = list(source)
- else
- status_traits[trait] |= list(source)
-
-
-/datum/proc/remove_trait(trait, list/sources, force)
- if(!status_traits)
- return //nothing to remove
-
- if(!status_traits[trait])
- return
-
- if(locate(ROUNDSTART_TRAIT) in status_traits[trait] && !force) //mob traits applied through roundstart cannot normally be removed
- return
-
- if(!sources) // No defined source cures the trait entirely.
- status_traits -= trait
- return
-
- if(!islist(sources))
- sources = list(sources)
-
- if(LAZYLEN(sources))
- for(var/S in sources)
- if(S in status_traits[trait])
- status_traits[trait] -= S
- else
- status_traits[trait] = list()
-
- if(!LAZYLEN(status_traits[trait]))
- status_traits -= trait
-
-/datum/proc/has_trait(trait, list/sources)
- if(!status_traits)
- return FALSE //well of course it doesn't have the trait
-
- if(!status_traits[trait])
- return FALSE
-
- . = FALSE
-
- if(sources && !islist(sources))
- sources = list(sources)
- if(LAZYLEN(sources))
- for(var/S in sources)
- if(S in status_traits[trait])
- return TRUE
- else if(LAZYLEN(status_traits[trait]))
- return TRUE
-
-/datum/proc/remove_all_traits(remove_species_traits = FALSE, remove_organ_traits = FALSE, remove_quirks = FALSE)
- if(!status_traits)
- return //nothing to remove
-
- var/list/blacklisted_sources = list()
- if(!remove_species_traits)
- blacklisted_sources += SPECIES_TRAIT
- if(!remove_organ_traits)
- blacklisted_sources += ORGAN_TRAIT
- if(!remove_quirks)
- blacklisted_sources += ROUNDSTART_TRAIT
-
- for(var/kebab in status_traits)
- var/skip
- for(var/S in blacklisted_sources)
- if(S in status_traits[kebab])
- skip = TRUE
- break
- if(!skip)
- remove_trait(kebab, null, TRUE)
- CHECK_TICK
diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm
index 963afacec3c..cc6dd8db3f8 100644
--- a/code/datums/traits/_quirk.dm
+++ b/code/datums/traits/_quirk.dm
@@ -21,7 +21,7 @@
to_chat(quirk_holder, gain_text)
quirk_holder.roundstart_quirks += src
if(mob_trait)
- quirk_holder.add_trait(mob_trait, ROUNDSTART_TRAIT)
+ ADD_TRAIT(quirk_holder, mob_trait, ROUNDSTART_TRAIT)
START_PROCESSING(SSquirks, src)
add()
if(spawn_effects)
@@ -35,7 +35,7 @@
to_chat(quirk_holder, lose_text)
quirk_holder.roundstart_quirks -= src
if(mob_trait)
- quirk_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT, TRUE)
+ REMOVE_TRAIT(quirk_holder, mob_trait, ROUNDSTART_TRAIT)
SSquirks.quirk_objects -= src
return ..()
@@ -43,8 +43,8 @@
quirk_holder.roundstart_quirks -= src
to_mob.roundstart_quirks += src
if(mob_trait)
- quirk_holder.remove_trait(mob_trait, ROUNDSTART_TRAIT)
- to_mob.add_trait(mob_trait, ROUNDSTART_TRAIT)
+ REMOVE_TRAIT(quirk_holder, mob_trait, ROUNDSTART_TRAIT)
+ ADD_TRAIT(to_mob, mob_trait, ROUNDSTART_TRAIT)
quirk_holder = to_mob
on_transfer()
@@ -111,7 +111,7 @@ Use this as a guideline
mob_trait = TRAIT_NEARSIGHT
///This define is in __DEFINES/traits.dm and is the actual "trait" that the game tracks
- ///You'll need to use "has_trait(X, sources)" checks around the code to check this; for instance, the Ageusia trait is checked in taste code
+ ///You'll need to use "HAS_TRAIT_FROM(src, X, sources)" checks around the code to check this; for instance, the Ageusia trait is checked in taste code
///If you need help finding where to put it, the declaration finder on GitHub is the best way to locate it
gain_text = "Things far away from you start looking blurry."
diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
index 5d4f8cdc22a..ff1ccc15b60 100644
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -8,12 +8,14 @@
mob_trait = TRAIT_ALCOHOL_TOLERANCE
gain_text = "You feel like you could drink a whole keg!"
lose_text = "You don't feel as resistant to alcohol anymore. Somehow."
+ medical_record_text = "Patient demonstrates a high tolerance for alcohol."
/datum/quirk/apathetic
name = "Apathetic"
desc = "You just don't care as much as other people. That's nice to have in a place like this, I guess."
value = 1
mood_quirk = TRUE
+ medical_record_text = "Patient was administered the Apathy Evaluation Scale but did not bother to complete it."
/datum/quirk/apathetic/add()
GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder)
@@ -35,6 +37,15 @@
lose_text = "You no longer feel like drinking would ease your pain."
medical_record_text = "Patient has unusually efficient liver metabolism and can slowly regenerate wounds by drinking alcoholic beverages."
+/datum/quirk/empath
+ name = "Empath"
+ desc = "Whether it's a sixth sense or careful study of body language, it only takes you a quick glance at someone to understand how they feel."
+ value = 2
+ mob_trait = TRAIT_EMPATH
+ gain_text = "You feel in tune with those around you."
+ lose_text = "You feel isolated from others."
+ medical_record_text = "Patient is highly perceptive of and sensitive to social cues, or may possibly have ESP. Further testing needed."
+
/datum/quirk/freerunning
name = "Freerunning"
desc = "You're great at quick moves! You can climb tables more quickly."
@@ -42,6 +53,17 @@
mob_trait = TRAIT_FREERUNNING
gain_text = "You feel lithe on your feet!"
lose_text = "You feel clumsy again."
+ medical_record_text = "Patient scored highly on cardio tests."
+
+/datum/quirk/friendly
+ name = "Friendly"
+ desc = "You give the best hugs, especially when you're in the right mood."
+ value = 1
+ mob_trait = TRAIT_FRIENDLY
+ gain_text = "You want to hug someone."
+ lose_text = "You no longer feel compelled to hug others."
+ mood_quirk = TRUE
+ medical_record_text = "Patient demonstrates low-inhibitions for physical contact and well-developed arms. Requesting another doctor take over this case."
/datum/quirk/jolly
name = "Jolly"
@@ -49,6 +71,11 @@
value = 1
mob_trait = TRAIT_JOLLY
mood_quirk = TRUE
+ medical_record_text = "Patient demonstrates constant euthymia irregular for environment. It's a bit much, to be honest."
+
+/datum/quirk/jolly/on_process()
+ if(prob(0.05))
+ SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "jolly", /datum/mood_event/jolly)
/datum/quirk/light_step
name = "Light Step"
@@ -57,6 +84,7 @@
mob_trait = TRAIT_LIGHT_STEP
gain_text = "You walk with a little more litheness."
lose_text = "You start tromping around like a barbarian."
+ medical_record_text = "Patient's dexterity belies a strong capacity for stealth."
/datum/quirk/musician
name = "Musician"
@@ -65,6 +93,7 @@
mob_trait = TRAIT_MUSICIAN
gain_text = "You know everything about musical instruments."
lose_text = "You forget how musical instruments work."
+ medical_record_text = "Patient brain scans show a highly-developed auditory pathway."
/datum/quirk/musician/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
@@ -80,6 +109,7 @@
mob_trait = TRAIT_NIGHT_VISION
gain_text = "The shadows seem a little less dark."
lose_text = "Everything seems a little darker."
+ medical_record_text = "Patient's eyes show above-average acclimation to darkness."
/datum/quirk/night_vision/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
@@ -95,6 +125,7 @@
mob_trait = TRAIT_PHOTOGRAPHER
gain_text = "You know everything about photography."
lose_text = "You forget how photo cameras work."
+ medical_record_text = "Patient mentions photography as a stress-relieving hobby."
/datum/quirk/photographer/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
@@ -108,12 +139,14 @@
desc = "You know your body well, and can accurately assess the extent of your wounds."
value = 2
mob_trait = TRAIT_SELF_AWARE
+ medical_record_text = "Patient demonstrates an uncanny knack for self-diagnosis."
/datum/quirk/skittish
name = "Skittish"
desc = "You can conceal yourself in danger. Ctrl-shift-click a closed locker to jump into it, as long as you have access."
value = 2
mob_trait = TRAIT_SKITTISH
+ medical_record_text = "Patient demonstrates a high aversion to danger and has described hiding in containers out of fear."
/datum/quirk/spiritual
name = "Spiritual"
@@ -122,23 +155,13 @@
mob_trait = TRAIT_SPIRITUAL
gain_text = "You have faith in a higher power."
lose_text = "You lose faith!"
+ medical_record_text = "Patient reports a belief in a higher power."
/datum/quirk/spiritual/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
H.equip_to_slot_or_del(new /obj/item/storage/fancy/candle_box(H), SLOT_IN_BACKPACK)
H.equip_to_slot_or_del(new /obj/item/storage/box/matches(H), SLOT_IN_BACKPACK)
-/datum/quirk/spiritual/on_process()
- var/comforted = FALSE
- for(var/mob/living/L in oview(5, quirk_holder))
- if(L.mind && L.mind.isholy && L.stat == CONSCIOUS)
- comforted = TRUE
- break
- if(comforted)
- SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "religious_comfort", /datum/mood_event/religiously_comforted)
- else
- SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "religious_comfort")
-
/datum/quirk/tagger
name = "Tagger"
desc = "You're an experienced artist. While drawing graffiti, you can get twice as many uses out of drawing supplies."
@@ -146,6 +169,7 @@
mob_trait = TRAIT_TAGGER
gain_text = "You know how to tag walls efficiently."
lose_text = "You forget how to tag walls properly."
+ medical_record_text = "Patient was recently seen for possible paint huffing incident."
/datum/quirk/tagger/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
@@ -161,6 +185,7 @@
mob_trait = TRAIT_VORACIOUS
gain_text = "You feel HONGRY."
lose_text = "You no longer feel HONGRY."
+ medical_record_text = "Patient demonstrates a disturbing capacity for eating."
/datum/quirk/neet
name = "NEET"
@@ -170,9 +195,18 @@
gain_text = "You feel useless to society."
lose_text = "You no longer feel useless to society."
mood_quirk = TRUE
+ medical_record_text = "Patient continues to qualify for welfare and has made no efforts to improve hygiene."
/datum/quirk/neet/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/datum/bank_account/D = H.get_bank_account()
+ if(!D) //if their current mob doesn't have a bank account, likely due to them being a special role (ie nuke op)
+ return
D.welfare = TRUE
- D.add_neetbux()
+
+/datum/quirk/neet/on_process()
+ var/mob/living/carbon/human/H = quirk_holder
+ if (H.hygiene <= HYGIENE_LEVEL_DIRTY)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "NEET", /datum/mood_event/happy_neet)
+ else
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "NEET")
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index a2770e5ae61..d96e567b74a 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -1,7 +1,23 @@
//predominantly negative traits
+/datum/quirk/badback
+ name = "Bad Back"
+ desc = "Thanks to your poor posture, backpacks and other bags never sit right on your back. More evently weighted objects are fine, though."
+ value = -2
+ mood_quirk = TRUE
+ gain_text = "Your back REALLY hurts!"
+ lose_text = "Your back feels better."
+ medical_record_text = "Patient scans indicate severe and chronic back pain."
+
+/datum/quirk/badback/on_process()
+ var/mob/living/carbon/human/H = quirk_holder
+ if(H.back && istype(H.back, /obj/item/storage/backpack))
+ SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "back_pain", /datum/mood_event/back_pain)
+ else
+ SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "back_pain")
+
/datum/quirk/blooddeficiency
- name = "Acute Blood Deficiency"
+ name = "Blood Deficiency"
desc = "Your body can't produce enough blood to sustain itself."
value = -2
gain_text = "You feel your vigor slowly fading away."
@@ -13,7 +29,8 @@
if(NOBLOOD in H.dna.species.species_traits) //can't lose blood if your species doesn't have any
return
else
- quirk_holder.blood_volume -= 0.275
+ if (H.blood_volume > (BLOOD_VOLUME_SAFE - 25)) // just barely survivable without treatment
+ H.blood_volume -= 0.275
/datum/quirk/blindness
name = "Blind"
@@ -21,7 +38,7 @@
value = -4
gain_text = "You can't see anything."
lose_text = "You miraculously gain back your vision."
- medical_record_text = "Subject has permanent blindness."
+ medical_record_text = "Patient has permanent blindness."
/datum/quirk/blindness/add()
quirk_holder.become_blind(ROUNDSTART_TRAIT)
@@ -51,7 +68,7 @@
mob_trait = TRAIT_DEAF
gain_text = "You can't hear anything."
lose_text = "You're able to hear again!"
- medical_record_text = "Subject's cochlear nerve is incurably damaged."
+ medical_record_text = "Patient's cochlear nerve is incurably damaged."
/datum/quirk/depression
name = "Depression"
@@ -60,9 +77,13 @@
value = -1
gain_text = "You start feeling depressed."
lose_text = "You no longer feel depressed." //if only it were that easy!
- medical_record_text = "Patient has a severe mood disorder causing them to experience sudden moments of sadness."
+ medical_record_text = "Patient has a severe mood disorder, causing them to experience acute episodes of depression."
mood_quirk = TRUE
+/datum/quirk/depression/on_process()
+ if(prob(0.05))
+ SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "depression", /datum/mood_event/depression)
+
/datum/quirk/family_heirloom
name = "Family Heirloom"
desc = "You are the current owner of an heirloom, passed down for generations. You have to keep it safe!"
@@ -70,6 +91,7 @@
mood_quirk = TRUE
var/obj/item/heirloom
var/where
+ medical_record_text = "Patient demonstrates an unnatural attachment to a family heirloom."
/datum/quirk/family_heirloom/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
@@ -194,6 +216,7 @@
value = -1
gain_text = "You seem to make a big deal out of everything."
lose_text = "You don't seem to make a big deal out of everything anymore."
+ medical_record_text = "Patient demonstrates a high level of emotional volatility."
/datum/quirk/hypersensitive/add()
GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder)
@@ -213,6 +236,7 @@
mob_trait = TRAIT_LIGHT_DRINKER
gain_text = "Just the thought of drinking alcohol makes your head spin."
lose_text = "You're no longer severely affected by alcohol."
+ medical_record_text = "Patient demonstrates a low tolerance for alcohol. (Wimp)"
/datum/quirk/nearsighted //t. errorage
name = "Nearsighted"
@@ -236,6 +260,7 @@
name = "Nyctophobia"
desc = "As far as you can remember, you've always been afraid of the dark. While in the dark without a light source, you instinctually act careful, and constantly feel a sense of dread."
value = -1
+ medical_record_text = "Patient demonstrates a fear of the dark. (Seriously?)"
/datum/quirk/nyctophobia/on_process()
var/mob/living/carbon/human/H = quirk_holder
@@ -260,11 +285,6 @@
lose_text = "You think you can defend yourself again."
medical_record_text = "Patient is unusually pacifistic and cannot bring themselves to cause physical harm."
-/datum/quirk/nonviolent/on_process()
- if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
- to_chat(quirk_holder, "Your antagonistic nature has caused you to renounce your pacifism.")
- qdel(src)
-
/datum/quirk/paraplegic
name = "Paraplegic"
desc = "Your legs do not function. Nothing will ever fix this. But hey, free wheelchair!"
@@ -299,7 +319,6 @@
if(I.fingerprintslast == quirk_holder.ckey)
quirk_holder.put_in_hands(I)
-
/datum/quirk/poor_aim
name = "Poor Aim"
desc = "You're terrible with guns and can't line up a straight shot to save your life. Dual-wielding is right out."
@@ -319,6 +338,7 @@
desc = "An accident caused you to lose one of your limbs. Because of this, you now have a random prosthetic!"
value = -1
var/slot_string = "limb"
+ medical_record_text = "During physical examination, patient was found to have a prosthetic limb."
/datum/quirk/prosthetic_limb/on_spawn()
var/limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
@@ -442,7 +462,7 @@
for(var/i in 1 to 7)
var/obj/item/reagent_containers/pill/P = new(drug_instance)
P.icon_state = pill_state
- P.list_reagents = list("[reagent_id]" = 1)
+ P.reagents.add_reagent(reagent_id, 1)
if (accessory_type)
accessory_instance = new accessory_type(current_turf)
@@ -500,11 +520,11 @@
/obj/item/storage/fancy/cigarettes/cigars,
/obj/item/storage/fancy/cigarettes/cigars/cohiba,
/obj/item/storage/fancy/cigarettes/cigars/havana)
- . = ..()
+ . = ..()
/datum/quirk/junkie/smoker/announce_drugs()
to_chat(quirk_holder, "There is a [drug_instance.name] [where_drug], and a lighter [where_accessory]. Make sure you get your favorite brand when you run out.")
-
+
/datum/quirk/junkie/smoker/on_process()
. = ..()
@@ -512,7 +532,16 @@
var/obj/item/I = H.get_item_by_slot(SLOT_WEAR_MASK)
if (istype(I, /obj/item/clothing/mask/cigarette))
var/obj/item/storage/fancy/cigarettes/C = drug_instance
- if(istype(I, C.spawn_type))
+ if(istype(I, C.spawn_type))
SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "wrong_cigs")
return
SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "wrong_cigs", /datum/mood_event/wrong_brand)
+
+/datum/quirk/unstable
+ name = "Unstable"
+ desc = "Due to past troubles, you are unable to recover your sanity if you lose it. Be very careful managing your mood!"
+ value = -2
+ mob_trait = TRAIT_UNSTABLE
+ gain_text = "There's a lot on your mind right now."
+ lose_text = "Your mind finally feels calm."
+ medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events."
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index d02b93926f2..66ac13905bb 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -16,6 +16,7 @@
value = 0
gain_text = "You feel repulsion at the idea of eating meat."
lose_text = "You feel like eating meat isn't that bad."
+ medical_record_text = "Patient reports a vegetarian diet."
/datum/quirk/vegetarian/add()
var/mob/living/carbon/human/H = quirk_holder
@@ -31,13 +32,14 @@
species.liked_food |= MEAT
if(!initial(species.disliked_food) & MEAT)
species.disliked_food &= ~MEAT
-
+
/datum/quirk/pineapple_liker
name = "Ananas Affinity"
desc = "You find yourself greatly enjoying fruits of the ananas genus. You can't seem to ever get enough of their sweet goodness!"
value = 0
gain_text = "You feel an intense craving for pineapple."
lose_text = "Your feelings towards pineapples seem to return to a lukewarm state."
+ medical_record_text = "Patient demonstrates a pathological love of pineapple."
/datum/quirk/pineapple_liker/add()
var/mob/living/carbon/human/H = quirk_holder
@@ -56,6 +58,7 @@
value = 0
gain_text = "You find yourself pondering what kind of idiot actually enjoys pineapples..."
lose_text = "Your feelings towards pineapples seem to return to a lukewarm state."
+ medical_record_text = "Patient is correct to think that pineapple is disgusting."
/datum/quirk/pineapple_hater/add()
var/mob/living/carbon/human/H = quirk_holder
@@ -74,6 +77,7 @@
value = 0
gain_text = "You start craving something that tastes strange."
lose_text = "You feel like eating normal food again."
+ medical_record_text = "Patient demonstrates irregular nutrition preferences."
/datum/quirk/deviant_tastes/add()
var/mob/living/carbon/human/H = quirk_holder
@@ -96,6 +100,17 @@
gain_text = "You feel like you have to stay clean."
lose_text = "You no longer feel the need to always be clean."
mood_quirk = TRUE
+ medical_record_text = "While waiting for the exam to begin, patient cleaned the examination room."
+
+/datum/quirk/neat/on_process()
+ var/mob/living/carbon/human/H = quirk_holder
+ switch (H.hygiene)
+ if(0 to HYGIENE_LEVEL_DIRTY)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "neat", /datum/mood_event/dirty)
+ if(HYGIENE_LEVEL_DIRTY to HYGIENE_LEVEL_NORMAL)
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "neat")
+ if(HYGIENE_LEVEL_NORMAL to HYGIENE_LEVEL_CLEAN)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "neat", /datum/mood_event/neat)
/datum/quirk/monochromatic
name = "Monochromacy"
diff --git a/code/datums/verbs.dm b/code/datums/verbs.dm
index 79fe256bb49..d8d7ee74334 100644
--- a/code/datums/verbs.dm
+++ b/code/datums/verbs.dm
@@ -11,7 +11,7 @@
//do things for each entry in Generate_list
//return value sets Generate_list[verbpath]
-/datum/verbs/proc/HandleVerb(list/entry, atom/verb/verbpath, ...)
+/datum/verbs/proc/HandleVerb(list/entry, procpath/verbpath, ...)
return entry
/datum/verbs/New()
@@ -82,7 +82,7 @@
. += childlist
for (var/thing in verblist)
- var/atom/verb/verbpath = thing
+ var/procpath/verbpath = thing
if (!verbpath)
stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]")
var/list/entry = list()
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index 070c19331e0..d0fff8da9fe 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -33,7 +33,7 @@
if(prob(40))
if(ishuman(L))
var/mob/living/carbon/human/H = L
- if(H.dna && !H.has_trait(TRAIT_RADIMMUNE))
+ if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
if(prob(max(0,100-resist)))
H.randmuti()
if(prob(50))
diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm
index 9030adfa6d6..237d36f51bd 100644
--- a/code/datums/wires/airalarm.dm
+++ b/code/datums/wires/airalarm.dm
@@ -44,7 +44,7 @@
A.mode = 3 // AALARM_MODE_PANIC
else
A.mode = 1 // AALARM_MODE_SCRUB
- A.apply_mode()
+ A.apply_mode(usr)
if(WIRE_ALARM) // Clear alarms.
var/area/AA = get_area(A)
if(AA.atmosalert(0, holder))
@@ -66,9 +66,9 @@
if(WIRE_PANIC) // Force panic syphon on.
if(!mend && !A.shorted)
A.mode = 3 // AALARM_MODE_PANIC
- A.apply_mode()
+ A.apply_mode(usr)
if(WIRE_ALARM) // Post alarm.
var/area/AA = get_area(A)
if(AA.atmosalert(2, holder))
A.post_alert(2)
- A.update_icon()
\ No newline at end of file
+ A.update_icon()
diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm
index 92cc1770b36..2fcccf26631 100644
--- a/code/datums/wires/syndicatebomb.dm
+++ b/code/datums/wires/syndicatebomb.dm
@@ -22,16 +22,19 @@
holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")
B.explode_now = TRUE
tell_admins(B)
+ else
+ holder.visible_message("[icon2html(B, viewers(holder))] Nothing happens.")
if(WIRE_UNBOLT)
holder.visible_message("[icon2html(B, viewers(holder))] The bolts spin in place for a moment.")
if(WIRE_DELAY)
if(B.delayedbig)
- holder.visible_message("[icon2html(B, viewers(holder))] The bomb has already been delayed.")
+ holder.visible_message("[icon2html(B, viewers(holder))] Nothing happens.")
else
holder.visible_message("[icon2html(B, viewers(holder))] The bomb chirps.")
playsound(B, 'sound/machines/chime.ogg', 30, 1)
B.detonation_timer += 300
- B.delayedbig = TRUE
+ if(B.active)
+ B.delayedbig = TRUE
if(WIRE_PROCEED)
holder.visible_message("[icon2html(B, viewers(holder))] The bomb buzzes ominously!")
playsound(B, 'sound/machines/buzz-sigh.ogg', 30, 1)
@@ -43,7 +46,7 @@
else if(seconds >= 11) // Both to prevent negative timers and to have a little mercy.
B.detonation_timer = world.time + 100
if(WIRE_ACTIVATE)
- if(!B.active && !B.defused)
+ if(!B.active)
holder.visible_message("[icon2html(B, viewers(holder))] You hear the bomb start ticking!")
B.activate()
B.update_icon()
@@ -58,15 +61,10 @@
var/obj/machinery/syndicatebomb/B = holder
switch(wire)
if(WIRE_BOOM)
- if(mend)
- B.defused = FALSE // Cutting and mending all the wires of an inactive bomb will thus cure any sabotage.
- else
- if(B.active)
- holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")
- B.explode_now = TRUE
- tell_admins(B)
- else
- B.defused = TRUE
+ if(!mend && B.active)
+ holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")
+ B.explode_now = TRUE
+ tell_admins(B)
if(WIRE_UNBOLT)
if(!mend && B.anchored)
holder.visible_message("[icon2html(B, viewers(holder))] The bolts lift out of the ground!")
@@ -81,7 +79,8 @@
if(!mend && B.active)
holder.visible_message("[icon2html(B, viewers(holder))] The timer stops! The bomb has been defused!")
B.active = FALSE
- B.defused = TRUE
+ B.delayedlittle = FALSE
+ B.delayedbig = FALSE
B.update_icon()
/datum/wires/syndicatebomb/proc/tell_admins(obj/machinery/syndicatebomb/B)
diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index d1ca07be2e6..fed7545428d 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -174,7 +174,13 @@
.["time_dilation_avg"] = SStime_track.time_dilation_avg
.["time_dilation_avg_slow"] = SStime_track.time_dilation_avg_slow
.["time_dilation_avg_fast"] = SStime_track.time_dilation_avg_fast
-
+
+ //pop cap stats
+ .["soft_popcap"] = CONFIG_GET(number/soft_popcap) || 0
+ .["hard_popcap"] = CONFIG_GET(number/hard_popcap) || 0
+ .["extreme_popcap"] = CONFIG_GET(number/extreme_popcap) || 0
+ .["popcap"] = max(CONFIG_GET(number/soft_popcap), CONFIG_GET(number/hard_popcap), CONFIG_GET(number/extreme_popcap)) //generalized field for this concept for use across ss13 codebases
+
if(SSshuttle && SSshuttle.emergency)
.["shuttle_mode"] = SSshuttle.emergency.mode
// Shuttle status, see /__DEFINES/stat.dm
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index e88a13bd857..f82d0a62d61 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -483,6 +483,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Atmospherics Engine"
icon_state = "atmos_engine"
+/area/engine/engine_room //donut station specific
+ name = "Engine Room"
+ icon_state = "atmos_engine"
+
+/area/engine/engine_room/external
+ name = "Supermatter External Access"
+ icon_state = "engine_foyer"
+
/area/engine/supermatter
name = "Supermatter Engine"
icon_state = "engine_sm"
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index d7d97818c6a..00a72db4acf 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -75,7 +75,9 @@ GLOBAL_LIST_EMPTY(teleportlocs)
continue
if(GLOB.teleportlocs[AR.name])
continue
- var/turf/picked = safepick(get_area_turfs(AR.type))
+ if (!AR.contents.len)
+ continue
+ var/turf/picked = AR.contents[1]
if (picked && is_station_level(picked.z))
GLOB.teleportlocs[AR.name] = AR
@@ -327,7 +329,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
for(var/obj/machinery/light/L in src)
L.update()
-/area/proc/updateicon()
+/area/proc/update_icon()
var/weather_icon
for(var/V in SSweather.processing)
var/datum/weather/W = V
@@ -337,7 +339,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
if(!weather_icon)
icon_state = null
-/area/space/updateicon()
+/area/space/update_icon()
icon_state = null
/*
@@ -370,7 +372,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/area/proc/power_change()
for(var/obj/machinery/M in src) // for each machine in the area
M.power_change() // reverify power status (to update icons etc.)
- updateicon()
+ update_icon()
/area/proc/usage(chan)
var/used = 0
diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm
index b724c926079..997d85ded40 100644
--- a/code/game/area/areas/away_content.dm
+++ b/code/game/area/areas/away_content.dm
@@ -25,4 +25,8 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
/area/awaymission/vr
name = "Virtual Reality"
- icon_state = "awaycontent1"
\ No newline at end of file
+ icon_state = "awaycontent1"
+ requires_power = FALSE
+ dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+ var/pacifist = TRUE // if when you enter this zone, you become a pacifist or not
+ var/death = FALSE // if when you enter this zone, you die
diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm
index 5db39eebc66..2f976a71e5e 100644
--- a/code/game/area/areas/centcom.dm
+++ b/code/game/area/areas/centcom.dm
@@ -47,16 +47,19 @@
icon_state = "supplypod_loading"
/area/centcom/supplypod/loading/one
- name = "Supplypod Loading Bay #1"
+ name = "Bay #1"
/area/centcom/supplypod/loading/two
- name = "Supplypod Loading Bay #2"
+ name = "Bay #2"
/area/centcom/supplypod/loading/three
- name = "Supplypod Loading Bay #3"
+ name = "Bay #3"
/area/centcom/supplypod/loading/four
- name = "Supplypod Loading Bay #4"
+ name = "Bay #4"
+
+/area/centcom/supplypod/loading/ert
+ name = "ERT Bay"
//THUNDERDOME
/area/tdome
diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm
index 10e3249d649..47a8de404d7 100644
--- a/code/game/area/areas/holodeck.dm
+++ b/code/game/area/areas/holodeck.dm
@@ -99,6 +99,9 @@
/area/holodeck/rec_center/winterwonderland
name = "Holodeck - Winter Wonderland"
+/area/holodeck/rec_center/photobooth
+ name = "Holodeck - Photobooth"
+
// Bad programs
/area/holodeck/rec_center/burn
diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm
index 61a3803f47c..3c63dd6d6b6 100644
--- a/code/game/area/areas/shuttles.dm
+++ b/code/game/area/areas/shuttles.dm
@@ -60,6 +60,14 @@
requires_power = TRUE
canSmoothWithAreas = /area/shuttle/pirate
+////////////////////////////Bounty Hunter Shuttles////////////////////////////
+
+/area/shuttle/hunter
+ name = "Hunter Shuttle"
+ dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+ blob_allowed = FALSE
+ canSmoothWithAreas = /area/shuttle/hunter
+
////////////////////////////White Ship////////////////////////////
/area/shuttle/abandoned
@@ -119,6 +127,11 @@
name = "Mining Shuttle"
blob_allowed = FALSE
+/area/shuttle/mining/large
+ name = "Mining Shuttle"
+ blob_allowed = FALSE
+ requires_power = TRUE
+
/area/shuttle/labor
name = "Labor Camp Shuttle"
blob_allowed = FALSE
@@ -196,4 +209,4 @@
name = "Tiny Freighter"
/area/shuttle/caravan/freighter3
- name = "Tiny Freighter"
\ No newline at end of file
+ name = "Tiny Freighter"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 7073362590e..d11fd39a4ef 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -42,7 +42,7 @@
/atom/New(loc, ...)
//atom creation method that preloads variables at creation
if(GLOB.use_preloader && (src.type == GLOB._preloader.target_path))//in case the instanciated atom is creating other atoms in New()
- GLOB._preloader.load(src)
+ world.preloader_load(src)
if(datum_flags & DF_USE_TAG)
GenerateTag()
@@ -74,23 +74,26 @@
if(color)
add_atom_colour(color, FIXED_COLOUR_PRIORITY)
- if (light_power && light_range)
+ if(light_power && light_range)
update_light()
- if (opacity && isturf(loc))
+ if(opacity && isturf(loc))
var/turf/T = loc
T.has_opaque_atom = TRUE // No need to recalculate it in this case, it's guaranteed to be on afterwards anyways.
- if (canSmoothWith)
+ if(canSmoothWith)
canSmoothWith = typelist("canSmoothWith", canSmoothWith)
+ if(datum_outputs)
+ for(var/i in 1 to length(datum_outputs))
+ datum_outputs[i] = SSoutputs.outputs[datum_outputs[i]]
ComponentInitialize()
return INITIALIZE_HINT_NORMAL
//called if Initialize returns INITIALIZE_HINT_LATELOAD
/atom/proc/LateInitialize()
- return
+ set waitfor = FALSE
// Put your AddComponent() calls here
/atom/proc/ComponentInitialize()
@@ -202,6 +205,9 @@
else
return null
+/atom/proc/return_analyzable_air()
+ return null
+
/atom/proc/check_eye(mob/user)
return
@@ -265,7 +271,7 @@
. = "[icon2html(src, user)] [thats? "That's ":""][get_examine_name(user)]"
/atom/proc/examine(mob/user)
- to_chat(user, get_examine_string(user, TRUE))
+ to_chat(user, "[get_examine_string(user, TRUE)].")
if(desc)
to_chat(user, desc)
@@ -694,7 +700,7 @@ Proc for attack log creation, because really why not
var/sobject = ""
if(object)
- sobject = " with [key_name(object)]"
+ sobject = " with [object]"
var/saddition = ""
if(addition)
saddition = " [addition]"
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index dcb90e37cae..bed96e11d9d 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -163,7 +163,7 @@
/atom/movable/proc/Move_Pulled(atom/A)
if(!pulling)
return
- if(pulling.anchored || !pulling.Adjacent(src))
+ if(pulling.anchored || pulling.move_resist > move_force || !pulling.Adjacent(src))
stop_pulling()
return
if(isliving(pulling))
@@ -176,6 +176,14 @@
if(!Process_Spacemove(get_dir(pulling.loc, A)))
return
step(pulling, get_dir(pulling.loc, A))
+ return TRUE
+
+/mob/living/Move_Pulled(atom/A)
+ . = ..()
+ if(!. || !isliving(A))
+ return
+ var/mob/living/L = A
+ set_pull_offsets(L, grab_state)
/atom/movable/proc/check_pulling()
if(pulling)
@@ -190,7 +198,7 @@
log_game("DEBUG:[src]'s pull on [pullee] wasn't broken despite [pullee] being in [pullee.loc]. Pull stopped manually.")
stop_pulling()
return
- if(pulling.anchored)
+ if(pulling.anchored || pulling.move_resist > move_force)
stop_pulling()
return
if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1) //separated from our puller and not in the middle of a diagonal move.
@@ -215,6 +223,9 @@
if(!newloc.Enter(src, src.loc))
return
+ if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, newloc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
+ return
+
// Past this is the point of no return
var/atom/oldloc = loc
var/area/oldarea = get_area(oldloc)
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 993b5f5ad89..297f341ee72 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -102,7 +102,7 @@
//helper for getting the appropriate health status
/proc/RoundHealth(mob/living/M)
- if(M.stat == DEAD || (M.has_trait(TRAIT_FAKEDEATH)))
+ if(M.stat == DEAD || (HAS_TRAIT(M, TRAIT_FAKEDEATH)))
return "health-100" //what's our health? it doesn't matter, we're dead, or faking
var/maxi_health = M.maxHealth
if(iscarbon(M) && M.health < 0)
@@ -174,7 +174,7 @@
var/image/holder = hud_list[STATUS_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
- if(stat == DEAD || (has_trait(TRAIT_FAKEDEATH)))
+ if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH)))
holder.icon_state = "huddead"
else
holder.icon_state = "hudhealthy"
@@ -184,9 +184,9 @@
var/icon/I = icon(icon, icon_state, dir)
var/virus_threat = check_virus()
holder.pixel_y = I.Height() - world.icon_size
- if(has_trait(TRAIT_XENO_HOST))
+ if(HAS_TRAIT(src, TRAIT_XENO_HOST))
holder.icon_state = "hudxeno"
- else if(stat == DEAD || (has_trait(TRAIT_FAKEDEATH)))
+ else if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH)))
if(tod)
var/tdelta = round(world.time - timeofdeath)
if(tdelta < (DEFIB_TIME_LIMIT * 10))
@@ -244,7 +244,7 @@
var/icon/IC = icon(icon, icon_state, dir)
holder.pixel_y = IC.Height() - world.icon_size
holder.icon_state = "hud_imp_chem"
- if(has_trait(TRAIT_MINDSHIELD))
+ if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
holder = hud_list[IMPLOYAL_HUD]
var/icon/IC = icon(icon, icon_state, dir)
holder.pixel_y = IC.Height() - world.icon_size
diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm
index 70c04cb008f..ef9b710d7b0 100644
--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ b/code/game/gamemodes/changeling/traitor_chan.dm
@@ -9,15 +9,13 @@
required_enemies = 1 // how many of each type are required
recommended_enemies = 3
reroll_friendly = 1
+ announce_span = "Traitors and Changelings"
+ announce_text = "There are alien creatures on the station along with some syndicate operatives out for their own gain! Do not let the changelings or the traitors succeed!"
var/list/possible_changelings = list()
var/list/changelings = list()
var/const/changeling_amount = 1 //hard limit on changelings if scaling is turned off
-/datum/game_mode/traitor/changeling/announce()
- to_chat(world, "The current game mode is - Traitor+Changeling!")
- to_chat(world, "There are alien creatures on the station along with some syndicate operatives out for their own gain! Do not let the changelings or the traitors succeed!")
-
/datum/game_mode/traitor/changeling/can_start()
if(!..())
return 0
diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm
index 15695dfde69..6779a22b5a2 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -63,7 +63,7 @@ Credit where due:
return FALSE
if(isliving(M))
var/mob/living/L = M
- if(L.has_trait(TRAIT_MINDSHIELD))
+ if(HAS_TRAIT(L, TRAIT_MINDSHIELD))
return FALSE
if(ishuman(M) || isbrain(M) || isguardian(M) || issilicon(M) || isclockmob(M) || istype(M, /mob/living/simple_animal/drone/cogscarab) || istype(M, /mob/camera/eminence))
return TRUE
diff --git a/code/game/gamemodes/clown_ops/bananium_bomb.dm b/code/game/gamemodes/clown_ops/bananium_bomb.dm
index 7e7d17e665d..3596758fcc1 100644
--- a/code/game/gamemodes/clown_ops/bananium_bomb.dm
+++ b/code/game/gamemodes/clown_ops/bananium_bomb.dm
@@ -42,17 +42,17 @@
var/obj/item/clothing/C
if(!H.w_uniform || H.dropItemToGround(H.w_uniform))
C = new /obj/item/clothing/under/rank/clown(H)
- C.add_trait(TRAIT_NODROP, CLOWN_NUKE_TRAIT)
+ ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
H.equip_to_slot_or_del(C, SLOT_W_UNIFORM)
if(!H.shoes || H.dropItemToGround(H.shoes))
C = new /obj/item/clothing/shoes/clown_shoes(H)
- C.add_trait(TRAIT_NODROP, CLOWN_NUKE_TRAIT)
+ ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
H.equip_to_slot_or_del(C, SLOT_SHOES)
if(!H.wear_mask || H.dropItemToGround(H.wear_mask))
C = new /obj/item/clothing/mask/gas/clown_hat(H)
- C.add_trait(TRAIT_NODROP, CLOWN_NUKE_TRAIT)
+ ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
H.equip_to_slot_or_del(C, SLOT_WEAR_MASK)
H.dna.add_mutation(CLOWNMUT)
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
index 2cb6d24aabf..2a37142a7a0 100644
--- a/code/game/gamemodes/clown_ops/clown_weapons.dm
+++ b/code/game/gamemodes/clown_ops/clown_weapons.dm
@@ -70,7 +70,7 @@
light_color = "#ffff00"
var/next_trombone_allowed = 0
-/obj/item/melee/transforming/energy/sword/bananium/Initialize()
+/obj/item/melee/transforming/energy/sword/bananium/ComponentInitialize()
. = ..()
AddComponent(/datum/component/slippery, 60, GALOSHES_DONT_HELP)
GET_COMPONENT(slipper, /datum/component/slippery)
@@ -127,7 +127,7 @@
on_throwforce = 0
on_throw_speed = 1
-/obj/item/shield/energy/bananium/Initialize()
+/obj/item/shield/energy/bananium/ComponentInitialize()
. = ..()
AddComponent(/datum/component/slippery, 60, GALOSHES_DONT_HELP)
GET_COMPONENT(slipper, /datum/component/slippery)
@@ -138,7 +138,7 @@
GET_COMPONENT(slipper, /datum/component/slippery)
slipper.signal_enabled = active
-/obj/item/shield/energy/bananium/throw_at(atom/target, range, speed, mob/thrower, spin=1)
+/obj/item/shield/energy/bananium/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force)
if(active)
if(iscarbon(thrower))
var/mob/living/carbon/C = thrower
@@ -176,7 +176,6 @@
/obj/item/grown/bananapeel/bombanana/Initialize()
. = ..()
- AddComponent(/datum/component/slippery, det_time)
bomb = new /obj/item/grenade/syndieminibomb(src)
bomb.det_time = det_time
if(iscarbon(loc))
@@ -185,6 +184,10 @@
C.throw_mode_on()
bomb.preprime(loc, null, FALSE)
+/obj/item/grown/bananapeel/bombanana/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/slippery, det_time)
+
/obj/item/grown/bananapeel/bombanana/Destroy()
. = ..()
QDEL_NULL(bomb)
@@ -217,11 +220,11 @@
/obj/item/clothing/mask/fakemoustache/sticky/Initialize()
. = ..()
- add_trait(TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
+ ADD_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
addtimer(CALLBACK(src, .proc/unstick), unstick_time)
/obj/item/clothing/mask/fakemoustache/sticky/proc/unstick()
- remove_trait(TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
+ REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
//DARK H.O.N.K. AND CLOWN MECH WEAPONS
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 31641283961..1c7d8f5221b 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -26,7 +26,7 @@
return FALSE
else
return FALSE
- if(M.has_trait(TRAIT_MINDSHIELD) || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M) || !M.client)
+ if(HAS_TRAIT(M, TRAIT_MINDSHIELD) || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M) || !M.client)
return FALSE //can't convert machines, shielded, braindead, or ratvar's dogs
return TRUE
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index cdc0ac89fbc..ef781c5ee36 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -5,28 +5,16 @@
continue
S.charge = 0
S.output_level = 0
- S.output_attempt = 0
+ S.output_attempt = FALSE
S.update_icon()
S.power_change()
- var/list/skipped_areas = list(/area/engine/engineering, /area/engine/supermatter, /area/engine/atmospherics_engine, /area/ai_monitored/turret_protected/ai)
-
- for(var/area/A in world)
- if( !A.requires_power || A.always_unpowered )
+ for(var/area/A in GLOB.the_station_areas)
+ if(!A.requires_power || A.always_unpowered )
+ continue
+ if(GLOB.typecache_powerfailure_safe_areas[A.type])
continue
- var/skip = 0
- for(var/area_type in skipped_areas)
- if(istype(A,area_type))
- skip = 1
- break
- if(A.contents)
- for(var/atom/AT in A.contents)
- if(!is_station_level(AT.z)) //Only check one, it's enough.
- skip = 1
- break
- if(skip)
- continue
A.power_light = FALSE
A.power_equip = FALSE
A.power_environ = FALSE
@@ -35,13 +23,7 @@
for(var/obj/machinery/power/apc/C in GLOB.apcs_list)
if(C.cell && is_station_level(C.z))
var/area/A = C.area
-
- var/skip = 0
- for(var/area_type in skipped_areas)
- if(istype(A,area_type))
- skip = 1
- break
- if(skip)
+ if(GLOB.typecache_powerfailure_safe_areas[A.type])
continue
C.cell.charge = 0
@@ -58,11 +40,13 @@
continue
S.charge = S.capacity
S.output_level = S.output_level_max
- S.output_attempt = 1
+ S.output_attempt = TRUE
S.update_icon()
S.power_change()
- for(var/area/A in world)
- if(!istype(A, /area/space) && !istype(A, /area/shuttle))
+ for(var/area/A in GLOB.the_station_areas)
+ if(!A.requires_power || A.always_unpowered)
+ continue
+ if(!istype(A, /area/shuttle))
A.power_light = TRUE
A.power_equip = TRUE
A.power_environ = TRUE
@@ -76,7 +60,7 @@
continue
S.charge = S.capacity
S.output_level = S.output_level_max
- S.output_attempt = 1
+ S.output_attempt = TRUE
S.update_icon()
S.power_change()
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index fb46fb67554..affc7c4f2e6 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -25,13 +25,14 @@
var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here
var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist
var/list/protected_jobs = list() // Jobs that can't be traitors because
+ var/list/required_jobs = list() // alternative required job groups eg list(list(cap=1),list(hos=1,sec=2)) translates to one captain OR one hos and two secmans
var/required_players = 0
var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations
var/required_enemies = 0
var/recommended_enemies = 0
var/antag_flag = null //preferences flag such as BE_WIZARD that need to be turned on for players to be antag
var/mob/living/living_antag_player = null
- var/list/datum/game_mode/replacementmode = null
+ var/datum/game_mode/replacementmode = null
var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted
var/reroll_friendly //During mode conversion only these are in the running
var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die
@@ -139,7 +140,7 @@
else
qdel(G)
- if(!usable_modes)
+ if(!usable_modes.len)
message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.")
return null
@@ -235,10 +236,11 @@
return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark.
for(var/mob/Player in GLOB.alive_mob_list)
- if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client)
- if(Player.mind.special_role || LAZYLEN(Player.mind.antag_datums)) //Someone's still antaging!
- living_antag_player = Player
- return 0
+ if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client && (Player.mind.special_role || LAZYLEN(Player.mind.antag_datums))) //Someone's still antagging but is their antagonist datum important enough to skip mulligan?
+ for(var/datum/antagonist/antag_types in Player.mind.antag_datums)
+ if(antag_types.prevent_roundtype_conversion)
+ living_antag_player = Player //they were an important antag, they're our new mark
+ return 0
if(!are_special_antags_dead())
return FALSE
@@ -358,7 +360,7 @@
// Ultimate randomizing code right here
for(var/mob/dead/new_player/player in GLOB.player_list)
- if(player.client && player.ready == PLAYER_READY_TO_PLAY)
+ if(player.client && player.ready == PLAYER_READY_TO_PLAY && player.has_valid_preferences())
players += player
// Shuffling, the players list is now ping-independent!!!
@@ -393,24 +395,6 @@
drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie
- while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates
- if(drafted.len > 0)
- applicant = pick(drafted)
- if(applicant)
- candidates += applicant
- drafted.Remove(applicant)
-
- else // Not enough scrubs, ABORT ABORT ABORT
- break
-
- if(restricted_jobs)
- for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist
- for(var/job in restricted_jobs)
- if(player.assigned_role == job)
- drafted -= player
-
- drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie
-
while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates
if(drafted.len > 0)
applicant = pick(drafted)
diff --git a/code/game/gamemodes/hivemind/hivemind.dm b/code/game/gamemodes/hivemind/hivemind.dm
index 5ee1c798023..3df6ea0d5aa 100644
--- a/code/game/gamemodes/hivemind/hivemind.dm
+++ b/code/game/gamemodes/hivemind/hivemind.dm
@@ -6,7 +6,7 @@
false_report_weight = 5
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
restricted_jobs = list("Cyborg","AI")
- required_players = 25
+ required_players = 24
required_enemies = 2
recommended_enemies = 3
reroll_friendly = 1
@@ -20,20 +20,19 @@
var/list/hosts = list()
/proc/is_hivehost(mob/living/M)
- return M && M.mind && M.mind.has_antag_datum(/datum/antagonist/hivemind)
-
-/proc/is_real_hivehost(mob/living/M) //This proc ignores mind controlled vessels
if(!M || !M.mind)
- return FALSE
- var/datum/antagonist/hivemind/hive = M.mind.has_antag_datum(/datum/antagonist/hivemind)
- if(!hive)
- return FALSE
- var/obj/effect/proc_holder/spell/target_hive/hive_control/the_spell = locate(/obj/effect/proc_holder/spell/target_hive/hive_control) in M.mind.spell_list
- if(the_spell && the_spell.active)
- if(the_spell.original_body == M)
+ return
+ return M.mind.has_antag_datum(/datum/antagonist/hivemind)
+
+/mob/living/proc/is_real_hivehost() //This proc ignores mind controlled vessels
+ for(var/datum/antagonist/hivemind/hive in GLOB.antagonists)
+ if(!hive.owner?.spell_list)
+ continue
+ var/obj/effect/proc_holder/spell/target_hive/hive_control/the_spell = locate(/obj/effect/proc_holder/spell/target_hive/hive_control) in hive.owner.spell_list
+ if((!the_spell || !the_spell.active ) && mind == hive.owner)
+ return TRUE
+ if(the_spell?.active && the_spell.original_body == src)
return TRUE
- else
- return TRUE
return FALSE
/mob/living/proc/get_real_hivehost() //Returns src unless it's under mind control, then it returns the original body
@@ -47,7 +46,10 @@
return the_spell.original_body
return M
-/proc/is_hivemember(mob/living/M)
+/proc/is_hivemember(mob/living/L)
+ if(!L)
+ return FALSE
+ var/datum/mind/M = L.mind
if(!M)
return FALSE
for(var/datum/antagonist/hivemind/H in GLOB.antagonists)
@@ -55,13 +57,17 @@
return TRUE
return FALSE
-/proc/remove_hivemember(mob/living/M) //Removes somebody from all hives as opposed to the antag proc remove_from_hive()
+/proc/remove_hivemember(mob/living/L) //Removes somebody from all hives as opposed to the antag proc remove_from_hive()
+ var/datum/mind/M = L?.mind
if(!M)
return
for(var/datum/antagonist/hivemind/H in GLOB.antagonists)
if(H.hivemembers.Find(M))
H.hivemembers -= M
H.calc_size()
+ var/datum/antagonist/hivevessel/V = L.is_wokevessel()
+ if(V && M)
+ M.remove_antag_datum(/datum/antagonist/hivevessel)
/datum/game_mode/hivemind/pre_setup()
@@ -71,7 +77,7 @@
if(CONFIG_GET(flag/protect_assistant_from_antagonist))
restricted_jobs += "Assistant"
- var/num_hosts = max( 1 , rand(0,1) + min(5, round(num_players() / 12) ) ) //1 host for every 12 players up to 60, with a 50% chance of an extra
+ var/num_hosts = max( 1 , rand(0,1) + min(8, round(num_players() / 8) ) ) //1 host for every 8 players up to 64, with a 50% chance of an extra
for(var/j = 0, j < num_hosts, j++)
if (!antag_candidates.len)
@@ -91,10 +97,6 @@
/datum/game_mode/hivemind/post_setup()
- if(hosts.len >= 4 && prob(35)) //Create the versus objective here since we want a common target for all the antags
- var/datum/antagonist/hivemind/hive
- hive.common_assimilation_obj = new /datum/objective/hivemind/assimilate_common
- hive.common_assimilation_obj.find_target_by_role(role = ROLE_HIVE, role_type = TRUE, invert = TRUE)
for(var/datum/mind/i in hosts)
i.add_antag_datum(/datum/antagonist/hivemind)
return ..()
diff --git a/code/game/gamemodes/hivemind/objectives.dm b/code/game/gamemodes/hivemind/objectives.dm
index b26ed9c3bdf..526fc03e83b 100644
--- a/code/game/gamemodes/hivemind/objectives.dm
+++ b/code/game/gamemodes/hivemind/objectives.dm
@@ -33,32 +33,11 @@
var/datum/antagonist/hivemind/host = owner.has_antag_datum(/datum/antagonist/hivemind)
if(!host)
return FALSE
- for(var/mob/living/L in host.hivemembers)
- var/datum/mind/M = L.mind
- if(M)
- if(considered_escaped(M))
- count++
+ for(var/datum/mind/M in host.hivemembers)
+ if(considered_escaped(M))
+ count++
return count >= target_amount
-/datum/objective/hivemind/assimilate
- explanation_text = "This is a bug. Error:HIVE3"
-
-/datum/objective/hivemind/assimilate/update_explanation_text()
- if(target)
- explanation_text = "Assimilate [target.name] into the hive and ensure they survive."
- else
- explanation_text = "Free Objective."
-
-/datum/objective/hivemind/assimilate/check_completion()
- var/datum/antagonist/hivemind/host = owner.has_antag_datum(/datum/antagonist/hivemind)
- if(!host)
- return FALSE
- for(var/mob/living/L in host.hivemembers)
- var/datum/mind/M = L.mind
- if(M == target)
- return considered_alive(target)
- return FALSE
-
/datum/objective/hivemind/biggest
explanation_text = "End the round with more vessels than any other hivemind host."
@@ -72,25 +51,3 @@
if(H.hive_size >= host.hive_size)
return FALSE
return TRUE
-
-/datum/objective/hivemind/assimilate_common
- explanation_text = "This is a bug. Error:HIVE3"
-
-/datum/objective/hivemind/assimilate_common/update_explanation_text()
- if(target)
- explanation_text = "Ensure that you are the only host assimilating [target.name] at the end of the round."
- else
- explanation_text = "Free Objective."
-
-/datum/objective/hivemind/assimilate_common/check_completion()
- var/datum/antagonist/hivemind/host = owner.has_antag_datum(/datum/antagonist/hivemind)
- if(!target)
- return TRUE
- if(!host || !target.current || !host.hivemembers.Find(target.current))
- return FALSE
- for(var/datum/antagonist/hivemind/H in GLOB.antagonists)
- if(H == host)
- continue
- if(H.hivemembers.Find(target.current))
- return FALSE
- return TRUE
\ No newline at end of file
diff --git a/code/game/gamemodes/hivemind/radar.dm b/code/game/gamemodes/hivemind/radar.dm
index 8e52578681c..bb5827cdc2c 100644
--- a/code/game/gamemodes/hivemind/radar.dm
+++ b/code/game/gamemodes/hivemind/radar.dm
@@ -1,6 +1,6 @@
-#define HIVEMIND_RADAR_MIN_DISTANCE 7 //Very generous, as the targets are only tracked for a few minutes.
+#define HIVEMIND_RADAR_MIN_DISTANCE 0 //Very generous, as the targets are only tracked for a few minutes.
#define HIVEMIND_RADAR_MAX_DISTANCE 50
-#define HIVEMIND_RADAR_PING_TIME 20 //2s update time.
+#define HIVEMIND_RADAR_PING_TIME 40 //4s update time.
//Modified IA/changeling pinpointer, points to the nearest person who is afflicted with the hive tracker status effect
/datum/status_effect/agent_pinpointer/hivemind
@@ -66,7 +66,7 @@
if(.)
tracked_by = hunter
if(isnum(set_duration))
- duration = set_duration
+ duration = world.time + set_duration
//Screen alert
/obj/screen/alert/status_effect/agent_pinpointer/hivemind
diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm
index 2d84309a62a..45cbe960e0c 100644
--- a/code/game/gamemodes/monkey/monkey.dm
+++ b/code/game/gamemodes/monkey/monkey.dm
@@ -15,6 +15,9 @@
restricted_jobs = list("Cyborg", "AI")
+ announce_span = "Monkey"
+ announce_text = "One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to CentCom. Monkeys: Ensure that your kind lives on! Rise up against your captors!"
+
var/carriers_to_make = 1
var/list/carriers = list()
@@ -45,11 +48,6 @@
return FALSE
return TRUE
-
-/datum/game_mode/monkey/announce()
- to_chat(world, "The current game mode is - Monkey!")
- to_chat(world, "One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to CentCom. Monkeys: Ensure that your kind lives on! Rise up against your captors!")
-
/datum/game_mode/monkey/post_setup()
for(var/datum/mind/carriermind in carriers)
var/datum/antagonist/monkey/M = add_monkey_leader(carriermind, monkey_team)
@@ -100,9 +98,9 @@
/datum/game_mode/monkey/special_report()
if(check_monkey_victory())
- return "The monkeys have overthrown their captors! Eeek eeeek!!"
+ return "The monkeys have overthrown their captors! Eeek eeeek!!
"
else
- return "The staff managed to contain the monkey infestation!"
+ return "The staff managed to contain the monkey infestation!
"
/datum/game_mode/monkey/generate_report()
return "Reports of an ancient [pick("retrovirus", "flesh eating bacteria", "disease", "magical curse blamed on viruses", "banana blight")] outbreak that turn humans into monkeys has been reported in your quadrant. Any such infections may be treated with banana juice. If an outbreak occurs, ensure the station is quarantined to prevent a largescale outbreak at CentCom."
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 5b6b2778892..4b1cc2cd443 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -137,6 +137,7 @@
command_radio = TRUE
/datum/outfit/syndicate/no_crystals
+ name = "Syndicate Operative - Reinforcement"
tc = 0
/datum/outfit/syndicate/post_equip(mob/living/carbon/human/H)
@@ -146,7 +147,7 @@
if(command_radio)
R.command = TRUE
- if(tc)
+ if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc
var/obj/item/U = new uplink_type(H, H.key, tc)
H.equip_to_slot_or_del(U, SLOT_IN_BACKPACK)
diff --git a/code/game/gamemodes/overthrow/overthrow.dm b/code/game/gamemodes/overthrow/overthrow.dm
index c3a86b9f2bb..3d4474cbe40 100644
--- a/code/game/gamemodes/overthrow/overthrow.dm
+++ b/code/game/gamemodes/overthrow/overthrow.dm
@@ -74,4 +74,4 @@
var/datum/team/Tagain = l
if(teams[Tagain] == max_points)
winners += Tagain.name
- return "The [english_list(winners)] team[winners.len > 1 ? "s tied" : " won"] with [max_points] points!"
+ return "The [english_list(winners)] team[winners.len > 1 ? "s tied" : " won"] with [max_points] points!
"
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index f4811f8a422..23924107fa9 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -14,12 +14,13 @@
antag_flag = ROLE_REV
false_report_weight = 10
restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
+ required_jobs = list(list("Captain"=1),list("Head of Personnel"=1),list("Head of Security"=1),list("Chief Engineer"=1),list("Research Director"=1),list("Chief Medical Officer"=1)) //Any head present
required_players = 30
required_enemies = 2
recommended_enemies = 3
enemy_minimum_age = 14
- announce_span = "danger"
+ announce_span = "Revolution"
announce_text = "Some crewmembers are attempting a coup!\n\
Revolutionaries: Expand your cause and overthrow the heads of staff by execution or otherwise.\n\
Crew: Prevent the revolutionaries from taking over the station."
@@ -31,14 +32,6 @@
var/list/datum/mind/headrev_candidates = list()
var/end_when_heads_dead = TRUE
-///////////////////////////
-//Announces the game type//
-///////////////////////////
-/datum/game_mode/revolution/announce()
- to_chat(world, "The current game mode is - Revolution!")
- to_chat(world, "Some crewmembers are attempting to start a revolution!
\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.
\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).")
-
-
///////////////////////////////////////////////////////////////////////////////
//Gets the round setup, cancelling if there's not enough players at the start//
///////////////////////////////////////////////////////////////////////////////
@@ -185,9 +178,9 @@
//TODO What should be displayed for revs in non-rev rounds
/datum/game_mode/revolution/special_report()
if(finished == 1)
- return "The heads of staff were killed or exiled! The revolutionaries win!"
+ return "The heads of staff were killed or exiled! The revolutionaries win!
"
else if(finished == 2)
- return "The heads of staff managed to stop the revolution!"
+ return "The heads of staff managed to stop the revolution!
"
/datum/game_mode/revolution/generate_report()
return "Employee unrest has spiked in recent weeks, with several attempted mutinies on heads of staff. Some crew have been observed using flashbulb devices to blind their colleagues, \
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index c0b5e9c85d9..118e18c74dc 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -67,7 +67,7 @@
/datum/game_mode/wizard/special_report()
if(finished)
- return "The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!"
+ return "The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!
"
//returns whether the mob is a wizard (or apprentice)
/proc/iswizard(mob/living/M)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index d38963d9e76..d5b41a02371 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -27,8 +27,11 @@
var/enter_message = "You feel cool air surround you. You go numb as your senses turn inward."
payment_department = ACCOUNT_MED
fair_market_price = 5
-/obj/machinery/sleeper/Initialize()
+/obj/machinery/sleeper/Initialize(mapload)
. = ..()
+ if(mapload)
+ component_parts -= circuit
+ QDEL_NULL(circuit)
occupant_typecache = GLOB.typecache_living
update_icon()
reset_chem_buttons()
@@ -139,6 +142,8 @@
ui.open()
/obj/machinery/sleeper/AltClick(mob/user)
+ if(!user.canUseTopic(src, !issilicon(user)))
+ return
if(state_open)
close_machine()
else
@@ -259,7 +264,6 @@
/obj/machinery/sleeper/syndie/fullupgrade/Initialize()
. = ..()
component_parts = list()
- component_parts += new /obj/item/circuitboard/machine/sleeper(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
component_parts += new /obj/item/stock_parts/manipulator/femto(null)
component_parts += new /obj/item/stack/sheet/glass(null)
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 077818cb91f..ebe68f10e92 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -147,6 +147,10 @@ Class Procs:
else
STOP_PROCESSING(SSfastprocess, src)
dropContents()
+ if(length(component_parts))
+ for(var/atom/A in component_parts)
+ qdel(A)
+ component_parts.Cut()
return ..()
/obj/machinery/proc/locate_machinery()
@@ -183,12 +187,15 @@ Class Procs:
L.update_mobility()
occupant = null
+/obj/machinery/proc/can_be_occupant(atom/movable/am)
+ return occupant_typecache ? is_type_in_typecache(am, occupant_typecache) : isliving(am)
+
/obj/machinery/proc/close_machine(atom/movable/target = null)
state_open = FALSE
density = TRUE
if(!target)
for(var/am in loc)
- if (!(occupant_typecache ? is_type_in_typecache(am, occupant_typecache) : isliving(am)))
+ if (!(can_be_occupant(am)))
continue
var/atom/movable/AM = am
if(AM.has_buckled_mobs())
@@ -249,19 +256,19 @@ Class Procs:
var/datum/bank_account/insurance = I.registered_account
if(!insurance)
say("[market_verb] NAP Violation: No bank account found.")
- nap_violation()
+ nap_violation(occupant)
return FALSE
else
if(!insurance.adjust_money(-fair_market_price))
say("[market_verb] NAP Violation: Unable to pay.")
- nap_violation()
+ nap_violation(occupant)
return FALSE
var/datum/bank_account/D = SSeconomy.get_dep_account(payment_department)
if(D)
D.adjust_money(fair_market_price)
else
say("[market_verb] NAP Violation: No ID card found.")
- nap_violation()
+ nap_violation(occupant)
return FALSE
return TRUE
@@ -345,6 +352,7 @@ Class Procs:
spawn_frame(disassembled)
for(var/obj/item/I in component_parts)
I.forceMove(loc)
+ component_parts.Cut()
qdel(src)
/obj/machinery/proc/spawn_frame(disassembled)
diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm
index 92e3aba7391..1b00785bba4 100644
--- a/code/game/machinery/announcement_system.dm
+++ b/code/game/machinery/announcement_system.dm
@@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
/obj/machinery/announcement_system/Initialize()
. = ..()
GLOB.announcement_systems += src
- radio = new /obj/item/radio/headset/ai(src)
+ radio = new /obj/item/radio/headset/silicon/ai(src)
update_icon()
/obj/machinery/announcement_system/update_icon()
diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm
index ce4aa0c5920..35aa8f7746f 100644
--- a/code/game/machinery/aug_manipulator.dm
+++ b/code/game/machinery/aug_manipulator.dm
@@ -130,7 +130,7 @@
/obj/machinery/aug_manipulator/AltClick(mob/living/user)
..()
- if(!user.canUseTopic(src))
+ if(!user.canUseTopic(src, !issilicon(user)))
return
else
eject_part(user)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 19f2711738b..4c4e4bb365e 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -171,7 +171,7 @@
busy = TRUE
use_power(power)
icon_state = "autolathe_n"
- var/time = is_stack ? 32 : 32*coeff*multiplier
+ var/time = is_stack ? 32 : (32 * coeff * multiplier) ** 0.8
addtimer(CALLBACK(src, .proc/make_item, power, metal_cost, glass_cost, multiplier, coeff, is_stack), time)
if(href_list["search"])
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index b3c86d5a136..e54cc9c0b4e 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -13,7 +13,7 @@
var/chargelevel = -1
var/charge_rate = 500
-/obj/machinery/cell_charger/proc/updateicon()
+/obj/machinery/cell_charger/update_icon()
cut_overlays()
if(charging)
add_overlay(image(charging.icon, charging.icon_state))
@@ -55,7 +55,7 @@
charging = W
user.visible_message("[user] inserts a cell into [src].", "You insert a cell into [src].")
chargelevel = -1
- updateicon()
+ update_icon()
else
if(!charging && default_deconstruction_screwdriver(user, icon_state, icon_state, W))
return
@@ -78,7 +78,7 @@
charging.update_icon()
charging = null
chargelevel = -1
- updateicon()
+ update_icon()
/obj/machinery/cell_charger/attack_hand(mob/user)
. = ..()
@@ -129,4 +129,4 @@
use_power(charge_rate)
charging.give(charge_rate) //this is 2558, efficient batteries exist
- updateicon()
+ update_icon()
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 1c6b8e41be3..5a0f4cada78 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -53,7 +53,10 @@
radio.recalculateChannels()
/obj/machinery/clonepod/Destroy()
+ var/mob/living/mob_occupant = occupant
go_out()
+ if(mob_occupant)
+ log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to Destroy().")
QDEL_NULL(radio)
QDEL_NULL(countdown)
if(connected)
@@ -173,7 +176,7 @@
H.hardset_dna(ui, mutation_index, H.real_name, null, mrace, features)
- if(!H.has_trait(TRAIT_RADIMMUNE))//dont apply mutations if the species is Mutation proof.
+ if(!HAS_TRAIT(H, TRAIT_RADIMMUNE))//dont apply mutations if the species is Mutation proof.
if(efficiency > 2)
var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations)
H.dna.remove_mutation_group(unclean_mutations)
@@ -194,11 +197,11 @@
icon_state = "pod_1"
//Get the clone body ready
maim_clone(H)
- H.add_trait(TRAIT_STABLEHEART, CLONING_POD_TRAIT)
- H.add_trait(TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
- H.add_trait(TRAIT_MUTE, CLONING_POD_TRAIT)
- H.add_trait(TRAIT_NOBREATH, CLONING_POD_TRAIT)
- H.add_trait(TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
+ ADD_TRAIT(H, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
+ ADD_TRAIT(H, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
+ ADD_TRAIT(H, TRAIT_MUTE, CLONING_POD_TRAIT)
+ ADD_TRAIT(H, TRAIT_NOBREATH, CLONING_POD_TRAIT)
+ ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
H.Unconscious(80)
clonemind.transfer_to(H)
@@ -213,6 +216,7 @@
if(H)
H.faction |= factions
+ remove_hivemember(H)
for(var/V in quirks)
var/datum/quirk/Q = new V(H)
@@ -237,17 +241,21 @@
if(!is_operational()) //Autoeject if power is lost
if(mob_occupant)
go_out()
+ log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to power loss.")
+
connected_message("Clone Ejected: Loss of power.")
else if(mob_occupant && (mob_occupant.loc == src))
if(SSeconomy.full_ancap)
if(!current_insurance)
go_out()
+ log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to invalid bank account.")
connected_message("Clone Ejected: No bank account.")
if(internal_radio)
SPEAK("The cloning of [mob_occupant.real_name] has been terminated due to no bank account to draw payment from.")
else if(!current_insurance.adjust_money(-fair_market_price))
go_out()
+ log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to insufficient funds.")
connected_message("Clone Ejected: Out of Money.")
if(internal_radio)
SPEAK("The cloning of [mob_occupant.real_name] has been ended prematurely due to being unable to pay.")
@@ -261,6 +269,7 @@
SPEAK("The cloning of [mob_occupant.real_name] has been \
aborted due to unrecoverable tissue failure.")
go_out()
+ log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] after suiciding.")
else if(mob_occupant && mob_occupant.cloneloss > (100 - heal_level))
mob_occupant.Unconscious(80)
@@ -301,6 +310,7 @@
BP.attach_limb(mob_occupant)
go_out()
+ log_cloning("[key_name(mob_occupant)] completed cloning cycle in [src] at [AREACOORD(src)].")
else if (!mob_occupant || mob_occupant.loc != src)
occupant = null
@@ -346,10 +356,13 @@
to_chat(user, "Error: Pod has no occupant.")
return
else
+ add_fingerprint(user)
connected_message("Emergency Ejection")
SPEAK("An emergency ejection of [clonemind.name] has occurred. Survival not guaranteed.")
to_chat(user, "You force an emergency ejection. ")
go_out()
+ log_cloning("[key_name(user)] manually ejected [key_name(mob_occupant)] from [src] at [AREACOORD(src)].")
+ log_combat(user, mob_occupant, "ejected", W, "from [src]")
else
return ..()
@@ -358,6 +371,9 @@
return
to_chat(user, "You corrupt the genetic compiler.")
malfunction()
+ add_fingerprint(user)
+ log_cloning("[key_name(user)] emagged [src] at [AREACOORD(src)], causing it to malfunction.")
+ log_combat(user, src, "emagged", null, occupant ? "[occupant] inside, killing them via malfunction." : null)
//Put messages in the connected computer's temp var for display.
/obj/machinery/clonepod/proc/connected_message(message)
@@ -388,11 +404,11 @@
if(!mob_occupant)
return
current_insurance = null
- mob_occupant.remove_trait(TRAIT_STABLEHEART, CLONING_POD_TRAIT)
- mob_occupant.remove_trait(TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
- mob_occupant.remove_trait(TRAIT_MUTE, CLONING_POD_TRAIT)
- mob_occupant.remove_trait(TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
- mob_occupant.remove_trait(TRAIT_NOBREATH, CLONING_POD_TRAIT)
+ REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
+ REMOVE_TRAIT(mob_occupant, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
+ REMOVE_TRAIT(mob_occupant, TRAIT_MUTE, CLONING_POD_TRAIT)
+ REMOVE_TRAIT(mob_occupant, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
+ REMOVE_TRAIT(mob_occupant, TRAIT_NOBREATH, CLONING_POD_TRAIT)
if(grab_ghost_when == CLONER_MATURE_CLONE)
mob_occupant.grab_ghost()
@@ -424,8 +440,9 @@
mob_occupant.grab_ghost() // We really just want to make you suffer.
flash_color(mob_occupant, flash_color="#960000", flash_time=100)
to_chat(mob_occupant, "Agony blazes across your consciousness as your body is torn apart.
Is this what dying is like? Yes it is.")
- playsound(loc, 'sound/machines/warning-buzzer.ogg', 50, 0)
+ playsound(src, 'sound/machines/warning-buzzer.ogg', 50)
SEND_SOUND(mob_occupant, sound('sound/hallucinations/veryfar_noise.ogg',0,1,50))
+ log_cloning("[key_name(mob_occupant)] destroyed within [src] at [AREACOORD(src)] due to malfunction.")
QDEL_IN(mob_occupant, 40)
/obj/machinery/clonepod/relaymove(mob/user)
@@ -443,11 +460,14 @@
connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [mob_occupant.real_name] prematurely." ,0))
go_out()
+ log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to EMP pulse.")
/obj/machinery/clonepod/ex_act(severity, target)
..()
- if(!QDELETED(src))
+ if(!QDELETED(src) && occupant)
+ var/mob/living/mob_occupant = occupant
go_out()
+ log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to explosion.")
/obj/machinery/clonepod/handle_atom_del(atom/A)
if(A == occupant)
@@ -456,14 +476,16 @@
/obj/machinery/clonepod/proc/horrifyingsound()
for(var/i in 1 to 5)
- playsound(loc,pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 100, rand(0.95,1.05))
+ playsound(src,pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 100, rand(0.95,1.05))
sleep(1)
sleep(10)
- playsound(loc,'sound/hallucinations/wail.ogg',100,1)
+ playsound(src,'sound/hallucinations/wail.ogg', 100, TRUE)
/obj/machinery/clonepod/deconstruct(disassembled = TRUE)
if(occupant)
+ var/mob/living/mob_occupant = occupant
go_out()
+ log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to deconstruction.")
..()
/obj/machinery/clonepod/proc/maim_clone(mob/living/carbon/human/H)
@@ -479,7 +501,7 @@
// Applying brainloss is done when the clone leaves the pod, so application of traumas can happen
// based on the level of damage sustained.
- if(!H.has_trait(TRAIT_NODISMEMBER))
+ if(!HAS_TRAIT(H, TRAIT_NODISMEMBER))
var/static/list/zones = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)
for(var/zone in zones)
var/obj/item/bodypart/BP = H.get_bodypart(zone)
diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
index 3c3f0e7f0fa..7b3d986928d 100644
--- a/code/game/machinery/computer/_computer.dm
+++ b/code/game/machinery/computer/_computer.dm
@@ -13,6 +13,7 @@
var/icon_keyboard = "generic_key"
var/icon_screen = "generic"
var/clockwork = FALSE
+ var/time_to_scewdrive = 20
/obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
@@ -77,7 +78,7 @@
return TRUE
if(circuit && !(flags_1&NODECONSTRUCT_1))
to_chat(user, "You start to disconnect the monitor...")
- if(I.use_tool(src, user, 20, volume=50))
+ if(I.use_tool(src, user, time_to_scewdrive, volume=50))
deconstruct(TRUE, user)
return TRUE
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 0604b3ab3a6..ae929e4b2d6 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -9,8 +9,8 @@
icon_screen = "ai-fixer"
light_color = LIGHT_COLOR_PINK
-/obj/machinery/computer/aifixer/attackby(obj/item/I, mob/user, params)
- if(occupier && I.tool_behaviour == TOOL_SCREWDRIVER)
+/obj/machinery/computer/aifixer/screwdriver_act(mob/living/user, obj/item/I)
+ if(occupier)
if(stat & (NOPOWER|BROKEN))
to_chat(user, "The screws on [name]'s screen won't budge.")
else
@@ -148,3 +148,7 @@
to_chat(user, "ERROR: Reconstruction in progress.")
else if (!occupier)
to_chat(user, "ERROR: Unable to locate artificial intelligence.")
+
+/obj/machinery/computer/aifixer/on_deconstruction()
+ if(occupier)
+ QDEL_NULL(occupier)
diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm
index b2324d0cae6..36393fb2e6b 100644
--- a/code/game/machinery/computer/apc_control.dm
+++ b/code/game/machinery/computer/apc_control.dm
@@ -90,7 +90,7 @@
/obj/machinery/computer/apc_control/Topic(href, href_list)
if(..())
return
- if(!usr || !usr.canUseTopic(src) || stat || QDELETED(src))
+ if(!usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return
if(href_list["authenticate"])
var/obj/item/card/id/ID = usr.get_idcard(TRUE)
@@ -139,7 +139,7 @@
if(href_list["name_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
var/new_filter = stripped_input(usr, "What name are you looking for?", name)
- if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
+ if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return
log_activity("changed name filter to \"[new_filter]\"")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
@@ -147,7 +147,7 @@
if(href_list["above_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num
- if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
+ if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return
log_activity("changed greater than charge filter to \"[new_filter]\"")
if(new_filter)
@@ -157,7 +157,7 @@
if(href_list["below_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num
- if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
+ if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return
log_activity("changed lesser than charge filter to \"[new_filter]\"")
if(new_filter)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index c7fce6fe61a..f874ef543ca 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -65,8 +65,11 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
// If it's a generic arcade machine, pick a random arcade
// circuit board for it and make the new machine
if(!circuit)
- var/choice = pick(subtypesof(/obj/item/circuitboard/computer/arcade))
- var/obj/item/circuitboard/CB = new choice()
+ var/list/gameodds = list(/obj/item/circuitboard/computer/arcade/battle = 49,
+ /obj/item/circuitboard/computer/arcade/orion_trail = 49,
+ /obj/item/circuitboard/computer/arcade/amputation = 2)
+ var/thegame = pickweight(gameodds)
+ var/obj/item/circuitboard/CB = new thegame()
new CB.build_path(loc, CB)
return INITIALIZE_HINT_QDEL
Reset()
@@ -1112,6 +1115,35 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
explosion(loc, 2,4,8, flame_range = 16)
qdel(src)
+// ** AMPUTATION ** //
+
+/obj/machinery/computer/arcade/amputation
+ name = "Mediborg's Amputation Adventure"
+ desc = "A picture of a blood-soaked medical cyborg flashes on the screen. The mediborg has a speech bubble that says, \"Put your hand in the machine if you aren't a coward!\""
+ icon_state = "arcade"
+ circuit = /obj/item/circuitboard/computer/arcade/amputation
+
+/obj/machinery/computer/arcade/amputation/attack_hand(mob/user)
+ if(!iscarbon(user))
+ return
+ var/mob/living/carbon/c_user = user
+ if(!c_user.get_bodypart(BODY_ZONE_L_ARM) && !c_user.get_bodypart(BODY_ZONE_R_ARM))
+ return
+ to_chat(c_user, "You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...")
+ if(do_after(c_user, 50, target = src))
+ to_chat(c_user, "The guillotine drops on your arm, and the machine sucks it in!")
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ var/which_hand = BODY_ZONE_L_ARM
+ if(!(c_user.active_hand_index % 2))
+ which_hand = BODY_ZONE_R_ARM
+ var/obj/item/bodypart/chopchop = c_user.get_bodypart(which_hand)
+ chopchop.dismember()
+ qdel(chopchop)
+ playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10)
+ for(var/i=1; i<=rand(3,5); i++)
+ prizevend(user)
+ else
+ to_chat(c_user, "You (wisely) decide against putting your hand in the machine.")
#undef ORION_TRAIL_WINTURN
#undef ORION_TRAIL_RAIDERS
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 013a9501c0b..cce338b5af9 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -54,12 +54,12 @@
if(stat)
return
if (!network)
- throw EXCEPTION("No camera network")
user.unset_machine()
+ CRASH("No camera network")
return
if (!(islist(network)))
- throw EXCEPTION("Camera network is not a list")
user.unset_machine()
+ CRASH("Camera network is not a list")
return
if(..())
user.unset_machine()
@@ -272,7 +272,7 @@
/obj/machinery/computer/security/telescreen/toxins
name = "bomb test site monitor"
desc = "A telescreen that connects to the bomb test site's camera."
- network = list("toxin")
+ network = list("toxins")
/obj/machinery/computer/security/telescreen/engine
name = "engine monitor"
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 0c39701f527..62d9600b40b 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -47,7 +47,10 @@
jump_action.Grant(user)
actions += jump_action
-/obj/machinery/computer/camera_advanced/proc/remove_eye_control(mob/living/user)
+/obj/machinery/proc/remove_eye_control(mob/living/user)
+ CRASH("[type] does not implement ai eye handling")
+
+/obj/machinery/computer/camera_advanced/remove_eye_control(mob/living/user)
if(!user)
return
for(var/V in actions)
@@ -159,7 +162,7 @@
var/cooldown = 0
var/acceleration = 1
var/mob/living/eye_user = null
- var/obj/machinery/computer/camera_advanced/origin
+ var/obj/machinery/origin
var/eye_initialized = 0
var/visible_icon = 0
var/image/user_image = null
@@ -172,7 +175,7 @@
/mob/camera/aiEye/remote/Destroy()
if(origin && eye_user)
- origin.remove_eye_control(eye_user)
+ origin.remove_eye_control(eye_user,src)
origin = null
. = ..()
eye_user = null
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 04289df5cf0..88792b870ee 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -436,8 +436,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
return
if(modify.registered_account)
modify.registered_account.account_job = jobdatum // this is a terrible idea and people will grief but sure whatever
- if(modify.registered_account.welfare)
- modify.registered_account.add_neetbux()
modify.access = ( istype(src, /obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() )
if (modify)
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 5fcd4c06c4d..8f0fd7e7a14 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -63,7 +63,7 @@
. = pod
/proc/grow_clone_from_record(obj/machinery/clonepod/pod, datum/data/record/R)
- return pod.growclone(R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["last_death"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"])
+ return pod.growclone(R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mindref"], R.fields["last_death"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"])
/obj/machinery/computer/cloning/process()
if(!(scanner && LAZYLEN(pods) && autoprocess))
@@ -73,7 +73,7 @@
scan_occupant(scanner.occupant)
for(var/datum/data/record/R in records)
- var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mind"])
+ var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mindref"])
if(!pod)
return
@@ -84,9 +84,10 @@
var/result = grow_clone_from_record(pod, R)
if(result & CLONING_SUCCESS)
temp = "[R.fields["name"]] => Cloning cycle in progress..."
+ log_cloning("Cloning of [key_name(R.fields["mindref"])] automatically started via autoprocess - [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].")
if(result & CLONING_DELETE_RECORD)
records -= R
-
+
/obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner)
scanner = findscanner()
@@ -353,8 +354,8 @@
say("Initiating scan...")
spawn(20)
- scan_occupant(scanner.occupant)
-
+ scan_occupant(scanner.occupant, usr)
+
loading = FALSE
updateUsrDialog()
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
@@ -394,11 +395,12 @@
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
else
temp = "Access Denied"
- menu = 2
+ menu = 2
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-
+
else if (menu == 4)
+ log_cloning("[key_name(usr)] deleted [key_name(active_record.fields["mindref"])]'s cloning records from [src] at [AREACOORD(src)].")
temp = "[active_record.fields["name"]] => Record deleted."
records.Remove(active_record)
active_record = null
@@ -408,7 +410,7 @@
else if (href_list["disk"]) //Load or eject.
switch(href_list["disk"])
if("load")
-
+
if (!diskette || !istype(diskette.fields))
temp = "Load error."
@@ -430,7 +432,8 @@
overwrite_field_if_available(active_record, diskette, "UI")
if(include_se)
overwrite_field_if_available(active_record, diskette, "SE")
-
+
+ log_cloning("[key_name(usr)] uploaded [key_name(active_record.fields["mindref"])]'s cloning records to [src] at [AREACOORD(src)] via [diskette].")
temp = "Load successful."
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
@@ -446,6 +449,7 @@
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
return
+ log_cloning("[key_name(usr)] added [key_name(active_record.fields["mindref"])]'s cloning records to [diskette] via [src] at [AREACOORD(src)].")
diskette.fields = active_record.fields.Copy()
diskette.name = "data disk - '[diskette.fields["name"]]'"
temp = "Save successful."
@@ -483,6 +487,7 @@
active_record = null
menu = 1
success = TRUE
+ log_cloning("[key_name(usr)] initiated cloning of [key_name(C.fields["mindref"])] via [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].")
if(result & CLONING_DELETE_RECORD)
if(active_record == C)
active_record = null
@@ -505,7 +510,7 @@
updateUsrDialog()
return
-/obj/machinery/computer/cloning/proc/scan_occupant(occupant)
+/obj/machinery/computer/cloning/proc/scan_occupant(occupant, mob/M)
var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
var/datum/dna/dna
var/datum/bank_account/has_bank_account
@@ -530,11 +535,11 @@
scantemp = "Subject's brain is not responding to scanning stimuli."
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
return
- if((mob_occupant.has_trait(TRAIT_HUSK)) && (src.scanner.scan_level < 2))
+ if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2))
scantemp = "Subject's body is too damaged to scan properly."
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
return
- if(mob_occupant.has_trait(TRAIT_BADDNA))
+ if(HAS_TRAIT(mob_occupant, TRAIT_BADDNA))
scantemp = "Subject's DNA is damaged beyond any hope of recovery."
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
return
@@ -578,7 +583,7 @@
R.fields["traumas"] = B.get_traumas()
R.fields["bank_account"] = has_bank_account
- R.fields["mind"] = "[REF(mob_occupant.mind)]"
+ R.fields["mindref"] = "[REF(mob_occupant.mind)]"
R.fields["last_death"] = mob_occupant.stat == DEAD ? mob_occupant.mind.last_death : -1
//Add an implant if needed
@@ -590,11 +595,12 @@
imp = new /obj/item/implant/health(mob_occupant)
imp.implant(mob_occupant)
R.fields["imp"] = "[REF(imp)]"
- var/old_record = find_record("mind", REF(mob_occupant.mind), records)
+ var/old_record = find_record("mindref", REF(mob_occupant.mind), records)
if(old_record)
records -= old_record
scantemp = "Record updated."
else
scantemp = "Subject successfully scanned."
records += R
+ log_cloning("[M ? key_name(M) : "Autoprocess"] added the record of [key_name(mob_occupant)] to [src] at [AREACOORD(src)].")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 1047c6f17a9..22dd25037e7 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -52,7 +52,7 @@
/obj/machinery/computer/communications/Topic(href, href_list)
if(..())
return
- if(!usr.canUseTopic(src))
+ if(!usr.canUseTopic(src, !issilicon(usr)))
return
if(!is_station_level(z) && !is_reserved_level(z)) //Can only use in transit and on SS13
to_chat(usr, "Unable to establish a connection: \black You're too far away from the station!")
@@ -284,7 +284,7 @@
// OMG CENTCOM LETTERHEAD
if("MessageCentCom")
- if(authenticated==2)
+ if(authenticated)
if(!checkCCcooldown())
to_chat(usr, "Arrays recycling. Please stand by.")
return
@@ -300,7 +300,7 @@
// OMG SYNDICATE ...LETTERHEAD
if("MessageSyndicate")
- if((authenticated==2) && (obj_flags & EMAGGED))
+ if((authenticated) && (obj_flags & EMAGGED))
if(!checkCCcooldown())
to_chat(usr, "Arrays recycling. Please stand by.")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
@@ -708,7 +708,7 @@
to_chat(user, "Intercomms recharging. Please stand by.")
return
var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?")
- if(!input || !user.canUseTopic(src))
+ if(!input || !user.canUseTopic(src, !issilicon(usr)))
return
SScommunications.make_announcement(user, is_silicon, input)
deadchat_broadcast("[user.real_name] made a priority announcement from [get_area_name(usr, TRUE)].", user)
diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm
index 67c1d7fc09d..945552c01eb 100644
--- a/code/game/machinery/computer/dna_console.dm
+++ b/code/game/machinery/computer/dna_console.dm
@@ -126,7 +126,7 @@
if(connected && connected.is_operational())
if(connected.occupant) //set occupant_status message
viable_occupant = connected.occupant
- if(viable_occupant.has_dna() && !viable_occupant.has_trait(TRAIT_RADIMMUNE) && !viable_occupant.has_trait(TRAIT_BADDNA) || (connected.scan_level == 3)) //occupant is viable for dna modification
+ if(viable_occupant.has_dna() && !HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) && !HAS_TRAIT(viable_occupant, TRAIT_BADDNA) || (connected.scan_level == 3)) //occupant is viable for dna modification
occupant_status += "[viable_occupant.name] => "
switch(viable_occupant.stat)
if(CONSCIOUS)
@@ -354,7 +354,10 @@
for(var/datum/mutation/human/HM in stored_mutations)
var/i = stored_mutations.Find(HM)
temp_html += "| [HM.name] | "
- temp_html += "Export | "
+ if(diskette)
+ temp_html += "Export | "
+ else
+ temp_html += " | Export | "
temp_html += "Delete | "
if(combine == HM.type)
temp_html += "Combine |
"
@@ -367,7 +370,6 @@
var/obj/item/chromosome/CM = stored_chromosomes[i]
temp_html += "