"
+ for(var/path in skills)
+ var/datum/skill/S = GLOB.skill_datums[path]
+ out += "
[S.name]
[S.standard_render_value(skills[path])]
"
+ out += "
"
+ return out.Join("")
diff --git a/code/datums/skills/medical.dm b/code/datums/skills/medical.dm
new file mode 100644
index 0000000000..3b67cacb04
--- /dev/null
+++ b/code/datums/skills/medical.dm
@@ -0,0 +1,3 @@
+/datum/skill/numerical/surgery
+ name = "Surgery"
+ desc = "How proficient you are at doing surgery."
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index 32fb4498dd..e6e10941c4 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -40,8 +40,10 @@ GLOBAL_VAR_INIT(dynamic_stacking_limit, 90)
GLOBAL_LIST_EMPTY(dynamic_forced_roundstart_ruleset)
// Forced threat level, setting this to zero or higher forces the roundstart threat to the value.
GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
-
+// Storyteller picked by the voting.
GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
+// Storyteller forced by admins during voting--will be used instead of above.
+GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
/datum/game_mode/dynamic
name = "dynamic mode"
@@ -252,7 +254,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
/datum/game_mode/dynamic/send_intercept()
. = "Central Command Status Summary"
switch(round(threat_level))
- if(0 to 20)
+ if(-INFINITY to 20)
. += "Peaceful Waypoint "
. += "Your station orbits deep within controlled, core-sector systems and serves as a waypoint for routine traffic through Nanotrasen's trade empire. Due to the combination of high security, interstellar traffic, and low strategic value, it makes any direct threat of violence unlikely. Your primary enemies will be incompetence and bored crewmen: try to organize team-building events to keep staffers interested and productive. However, even deep in our territory there may be subversive elements, especially for such a high-value target as your station. Keep an eye out, but don't expect much trouble."
set_security_level(SEC_LEVEL_GREEN)
@@ -284,7 +286,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
. += "Black Orbit "
. += "As part of a mandatory security protocol, we are required to inform you that as a result of your orbital pattern directly behind an astrological body (oriented from our nearest observatory), your station will be under decreased monitoring and support. It is anticipated that your extreme location and decreased surveillance could pose security risks. Avoid unnecessary risks and attempt to keep your station in one piece."
set_security_level(SEC_LEVEL_AMBER)
- if(96 to 100)
+ if(96 to INFINITY)
. += "Impending Doom "
. += "Your station is somehow in the middle of hostile territory, in clear view of any enemy of the corporation. Your likelihood to survive is low, and station destruction is expected and almost inevitable. Secure any sensitive material and neutralize any enemy you will come across. It is important that you at least try to maintain the station. "
. += "Good luck."
@@ -355,6 +357,8 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
SSblackbox.record_feedback("tally","dynamic_threat",peaceful_percentage,"Percent of same-vote rounds that are more peaceful")
/datum/game_mode/dynamic/can_start()
+ if(GLOB.dynamic_forced_storyteller)
+ GLOB.dynamic_storyteller_type = GLOB.dynamic_forced_storyteller
storyteller = new GLOB.dynamic_storyteller_type // this is where all the initialization happens
storyteller.on_start()
SSblackbox.record_feedback("text","dynamic_storyteller",1,storyteller.name)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 686018e06d..9cb03c6a85 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -393,7 +393,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
qdel(src)
item_flags &= ~IN_INVENTORY
if(SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user) & COMPONENT_DROPPED_RELOCATION)
- return ITEM_RELOCATED_BY_DROPPED
+ . = ITEM_RELOCATED_BY_DROPPED
user.update_equipment_speed_mods()
// called just as an item is picked up (loc is not yet changed)
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 50e9b94e97..adc4970175 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -100,6 +100,7 @@
if(!H.bleedsuppress && H.bleed_rate) //so you can't stack bleed suppression
H.suppress_bloodloss(stop_bleeding)
to_chat(user, "You stop the bleeding of [M]!")
+ H.adjustBruteLoss(-(heal_brute))
return TRUE
to_chat(user, "You can not use \the [src] on [M]!")
@@ -127,6 +128,12 @@
stop_bleeding = 900
heal_brute = 0
+/obj/item/stack/medical/gauze/adv
+ name = "sterilized medical gauze"
+ desc = "A roll of elastic sterilized cloth that is extremely effective at stopping bleeding, heals minor wounds and cleans them."
+ singular_name = "sterilized medical gauze"
+ self_delay = 5
+
/obj/item/stack/medical/gauze/cyborg
custom_materials = null
is_cyborg = 1
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index dc6f5f701e..97b7ee8a38 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -695,7 +695,10 @@
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box,
/obj/item/toy/gun,
- /obj/item/gun/energy/e_gun/mini
+ /obj/item/gun/energy/e_gun/mini,
+ /obj/item/gun/ballistic/automatic/magrifle/pistol,
+ /obj/item/gun/energy/disabler,
+ /obj/item/gun/energy/taser
))
/obj/item/storage/belt/holster/full/PopulateContents()
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 4a7e818125..a2e2b3c122 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -429,6 +429,10 @@
for(var/datum/dynamic_ruleset/roundstart/rule in GLOB.dynamic_forced_roundstart_ruleset)
dat += {"-> [rule.name] <- "}
dat += "(Clear Rulesets) "
+ dat += "(Force Storyteller) "
+ if (GLOB.dynamic_forced_storyteller)
+ var/datum/dynamic_storyteller/S = GLOB.dynamic_forced_storyteller
+ dat += "-> [initial(S.name)] <- "
dat += "(Dynamic mode options) "
else if (SSticker.IsRoundInProgress())
dat += "(Force Next Latejoin Ruleset) "
@@ -690,7 +694,7 @@
var/prev_dynamic_voting = CONFIG_GET(flag/dynamic_voting)
CONFIG_SET(flag/dynamic_voting,!prev_dynamic_voting)
if (!prev_dynamic_voting)
- to_chat(world, "Vote is now a ranked choice of dynamic storytellers.")
+ to_chat(world, "Vote is now between dynamic storytellers.")
else
to_chat(world, "Vote is now between extended and secret.")
log_admin("[key_name(usr)] [prev_dynamic_voting ? "disabled" : "enabled"] dynamic voting.")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 342f2ca6eb..042a6e0fe9 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1394,6 +1394,32 @@
log_admin("[key_name(usr)] removed [rule] from the forced roundstart rulesets.")
message_admins("[key_name(usr)] removed [rule] from the forced roundstart rulesets.", 1)
+ else if(href_list["f_dynamic_storyteller"])
+ if(!check_rights(R_ADMIN))
+ return
+ if(SSticker && SSticker.mode)
+ return alert(usr, "The game has already started.", null, null, null, null)
+ if(GLOB.master_mode != "dynamic")
+ return alert(usr, "The game mode has to be dynamic mode.", null, null, null, null)
+ var/list/choices = list()
+ for(var/T in config.storyteller_cache)
+ var/datum/dynamic_storyteller/S = T
+ choices[initial(S.name)] = T
+ var/choice = choices[input("Select storyteller:", "Storyteller", "Classic") as null|anything in choices]
+ if(choice)
+ GLOB.dynamic_forced_storyteller = choice
+ log_admin("[key_name(usr)] forced the storyteller to [GLOB.dynamic_forced_storyteller].")
+ message_admins("[key_name(usr)] forced the storyteller to [GLOB.dynamic_forced_storyteller].")
+ Game()
+
+ else if(href_list["f_dynamic_storyteller_clear"])
+ if(!check_rights(R_ADMIN))
+ return
+ GLOB.dynamic_forced_storyteller = null
+ Game()
+ log_admin("[key_name(usr)] cleared the forced storyteller. The mode will pick one as normal.")
+ message_admins("[key_name(usr)] cleared the forced storyteller. The mode will pick one as normal.", 1)
+
else if(href_list["f_dynamic_latejoin"])
if(!check_rights(R_ADMIN))
return
diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm
index 0d30ebe992..d9ae678bb9 100644
--- a/code/modules/antagonists/abductor/equipment/gland.dm
+++ b/code/modules/antagonists/abductor/equipment/gland.dm
@@ -6,6 +6,7 @@
status = ORGAN_ROBOTIC
beating = TRUE
organ_flags = ORGAN_NO_SPOIL
+ no_pump = TRUE
var/true_name = "baseline placebo referencer"
var/cooldown_low = 300
var/cooldown_high = 300
@@ -92,6 +93,7 @@
update_gland_hud()
/obj/item/organ/heart/gland/on_life()
+ . = ..()
if(!beating)
// alien glands are immune to stopping.
beating = TRUE
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index ee441c21f7..e40c278e92 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -66,6 +66,11 @@
// How much threat this job is worth in dynamic. Is subtracted if the player's not an antag, added if they are.
var/threat = 0
+ /// Starting skill levels.
+ var/list/starting_skills
+ /// Skill affinities to set
+ var/list/skill_affinities
+
//Only override this proc
//H is usually a human unless an /equip override transformed it
/datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
@@ -142,7 +147,6 @@
return TRUE //Available in 0 days = available right now = player is old enough to play.
return FALSE
-
/datum/job/proc/available_in_days(client/C)
if(!C)
return 0
@@ -166,6 +170,17 @@
/datum/job/proc/radio_help_message(mob/M)
to_chat(M, "Prefix your message with :h to speak on your department's radio. To see other prefixes, look closely at your headset.")
+/datum/job/proc/standard_assign_skills(datum/mind/M)
+ if(!starting_skills)
+ return
+ for(var/skill in starting_skills)
+ M.skill_holder.boost_skill_value_to(skill, starting_skills[skill])
+ // do wipe affinities though
+ M.skill_holder.skill_affinities = list()
+ for(var/skill in skill_affinities)
+ M.skill_holder.skill_affinities[skill] = skill_affinities[skill]
+ UNSETEMPTY(M.skill_holder.skill_affinities) //if we didn't set any.
+
/datum/outfit/job
name = "Standard Gear"
diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm
index 44b0e90ec8..571785526b 100644
--- a/code/modules/jobs/job_types/chemist.dm
+++ b/code/modules/jobs/job_types/chemist.dm
@@ -19,6 +19,9 @@
display_order = JOB_DISPLAY_ORDER_CHEMIST
threat = 1.5
+ starting_skills = list(/datum/skill/numerical/surgery = STARTING_SKILL_SURGERY_MEDICAL)
+ skill_affinities = list(/datum/skill/numerical/surgery = STARTING_SKILL_AFFINITY_SURGERY_MEDICAL)
+
/datum/outfit/job/chemist
name = "Chemist"
jobtype = /datum/job/chemist
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index 8dd7fafab3..478c33551d 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -29,6 +29,9 @@
blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity)
threat = 2
+ starting_skills = list(/datum/skill/numerical/surgery = STARTING_SKILL_SURGERY_MEDICAL)
+ skill_affinities = list(/datum/skill/numerical/surgery = STARTING_SKILL_AFFINITY_SURGERY_MEDICAL)
+
/datum/outfit/job/cmo
name = "Chief Medical Officer"
jobtype = /datum/job/cmo
diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm
index 2e8b18d772..4fb989f6e8 100644
--- a/code/modules/jobs/job_types/geneticist.dm
+++ b/code/modules/jobs/job_types/geneticist.dm
@@ -19,6 +19,8 @@
display_order = JOB_DISPLAY_ORDER_GENETICIST
threat = 1.5
+ starting_skills = list(/datum/skill/numerical/surgery = STARTING_SKILL_SURGERY_MEDICAL)
+
/datum/outfit/job/geneticist
name = "Geneticist"
jobtype = /datum/job/geneticist
diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm
index 3eaa2ae10a..0e8b2e645b 100644
--- a/code/modules/jobs/job_types/medical_doctor.dm
+++ b/code/modules/jobs/job_types/medical_doctor.dm
@@ -17,6 +17,9 @@
display_order = JOB_DISPLAY_ORDER_MEDICAL_DOCTOR
threat = 0.5
+ starting_skills = list(/datum/skill/numerical/surgery = STARTING_SKILL_SURGERY_MEDICAL)
+ skill_affinities = list(/datum/skill/numerical/surgery = STARTING_SKILL_AFFINITY_SURGERY_MEDICAL)
+
/datum/outfit/job/doctor
name = "Medical Doctor"
jobtype = /datum/job/doctor
diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm
index df6e1431ae..e8098daddc 100644
--- a/code/modules/jobs/job_types/paramedic.dm
+++ b/code/modules/jobs/job_types/paramedic.dm
@@ -19,6 +19,9 @@
threat = 0.5
+ starting_skills = list(/datum/skill/numerical/surgery = STARTING_SKILL_SURGERY_MEDICAL)
+ skill_affinities = list(/datum/skill/numerical/surgery = STARTING_SKILL_AFFINITY_SURGERY_MEDICAL)
+
/datum/outfit/job/paramedic
name = "Paramedic"
jobtype = /datum/job/paramedic
diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm
index 4ba65dff59..78f0ba4272 100644
--- a/code/modules/jobs/job_types/virologist.dm
+++ b/code/modules/jobs/job_types/virologist.dm
@@ -20,6 +20,9 @@
threat = 1.5
+ starting_skills = list(/datum/skill/numerical/surgery = STARTING_SKILL_SURGERY_MEDICAL)
+ skill_affinities = list(/datum/skill/numerical/surgery = STARTING_SKILL_AFFINITY_SURGERY_MEDICAL)
+
/datum/outfit/job/virologist
name = "Virologist"
jobtype = /datum/job/virologist
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index c14aa097bb..47a1d84f58 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -65,7 +65,7 @@
qdel(src)
/obj/item/organ/regenerative_core/on_life()
- ..()
+ . = ..()
if(owner.health < owner.crit_threshold)
ui_action_click()
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 35b1a69761..f7e1f24b63 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -392,6 +392,8 @@
character.update_parallax_teleport()
+ job.standard_assign_skills(character.mind)
+
SSticker.minds += character.mind
var/mob/living/carbon/human/humanc
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 4cb93a1b6a..90621ecd3f 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -245,23 +245,17 @@
. = adjusted_amount
*/
-/obj/item/organ/brain/on_life()
- if(damage >= BRAIN_DAMAGE_DEATH) //rip
- to_chat(owner, "The last spark of life in your brain fizzles out...")
- owner.death()
- brain_death = TRUE
- return
- ..()
-
-/obj/item/organ/brain/on_death()
- if(damage <= BRAIN_DAMAGE_DEATH) //rip
- brain_death = FALSE
- ..()
-
-
/obj/item/organ/brain/applyOrganDamage(var/d, var/maximum = maxHealth)
- ..()
-
+ . = ..()
+ if(!. || !owner)
+ return
+ if(damage >= BRAIN_DAMAGE_DEATH) //rip
+ if(owner.stat != DEAD)
+ to_chat(owner, "The last spark of life in your brain fizzles out...")
+ owner.death()
+ brain_death = TRUE
+ else
+ brain_death = FALSE
/obj/item/organ/brain/check_damage_thresholds(mob/M)
. = ..()
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index b57f9653a9..8485fece85 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -77,6 +77,9 @@
alien_powers = list(/obj/effect/proc_holder/alien/transfer)
/obj/item/organ/alien/plasmavessel/on_life()
+ . = ..()
+ if(!.)
+ return
//If there are alien weeds on the ground then heal if needed or give some plasma
if(locate(/obj/structure/alien/weeds) in owner.loc)
if(owner.health >= owner.maxHealth)
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index 5352329f99..0e8764a372 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -23,6 +23,8 @@
/obj/item/organ/body_egg/alien_embryo/on_life()
. = ..()
+ if(!owner)
+ return
switch(stage)
if(2, 3)
if(prob(2))
diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm
index 414f339b28..adca193ce0 100644
--- a/code/modules/mob/living/carbon/damage_procs.dm
+++ b/code/modules/mob/living/carbon/damage_procs.dm
@@ -38,7 +38,7 @@
adjustCloneLoss(damage_amount, forced = forced)
if(STAMINA)
if(BP)
- if(damage > 0 ? BP.receive_damage(0, 0, damage_amount) : BP.heal_damage(0, 0, abs(damage_amount)))
+ if(damage > 0 ? BP.receive_damage(0, 0, damage_amount) : BP.heal_damage(0, 0, abs(damage_amount), FALSE, FALSE))
update_damage_overlays()
else
adjustStaminaLoss(damage_amount, forced = forced)
diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
index 50b88579f4..ff733d9436 100644
--- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
@@ -101,12 +101,11 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
/obj/item/organ/dwarfgland/on_life() //Primary loop to hook into to start delayed loops for other loops..
. = ..()
- dwarf_cycle_ticker()
+ if(!owner || owner.stat == DEAD)
+ dwarf_cycle_ticker()
//Handles the delayed tick cycle by just adding on increments per each on_life() tick
/obj/item/organ/dwarfgland/proc/dwarf_cycle_ticker()
- if(owner.stat == DEAD)
- return //We make sure they are not dead, so they don't increment any tickers.
dwarf_eth_ticker++
dwarf_filth_ticker++
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 9a6bc2659d..46c37a5b03 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -91,4 +91,9 @@
if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail_lizard"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines
C.dna.features["tail_lizard"] = "Smooth"
C.update_body()
+ if(C.dna.features["legs"] != "digitigrade")
+ C.dna.features["legs"] = "digitigrade"
+ for(var/obj/item/bodypart/leggie in C.bodyparts)
+ if(leggie.body_zone == BODY_ZONE_L_LEG || leggie.body_zone == BODY_ZONE_R_LEG)
+ leggie.update_limb(FALSE, C)
return ..()
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 0e48723f37..adb49938e1 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -19,6 +19,11 @@
path_image_color = "#993299"
weather_immunities = list("lava","ash")
+ var/clean_time = 50 //How long do we take to clean?
+ var/broom = FALSE //Do we have an speed buff from a broom?
+ var/adv_mop = FALSE //Do we have a cleaning buff from a better mop?
+
+
var/blood = 1
var/trash = 0
var/pests = 0
@@ -75,6 +80,26 @@
to_chat(user, "Please close the access panel before locking it.")
else
to_chat(user, "\The [src] doesn't seem to respect your authority.")
+
+ if(istype(W, /obj/item/mop/advanced))
+ if(bot_core.allowed(user) && open && adv_mop == TRUE)
+ to_chat(user, "You replace \the [src] old mop with a new better one!")
+ adv_mop = TRUE
+ clean_time = 20 //2.5 the speed!
+ window_name = "Automatic Station Cleaner v2.1 BETA" //New!
+ qdel(W)
+ else
+ to_chat(user, "\the [src] already has this mop!")
+
+ if(istype(W, /obj/item/twohanded/broom))
+ if(bot_core.allowed(user) && open && broom == TRUE)
+ to_chat(user, "You add to \the [src] a broom speeding it up!")
+ broom = TRUE
+ base_speed = 1 //2x faster!
+ qdel(W)
+ else
+ to_chat(user, "\the [src] already has a broom!")
+
else
return ..()
@@ -221,7 +246,7 @@
icon_state = "cleanbot-c"
visible_message("[src] begins to clean up [A].")
mode = BOT_CLEANING
- spawn(50)
+ spawn(clean_time)
if(mode == BOT_CLEANING)
if(A && isturf(A.loc))
var/atom/movable/AM = A
diff --git a/code/modules/projectiles/ammunition/energy/special.dm b/code/modules/projectiles/ammunition/energy/special.dm
index 39e3ca06ff..15e9b68912 100644
--- a/code/modules/projectiles/ammunition/energy/special.dm
+++ b/code/modules/projectiles/ammunition/energy/special.dm
@@ -3,6 +3,10 @@
select_name = "ion"
fire_sound = 'sound/weapons/ionrifle.ogg'
+/obj/item/ammo_casing/energy/ion/hos
+ projectile_type = /obj/item/projectile/ion/weak
+ e_cost = 300
+
/obj/item/ammo_casing/energy/declone
projectile_type = /obj/item/projectile/energy/declone
select_name = "declone"
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
index 2abc472138..f063672654 100644
--- a/code/modules/projectiles/ammunition/energy/stun.dm
+++ b/code/modules/projectiles/ammunition/energy/stun.dm
@@ -16,9 +16,6 @@
fire_sound = 'sound/weapons/gunshot.ogg'
e_cost = 100
-/obj/item/ammo_casing/energy/electrode/hos
- projectile_type = /obj/item/projectile/energy/electrode/security/hos
- e_cost = 200
/obj/item/ammo_casing/energy/electrode/old
e_cost = 1000
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index efe107a3f8..71ee8bc5ef 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -52,13 +52,16 @@
/obj/item/gun/energy/e_gun/hos
name = "\improper X-01 MultiPhase Energy Gun"
- desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
+ desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time in exchange for inbuilt advanced firearm EMP shielding."
icon_state = "hoslaser"
force = 10
- ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/hos)
+ ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/ion/hos)
ammo_x_offset = 4
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+/obj/item/gun/energy/e_gun/hos/emp_act(severity)
+ return
+
/obj/item/gun/energy/e_gun/dragnet
name = "\improper DRAGnet"
desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology."
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index b4303dd5a0..f55ce75baa 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -315,6 +315,8 @@
objs += O
var/obj/O = safepick(objs)
if(O)
+ if(length(O.buckled_mobs))
+ return pick(O.buckled_mobs)
return O
//Nothing else is here that we can hit, hit the turf if we haven't.
if(!(T in permutated) && can_hit_target(T, permutated, T == original, TRUE))
diff --git a/code/modules/projectiles/projectile/special/ion.dm b/code/modules/projectiles/projectile/special/ion.dm
index ae0888d3df..9755269031 100644
--- a/code/modules/projectiles/projectile/special/ion.dm
+++ b/code/modules/projectiles/projectile/special/ion.dm
@@ -3,7 +3,7 @@
icon_state = "ion"
damage = 0
damage_type = BURN
- nodamage = 1
+ nodamage = TRUE
flag = "energy"
impact_effect_type = /obj/effect/temp_visual/impact_effect/ion
var/emp_radius = 1
@@ -14,4 +14,4 @@
return BULLET_ACT_HIT
/obj/item/projectile/ion/weak
- emp_radius = 0
+ emp_radius = 0
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index d9eb1f77a7..e4973dd2d5 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -246,6 +246,13 @@
metabolization_rate = 5 * REAGENTS_METABOLISM
overdose_threshold = 50
+/datum/reagent/medicine/silver_sulfadiazine/reaction_obj(obj/O, reac_volume)
+ if(istype(O, /obj/item/stack/medical/gauze))
+ var/obj/item/stack/medical/gauze/G = O
+ reac_volume = min((reac_volume / 10), G.amount)
+ new/obj/item/stack/medical/ointment(get_turf(G), reac_volume)
+ G.use(reac_volume)
+
/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
if(method in list(INGEST, VAPOR, INJECT))
@@ -321,6 +328,12 @@
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
..()
+/datum/reagent/medicine/styptic_powder/reaction_obj(obj/O, reac_volume)
+ if(istype(O, /obj/item/stack/medical/gauze))
+ var/obj/item/stack/medical/gauze/G = O
+ reac_volume = min((reac_volume / 10), G.amount)
+ new/obj/item/stack/medical/bruise_pack(get_turf(G), reac_volume)
+ G.use(reac_volume)
/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-2*REM, 0)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 6dc27dcd9e..5fb27bd074 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1045,6 +1045,14 @@
// +20% success propability on each step, useful while operating in less-than-perfect conditions
..()
+/datum/reagent/space_cleaner/sterilizine/reaction_obj(obj/O, reac_volume)
+ if(istype(O, /obj/item/stack/medical/gauze))
+ var/obj/item/stack/medical/gauze/G = O
+ reac_volume = min((reac_volume / 10), G.amount)
+ new/obj/item/stack/medical/gauze/adv(get_turf(G), reac_volume)
+ G.use(reac_volume)
+
+
/datum/reagent/iron
name = "Iron"
description = "Pure iron is a metal."
diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm
index 9da20e4921..1ad55b12dd 100644
--- a/code/modules/surgery/organs/appendix.dm
+++ b/code/modules/surgery/organs/appendix.dm
@@ -12,12 +12,10 @@
var/inflamed
/obj/item/organ/appendix/on_life()
- ..()
- if(!(organ_flags & ORGAN_FAILING))
+ . = ..()
+ if(.)
return
- var/mob/living/carbon/M = owner
- if(M)
- M.adjustToxLoss(4, TRUE, TRUE) //forced to ensure people don't use it to gain tox as slime person
+ owner.adjustToxLoss(4, TRUE, TRUE) //forced to ensure people don't use it to gain tox as slime person
/obj/item/organ/appendix/update_icon_state()
if(inflamed)
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index eb42303060..46092ff0c2 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -16,7 +16,8 @@
slot = ORGAN_SLOT_STOMACH_AID
/obj/item/organ/cyberimp/chest/nutriment/on_life()
- if(synthesizing)
+ . = ..()
+ if(!. || synthesizing)
return
if(owner.nutrition <= hunger_threshold)
@@ -59,23 +60,25 @@
var/convalescence_time = 0
/obj/item/organ/cyberimp/chest/reviver/on_life()
+ . = ..()
if(reviving)
- var/do_heal = world.time < convalescence_time
+ var/do_heal = . && world.time < convalescence_time
if(revive_cost >= MAX_HEAL_COOLDOWN)
do_heal = FALSE
- else if(owner.stat && owner.stat != DEAD)
+ else if(owner?.stat && owner.stat != DEAD)
do_heal = TRUE
else if(!do_heal)
convalescence_time = world.time + DEF_CONVALESCENCE_TIME
- if(do_heal)
+ if(. && (do_heal || world.time < convalescence_time))
addtimer(CALLBACK(src, .proc/heal), 3 SECONDS)
else
cooldown = revive_cost + world.time
reviving = FALSE
- to_chat(owner, "Your reviver implant shuts down and starts recharging. It will be ready again in [DisplayTimeText(revive_cost)].")
+ if(owner)
+ to_chat(owner, "Your reviver implant shuts down and starts recharging. It will be ready again in [DisplayTimeText(revive_cost)].")
return
- if(cooldown > world.time || owner.stat == CONSCIOUS || owner.stat == DEAD || owner.suiciding)
+ if(!. || cooldown > world.time || owner.stat == CONSCIOUS || owner.stat == DEAD || owner.suiciding)
return
revive_cost = 0
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index a678482ef3..6705b4c7b4 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -102,8 +102,8 @@
slot = ORGAN_SLOT_BRAIN_ANTISTUN
/obj/item/organ/cyberimp/brain/anti_stun/on_life()
- ..()
- if(crit_fail || !(organ_flags & ORGAN_FAILING))
+ . = ..()
+ if(!. || crit_fail)
return
owner.adjustStaminaLoss(-3.5, FALSE) //Citadel edit, makes it more useful in Stamina based combat
owner.HealAllImmobilityUpTo(STUN_SET_AMOUNT)
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index 63febd1a9f..c1e33c7dac 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -29,22 +29,17 @@
var/damage_multiplier = 1
/obj/item/organ/ears/on_life()
- if(!iscarbon(owner))
- return
- ..()
- var/mob/living/carbon/C = owner
- if((damage < maxHealth) && (organ_flags & ORGAN_FAILING)) //ear damage can be repaired from the failing condition
- organ_flags &= ~ORGAN_FAILING
+ . = ..()
// genetic deafness prevents the body from using the ears, even if healthy
- if(HAS_TRAIT(C, TRAIT_DEAF))
+ if(owner && HAS_TRAIT(owner, TRAIT_DEAF))
deaf = max(deaf, 1)
- else if(!(organ_flags & ORGAN_FAILING)) // if this organ is failing, do not clear deaf stacks.
+ else if(.) // if this organ is failing, do not clear deaf stacks.
deaf = max(deaf - 1, 0)
if(prob(damage / 20) && (damage > low_threshold))
adjustEarDamage(0, 4)
- SEND_SOUND(C, sound('sound/weapons/flash_ring.ogg'))
- to_chat(C, "The ringing in your ears grows louder, blocking out any external noises for a moment.")
- else if((organ_flags & ORGAN_FAILING) && (deaf == 0))
+ SEND_SOUND(owner, sound('sound/weapons/flash_ring.ogg'))
+ to_chat(owner, "The ringing in your ears grows louder, blocking out any external noises for a moment.")
+ else if(!. && !deaf)
deaf = 1 //stop being not deaf you deaf idiot
/obj/item/organ/ears/proc/restoreEars()
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index e5aac2a47d..049fc5b5d4 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -1,3 +1,7 @@
+#define BLURRY_VISION_ONE 1
+#define BLURRY_VISION_TWO 2
+#define BLIND_VISION_THREE 3
+
/obj/item/organ/eyes
name = BODY_ZONE_PRECISE_EYES
icon_state = "eyeballs"
@@ -10,7 +14,7 @@
decay_factor = STANDARD_ORGAN_DECAY
maxHealth = 0.5 * STANDARD_ORGAN_THRESHOLD //half the normal health max since we go blind at 30, a permanent blindness at 50 therefore makes sense unless medicine is administered
high_threshold = 0.3 * STANDARD_ORGAN_THRESHOLD //threshold at 30
- low_threshold = 0.15 * STANDARD_ORGAN_THRESHOLD //threshold at 15
+ low_threshold = 0.2 * STANDARD_ORGAN_THRESHOLD //threshold at 15
low_threshold_passed = "Distant objects become somewhat less tangible."
high_threshold_passed = "Everything starts to look a lot less clear."
@@ -27,14 +31,17 @@
var/flash_protect = 0
var/see_invisible = SEE_INVISIBLE_LIVING
var/lighting_alpha
- var/damaged = FALSE //damaged indicates that our eyes are undergoing some level of negative effect
+ var/eye_damaged = FALSE //indicates that our eyes are undergoing some level of negative effect
/obj/item/organ/eyes/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = FALSE)
. = ..()
if(!.)
return
- if(damage == initial(damage))
- clear_eye_trauma()
+ switch(eye_damaged)
+ if(BLURRY_VISION_ONE, BLURRY_VISION_TWO)
+ owner.overlay_fullscreen("eye_damage", /obj/screen/fullscreen/impaired, eye_damaged)
+ if(BLIND_VISION_THREE)
+ owner.become_blind(EYE_DAMAGE)
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
old_eye_color = H.eye_color
@@ -48,46 +55,49 @@
owner.update_sight()
/obj/item/organ/eyes/Remove(special = FALSE)
- clear_eye_trauma()
. = ..()
var/mob/living/carbon/C = .
- if(!QDELETED(C))
- if(ishuman(C) && eye_color)
- var/mob/living/carbon/human/H = C
- H.eye_color = old_eye_color
- if(!special)
- H.dna.species.handle_body(H)
+ if(QDELETED(C))
+ return
+ switch(eye_damaged)
+ if(BLURRY_VISION_ONE, BLURRY_VISION_TWO)
+ C.clear_fullscreen("eye_damage")
+ if(BLIND_VISION_THREE)
+ C.cure_blind(EYE_DAMAGE)
+ if(ishuman(C) && eye_color)
+ var/mob/living/carbon/human/H = C
+ H.eye_color = old_eye_color
if(!special)
- C.update_tint()
- C.update_sight()
+ H.dna.species.handle_body(H)
+ if(!special)
+ C.update_tint()
+ C.update_sight()
-/obj/item/organ/eyes/on_life()
- ..()
- var/mob/living/carbon/C = owner
- //since we can repair fully damaged eyes, check if healing has occurred
- if((organ_flags & ORGAN_FAILING) && (damage < maxHealth))
- organ_flags &= ~ORGAN_FAILING
- C.cure_blind(EYE_DAMAGE)
- //various degrees of "oh fuck my eyes", from "point a laser at your eye" to "staring at the Sun" intensities
- if(damage > 20)
- damaged = TRUE
- if(organ_flags & ORGAN_FAILING)
- C.become_blind(EYE_DAMAGE)
- else if(damage > 30)
- C.overlay_fullscreen("eye_damage", /obj/screen/fullscreen/impaired, 2)
+
+/obj/item/organ/eyes/applyOrganDamage(d, maximum = maxHealth)
+ . = ..()
+ if(!.)
+ return
+ var/old_damaged = eye_damaged
+ switch(damage)
+ if(INFINITY to maxHealth)
+ eye_damaged = BLIND_VISION_THREE
+ if(maxHealth to high_threshold)
+ eye_damaged = BLURRY_VISION_TWO
+ if(high_threshold to low_threshold)
+ eye_damaged = BLURRY_VISION_ONE
else
- C.overlay_fullscreen("eye_damage", /obj/screen/fullscreen/impaired, 1)
- //called once since we don't want to keep clearing the screen of eye damage for people who are below 20 damage
- else if(damaged)
- damaged = FALSE
- C.clear_fullscreen("eye_damage")
- return
-
-/obj/item/organ/eyes/proc/clear_eye_trauma()
- var/mob/living/carbon/C = owner
- C.clear_fullscreen("eye_damage")
- C.cure_blind(EYE_DAMAGE)
- damaged = FALSE
+ eye_damaged = FALSE
+ if(eye_damaged == old_damaged || !owner)
+ return
+ if(old_damaged == BLIND_VISION_THREE)
+ owner.cure_blind(EYE_DAMAGE)
+ else if(eye_damaged == BLIND_VISION_THREE)
+ owner.become_blind(EYE_DAMAGE)
+ if(eye_damaged && eye_damaged != BLIND_VISION_THREE)
+ owner.overlay_fullscreen("eye_damage", /obj/screen/fullscreen/impaired, eye_damaged)
+ else
+ owner.clear_fullscreen("eye_damage")
/obj/item/organ/eyes/night_vision
name = "shadow eyes"
@@ -382,4 +392,8 @@
/obj/item/organ/eyes/ipc
name = "ipc eyes"
- icon_state = "cybernetic_eyeballs"
\ No newline at end of file
+ icon_state = "cybernetic_eyeballs"
+
+#undef BLURRY_VISION_ONE
+#undef BLURRY_VISION_TWO
+#undef BLIND_VISION_THREE
\ No newline at end of file
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index ea98ecd32b..1fee605b12 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -15,6 +15,7 @@
// Heart attack code is in code/modules/mob/living/carbon/human/life.dm
var/beating = 1
+ var/no_pump = FALSE
var/icon_base = "heart"
attack_verb = list("beat", "thumped")
var/beat = BEAT_NONE//is this mob having a heatbeat sound played? if so, which?
@@ -66,27 +67,28 @@
return S
/obj/item/organ/heart/on_life()
- ..()
+ . = ..()
+ if(!owner || no_pump)
+ return
if(owner.client && beating)
failed = FALSE
var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE)
var/sound/fastbeat = sound('sound/health/fastbeat.ogg', repeat = TRUE)
- var/mob/living/carbon/H = owner
- if(H.health <= H.crit_threshold && beat != BEAT_SLOW)
+ if(owner.health <= owner.crit_threshold && beat != BEAT_SLOW)
beat = BEAT_SLOW
- H.playsound_local(get_turf(H), slowbeat,40,0, channel = CHANNEL_HEARTBEAT)
+ owner.playsound_local(get_turf(owner), slowbeat,40,0, channel = CHANNEL_HEARTBEAT)
to_chat(owner, "You feel your heart slow down...")
- if(beat == BEAT_SLOW && H.health > H.crit_threshold)
- H.stop_sound_channel(CHANNEL_HEARTBEAT)
+ if(beat == BEAT_SLOW && owner.health > owner.crit_threshold)
+ owner.stop_sound_channel(CHANNEL_HEARTBEAT)
beat = BEAT_NONE
- if(H.jitteriness)
- if(H.health > HEALTH_THRESHOLD_FULLCRIT && (!beat || beat == BEAT_SLOW))
- H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
+ if(owner.jitteriness)
+ if(owner.health > HEALTH_THRESHOLD_FULLCRIT && (!beat || beat == BEAT_SLOW))
+ owner.playsound_local(get_turf(owner),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
beat = BEAT_FAST
else if(beat == BEAT_FAST)
- H.stop_sound_channel(CHANNEL_HEARTBEAT)
+ owner.stop_sound_channel(CHANNEL_HEARTBEAT)
beat = BEAT_NONE
if(organ_flags & ORGAN_FAILING) //heart broke, stopped beating, death imminent
@@ -107,6 +109,7 @@ obj/item/organ/heart/slime
icon_state = "cursedheart-off"
icon_base = "cursedheart"
decay_factor = 0
+ no_pump = TRUE
actions_types = list(/datum/action/item_action/organ_action/cursed_heart)
var/last_pump = 0
var/add_colour = TRUE //So we're not constantly recreating colour datums
@@ -128,6 +131,9 @@ obj/item/organ/heart/slime
return ..()
/obj/item/organ/heart/cursed/on_life()
+ . = ..()
+ if(!owner)
+ return
if(world.time > (last_pump + pump_delay))
if(ishuman(owner) && owner.client) //While this entire item exists to make people suffer, they can't control disconnects.
var/mob/living/carbon/human/H = owner
@@ -208,6 +214,8 @@ obj/item/organ/heart/slime
obj/item/organ/heart/cybernetic/upgraded/on_life()
. = ..()
+ if(!.)
+ return
if(dose_available && owner.health <= owner.crit_threshold && !owner.reagents.has_reagent(rid))
owner.reagents.add_reagent(rid, ramount)
used_dose()
@@ -233,7 +241,7 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
/obj/item/organ/heart/freedom/on_life()
. = ..()
- if(owner.health < 5 && world.time > min_next_adrenaline)
+ if(. && owner.health < 5 && world.time > min_next_adrenaline)
min_next_adrenaline = world.time + rand(250, 600) //anywhere from 4.5 to 10 minutes
to_chat(owner, "You feel yourself dying, but you refuse to give up!")
owner.heal_overall_damage(15, 15)
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index f4771de14f..146e5c7119 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -25,25 +25,24 @@
var/cachedmoveCalc = 1
/obj/item/organ/liver/on_life()
- var/mob/living/carbon/C = owner
+ . = ..()
+ if(!.)//can't process reagents with a failing liver
+ return
- if(istype(C))
- if(!(organ_flags & ORGAN_FAILING))//can't process reagents with a failing liver
+ if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
+ //handle liver toxin filtration
+ for(var/datum/reagent/toxin/T in owner.reagents.reagent_list)
+ var/thisamount = owner.reagents.get_reagent_amount(T.type)
+ if (thisamount && thisamount <= toxTolerance)
+ owner.reagents.remove_reagent(T.type, 1)
+ else
+ damage += (thisamount*toxLethality)
- if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
- //handle liver toxin filtration
- for(var/datum/reagent/toxin/T in C.reagents.reagent_list)
- var/thisamount = C.reagents.get_reagent_amount(T.type)
- if (thisamount && thisamount <= toxTolerance)
- C.reagents.remove_reagent(T.type, 1)
- else
- damage += (thisamount*toxLethality)
+ //metabolize reagents
+ owner.reagents.metabolize(owner, can_overdose=TRUE)
- //metabolize reagents
- C.reagents.metabolize(C, can_overdose=TRUE)
-
- if(damage > 10 && prob(damage/3))//the higher the damage the higher the probability
- to_chat(C, "You feel a dull pain in your abdomen.")
+ if(damage > 10 && prob(damage/3))//the higher the damage the higher the probability
+ to_chat(owner, "You feel a dull pain in your abdomen.")
/obj/item/organ/liver/prepare_eat()
var/obj/S = ..()
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 1b66af6232..b3020ae13f 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -446,17 +446,17 @@
if(prob(20))
to_chat(H, "You feel [hot_message] in your [name]!")
-
-/obj/item/organ/lungs/on_life()
- ..()
- if((!failed) && ((organ_flags & ORGAN_FAILING)))
- if(owner.stat == CONSCIOUS)
+/obj/item/organ/lungs/applyOrganDamage(d, maximum = maxHealth)
+ . = ..()
+ if(!.)
+ return
+ if(!failed && organ_flags & ORGAN_FAILING)
+ if(owner && owner.stat == CONSCIOUS)
owner.visible_message("[owner] grabs [owner.p_their()] throat, struggling for breath!", \
"You suddenly feel like you can't breathe!")
failed = TRUE
else if(!(organ_flags & ORGAN_FAILING))
failed = FALSE
- return
/obj/item/organ/lungs/prepare_eat()
var/obj/S = ..()
@@ -547,5 +547,6 @@
color = "#68e83a"
/obj/item/organ/lungs/yamerol/on_life()
- ..()
- damage += 2 //Yamerol lungs are temporary
\ No newline at end of file
+ . = ..()
+ if(.)
+ applyOrganDamage(2) //Yamerol lungs are temporary
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 4e4268c5fe..4bb1eaec19 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -134,18 +134,19 @@
organ_flags &= ~ORGAN_FROZEN
return FALSE
-/obj/item/organ/proc/on_life() //repair organ damage if the organ is not failing
- if(organ_flags & ORGAN_FAILING)
- return
+/obj/item/organ/proc/on_life() //repair organ damage if the organ is not failing or synthetic
+ if(organ_flags & ORGAN_FAILING || !owner)
+ return FALSE
if(is_cold())
- return
- ///Damage decrements by a percent of its maxhealth
- var/healing_amount = -(maxHealth * healing_factor)
- ///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's health
- healing_amount -= owner.satiety > 0 ? 4 * healing_factor * owner.satiety / MAX_SATIETY : 0
- if(healing_amount)
- applyOrganDamage(healing_amount) //to FERMI_TWEAK
- //Make it so each threshold is stuck.
+ return FALSE
+ if(damage)
+ ///Damage decrements by a percent of its maxhealth
+ var/healing_amount = -(maxHealth * healing_factor)
+ ///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's satiety
+ healing_amount -= owner.satiety > 0 ? 4 * healing_factor * owner.satiety / MAX_SATIETY : 0
+ if(healing_amount)
+ applyOrganDamage(healing_amount) //to FERMI_TWEAK
+ return TRUE
/obj/item/organ/examine(mob/user)
. = ..()
@@ -205,9 +206,7 @@
///Adjusts an organ's damage by the amount "d", up to a maximum amount, which is by default max damage
/obj/item/organ/proc/applyOrganDamage(var/d, var/maximum = maxHealth) //use for damaging effects
- if(!d) //Micro-optimization.
- return FALSE
- if(maximum < damage)
+ if(!d || maximum < damage) //Micro-optimization.
return FALSE
damage = clamp(damage + d, 0, maximum)
var/mess = check_damage_thresholds()
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 3b383581cf..d9cbf9be03 100755
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -17,33 +17,24 @@
low_threshold_cleared = "The last bouts of pain in your stomach have died out."
/obj/item/organ/stomach/on_life()
- ..()
- var/datum/reagent/consumable/nutriment/Nutri
+ . = ..()
+ if(!owner)
+ return
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
- if(!(organ_flags & ORGAN_FAILING))
+ if(.)
H.dna.species.handle_digestion(H)
handle_disgust(H)
- Nutri = locate(/datum/reagent/consumable/nutriment) in H.reagents.reagent_list
- if(Nutri)
- if(prob((damage/40) * Nutri.volume * Nutri.volume))
- H.vomit(damage)
- to_chat(H, "Your stomach reels in pain as you're incapable of holding down all that food!")
-
- else if(Nutri && damage > high_threshold)
- if(prob((damage/10) * Nutri.volume * Nutri.volume))
- H.vomit(damage)
- to_chat(H, "Your stomach reels in pain as you're incapable of holding down all that food!")
-
-
- else if(iscarbon(owner))
- var/mob/living/carbon/C = owner
- Nutri = locate(/datum/reagent/consumable/nutriment) in C.reagents.reagent_list
-
- if(damage < low_threshold)
+ if(!damage)
return
-
+ var/datum/reagent/consumable/nutriment/Nutri = locate(/datum/reagent/consumable/nutriment) in owner.reagents.reagent_list
+ if(!Nutri)
+ return
+ var/prob_divisor = damage > high_threshold ? 10 : 40
+ if(prob((damage/prob_divisor) * (Nutri.volume**2)))
+ owner.vomit(damage)
+ to_chat(owner, "Your stomach reels in pain as you're incapable of holding down all that food!")
/obj/item/organ/stomach/proc/handle_disgust(mob/living/carbon/human/H)
if(H.disgust)
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 1857f8db48..7127b41ee3 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -58,7 +58,10 @@
return FALSE
if(tool)
speed_mod = tool.toolspeed
- if(do_after(user, time * speed_mod, target = target))
+ var/skill_mod = 1
+ if(user?.mind?.skill_holder)
+ skill_mod = SURGERY_SKILL_SPEEDUP_NUMERICAL_SCALE(user.mind.skill_holder.get_skill_value(/datum/skill/numerical/surgery))
+ if(do_after(user, time * speed_mod * skill_mod, target = target))
var/prob_chance = 100
if(implement_type) //this means it isn't a require hand or any item step.
prob_chance = implements[implement_type]
@@ -66,6 +69,7 @@
if((prob(prob_chance) || (iscyborg(user) && !silicons_obey_prob)) && chem_check(target) && !try_to_fail)
if(success(user, target, target_zone, tool, surgery))
+ user?.mind?.skill_holder?.auto_gain_experience(/datum/skill/numerical/surgery, SKILL_GAIN_SURGERY_PER_STEP)
advance = TRUE
else
if(failure(user, target, target_zone, tool, surgery))
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index ec741ef574..b1a6297981 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -21,7 +21,7 @@
/obj/item/clothing/head/helmet/blueshirt = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
/obj/item/clothing/under/rank/security/officer/blueshirt = 1,
- /obj/item/clothing/gloves/tackler = 5,
+ /obj/item/clothing/gloves/tackler = 5,
/obj/item/ssword_kit = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
diff --git a/html/changelog.html b/html/changelog.html
index b02b2d74a5..3d05d75736 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -833,555 +833,6 @@
box brig miscellaneous issues
box station hos office
-
-
26 February 2020
-
AnturK ported by kevinz000 updated:
-
-
Dueling pistols have been added.
-
-
Arturlang updated:
-
-
Replaces a lot of ingame UIs with TGUI next, increasing performance drastically.
-
Each night for bloodsuckers will last longer due to the sun dimming.
-
You cant level up for free, now you have to pay blood for power.
-
Bloodsuckers are no longer as resistant to hard stuns and regenerate less stamina. and a lot of their cooldowns are a lot higher.
-
Removed text macros from the chem dispenser.
-
Replaced with dispenser input recording macros.
-
Fancifying makeshift switchblades now works
-
Shields will no longer block lasers, and will break if they take too much damage.
-
Added a TGUI Next interface for crafting
-
Removed the old TGUI slow crafting interface
-
The MK2 hypospray now
-
The debug outfit is now kitted out for whatever debbuging needs.
-
Fixed the pandemic naming and the radiation healing symptom UI crashing
-
Hyposprays now switch modes on CTRL click, instead of alt, as it was already reserved for dispension amount.
-
Nanite interfaces have gotten a rework to TGUI Next, and can now support sub-programs. add:Adds the nanite sting program, which will allow you to manually sting people to give them nanites, changeling style.
-
The pandemic can no longer make vaccines or synthblood as quickly.
-
The syndicate uplinks interface has been redone in TGUI Next
-
Valentines can now be converted by bloodsuckers
-
-
Bhijn updated:
-
-
Click-dragging will now only perform the quick item usage behavior if you're in combat mode.
-
-
BlueWildrose updated:
-
-
podpeople tail wagging
-
lifebringer ghost role fixes
-
-
BuffEngineering, nemvar. updated:
-
-
Addicts can now feel like they're getting their fix or kicking it.
-
Aheals now remove addictions and restore your mood to default.
-
-
CameronWoof updated:
-
-
Lighting looks better now. I can say that because the PR wouldn't be merged and you wouldn't be reading this if it wasn't true.
-
Ammonia and saltpetre can now be made at the biogenerator.
-
-
Commandersand updated:
-
-
uplink centcomm suit doesn't have sensors
-
-
DeltaFire15 updated:
-
-
Nar'Sie runes no longer benefit from runed floors.
-
-
Detective-Google updated:
-
-
the POOL. remove: boxstation dorms 7
-
valentines candy no longer prefbreaks
-
Loudness Booster pAI program
-
Encryption Key pAI program
-
-
EmeraldSundisk updated:
-
-
Connects mining's disposal unit on Delta.
-
Slight visual adjustments to the immediate affected area.
-
-
Feasel updated:
-
-
Buffed dissection success chances.
-
-
Ghommie updated:
-
-
The anomalous honking crystal should now properly clown your mind.
-
Stopped the ellipsis question mark from being displayed twice in the examine message for masked/unknown human mobs.
-
Made the aforementioned ellipsis question mark display on flavor-text-less masked/unknown human mobs too for consistency.
-
Stopped an APTFT exploit with spray bottles.
-
Fixed the detective revolver being quite risky to use.
-
Hair styles and undergarments are yet again free from gender restrictions.
-
Clown ops will find bombananas and clown bomb beacons instead of minibombs and bomb beacons in their infiltrator ship now.
-
For safety, the syndicate shuttle minibombs and bombananas come shipped in a box. Please don't instinctively eat any of those nanas, thank you.
-
Uplink items excluded (such as mulligan, chameleon, ebow) from or exclusive (such as cyber implants) to normal nuke ops will now be properly unavailable/available to clown ops.
-
Fixed bananium energy sword/shield slips.
-
Buffed said slips to ignore no-grav/crawling/flying as well as adding some deadly force to the e-sword.
-
Fixed the 'stache grenade anti-non-clumsy user check.
-
Doubled the timer for the sticky mustaches effect from the above grenade (from 1 to 2 minutes)
-
Fixed an edge case with the chaplain armaments beacon spawning the box in nullspace.
-
The playback device's cooldown now proportionally increases with messages longer than 60 characters (3 seconds is the default assembly cooldown).
-
Fixed space ninjas "Nothing" objective. Now you gotta steal some dandy stuff such as corgi meat and pinpointers as a ninja too.
-
Fixed maploaded APC terminals direction.
-
Nerfed magnetic rifles/pistols by re(?)adding power cell requirements for it. These firearms must be recharged after firing 2 magazines worth of projectiles and are slightly more susceptible to EMPs.
-
Fixed the tearstache nade not properly working.
-
Buffed it against space helmet internals.
-
Holographic fans won't display above mobs and other objects anymore.
-
Fixed paraplegics appearing as shoeless.
-
Fixed the petting element.
-
Fixed slipping.
-
Refactored mob holders into an element.
-
Fixed a few minor issues with that feature. such as mismatching sprites for certain held mobs and a slight lack of safety checks.
-
holdable mobs can't force themselves into people's hands anymore.
-
Milkies fix.
-
Fixed some mounted defibrillator issue with the altclicking functionality.
Fixed a little issue with sleeper UI and blood types.
-
Fixing accidental nerfs to the magpistol magazine.
-
The Lavaland's Herald speech sound should only play if they are actually speaking.
-
Nerfed cargo passive points generation from 500 to 125 creds per minute.
-
Fixed whitelisted/donor loadouts
-
Childproofs double-esword and hypereuplastic blade toys.
-
Some reagent holders (such as cigarettes, food) are not suitable for reagents export anymore, while unprocessed botany crops will only net 1/3 of the standard reagents values.
-
Export scanners now include the reagents value in the price report.
-
Fixed a little inconvenience with the character setup preview dummy having extra unwarranted bits.
-
Stopped role restricted uplink items from being discounted despite not being purchasable most times.
-
Missing words replacement file for the gondola mask.
-
Fixed an issue with the nearsighted prescription glasses taking over worn eyewear.
-
Fixed AI unanchoring not properly removing the no teleport trait. My bad.
-
Fixed another issue with hering comsig.
-
Fixed dozen missing privates sprites.
-
A little fix concerning some R&D and reagents.
-
Further mob holder fixes.
-
Fixed being unable to dump a trash bag's contents directly into disposal bins.
-
Doubled the halved flavor text maximum length.
-
Reduced tongue organ damage and tasting pH message spam.
-
Fixed agent IDs not registering the inputted name. Thanks MrPerson.
-
Fixed solar panels/trackers (de)construction being a bit wonky.
-
Fixed something about slime blood and the law of conservation of mass.
-
Fixed flypeople being emetic machine guns.
-
Fixed virology being unable to be done with synthetic blood.
-
Renamed "blaster carbine" and "blaster rifles" back to "energy gun" and "laser gun" respectively
-
Fixed magnetic rifles & co being inconsistent with printed energy guns and start with an empty power cell.
-
Reverted practice laser gun sprites back to their former glory. Mostly.
-
Fixed sprint buffer cost and regen being rounded down.
-
Nerfed the fermenting barrel export industry.
-
Reagent dispensers selling price no longer takes in account the reagents volume. It's already handled by reagents export.
-
pAIs are yet again unable to perform certain silicon interactions with machineries yet again.
-
Fixed pAI radios inability to be toggled on/off.
-
-
Ghommie (original PRs by Floyd/Qustinnus, 4Dplanner, Willox, ninjanomnom, mrdoombringer, Fikou, Fox McCloud, TheChosenEvilOne, nemvar, bobbahbrown, Time-Green, Stonebaykyle, MrPerson, ArcaneMusic and zxaber) updated:
-
-
You can now make toolboxes out of almost any solid material in an autolathe
-
adds Knight's Armour made out of any materials
-
new ruin found in lavaland protected by dark wizards, I wonder what they're guarding
-
You can now put a bunch more mats in the coin mint and autolathe
-
Adamantine and Mythril are now materials (Adamantine still only from xenobio, Mythril still only from badminnery). Adamantine boosts an item's force by 1.5, Mythril gives an item RPG statistics.
-
most custom sprites for coins have been lost
-
You can now give your ass acute radiation poisoning
-
floydmats now apply to all objs / items
-
you can now make tables and chairs out of any material
-
Fixes being able to exploit fully upgraded destructive analyzers to multiply materials
-
An old monastery from a previously abandoned sector of space has recently resurfaced in some regions surrounding the station.
-
Latent scans of the surrounding systems have picked up trace signs of new, smaller cult constructs, however these signatures quickly vanished.
-
In other news, scavengers in your sector have been seen occasionally with classically recreated maces, so autolathe firmware has been upgraded to accommodate this.
-
-
Hatterhat updated:
-
-
Zombie powder is now instant when ingested, but delayed when injected or applied through touch.
-
The H.E.C.K. suit is now goliath tentacle resistant and probably better for acid resistance.
-
The Engineering techfab can now print standard and large RCD compressed matter cartridges.
-
The Experimental Tools node now has the Combifan projector, blocking both temperature and atmospheric changes.
-
fiddles with the seed extractor upgrade examine to make it not shit
-
Formaldehyde prevents organ decay and corpses' miasma production at 1u in the body.
-
Epinephrine pens now contain 3u formaldehyde. This should not kill you.
-
The ships often crashed by Free Golems on Lavaland now have GPSes. They're off, by default, but an awakening Golem could easily turn one on.
-
Standard RCD ammo can now be printed from Engineering-keyed techfabs once you hit Industrial Engineering.
-
Consoleless interfaces are now default - this means unrestricted protolathes and circuit imprinters can now be interfaced with by interacting with the machine itself.
-
Multitools can now actually be printed from Engineering and Science protolathes/techfabs once you unlock Basic Tools.
-
Husking (from being burned to shit) can now be reverted! 5u rezadone or 100u synthflesh, at below 50 burn.
-
Turning a body into a burnt husk now takes more effort. 300 burn's worth of effort.
-
Buckshot individual pellet damage up from 10 to 12.5. Still firing 6 pellets.
-
Preservahyde! Made with water, bromine, and formaldehyde, it doesn't decay into histamine. Instead, it just prevents your organs from rotting into nothing.
-
You can now purify eldritch longswords with a bible. This creates purified longswords, which do not have anti-magic properties, but are still good for swinging at cultists.
-
Extend votes! Ported from Hyper, ported from AUstation.
-
mechs with stock parts now have icons
-
Pie reagent transfer now requires an uncovered mouth.
-
Biogenerators can now actually generate universal enzyme.
-
The Basic Tools node now unlocks the multitool for printing on Engineering and Science fabricators.
-
The Ash Walkers' nest on Lavaland now starts with three bowyery slabs.
-
You can now welder-harden arrows. It might take longer.
-
Silkstring's costs adjusted for bows and whatnot.
-
Grammar adjusted on a lot of things relating to bows.
-
Pipe bows' bowstring doesn't look like it replicated itself upon draw.
-
-
IHOPMommyLich updated:
-
-
Changed the multiplicative_slowdown of Stimulants from -1 to -0.5
-
-
IronEleven updated:
-
-
Minor stat changes to Choking, Spontaneous Combustion, Autophagocytosis Necrosis, Hallucigen, Narcolepsy, Shivering, and Vomiting symptoms.
-
-
KathrinBailey updated:
-
-
Missing turf_decals in Cargo Office.
-
Turns on the docking beacons on Box.
-
Fixes Starboard Quarter maint room being spaced. It was never intended to be like how it was.
-
The aforementioned maint room not having stuff in it.
-
varedited photocopier sometimes not opening any UI.
-
Atmos differences in Starboard Quarter maint.
-
Atmos differences in destroyed shuttle/EVA bridge. Plating replaced with airless plating.
-
Rotates AI satellite computers. These have probably been like this since computers had the old sprites and no directional ones. You shouldn't sit at a chair to operate a sideways computer.
-
-
KrabSpider updated:
-
-
The Van Dyke is no longer Fu Manchu.
-
Gets rid of a Fu Manchu imitation.
-
-
Kraseo updated:
-
-
You can no longer pull before wearing boxing gloves to bypass the grab check.
-
Nightmares no longer delete entire guns from existence for merely having a light on them.
-
-
Linzolle updated:
-
-
Bows now will not delete an arrow if it cant fire it.
-
bows now like and respect sprite changes
-
-
MalricB updated:
-
-
"Shaggy" sprite from virgo
-
"shaggy" option in the character customization
-
-
MrJWhit updated:
-
-
Removed meteor defense tech node
-
TEG
-
-
Naksu updated:
-
-
Odysseus chem synthesizing now works again.
-
-
Owai-Seek updated:
-
-
Burger, Cargo Packaging, Dirty Magazine, Air Pump, and Scrubber crates.
-
Duplicate Crate, Festive Wrapping Paper Crate, Contraband Monkey Meat Crate
-
Gave Seed Crate Ambrosia Seed, gave Biker Gang Crate Spraypaint.
-
Organised some crates with sub-categories. Also, moved all vendor refills to a new tab.
-
Moved Grill to Service Tab
-
Engineering Hardsuit Access
-
Blood Crate now has all of the current blood types.
-
Birthday Cake Recipe is now the same as TG.
-
Added Soy Sauce and BBQ Packets to Dinnerware Vendor.
-
Added nurse outfit, nurse cap, and mailman hat to loadout.
-
Changed the name of scrubs to blue, green, and purple scrubs.
-
Bacon and Eggs food item. Delicious! Added a Lemony Poppy Seed Muffin.
-
Snack Vendor has Chocolates, Tortilla Chips, and a Marshmallow Box
-
Mops can now be printed at service lathe once tools are researched.
-
Biobags can hold most organic limbs/organs, but not brains, implants, or cybernetics.
-
Trash Bag can now hold limbs (but not heads.)
-
Most snack vendor items reduced by 1.
-
Trash Cans are now actually craftable, and only require metal instead of plastic.
-
Bacon and Eggs, Drying Agent Bottle.
-
Mugs now show reagent colors of contained reagents. Thanks Seris!
-
Reorganized all food recipes, (hopefully) making things easier to find.
-
Trays now have a whitelist, allowing them to pick up normal sized foods, bowls, glassware, booze, ect.
-
Easter foods are no longer their own Misc Food Category on the top of the menu.
-
fixed a few typos/capitalization consistency.
-
Mexican Foods are their own Subcategory.
-
Donuts are their own Subcategory
-
Moved Sweets from Misc Food in with Pies. Renamed to Pies & Sweets
-
BROOM
-
Janitor Vendor now has gear for two Janitors.
-
-
PersianXerxes updated:
-
-
SMES and PACMAN attached to gulag Security to power electrified windows remove: Removed Sec vendor from gulag Security
-
Separation of gulag and public mining
-
Better clarified the comment explaining the contraband tag.
-
Cargo nuclear defusal kits now require an emag'd drop pod console to be purchased.
-
Added Kilo Station
-
Adjusts Kilo Station to be more in line with Citadel standards
-
Added area icons required to make Kilo Station editable on Citadel code
-
Fixed a reagent container on Kilo pointing to a nonexistent reagent
-
Adds Kilo Station to the maps config file, does not fix Meta Station's population requirement
-
-
Psody-Mordheim updated:
-
-
You can now make synth-flesh with synthetic blood.
-
You can now make synthetic blood via mixing saline glucose, iron, stable plasma and heating it to 350 temp.
-
You can mix synthetic blood and cryoxadone to create synth-meat in addition to normal blood.
-
Disfiguration Symptom.
-
Deoxyribonucleic Acid Saboteur Symptom.
-
Polyvitiligo Symptom.
-
Revitiligo Symptom.
-
Vitiligo Symptom.
-
-
Putnam3145 updated:
-
-
Added logging to various consent things.
-
Lots of new traitor objectives
-
gender change potion now respects prefs
-
Hypno prefs work better.
-
Panic bunker is now round-to-round persistent
-
Relief valve now has a TGUI-next UI
-
Atmos reaction priority works now.
-
map voting doesn't suck anymore
-
Dynamic now defaults to "classic" storyteller instead of just failing if the vote didn't choose a storyteller.
-
antag quirk blacklisting works now
-
default should be... default
-
all supermatter damage is now hardcapped
-
Supermatter sabotage objective no longer shows up with no supermatter
-
Mining vendors no longer fail and eat your points iff you have precisely enough points to pay for an item
-
Licking pref
-
Fixed IRV.
-
Runtime if nobody has a chaos pref set
-
IRV fixed... again
-
temporary flavor text can now be of reasonable length
-
Shooting the supermatter now adds to the supermatter's power. CO2 setups beware!
-
Logging for renaming
-
-
Raiq & Linzolle updated:
-
-
Bone bow - Ash walkers crafting , bone arrows - Ash walkers crafting, silk string used in bow crafting, harden arrows - Ash walkers crafting, ash walker only crafting book, basic pipe bow, and bow & arrow selling. Quivers for ash walkers as well, just to hold some arrows well out on the hunt!
-
-
Seris02 updated:
-
-
tweaked the way the SM works
-
custom reagent pie smite
-
hijack implant
-
changed mentions of the issilion proc to hasSiliconAccessInArea based on what the proc is used for
-
recipe for mammal mutation toxin
-
polychromic winter coat
-
thief's gloves
-
crushing magboots
-
golden plastitanium toolbox being actually plastitanuium
-
character slot amount
-
rebalanced rising bass
-
string highlighting whitespace
-
glitch with PKA
-
meteor hallucinations (again)
-
Added naked hallucination
-
crowbarring manifests off crates
-
makes RCDs cost a better amount
-
apc icons
-
rest hotkey
-
hsl instead of sum of rgb for spraycan lum check
-
bloodcrawl's cooldown
-
-
ShadeAware updated:
-
-
Craftable Switchblades, a weaker subtype of normal switchblades that can be crafted using a Kitchen Knife, Modular Receiver, Rifle Stock and some Cable Coil. Requires a welder to complete.
-
You can now actually craft Switchblades.
-
Switchblades no longer regain their old Makeshift sprite after retracting if you've made them fancy with Silver.
-
The Captain's Wardrobe, a special one-of-a-kind and ID-locked wardrobe for the Captain that holds all of their snowflakey gear. Remove: Snowflake gear from the Captain's locker, since now it has its own vendor.
-
-
Tlaltecuhtli, ported by Hatterhat updated:
-
-
Ripley, Firefighter, Odysseus and H.O.N.K. mechs now also use scanning modules and capacitors on construction. This means that they also gain reduced power consumption and EMP protection from higher-tier stock parts.
-
-
Trilbyspaceclone updated:
-
-
Vault hallway door being all access
-
Updates change logs
-
Crafts are now made of plasteel and can be made with 5 sheets
-
Takes away NT's connections to the Aliens that run the Syndicats
-
Carps have evolved to take more damage
-
restock crates for each vender
-
restock units for all station venders
-
Sec-vender missing icon
-
Box station captain office issues maping: Gulag on box can now be accessed
-
Alien stools and chairs
-
Bone armor/Dagger are now crafting from bones rather then crafting menu
-
Firing pins that only works when not on station
-
Medical locked crates
-
Russian gear crates have less gear in some cases but all will cost more
-
Medical locked crates that were not locked
-
Crates that were out of date are corrected
-
Heads of staff have been better screened by NT before being promoted
-
The suit full of spiders also known as a ninja now is a tactical turtleneck
-
The Wiznerds now dont have suits set to max
-
Meat wheat no longer has blood
-
Flat guns can no longer be suppressed
-
replaced stickmans .45 caliber with 10mm, for consistency.
-
Meatwheat and Oats now have rarity
-
Oats now have at lest 50% more flour in them
-
BDM now uses a PKA rather then a normal KA
-
Gang tower shield is no longer transparent
-
Cosmic winter coat now glows like the bedsheet, and holds normal winter coat gear
-
Express console is now logging what it buys, like the normal console should
-
Crabs are now made of crab meat.
-
AIs now understand the old ways of drunken dwarfs
-
Removes some armored Russian hats from box station round start
-
Doner items spawning
-
Engi/Sec Trek suit no longer has 10% melee protection
-
IPC hearts are now made of robomeat and roboblood thats emp proof. Heals and is all and all just like an normal heart
-
All robotic organs now have an animation.
-
IPC's now organs now look like robotic ones, even tho thats not the case game wise
-
Added a new bee themed bar sign
-
Makes plywood chair not look as bad.
-
corndog sprite being miss-spelled
-
Ash from land of lava now is useable for sandstone
-
Peach cake slices are no long made by mimes
-
-
Tupinambis updated:
-
-
the portion of laws that require harm prevention by silicons has been removed.
-
silicon_laws.txt config file is required to be modified for full implementation.
-
masks no longer improperly stick out of helmets when they should be hidden.
-
Status Displays should now update correctly.
-
stunbatons now take 4 hits to inflict hard crit, up from 3.
-
stunbatons no longer disarm targets.
-
-
Yakumo Chen updated:
-
-
Rings for your fingers!
-
New cargo crates and loadout options to bling your rings!
-
-
YakumoChen updated:
-
-
Observe is back in the OOC tab
-
Rings look nicer. Sprites used from RP.
-
Ring on-hands. Diamond rings sparkle!
-
You can now propose using a diamond ring in your hand.
-
Legion skulls behave like bees!!!!
-
-
Zellular updated:
-
-
Movement state for pupdozer and its decals
-
Tweaked the movement state for the pupdozer's eyes
-
-
ancientpower updated:
-
-
Fixes an error in pH strips' feedback message.
-
Ported drink sliding from /vg/station.
-
Fixes color mismatching with the "genitals use skintone" preference.
-
Bunny ear style for humanoid species.
-
Ghosts are now literate.
-
-
bunny232 updated:
-
-
Changes the simple animal sentience event from the xenomorph preference to sentience potion preference.
-
-
coiax updated:
-
-
Admin and event only pair pinpointers! They come in a box of two, and each pinpointer will always point at its corresponding pair. Aww.
-
-
deathride58 updated:
-
-
Spacemen no longer run at lightspeed on local servers.
-
-
kappa-sama updated:
-
-
the plant dudes can actually make plant disks now
-
-
keronshb updated:
-
-
Added repairable turrets
-
Adds Tiny Fans to the pirate ship
-
changes some reinforced windows to plastinanium pirate windows
-
made the pirate shuttle + turrets bomb resistant
-
made most pirate machines + consoles indestructible
-
increased pirate turret health
-
Adds the CogChamp drink and Sprite
-
Added burn and knockback to stunhand during HALOS on cult.
-
fixed accelerated regeneration nanites
-
fixed mechanical repair nanites
-
fixed bio reconstruction nanites
-
-
kevinz000 updated:
-
-
Custom snowflake plushies are now in config rather than code.
-
Abductor mindsnapping (aka abductee objectives) can now be "cured" with brain surgery.
-
Shuttle hijacking has been completely reworked. Alt-click the shuttle as a hijack-capable mind (so traitors, and especially traitors with hijack) to begin or continue a hacking process.
-
A good amount of the blood RGB rework was cleaned up/reverted, with some notable gameplay changes including: Gibs and blood not having max blood by default (no more easy rampages, cultists), infinite gib streaking, etc etc.
-
meteor waves are now directional and announces the direction on the command report.
-
CTF CLAYMORES
-
shoves buffed, now shoving into a wall twice rapidly will also disarm their weapon.
-
traitor+bro gamemode minimum population set to 25 until there can be more in depth configuration systems for gamemodes.
-
no more bluespace skittish locker diving,
-
moths now have unique laughs and can *chitter.
-
nuke explosion is now full dev radius for anti lag purposes
-
Gangs can now only tag with a gang uplink bought spraycan.
-
dueling pistol accesses have been changed to be more accessible.
-
mechs no longer have admin logs flooding into IC control console log viewing
-
Guncode and energy guns have been refactored a bit.
-
You can now combat mode ight click on an energy gun to attempt to switch firing modes. This only works on guns without right click functions overridden.
-
shoes can now fit magpistols again.
-
Projectiles now always hit chest if targeting chest, snipers have 100% targeting zone accuracy. All other cases are unchanged.
-
The lawyer's PDA cartridge has been rebranded to something more accurate to its true nature.
-
Refactored ghostreading/etc
-
Cyborgization will now de-gang people, even gangheads.
-
reactive repulse armor now has an item limit
-
beam rifle runtime fix during aiming_beam
-
fail2topic runtime fix: taking out an ip while incrementing index resulted in accessing the next-next entry instead of the next and results in out of bound errors.
-
gravity gun repulse and chaos now work in all angles, rather than just basic cardinals and diagonals. fun.
-
Public autolathes can no longer be hacked.
-
Energy weapons now once again have their lens in contents.
-
pais are no longer muted for literally a whole hour on emp.
-
auto profiler subsystem from tg
-
Brig cells now are more accurate by using timeofday instead of realtime
-
Cryo now actually transfers reagents at tier 4 on enter rather than every 80 machine fire()-process()s regardless of if it was "reset" by open/close.
-
cmo now gets advanced surgery drapes that techweb-sync for advanced surgeries without an operating console.
-
ctf claymores now actually spawn (and fit).
-
STOP_PROCESSING now removes from currentrun to prevent another process cycle from happening where it shouldn't.
-
hand teleporters now require 30 deciseconds of still movement by the user to dispel portals. there's a beam effect too.
-
Sort of a bugfix but cult blood magic and all guns now respect stamina softcrit.
-
Organ healing rate doubled. Organ decay rate halved to match its define (15 minutes for full decay, so at around 8-10 minutes it'll be really fucked).
-
Storage now caches max screen size and only stores when being opened by a non ghost, meaning ghosts will no longer distort living player screens when viewing storage.
-
Stunbatons changed yet again.
-
the game's built in autoclicker aka CanMobAutoclick no longer triggers client/Click()'s anti clickspam guard.
-
pais can no longer bodyblock bullets
-
pai radio short changed to 3 minutes down from 5
-
pais are no longer fulltile click opacity.
-
vampire "immortal haste" has been reworked to be more reliable and consistent.
-
hand teles use a less atrocious beam
-
-
necromanceranne updated:
-
-
Ebows now disarm people hit by them.
-
Ebows now do 60 stamina damage on hit.
-
Ebows no longer inflict drowsiness
-
Miniature ebows do 15 toxin damage, up from 8.
-
Ebows have considerably shorter knockdowns.
-
Ebows now make you slur rather than stutter.
-
Large ebows are now heavy and bulky.
-
You can no longer order spinfusors or their ammo from cargo.
-
Removed the formal security officer jacket from the secdrobe
-
formal security jackets are now armor vests
-
Bullets causing bleed rates equal to unmitigated damage through all forms of defense.
-
Reverted #9092, crew mecha no longer spawn with tracking beacons.
-
[Port] Mecha ballistics weapons now require ammo created from an Exosuit Fabricator or the Security Protolathe, though they will start with a full magazine and in most cases enough for one full reload. Reloading these weapons no longer chunks your power cell. Clown (and mime) mecha equipment have not changed.
-
[Port] The SRM-8 Missile Launcher has been replaced with the BRM-6 Breaching Missile Launcher in techwebs (Nukie Mauler remains equipped with the SRM-8).
-
[Port] Both Missile Launchers and the Clusterbang Launcher do not have an ammo cache, and cannot be reloaded by the pilot. Once the initial loaded ammo has been spent, you can use the appropriate ammo box to load the weapon directly.
-
[Port] Utility mechs that have a clamp equipped can load ammo from their own cargo hold into other mechs.
-
[Port] Nuke Ops can purchase spare ammo duffel bags for their mecha weapons, should they run low.
-
Literally unclickability with a cham projector
-
-
nemvar updated:
-
-
Slight changes the self-repair borg module. It no longer references the borg that owns it.
-
Trash from food now gets generated at the location of the food item, instead of in the hands of the eater.
-
Changed mob biotypes from lists to flags.
-
-
r4d6 updated:
-
-
Added a dwarf language
-
Added more engines
-
RPD subcategories and preview icons reorganized.
-
RPD now starts with painting turned off, hitting pipes with build and no paint will target the turf underneath instead. Bye bye turf pixelhunting.
-
Made dwarves into a roundstart races
-
Meteor Timer back to 3-5 minutes
-
Mining no longer lead to spess
-
Added Plasteel Pickaxe
-
Added Titanium Pickaxe
-
fixed a missing tile
-
-
tralezab, bandit, Skoglol updated:
-
-
The mime's PDA messages are silent now!
-
30 new emoji have been added. Mime buff, mime now OP.
-
GoonStation 13 Development Team
diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi
index 7a638ef54c..6a538bc85e 100644
Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index 528fd42d23..aa6d38ad07 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index 5bf347fabf..01f77ca8c9 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index bf1e309b17..27caef76b2 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index e54f55ed46..691d5c8362 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index e7d134c85f..a157d333b0 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm
index e0e1b37a3d..69d2c791e7 100644
--- a/modular_citadel/code/modules/arousal/genitals.dm
+++ b/modular_citadel/code/modules/arousal/genitals.dm
@@ -150,7 +150,8 @@
aroused_state = FALSE
/obj/item/organ/genital/on_life()
- if(!reagents || !owner)
+ . = ..()
+ if(!reagents || !.)
return
reagents.maximum_volume = fluid_max_volume
if(fluid_id && CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION))
diff --git a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm
index 6963714f04..17c3f17ad8 100644
--- a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm
@@ -15,7 +15,7 @@
if(!forced && (status_flags & GODMODE))
return FALSE
var/obj/item/bodypart/BP = isbodypart(affected_zone)? affected_zone : (get_bodypart(check_zone(affected_zone)) || bodyparts[1])
- if(amount > 0? BP.receive_damage(0, 0, amount * incomingstammult) : BP.heal_damage(0, 0, abs(amount)))
+ if(amount > 0? BP.receive_damage(0, 0, amount * incomingstammult) : BP.heal_damage(0, 0, abs(amount), FALSE, FALSE))
update_damage_overlays()
if(updating_health)
updatehealth()
diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
index a4b6429bea..bcc156a22e 100644
--- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
@@ -131,7 +131,7 @@
item_state = "particleblaster"
lefthand_file = 'modular_citadel/icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'modular_citadel/icons/mob/inhands/guns_righthand.dmi'
- ammo_type = list(/obj/item/ammo_casing/energy/electrode/pump, /obj/item/ammo_casing/energy/laser/pump)
+ ammo_type = list(/obj/item/ammo_casing/energy/disabler/pump, /obj/item/ammo_casing/energy/laser/pump)
ammo_x_offset = 2
modifystate = 1
@@ -152,19 +152,19 @@
fire_sound = 'sound/weapons/LaserSlugv3.ogg'
/obj/item/ammo_casing/energy/laser/pump
- projectile_type = /obj/item/projectile/beam/weak
- e_cost = 200
+ projectile_type = /obj/item/projectile/beam/pump
+ e_cost = 350
select_name = "kill"
- pellets = 3
+ pellets = 6
variance = 15
fire_sound = 'sound/weapons/ParticleBlaster.ogg'
-/obj/item/ammo_casing/energy/electrode/pump
- projectile_type = /obj/item/projectile/energy/electrode/pump
- select_name = "stun"
+/obj/item/ammo_casing/energy/disabler/pump
+ projectile_type = /obj/item/projectile/energy/disabler/pump
+ select_name = "disable"
fire_sound = 'sound/weapons/LaserSlugv3.ogg'
- e_cost = 300
- pellets = 3
+ e_cost = 150
+ pellets = 6
variance = 20
//PROJECTILES
@@ -181,19 +181,13 @@
speed = 0.6
icon_state = "disablerslug"
-/obj/item/projectile/energy/electrode/pump
- name = "electron blast"
- icon_state = "stunjectile"
+/obj/item/projectile/beam/pump
+ damage = 9
+ range = 6
+
+/obj/item/projectile/energy/disabler/pump
+ name = "disabling blast"
+ icon_state = "disablerslug"
color = null
- nodamage = TRUE
- knockdown = 100
- knockdown_stamoverride = 0
- knockdown_stam_max = 0
- stamina = 18
- stutter = 5
- jitter = 20
- strong_tase = FALSE
- tase_duration = 0
- hitsound = 'sound/weapons/taserhit.ogg'
- range = 3
- strong_tase = FALSE
+ stamina = 13
+ range = 6
diff --git a/modular_citadel/icons/obj/guns/pumpactionblaster.dmi b/modular_citadel/icons/obj/guns/pumpactionblaster.dmi
index 363faf3c57..aed4d49956 100644
Binary files a/modular_citadel/icons/obj/guns/pumpactionblaster.dmi and b/modular_citadel/icons/obj/guns/pumpactionblaster.dmi differ
diff --git a/strings/tips.txt b/strings/tips.txt
index f396b3f542..c8f233bb1a 100644
--- a/strings/tips.txt
+++ b/strings/tips.txt
@@ -63,6 +63,7 @@ As a Roboticist, you can reset a cyborg's module by cutting and mending the rese
As a Roboticist, you can greatly help out Shaft Miners by building a Firefighter APLU equipped with a hydraulic clamp and plasma cutter. The mech is ash storm proof and can even walk across lava!
As a Roboticist, you can augment people with cyborg limbs. Augmented limbs can easily be repaired with cables and welders.
As a Roboticist, you can use your printer that is linked to the ore silo to teleport mats into your work place!
+As a Roboticist, you can upgrade cleanbots with adv mops and brooms to make them faster and better!
As the AI, you can click on people's names to look at them. This only works if there are cameras that can see them.
As the AI, you can quickly open and close doors by holding shift while clicking them, bolt them when holding ctrl, and even shock them while holding alt.
As the AI, you can take pictures with your camera and upload them to newscasters.
diff --git a/tgstation.dme b/tgstation.dme
index 848d149ae0..e1ac9673ff 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -125,6 +125,7 @@
#include "code\__DEFINES\dcs\signals.dm"
#include "code\__DEFINES\flags\shields.dm"
#include "code\__DEFINES\misc\return_values.dm"
+#include "code\__DEFINES\skills\skills.dm"
#include "code\__HELPERS\_cit_helpers.dm"
#include "code\__HELPERS\_lists.dm"
#include "code\__HELPERS\_logging.dm"
@@ -570,6 +571,10 @@
#include "code\datums\ruins\lavaland.dm"
#include "code\datums\ruins\space.dm"
#include "code\datums\ruins\station.dm"
+#include "code\datums\skills\_check_skills.dm"
+#include "code\datums\skills\_skill.dm"
+#include "code\datums\skills\_skill_holder.dm"
+#include "code\datums\skills\medical.dm"
#include "code\datums\status_effects\buffs.dm"
#include "code\datums\status_effects\debuffs.dm"
#include "code\datums\status_effects\gas.dm"