" else text += "|Disabled in Prefs
" @@ -340,7 +352,7 @@ else text += "loyal|EMPLOYEE|cultist" - if(current && current.client && current.client.prefs.be_special & BE_CULTIST) + if(current && current.client && (ROLE_CULTIST in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" @@ -360,7 +372,7 @@ else text += "yes|NO" - if(current && current.client && current.client.prefs.be_special & BE_WIZARD) + if(current && current.client && (ROLE_WIZARD in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" @@ -390,7 +402,7 @@ // if (istype(changeling) && changeling.changelingdeath) // text += "
All the changelings are dead! Restart in [round((changeling.TIME_TO_GET_REVIVED-(world.time-changeling.changelingdeathtime))/10)] seconds." - if(current && current.client && current.client.prefs.be_special & BE_CHANGELING) + if(current && current.client && (ROLE_CHANGELING in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" @@ -415,7 +427,7 @@ else text += "operative|NANOTRASEN" - if(current && current.client && current.client.prefs.be_special & BE_OPERATIVE) + if(current && current.client && (ROLE_OPERATIVE in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" @@ -434,7 +446,7 @@ else text += "traitor|LOYAL" - if(current && current.client && current.client.prefs.be_special & BE_TRAITOR) + if(current && current.client && (ROLE_TRAITOR in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" @@ -453,7 +465,7 @@ else text += "shadowling|thrall|HUMAN" - if(current && current.client && current.client.prefs.be_special & BE_SHADOWLING) + if(current && current.client && (ROLE_SHADOWLING in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" @@ -472,13 +484,45 @@ else text += "Abductor|human" - if(current && current.client && current.client.prefs.be_special & BE_ABDUCTOR) + if(current && current.client && (ROLE_ABDUCTOR in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" sections["abductor"] = text + /** HAND OF GOD **/ + text = "hand of god" + if(ticker.mode.config_tag == "handofgod") + text = uppertext(text) + text = "[text]: " + if(src in ticker.mode.red_deity_prophets) + text += "RED PROPHET|red follower|employee|blue follower|blue prophet|red god|blue god" + else if (src in ticker.mode.red_deity_followers) + text += "red prophet|RED FOLLOWER|employee|blue follower|blue prophet|red god|blue god" + else if (src in ticker.mode.blue_deity_followers) + text += "red prophet|red follower|employee|BLUE FOLLOWER|blue prophet|red god|blue god" + else if (src in ticker.mode.blue_deity_prophets) + text += "red prophet|red follower|employee|blue follower|BLUE PROPHET|red god|blue god" + else if (src in ticker.mode.red_deities) + text += "red prophet|red follower|employee|blue follower|blue prophet|RED GOD|blue god" + else if (src in ticker.mode.blue_deities) + text += "red prophet|red follower|employee|blue follower|blue prophet|red god|BLUE GOD" + else + text += "red prophet|red follower|EMPLOYEE|blue follower|blue prophet|red god|blue god" + + if(current && current.client && (ROLE_HOG_GOD in current.client.prefs.be_special)) + text += "|HOG God Enabled in Prefs" + else + text += "|HOG God Disabled in Prefs" + + if(current && current.client && (ROLE_HOG_CULTIST in current.client.prefs.be_special)) + text += "|HOG Cultist Enabled in Prefs" + else + text += "|HOG Disabled in Prefs" + + sections["follower"] = text + /** MONKEY ***/ if (istype(current, /mob/living/carbon)) text = "monkey" @@ -500,7 +544,7 @@ else text += "healthy|infected|human|OTHER" - if(current && current.client && current.client.prefs.be_special & BE_MONKEY) + if(current && current.client && (ROLE_MONKEY in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" @@ -531,7 +575,7 @@ n_e_robots++ text += "
[n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. Unemag" - if(current && current.client && current.client.prefs.be_special & BE_MALF) + if(current && current.client && (ROLE_MALF in current.client.prefs.be_special)) text += "|Enabled in Prefs" else text += "|Disabled in Prefs" @@ -622,7 +666,7 @@ if(!def_value)//If it's a custom objective, it will be an empty string. def_value = "custom" - var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "steal", "download", "nuclear", "capture", "absorb", "custom") + var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "steal", "download", "nuclear", "capture", "absorb", "custom","follower block (HOG)","build (HOG)","deicide (HOG)", "follower escape (HOG)", "sacrifice prophet (HOG)") if (!new_obj_type) return var/datum/objective/new_objective = null @@ -722,6 +766,22 @@ new_objective.owner = src new_objective.target_amount = target_number + if("follower block (HOG)") + new_objective = new /datum/objective/follower_block + new_objective.owner = src + if("build (HOG)") + new_objective = new /datum/objective/build + new_objective.owner = src + if("deicide (HOG)") + new_objective = new /datum/objective/deicide + new_objective.owner = src + if("follower escape (HOG)") + new_objective = new /datum/objective/escape_followers + new_objective.owner = src + if("sacrifice prophet (HOG)") + new_objective = new /datum/objective/sacrifice_prophet + new_objective.owner = src + if ("custom") var/expl = stripped_input(usr, "Custom objective:", "Objective", objective ? objective.explanation_text : "") if (!expl) return @@ -754,6 +814,46 @@ objective.completed = !objective.completed log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]") + else if (href_list["handofgod"]) + switch(href_list["handofgod"]) + if("clear") //wipe handofgod status + if((src in ticker.mode.red_deity_followers) || (src in ticker.mode.blue_deity_followers) || (src in ticker.mode.red_deity_prophets) || (src in ticker.mode.blue_deity_prophets)) + remove_hog_follower_prophet() + current << "You have been brainwashed... again! Your faith is no more!" + message_admins("[key_name_admin(usr)] has de-hand of god'ed [current].") + log_admin("[key_name(usr)] has de-hand of god'ed [current].") + + if("red follower") + make_Handofgod_follower("red") + message_admins("[key_name_admin(usr)] has red follower'ed [current].") + log_admin("[key_name(usr)] has red follower'ed [current].") + + if("red prophet") + make_Handofgod_prophet("red") + message_admins("[key_name_admin(usr)] has red prophet'ed [current].") + log_admin("[key_name(usr)] has red prophet'ed [current].") + + if("blue follower") + make_Handofgod_follower("blue") + message_admins("[key_name_admin(usr)] has blue follower'ed [current].") + log_admin("[key_name(usr)] has blue follower'ed [current].") + + if("blue prophet") + make_Handofgod_prophet("blue") + message_admins("[key_name_admin(usr)] has blue prophet'ed [current].") + log_admin("[key_name(usr)] has blue prophet'ed [current].") + + if("red god") + make_Handofgod_god("red") + message_admins("[key_name_admin(usr)] has red god'ed [current].") + log_admin("[key_name(usr)] has red god'ed [current].") + + if("blue god") + make_Handofgod_god("blue") + message_admins("[key_name_admin(usr)] has blue god'ed [current].") + log_admin("[key_name(usr)] has blue god'ed [current].") + + else if (href_list["revolution"]) switch(href_list["revolution"]) if("clear") @@ -1069,10 +1169,10 @@ ticker.mode.shadows -= src special_role = null current << "Your powers have been quenched! You are no longer a shadowling!" - remove_spell(/obj/effect/proc_holder/spell/targeted/shadowling_hatch) - remove_spell(/obj/effect/proc_holder/spell/targeted/shadowling_ascend) + remove_spell(/obj/effect/proc_holder/spell/self/shadowling_hatch) + remove_spell(/obj/effect/proc_holder/spell/self/shadowling_ascend) remove_spell(/obj/effect/proc_holder/spell/targeted/enthrall) - remove_spell(/obj/effect/proc_holder/spell/targeted/shadowling_hivemind) + remove_spell(/obj/effect/proc_holder/spell/self/shadowling_hivemind) message_admins("[key_name_admin(usr)] has de-shadowling'ed [current].") log_admin("[key_name(usr)] has de-shadowling'ed [current].") else if(src in ticker.mode.thralls) @@ -1448,6 +1548,118 @@ H.loc = L.loc +/datum/mind/proc/make_Handofgod_follower(colour) + . = 0 + switch(colour) + if("red") + //Remove old allegiances + if(src in ticker.mode.blue_deity_followers || src in ticker.mode.blue_deity_prophets) + current << "You are no longer a member of the Blue cult!" + + ticker.mode.blue_deity_followers -= src + ticker.mode.blue_deity_prophets -= src + current.faction |= "red god" + current.faction -= "blue god" + + if(src in ticker.mode.red_deity_prophets) + current << "You have lost the connection with your deity, but you still believe in their grand design, You are no longer a prophet!" + ticker.mode.red_deity_prophets -= src + + ticker.mode.red_deity_followers |= src + current << "You are now a follower of the red cult's god!" + + special_role = "Hand of God: Red Follower" + . = 1 + if("blue") + //Remove old allegiances + if(src in ticker.mode.red_deity_followers || src in ticker.mode.red_deity_prophets) + current << "You are no longer a member of the Red cult!" + + ticker.mode.red_deity_followers -= src + ticker.mode.red_deity_prophets -= src + current.faction -= "red god" + current.faction |= "blue god" + + if(src in ticker.mode.blue_deity_prophets) + current << "You have lost the connection with your deity, but you still believe in their grand design, You are no longer a prophet!" + ticker.mode.blue_deity_prophets -= src + + ticker.mode.blue_deity_followers |= src + current << "You are now a follower of the blue cult's god!" + + special_role = "Hand of God: Blue Follower" + . = 1 + else + return 0 + + ticker.mode.update_hog_icons_removed(src,"red") + ticker.mode.update_hog_icons_removed(src,"blue") + //ticker.mode.greet_hog_follower(src,colour) + ticker.mode.update_hog_icons_added(src, colour) + +/datum/mind/proc/make_Handofgod_prophet(colour) + . = 0 + switch(colour) + if("red") + //Remove old allegiances + + if(src in ticker.mode.blue_deity_followers || src in ticker.mode.blue_deity_prophets) + current << "You are no longer a member of the Blue cult!" + current.faction -= "blue god" + current.faction |= "red god" + + ticker.mode.blue_deity_followers -= src + ticker.mode.blue_deity_prophets -= src + ticker.mode.red_deity_followers -= src + + ticker.mode.red_deity_prophets |= src + current << "You are now a prophet of the red cult's god!" + + special_role = "Hand of God: Red Prophet" + . = 1 + if("blue") + //Remove old allegiances + + if(src in ticker.mode.red_deity_followers || src in ticker.mode.red_deity_prophets) + current << "You are no longer a member of the Red cult!" + current.faction -= "red god" + current.faction |= "blue god" + + ticker.mode.red_deity_followers -= src + ticker.mode.red_deity_prophets -= src + ticker.mode.blue_deity_followers -= src + + ticker.mode.blue_deity_prophets |= src + current << "You are now a prophet of the blue cult's god!" + + special_role = "Hand of God: Blue Prophet" + . = 1 + + else + return 0 + + ticker.mode.update_hog_icons_removed(src,"red") + ticker.mode.update_hog_icons_removed(src,"blue") + ticker.mode.greet_hog_follower(src,colour) + ticker.mode.update_hog_icons_added(src, colour) + + +/datum/mind/proc/make_Handofgod_god(colour) + switch(colour) + if("red") + current.become_god("red") + ticker.mode.add_god(src,"red") + if("blue") + current.become_god("blue") + ticker.mode.add_god(src,"blue") + else + return 0 + ticker.mode.forge_deity_objectives(src) + ticker.mode.remove_hog_follower(src,0) + ticker.mode.update_hog_icons_added(src, colour) +// ticker.mode.greet_hog_follower(src,colour) + return 1 + /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/spell) spell_list += spell diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm index 1572fd4cf97..c7e53d39b64 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -19,6 +19,7 @@ var/layer_used = MUTATIONS_LAYER //which mutation layer to use var/list/species_allowed = list() //to restrict mutation to only certain species var/health_req //minimum health required to acquire the mutation + var/time_coeff = 1 //coefficient for timed mutations /datum/mutation/human/proc/force_give(mob/living/carbon/human/owner) set_block(owner) @@ -177,6 +178,7 @@ get_chance = 25 lowest_value = 256 * 12 text_gain_indication = "Your body feels warm!" + time_coeff = 5 /datum/mutation/human/cold_resistance/New() ..() @@ -197,6 +199,7 @@ get_chance = 25 lowest_value = 256 * 12 text_gain_indication = "The walls suddenly disappear!" + time_coeff = 2 /datum/mutation/human/x_ray/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -378,6 +381,7 @@ name = "Monkified" quality = NEGATIVE + time_coeff = 2 /datum/mutation/human/race/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -396,6 +400,7 @@ lowest_value = 256 * 12 text_gain_indication = "You begin to fade into the shadows." text_lose_indication = "You become fully visible." + time_coeff = 5 /datum/mutation/human/stealth/on_life(mob/living/carbon/human/owner) @@ -420,6 +425,7 @@ lowest_value = 256 * 12 text_gain_indication = "You feel one with your surroundings." text_lose_indication = "You feel oddly exposed." + time_coeff = 5 /datum/mutation/human/chameleon/on_acquiring(mob/living/carbon/human/owner) if(..()) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index f0600d848ab..8596b5267fe 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -10,7 +10,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin name = "Spell" desc = "A wizard spell" panel = "Spells" - var/sound = "sound/weapons/badZap.ogg" + var/sound = null //The sound the spell makes when it is cast anchored = 1 // Crap like fireball projectiles are proc_holders, this is needed so fireballs don't get blown back into your face via atmos etc. pass_flags = PASSTABLE density = 0 @@ -175,6 +175,8 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin spawn(0) if(charge_type == "recharge" && recharge) start_recharge() + if(sound) + playMagSound() if(prob(critfailchance)) critfail(targets) else @@ -407,4 +409,31 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin return 0 if(nonabstract_req && (isbrain(user) || ispAI(user))) return 0 - return 1 \ No newline at end of file + return 1 + +/obj/effect/proc_holder/spell/self //Targets only the caster. Good for buffs and heals, but probably not wise for fireballs (although they usually fireball themselves anyway, honke) + range = -1 //Duh + +/obj/effect/proc_holder/spell/self/choose_targets(mob/user = usr) + if(!user) + revert_cast() + return + perform(user) + +/obj/effect/proc_holder/spell/self/basic_heal //This spell exists mainly for debugging purposes, and also to show how casting works + name = "Lesser Heal" + desc = "Heals a small amount of brute and burn damage." + human_req = 1 + clothes_req = 0 + charge_max = 100 + cooldown_min = 50 + invocation = "Victus sano!" + invocation_type = "whisper" + school = "restoration" + sound = 'sound/magic/Staff_Healing.ogg' + +/obj/effect/proc_holder/spell/self/basic_heal/cast(mob/living/carbon/human/user) //Note the lack of "list/targets" here. Instead, use a "user" var depending on mob requirements. + //Also, notice the lack of a "for()" statement that looks through the targets. This is, again, because the spell can only have a single target. + user.visible_message("A wreath of gentle light passes over [user]!", "You wreath yourself in healing light!") + user.adjustBruteLoss(-10) + user.adjustFireLoss(-10) diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index 54003d8ed0b..e471cf084a8 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -2,13 +2,15 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser charge_max = 1800 + action_icon_state = "artificer" + action_background_icon_state = "bg_demon" /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser/cult cult_req = 1 charge_max = 2500 /obj/effect/proc_holder/spell/aoe_turf/conjure/floor - name = "Floor Construction" + name = "Summon Cult Floor" desc = "This spell constructs a cult floor" school = "conjuration" @@ -17,11 +19,12 @@ invocation = "none" invocation_type = "none" range = 0 - summon_type = list(/turf/simulated/floor/plasteel/cult) - centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles + summon_type = list(/turf/simulated/floor/engine/cult) + action_icon_state = "floorconstruct" + action_background_icon_state = "bg_cult" /obj/effect/proc_holder/spell/aoe_turf/conjure/wall - name = "Lesser Construction" + name = "Summon Cult Wall" desc = "This spell constructs a cult wall" school = "conjuration" @@ -30,8 +33,10 @@ invocation = "none" invocation_type = "none" range = 0 + action_icon_state = "lesserconstruct" + action_background_icon_state = "bg_cult" + summon_type = list(/turf/simulated/wall/cult) - centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced name = "Greater Construction" @@ -43,7 +48,6 @@ invocation = "none" invocation_type = "none" range = 0 - centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles summon_type = list(/turf/simulated/wall/r_wall) @@ -57,7 +61,8 @@ invocation = "none" invocation_type = "none" range = 0 - + action_icon_state = "summonsoulstone" + action_background_icon_state = "bg_demon" summon_type = list(/obj/item/device/soulstone) @@ -76,8 +81,10 @@ invocation = "none" invocation_type = "none" range = 0 - summon_type = list(/obj/effect/forcefield) + summon_type = list(/obj/effect/forcefield/cult) summon_lifespan = 200 + action_icon_state = "cultforcewall" + action_background_icon_state = "bg_demon" /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift @@ -93,6 +100,8 @@ include_user = 1 jaunt_duration = 50 //in deciseconds centcom_cancast = 0 //Stop people from getting to centcom + action_icon_state = "phaseshift" + action_background_icon_state = "bg_demon" /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(atom/movable/overlay/animation, mob/living/target) animation.icon_state = "phase_shift" @@ -118,6 +127,8 @@ invocation_type = "none" proj_lifespan = 10 max_targets = 6 + action_icon_state = "magicm" + action_background_icon_state = "bg_demon" /obj/effect/proc_holder/spell/targeted/smoke/disable @@ -135,3 +146,5 @@ smoke_spread = 3 smoke_amt = 4 + action_icon_state = "parasmoke" + action_background_icon_state = "bg_cult" diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index e723c5649de..ca80db2b644 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -53,7 +53,7 @@ if(!marked_item || qdeleted(marked_item)) //Wait nevermind user << "Your phylactery is gone!" return - + var/turf/user_turf = get_turf(user) var/turf/item_turf = get_turf(marked_item) @@ -78,6 +78,7 @@ lich << "Your bones clatter and shutter as they're pulled back into this world!" charge_max += 600 var/mob/old_body = current_body + var/turf/body_turf = get_turf(old_body) current_body = lich lich.Weaken(10+10*resurrections) ++resurrections @@ -86,10 +87,10 @@ var/mob/living/carbon/C = old_body for(var/obj/item/W in C) C.unEquip(W) - var/wheres_wizdo = dir2text(get_dir(get_turf(old_body), item_turf)) + var/wheres_wizdo = dir2text(get_dir(body_turf, item_turf)) if(wheres_wizdo) old_body.visible_message("Suddenly [old_body.name]'s corpse falls to pieces! You see a strange energy rise from the remains, and speed off towards the [wheres_wizdo]!") - old_body.Beam(item_turf,icon_state="drain_life",icon='icons/effects/effects.dmi',time=10+10*resurrections,maxdistance=INFINITY) + body_turf.Beam(item_turf,icon_state="lichbeam",icon='icons/effects/effects.dmi',time=10+10*resurrections,maxdistance=INFINITY) old_body.dust() if(!marked_item) //linking item to the spell diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index cb101ef5d8c..7ed4d7e2b68 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -67,7 +67,8 @@ Also, you never added distance checking after target is selected. I've went ahea caster.verbs += V ghost.mind.transfer_to(caster) - caster.key = ghost.key //have to transfer the key since the mind was not active + if(ghost.key) + caster.key = ghost.key //have to transfer the key since the mind was not active if(caster.mind.special_verbs.len)//If they had any special verbs, we add them here. for(var/V in caster.mind.special_verbs) diff --git a/code/datums/spells/shapeshift.dm b/code/datums/spells/shapeshift.dm new file mode 100644 index 00000000000..52a6c24785f --- /dev/null +++ b/code/datums/spells/shapeshift.dm @@ -0,0 +1,72 @@ +/obj/effect/proc_holder/spell/targeted/shapeshift + name = "Shapeshift" + desc = "Change shapes" + clothes_req = 0 + human_req = 0 + charge_max = 200 + cooldown_min = 50 + range = -1 + include_user = 1 + invocation = "RAC'WA NO!" + invocation_type = "shout" + action_icon_state = "shapeshift" + + var/shapeshift_type = /mob/living/simple_animal/hostile/retaliate/goat + var/list/current_shapes = list() + var/list/current_casters = list() + +/obj/effect/proc_holder/spell/targeted/shapeshift/cast(list/targets) + for(var/mob/living/M in targets) + if(M in current_shapes) + Restore(M) + else + Shapeshift(M) + +/obj/effect/proc_holder/spell/targeted/shapeshift/proc/Shapeshift(mob/living/caster) + for(var/mob/living/M in caster) + if(M.status_flags & GODMODE) + caster << "You're already shapeshifted!" + return + + var/mob/living/shape = new shapeshift_type(caster.loc) + caster.loc = shape + caster.status_flags |= GODMODE + + current_shapes |= shape + current_casters |= caster + clothes_req = 0 + human_req = 0 + + caster.mind.transfer_to(shape) + +/obj/effect/proc_holder/spell/targeted/shapeshift/proc/Restore(mob/living/shape) + var/mob/living/caster + for(var/mob/living/M in shape) + if(M in current_casters) + caster = M + break + if(!caster) + return + caster.loc = shape.loc + caster.status_flags &= ~GODMODE + + clothes_req = initial(clothes_req) + human_req = initial(human_req) + current_casters.Remove(caster) + current_shapes.Remove(shape) + + shape.mind.transfer_to(caster) + qdel(shape) //Gib it maybe ? + +/obj/effect/proc_holder/spell/targeted/shapeshift/wild + name = "Wild Shapeshift" + desc = "Change into a variety of forms. Most of them deadly. Or inconspicious" + + var/list/possible_shapes = list(/mob/living/simple_animal/pet/dog/corgi,\ + /mob/living/simple_animal/hostile/poison/giant_spider/hunter,\ + /mob/living/simple_animal/hostile/carp/megacarp,\ + /mob/living/simple_animal/construct/armored) + +/obj/effect/proc_holder/spell/targeted/shapeshift/wild/New() + ..() + shapeshift_type = pick(possible_shapes) \ No newline at end of file diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 3a35a55f2d7..bc3b26bd3b6 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1176,6 +1176,16 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 20 containername = "high-traction floor tiles" +/datum/supply_packs/misc/plasmaman + name = "Plasma-man Supply Kit" + contains = list(/obj/item/clothing/under/plasmaman, + /obj/item/clothing/under/plasmaman, + /obj/item/weapon/tank/internals/plasmaman/belt/full, + /obj/item/weapon/tank/internals/plasmaman/belt/full, + /obj/item/clothing/head/helmet/plasmaman, + /obj/item/clothing/head/helmet/plasmaman) + cost = 20 + containername = "plasma-man supply kit" ///////////// Costumes diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 4a677ab1d4b..1910b88dd9e 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -31,7 +31,7 @@ var/list/uplink_items = list() //Filtered version var/list/filtered_uplink_items = list() - + for(var/category in uplink_items) for(var/datum/uplink_item/I in uplink_items[category]) if(I.gamemodes.len) @@ -406,7 +406,7 @@ var/list/uplink_items = list() /datum/uplink_item/stealthy_weapons/traitor_chem_bottle name = "Poison Kit" - desc = "An assortment of deadly chemicals packed into a compact box. Hard to utilize if there is no method of application." + desc = "An assortment of deadly chemicals packed into a compact box. Comes with a syringe for more precise application." item = /obj/item/weapon/storage/box/syndie_kit/chemical cost = 6 surplus = 50 @@ -441,9 +441,9 @@ var/list/uplink_items = list() /datum/uplink_item/stealthy_weapons/dehy_carp name = "Dehydrated Space Carp" - desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate before use." + desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate in your hand before use so it knows not to kill you." item = /obj/item/toy/carpplushie/dehy_carp - cost = 3 + cost = 1 /datum/uplink_item/stealthy_weapons/door_charge name = "Explosive Airlock Charge" diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index 34a85d4bece..07df1f9770b 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -28,7 +28,7 @@ var/const/WIRE_EXPLODE = 1 /datum/wires/explosive/c4/explode() var/obj/item/weapon/c4/P = holder - P.explode(get_turf(P)) + P.explode() diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 5fc58f1cf87..cdcbfd1526a 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -91,20 +91,24 @@ var/list/teleportlocs = list() icon_state = "space" requires_power = 1 always_unpowered = 1 - lighting_use_dynamic = 0 + lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED power_light = 0 power_equip = 0 power_environ = 0 valid_territory = 0 ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',) +/area/space/nearstation + icon_state = "space_near" + lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT + //These are shuttle areas; all subtypes are only used as teleportation markers, they have no actual function beyond that. /area/shuttle name = "Shuttle" requires_power = 0 luminosity = 1 - lighting_use_dynamic = 1 + lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED has_gravity = 1 valid_territory = 0 icon_state = "shuttle" @@ -150,7 +154,7 @@ var/list/teleportlocs = list() icon_state = "start" requires_power = 0 luminosity = 1 - lighting_use_dynamic = 0 + lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED has_gravity = 1 // CENTCOM @@ -590,58 +594,6 @@ var/list/teleportlocs = list() name = "Law Office" icon_state = "law" - - - - - - -/area/holodeck - name = "Holodeck" - icon_state = "Holodeck" - luminosity = 1 - lighting_use_dynamic = 0 - -/area/holodeck/alphadeck - name = "Holodeck Alpha" - - -/area/holodeck/source_plating - name = "Holodeck - Off" - icon_state = "Holodeck" - -/area/holodeck/source_emptycourt - name = "Holodeck - Empty Court" - -/area/holodeck/source_boxingcourt - name = "Holodeck - Boxing Court" - -/area/holodeck/source_basketball - name = "Holodeck - Basketball Court" - -/area/holodeck/source_thunderdomecourt - name = "Holodeck - Thunderdome Court" - -/area/holodeck/source_beach - name = "Holodeck - Beach" - icon_state = "Holodeck" // Lazy. - -/area/holodeck/source_burntest - name = "Holodeck - Atmospheric Burn Test" - -/area/holodeck/source_wildlife - name = "Holodeck - Wildlife Simulation" - - - - - - - - - - - //Engineering /area/engine @@ -676,30 +628,30 @@ var/list/teleportlocs = list() /area/solar requires_power = 0 luminosity = 1 - lighting_use_dynamic = 0 + lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT valid_territory = 0 - auxport +/area/solar/auxport name = "Fore Port Solar Array" icon_state = "panelsA" - auxstarboard +/area/solar/auxstarboard name = "Fore Starboard Solar Array" icon_state = "panelsA" - fore +/area/solar/fore name = "Fore Solar Array" icon_state = "yellow" - aft +/area/solar/aft name = "Aft Solar Array" icon_state = "aft" - starboard +/area/solar/starboard name = "Aft Starboard Solar Array" icon_state = "panelsS" - port +/area/solar/port name = "Aft Port Solar Array" icon_state = "panelsP" @@ -1252,25 +1204,25 @@ var/list/teleportlocs = list() name = "AI Sat Ext" icon_state = "storage" luminosity = 1 - lighting_use_dynamic = 0 + lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT /area/turret_protected/AIsatextFS name = "AI Sat Ext" icon_state = "storage" luminosity = 1 - lighting_use_dynamic = 0 + lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT /area/turret_protected/AIsatextAS name = "AI Sat Ext" icon_state = "storage" luminosity = 1 - lighting_use_dynamic = 0 + lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT /area/turret_protected/AIsatextAP name = "AI Sat Ext" icon_state = "storage" luminosity = 1 - lighting_use_dynamic = 0 + lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT /area/turret_protected/NewAIMain name = "AI Main New" @@ -1374,7 +1326,7 @@ var/list/teleportlocs = list() name = "Beach" icon_state = "away" luminosity = 1 - lighting_use_dynamic = 0 + lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED requires_power = 0 has_gravity = 1 ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg') diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 45060918323..966b9acdd64 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -37,8 +37,9 @@ power_light = 1 power_equip = 1 power_environ = 1 - luminosity = 1 - lighting_use_dynamic = 0 + + if (lighting_use_dynamic != DYNAMIC_LIGHTING_IFSTARLIGHT) + lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED ..() @@ -325,12 +326,6 @@ var/mob/living/L = A if(!L.ckey) return - if(!L.lastarea) - L.lastarea = get_area(L.loc) - var/area/newarea = get_area(L.loc) - - L.lastarea = newarea - // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch if(L.client && !L.client.ambience_playing && L.client.prefs.toggles & SOUND_SHIP_AMBIENCE) L.client.ambience_playing = 1 diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index e234626288a..3d8a6667603 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -62,7 +62,7 @@ var/global/max_secret_rooms = 6 floortypes = list(/turf/simulated/floor/plasteel,/turf/simulated/floor/engine) treasureitems = list(/obj/machinery/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/critter/cat=2) fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/internal/appendix=2,/obj/structure/closet/crate/freezer=2, - /obj/structure/optable=1,/obj/item/weapon/scalpel=1,/obj/item/weapon/storage/firstaid/regular=3, + /obj/structure/table/optable=1,/obj/item/weapon/scalpel=1,/obj/item/weapon/storage/firstaid/regular=3, /obj/item/weapon/tank/internals/anesthetic=1, /obj/item/weapon/surgical_drapes=2, /obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1) if("cult") diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 2c2bf0e349e..8e1d0b2da09 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -186,8 +186,14 @@ Maxdistance is the longest range the beam will persist before it gives up. if(reagents && is_open_container()) //is_open_container() isn't really the right proc for this, but w/e user << "It contains:" if(reagents.reagent_list.len) - for(var/datum/reagent/R in reagents.reagent_list) - user << "[R.volume] units of [R.name]" + if(user.can_see_reagents()) //Show each individual reagent + for(var/datum/reagent/R in reagents.reagent_list) + user << "[R.volume] units of [R.name]" + else //Otherwise, just show the total volume + var/total_volume = 0 + for(var/datum/reagent/R in reagents.reagent_list) + total_volume += R.volume + user << "[total_volume] units of various reagents" else user << "Nothing." diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 4335c65caad..7e25943ea11 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -7,44 +7,47 @@ /* DATA HUD DATUMS */ -/atom/proc/add_to_all_data_huds() - for(var/datum/atom_hud/data/hud in huds) hud.add_to_hud(src) +/atom/proc/add_to_all_human_data_huds() + for(var/datum/atom_hud/data/human/hud in huds) hud.add_to_hud(src) /atom/proc/remove_from_all_data_huds() for(var/datum/atom_hud/data/hud in huds) hud.remove_from_hud(src) /datum/atom_hud/data -/datum/atom_hud/data/medical +/datum/atom_hud/data/human/medical hud_icons = list(HEALTH_HUD, STATUS_HUD) -/datum/atom_hud/data/medical/basic +/datum/atom_hud/data/human/medical/basic -/datum/atom_hud/data/medical/basic/proc/check_sensors(mob/living/carbon/human/H) +/datum/atom_hud/data/human/medical/basic/proc/check_sensors(mob/living/carbon/human/H) if(!istype(H)) return 0 var/obj/item/clothing/under/U = H.w_uniform if(!istype(U)) return 0 if(U.sensor_mode <= 2) return 0 return 1 -/datum/atom_hud/data/medical/basic/add_to_single_hud(mob/M, mob/living/carbon/H) +/datum/atom_hud/data/human/medical/basic/add_to_single_hud(mob/M, mob/living/carbon/H) if(check_sensors(H)) ..() -/datum/atom_hud/data/medical/basic/proc/update_suit_sensors(mob/living/carbon/H) +/datum/atom_hud/data/human/medical/basic/proc/update_suit_sensors(mob/living/carbon/H) check_sensors(H) ? add_to_hud(H) : remove_from_hud(H) -/datum/atom_hud/data/medical/advanced +/datum/atom_hud/data/human/medical/advanced -/datum/atom_hud/data/security +/datum/atom_hud/data/human/security -/datum/atom_hud/data/security/basic +/datum/atom_hud/data/human/security/basic hud_icons = list(ID_HUD) -/datum/atom_hud/data/security/advanced +/datum/atom_hud/data/human/security/advanced hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD, WANTED_HUD) -/* MED/SEC HUD HOOKS */ +/datum/atom_hud/data/diagnostic + hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD) + +/* MED/SEC/DIAG HUD HOOKS */ /* * THESE HOOKS SHOULD BE CALLED BY THE MOB SHOWING THE HUD @@ -90,7 +93,7 @@ //called when a human changes suit sensors /mob/living/carbon/proc/update_suit_sensors() - var/datum/atom_hud/data/medical/basic/B = huds[DATA_HUD_MEDICAL_BASIC] + var/datum/atom_hud/data/human/medical/basic/B = huds[DATA_HUD_MEDICAL_BASIC] B.update_suit_sensors(src) var/turf/T = get_turf(src) @@ -132,6 +135,7 @@ if(wear_id) holder.icon_state = "hud[ckey(wear_id.GetJobName())]" sec_hud_set_security_status() + var/turf/T = get_turf(src) if (T) crewmonitor.queueUpdate(T.z) @@ -172,3 +176,76 @@ holder.icon_state = "huddischarged" return holder.icon_state = null + +/*********************************************** + Diagnostic HUDs! +************************************************/ + +//For Diag health and cell bars! +/proc/RoundDiagBar(value) + switch(value * 100) + if(95 to INFINITY) + return "max" + if(80 to 100) + return "good" + if(60 to 80) + return "high" + if(40 to 60) + return "med" + if(20 to 40) + return "low" + if(1 to 20) + return "crit" + else + return "dead" + return "dead" + +//Sillycone hooks +/mob/living/silicon/proc/diag_hud_set_health() + var/image/holder = hud_list[DIAG_HUD] + if(stat == DEAD) + holder.icon_state = "huddiagdead" + else + holder.icon_state = "huddiag[RoundDiagBar(health/maxHealth)]" + +/mob/living/silicon/proc/diag_hud_set_status() + var/image/holder = hud_list[DIAG_STAT_HUD] + switch(stat) + if(CONSCIOUS) + holder.icon_state = "hudstat" + if(UNCONSCIOUS) + holder.icon_state = "hudoffline" + else + holder.icon_state = "huddead2" + +//Borgie battery tracking! +/mob/living/silicon/robot/proc/diag_hud_set_borgcell() + var/image/holder = hud_list[DIAG_BATT_HUD] + if (cell) + var/chargelvl = (cell.charge/cell.maxcharge) + holder.icon_state = "hudbatt[RoundDiagBar(chargelvl)]" + else + holder.icon_state = "hudnobatt" + +/*~~~~~~~~~~~~~~~~~~~~ + BIG STOMPY MECHS +~~~~~~~~~~~~~~~~~~~~~*/ +/obj/mecha/proc/diag_hud_set_mechhealth() + var/image/holder = hud_list[DIAG_MECH_HUD] + holder.icon_state = "huddiag[RoundDiagBar(health/initial(health))]" + + +/obj/mecha/proc/diag_hud_set_mechcell() + var/image/holder = hud_list[DIAG_BATT_HUD] + if (cell) + var/chargelvl = cell.charge/cell.maxcharge + holder.icon_state = "hudbatt[RoundDiagBar(chargelvl)]" + else + holder.icon_state = "hudnobatt" + + +/obj/mecha/proc/diag_hud_set_mechstat() + var/image/holder = hud_list[DIAG_STAT_HUD] + holder.icon_state = null + if(internal_damage) + holder.icon_state = "hudwarn" \ No newline at end of file diff --git a/code/game/dna.dm b/code/game/dna.dm index 098f89c9dd2..b15fc10715a 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -9,6 +9,8 @@ var/list/features = list("FFF") //first value is mutant color var/real_name //Stores the real name of the person who originally got this dna datum. Used primarely for changelings, var/list/mutations = list() //All mutations are from now on here + var/list/temporary_mutations = list() //Timers for temporary mutations + var/list/previous = list() //For temporary name/ui/ue/blood_type modifications var/mob/living/carbon/holder /datum/dna/New(mob/living/carbon/new_holder) @@ -22,6 +24,7 @@ destination.set_species(species.type, icon_update=0) destination.dna.features = features destination.dna.real_name = real_name + destination.dna.temporary_mutations = temporary_mutations if(transfer_SE) destination.dna.struc_enzymes = struc_enzymes diff --git a/code/game/gamemodes/abduction/abduction.dm b/code/game/gamemodes/abduction/abduction.dm index 4321082c0aa..bfb25e12699 100644 --- a/code/game/gamemodes/abduction/abduction.dm +++ b/code/game/gamemodes/abduction/abduction.dm @@ -6,7 +6,7 @@ /datum/game_mode/abduction name = "abduction" config_tag = "abduction" - antag_flag = BE_ABDUCTOR + antag_flag = ROLE_ABDUCTOR recommended_enemies = 2 required_players = 15 var/max_teams = 4 diff --git a/code/game/gamemodes/abduction/abduction_gear.dm b/code/game/gamemodes/abduction/abduction_gear.dm index 61a05796c16..75f2066ba27 100644 --- a/code/game/gamemodes/abduction/abduction_gear.dm +++ b/code/game/gamemodes/abduction/abduction_gear.dm @@ -574,11 +574,12 @@ Congratulations! You are now trained for xenobiology research!"} // Operating Table / Beds / Lockers -/obj/structure/optable/abductor +/obj/structure/table/optable/abductor icon = 'icons/obj/abductor.dmi' icon_state = "bed" can_buckle = 1 buckle_lying = 1 + deconstructable = 0 /obj/structure/bed/abductor name = "resting contraption" diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm index 0a8d5814359..fa610dae27b 100644 --- a/code/game/gamemodes/abduction/gland.dm +++ b/code/game/gamemodes/abduction/gland.dm @@ -255,7 +255,7 @@ /obj/item/organ/internal/gland/plasma cooldown_low = 2400 cooldown_high = 3000 - origin_tech = "materials=4;biotech=5;plasma=3" + origin_tech = "materials=4;biotech=5;plasmatech=3" uses = 1 /obj/item/organ/internal/gland/plasma/activate() diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index f2294177272..399d613a92b 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -1,41 +1,49 @@ /datum/atom_hud/antag hud_icons = list(ANTAG_HUD) -/datum/atom_hud/antag/proc/join_hud(mob/living/M) +/datum/atom_hud/antag/proc/join_hud(mob/M) if(!istype(M)) - CRASH("join_hud(): [M] ([M.type]) is not a living mob!") - if(M.mind.antag_hud) - var/datum/atom_hud/antag/oldhud = M.mind.antag_hud - oldhud.leave_hud(M) + CRASH("join_hud(): [M] ([M.type]) is not a mob!") + if(M.mind.antag_hud) //note: please let this runtime if a mob has no mind, as mindless mobs shouldn't be getting antagged + M.mind.antag_hud.leave_hud(M) add_to_hud(M) add_hud_to(M) M.mind.antag_hud = src -/datum/atom_hud/antag/proc/leave_hud(mob/living/M) +/datum/atom_hud/antag/proc/leave_hud(mob/M) if(!istype(M)) - CRASH("leave_hud(): [M] ([M.type]) is not a living mob!") + CRASH("leave_hud(): [M] ([M.type]) is not a mob!") remove_from_hud(M) remove_hud_from(M) - M.mind.antag_hud = null + if(M.mind) + M.mind.antag_hud = null //GAME_MODE PROCS //called to set a mob's antag icon state -/datum/game_mode/proc/set_antag_hud(mob/living/M, new_icon_state) +/datum/game_mode/proc/set_antag_hud(mob/M, new_icon_state) if(!istype(M)) - CRASH("set_antag_hud(): [M] ([M.type]) is not a living mob!") + CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!") var/image/holder = M.hud_list[ANTAG_HUD] - holder.icon_state = new_icon_state - M.mind.antag_hud_icon_state = new_icon_state + if(holder) + holder.icon_state = new_icon_state + if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime + M.mind.antag_hud_icon_state = new_icon_state //MIND PROCS -//this is called by mind.transfer_to() -/datum/mind/proc/transfer_antag_huds(mob/living/M) +//these are called by mind.transfer_to() +/datum/mind/proc/transfer_antag_huds(var/datum/atom_hud/antag/newhud) + leave_all_huds() + ticker.mode.set_antag_hud(current, antag_hud_icon_state) + if(newhud) + newhud.join_hud(current) + +/datum/mind/proc/leave_all_huds() for(var/datum/atom_hud/antag/hud in huds) - if(M in hud.hudusers) - hud.leave_hud(M) - var/image/holder = M.hud_list[ANTAG_HUD] - holder.icon_state = antag_hud_icon_state - if(antag_hud) - antag_hud.join_hud(M) + if(current in hud.hudusers) + hud.leave_hud(current) + + for(var/datum/atom_hud/data/hud in huds) + if(current in hud.hudusers) + hud.remove_hud_from(current) diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 1dde1a9168c..7c5df6a0751 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -53,7 +53,7 @@ if (used) H << "You already used this contract!" return - var/list/candidates = get_candidates(BE_WIZARD) + var/list/candidates = get_candidates(ROLE_WIZARD) if(candidates.len) src.used = 1 var/client/C = pick(candidates) @@ -138,7 +138,7 @@ borg_to_spawn = input("What type?", "Cyborg Type", type) as null|anything in possible_types if(!borg_to_spawn) return - var/list/borg_candicates = get_candidates(BE_OPERATIVE, 3000, "operative") + var/list/borg_candicates = get_candidates(ROLE_OPERATIVE, 3000, "operative") if(borg_candicates.len > 0) used = 1 var/client/C = pick(borg_candicates) @@ -174,7 +174,7 @@ /obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user) - var/list/demon_candidates = get_candidates(BE_ALIEN) + var/list/demon_candidates = get_candidates(ROLE_ALIEN) if(user.z != 1) user << "You should probably wait until you reach the station." return diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 01e4bf2e05a..f8f120c4b22 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -9,7 +9,7 @@ var/list/blob_nodes = list() /datum/game_mode/blob name = "blob" config_tag = "blob" - antag_flag = BE_BLOB + antag_flag = ROLE_BLOB required_players = 30 required_enemies = 1 @@ -52,7 +52,7 @@ var/list/blob_nodes = list() /datum/game_mode/blob/proc/get_blob_candidates() var/list/candidates = list() for(var/mob/living/carbon/human/player in player_list) - if(!player.stat && player.mind && !player.mind.special_role && !jobban_isbanned(player, "Syndicate") && (player.client.prefs.be_special & BE_BLOB)) + if(!player.stat && player.mind && !player.mind.special_role && !jobban_isbanned(player, "Syndicate") && (ROLE_BLOB in player.client.prefs.be_special)) if(age_check(player.client)) candidates += player return candidates diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index b4abfdc9e57..e7647a048b0 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -98,7 +98,7 @@ var/list/candidates = list() if(!new_overmind) - candidates = get_candidates(BE_BLOB) + candidates = get_candidates(ROLE_BLOB) if(candidates.len) C = pick(candidates) else diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index c6033743ce7..f1101aa26fb 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -15,7 +15,7 @@ var/list/slot2type = list("head" = /obj/item/clothing/head/changeling, "wear_mas /datum/game_mode/changeling name = "changeling" config_tag = "changeling" - antag_flag = BE_CHANGELING + antag_flag = ROLE_CHANGELING restricted_jobs = list("AI", "Cyborg") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_players = 15 @@ -105,8 +105,8 @@ var/list/slot2type = list("head" = /obj/item/clothing/head/changeling, "wear_mas if(ticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists return if(ticker.mode.changelings.len <= (changelingcap - 2) || prob(100 - (config.changeling_scaling_coeff*2))) - if(character.client.prefs.be_special & BE_CHANGELING) - if(!jobban_isbanned(character.client, "changeling") && !jobban_isbanned(character.client, "Syndicate")) + if(ROLE_CHANGELING in character.client.prefs.be_special) + if(!jobban_isbanned(character.client, ROLE_CHANGELING) && !jobban_isbanned(character.client, "Syndicate")) if(age_check(character.client)) if(!(character.job in restricted_jobs)) character.mind.make_Changling() diff --git a/code/game/gamemodes/changeling/powers/biodegrade.dm b/code/game/gamemodes/changeling/powers/biodegrade.dm index f831655d2c8..c6bcb302ace 100644 --- a/code/game/gamemodes/changeling/powers/biodegrade.dm +++ b/code/game/gamemodes/changeling/powers/biodegrade.dm @@ -3,8 +3,10 @@ desc = "Dissolves restraints or other objects preventing free movement." helptext = "This is obvious to nearby people, and can destroy standard restraints and closets." chemical_cost = 30 //High cost to prevent spam - dna_cost = 1 + dna_cost = 2 req_human = 1 + genetic_damage = 10 + max_genetic_damage = 0 /obj/effect/proc_holder/changeling/biodegrade/sting_action(mob/living/carbon/human/user) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index ede5aa3e50b..613f8bcf1b7 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -31,3 +31,9 @@ feedback_add_details("changeling_powers","CR") user.stat = CONSCIOUS return 1 + +/obj/effect/proc_holder/changeling/revive/can_be_used_by(mob/user) + if((user.stat != DEAD) && !(user.status_flags & FAKEDEATH)) + user.mind.changeling.purchasedpowers -= src + return 0 + . = ..() diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 08c2bbfe5c9..da55f48d844 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -74,6 +74,9 @@ selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA") if(!selected_dna) return + if(NOTRANSSTING in selected_dna.dna.species.specflags) + user << "That DNA is not compatible with changeling retrovirus!" + return ..() /obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/target) diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index b236141c7f3..2d906e37ed0 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -18,7 +18,7 @@ /datum/game_mode/traitor/changeling/can_start() if(!..()) return 0 - possible_changelings = get_players_for_role(BE_CHANGELING) + possible_changelings = get_players_for_role(ROLE_CHANGELING) if(possible_changelings.len < required_enemies) return 0 return 1 @@ -30,7 +30,7 @@ if(config.protect_assistant_from_antagonist) restricted_jobs += "Assistant" - var/list/datum/mind/possible_changelings = get_players_for_role(BE_CHANGELING) + var/list/datum/mind/possible_changelings = get_players_for_role(ROLE_CHANGELING) var/num_changelings = 1 @@ -66,8 +66,8 @@ ..() return if(ticker.mode.changelings.len <= (changelingcap - 2) || prob(100 / (config.changeling_scaling_coeff * 4))) - if(character.client.prefs.be_special & BE_CHANGELING) - if(!jobban_isbanned(character.client, "changeling") && !jobban_isbanned(character.client, "Syndicate")) + if(ROLE_CHANGELING in character.client.prefs.be_special) + if(!jobban_isbanned(character.client, ROLE_CHANGELING) && !jobban_isbanned(character.client, "Syndicate")) if(age_check(character.client)) if(!(character.job in restricted_jobs)) character.mind.make_Changling() diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 86068219c85..09165d33d4a 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -51,7 +51,7 @@ /datum/game_mode/cult name = "cult" config_tag = "cult" - antag_flag = BE_CULTIST + antag_flag = ROLE_CULTIST restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") protected_jobs = list() required_players = 20 @@ -187,6 +187,8 @@ cult_mind.current.cult_add_comm() update_cult_icons_added(cult_mind) cult_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the cult!" + if(jobban_isbanned(cult_mind.current, "Cultist")) + replace_jobbaned_player(cult_mind.current, "Cultist") return 1 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 49e58c0a03a..aac9e0b23a2 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -292,20 +292,6 @@ var/list/drafted = list() var/datum/mind/applicant = null - var/roletext - switch(role) - if(BE_CHANGELING) roletext="changeling" - if(BE_TRAITOR) roletext="traitor" - if(BE_OPERATIVE) roletext="operative" - if(BE_WIZARD) roletext="wizard" - if(BE_REV) roletext="revolutionary" - if(BE_GANG) roletext="gangster" - if(BE_CULTIST) roletext="cultist" - if(BE_MONKEY) roletext="monkey" - if(BE_ABDUCTOR) roletext="abductor" - if(BE_SHADOWLING) roletext="shadowling" - - // Ultimate randomizing code right here for(var/mob/new_player/player in player_list) if(player.client && player.ready) @@ -317,8 +303,8 @@ for(var/mob/new_player/player in players) if(player.client && player.ready) - if(player.client.prefs.be_special & role) - if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, roletext)) //Nodrak/Carn: Antag Job-bans + if(role in player.client.prefs.be_special) + if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans if(age_check(player.client)) //Must be older than the minimum age candidates += player.mind // Get a list of all the people who want to be the antagonist for this round @@ -331,8 +317,8 @@ if(candidates.len < recommended_enemies) for(var/mob/new_player/player in players) if(player.client && player.ready) - if(!(player.client.prefs.be_special & role)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one - if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, roletext)) //Nodrak/Carn: Antag Job-bans + if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one + if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans drafted += player.mind if(restricted_jobs) @@ -398,22 +384,38 @@ //Keeps track of all living heads// /////////////////////////////////// /datum/game_mode/proc/get_living_heads() - var/list/heads = list() + . = list() for(var/mob/living/carbon/human/player in mob_list) - if(player.stat!=2 && player.mind && (player.mind.assigned_role in command_positions)) - heads |= player.mind - return heads + if(player.stat != DEAD && player.mind && (player.mind.assigned_role in command_positions)) + . |= player.mind //////////////////////////// //Keeps track of all heads// //////////////////////////// /datum/game_mode/proc/get_all_heads() - var/list/heads = list() + . = list() for(var/mob/player in mob_list) if(player.mind && (player.mind.assigned_role in command_positions)) - heads |= player.mind - return heads + . |= player.mind + +////////////////////////////////////////////// +//Keeps track of all living security members// +////////////////////////////////////////////// +/datum/game_mode/proc/get_living_sec() + . = list() + for(var/mob/living/carbon/human/player in mob_list) + if(player.stat != DEAD && player.mind && (player.mind.assigned_role in security_positions)) + . |= player.mind + +//////////////////////////////////////// +//Keeps track of all security members// +//////////////////////////////////////// +/datum/game_mode/proc/get_all_sec() + . = list() + for(var/mob/living/carbon/human/player in mob_list) + if(player.mind && (player.mind.assigned_role in security_positions)) + . |= player.mind ////////////////////////// //Reports player logouts// @@ -515,3 +517,19 @@ return 0 return max(0, enemy_minimum_age - C.player_age) + +/datum/game_mode/proc/replace_jobbaned_player(mob/living/M, role_type, pref) + var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a [role_type]?", "[role_type]", null, pref, 100) + var/mob/dead/observer/theghost = null + if(candidates.len) + theghost = pick(candidates) + M << "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!" + message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbaned player.") + M.ghostize() + M.key = theghost.key + +/datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie) + ticker.mode.remove_cultist(newborgie, 0) + ticker.mode.remove_revolutionary(newborgie, 0) + ticker.mode.remove_gangster(newborgie, 0, remove_bosses=1) + ticker.mode.remove_hog_follower(newborgie, 0) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index f6b6aed3925..0060304e861 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -22,7 +22,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" /datum/game_mode/gang name = "gang war" config_tag = "gang" - antag_flag = BE_GANG + antag_flag = ROLE_GANG restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") required_players = 20 required_enemies = 2 @@ -184,6 +184,8 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" gangster_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the [G.name] Gang!" gangster_mind.special_role = "[G.name] Gangster" G.add_gang_hud(gangster_mind) + if(jobban_isbanned(gangster_mind.current, "Gangster")) + replace_jobbaned_player(gangster_mind.current, "Gangster") return 2 //////////////////////////////////////////////////////////////////// //Deals with players reverting to neutral (Not a gangster anymore)// diff --git a/code/game/gamemodes/handofgod/_handofgod.dm b/code/game/gamemodes/handofgod/_handofgod.dm new file mode 100644 index 00000000000..5591897e264 --- /dev/null +++ b/code/game/gamemodes/handofgod/_handofgod.dm @@ -0,0 +1,464 @@ + +var/global/list/global_handofgod_traptypes = list() +var/global/list/global_handofgod_structuretypes = list() + +#define CONDUIT_RANGE 15 + + +/datum/game_mode + var/list/datum/mind/red_deities = list() + var/list/datum/mind/red_deity_prophets = list() + var/list/datum/mind/red_deity_followers = list() + + var/list/datum/mind/blue_deities = list() + var/list/datum/mind/blue_deity_prophets = list() + var/list/datum/mind/blue_deity_followers = list() + + var/list/datum/mind/unassigned_followers = list() //for roundstart team assigning + var/list/datum/mind/assigned_to_red = list() + var/list/datum/mind/assigned_to_blue = list() + + +/datum/game_mode/hand_of_god + name = "hand of god" + config_tag = "handofgod" + antag_flag = ROLE_HOG_CULTIST //Followers use ROLE_HOG_CULTIST, Gods are picked later on with ROLE_HOG_GOD + + required_players = 25 + required_enemies = 8 + recommended_enemies = 8 + restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") + + +/datum/game_mode/hand_of_god/announce() + world << "The current game mode is - Hand of God!" + world << "Two cults are onboard the station, seeking to overthrow the other, and anyone who stands in their way." + world << "Followers - Complete your deity's objectives. Convert crewmembers to your cause by using your deity's nexus. Remember - there is no you, there is only the cult." + world << "Prophets - Command your cult by the will of your deity. You are a high-value target, so be careful!" + world << "Personnel - Do not let any cult succeed in its mission. Loyalty implants and holy water will revert them to neutral, hopefully nonviolent crew." + + +///////////// +//Pre setup// +///////////// + +/datum/game_mode/hand_of_god/pre_setup() + if(config.protect_roles_from_antagonist) + restricted_jobs += protected_jobs + + if(config.protect_assistant_from_antagonist) + restricted_jobs += "Assistant" + + for(var/F in 1 to recommended_enemies) + if(!antag_candidates.len) + break + var/datum/mind/follower = pick_n_take(antag_candidates) + unassigned_followers += follower + follower.restricted_roles = restricted_jobs + log_game("[follower.key] (ckey) has been selected as a follower, however teams have not been decided yet.") + + while(unassigned_followers.len > (required_enemies / 2)) + var/datum/mind/chosen = pick_n_take(unassigned_followers) + add_hog_follower(chosen,"red") + + while(unassigned_followers.len) + var/datum/mind/chosen = pick_n_take(unassigned_followers) + add_hog_follower(chosen,"blue") + + return 1 + + +////////////// +//Post Setup// +////////////// + +//Pick a follower to uplift into a god +/datum/game_mode/hand_of_god/post_setup() + + //Find viable red god + var/list/red_god_possibilities = get_players_for_role(ROLE_HOG_GOD) + red_god_possibilities &= red_deity_followers //followers only + if(!red_god_possibilities.len) //No candidates? just pick any follower regardless of prefs + red_god_possibilities = red_deity_followers + + //Make red god + var/datum/mind/red_god = pick_n_take(red_god_possibilities) + if(red_god) + red_god.current.become_god("red") + remove_hog_follower(red_god,0) + add_god(red_god,"red") + + //Find viable blue god + var/list/blue_god_possibilities = get_players_for_role(ROLE_HOG_GOD) + blue_god_possibilities &= blue_deity_followers //followers only + if(!blue_god_possibilities.len) //No candidates? just pick any follower regardless of prefs + blue_god_possibilities = blue_deity_followers + + //Make blue god + var/datum/mind/blue_god = pick_n_take(blue_god_possibilities) + if(blue_god) + blue_god.current.become_god("blue") + remove_hog_follower(blue_god,0) + add_god(blue_god,"blue") + + + //Forge objectives + //This is done here so that both gods exist + if(red_god) + ticker.mode.forge_deity_objectives(red_god) + if(blue_god) + ticker.mode.forge_deity_objectives(blue_god) + + + ..() + +/////////////////// +//Objective Procs// +/////////////////// + +/datum/game_mode/proc/forge_deity_objectives(datum/mind/deity) + switch(rand(1,100)) + if(1 to 30) + var/datum/objective/deicide/deicide = new + deicide.owner = deity + deicide.find_target() + deity.objectives += deicide + + if(!(locate(/datum/objective/escape_followers) in deity.objectives)) + var/datum/objective/escape_followers/recruit = new + recruit.owner = deity + deity.objectives += recruit + recruit.gen_amount_goal(8, 12) + + if(31 to 60) + var/datum/objective/sacrifice_prophet/sacrifice = new + sacrifice.owner = deity + deity.objectives += sacrifice + + if(!(locate(/datum/objective/escape_followers) in deity.objectives)) + var/datum/objective/escape_followers/recruit = new + recruit.owner = deity + deity.objectives += recruit + recruit.gen_amount_goal(8, 12) + + if(61 to 85) + var/datum/objective/build/build = new + build.owner = deity + deity.objectives += build + build.gen_amount_goal(8, 16) + + var/datum/objective/sacrifice_prophet/sacrifice = new + sacrifice.owner = deity + deity.objectives += sacrifice + + if(!(locate(/datum/objective/escape_followers) in deity.objectives)) + var/datum/objective/escape_followers/recruit = new + recruit.owner = deity + deity.objectives += recruit + recruit.gen_amount_goal(8, 12) + + else + if (!locate(/datum/objective/follower_block) in deity.objectives) + var/datum/objective/follower_block/block = new + block.owner = deity + deity.objectives += block + +/////////////// +//Greet procs// +/////////////// + +/datum/game_mode/proc/greet_hog_follower(datum/mind/follower_mind,colour) + if(follower_mind in blue_deity_prophets || follower_mind in red_deity_prophets) + follower_mind.current << "You have been appointed as the prophet of the [colour] deity! You are the only one who can communicate with your deity at will. Guide your followers, but be wary, for many will want you dead." + else if(colour) + follower_mind.current << "You are a follower of the [colour] cult's deity!" + else + follower_mind.current << "You are a follower of a cult's deity!" + + +///////////////// +//Convert procs// +///////////////// + +/datum/game_mode/proc/add_hog_follower(datum/mind/follower_mind, colour = "No Colour") + var/mob/living/carbon/human/H = follower_mind.current + if(isloyal(H)) + H << "Your loyalty implant blocked the influence of the [colour] deity. " + return 0 + if((follower_mind in red_deity_followers) || (follower_mind in red_deity_prophets) || (follower_mind in blue_deity_followers) || (follower_mind in blue_deity_prophets)) + H << "You already belong to a deity. Your strong faith has blocked out the conversion attempt by the followers of the [colour] deity." + return 0 + var/obj/item/weapon/nullrod/N = locate() in H + if(N) + H << "Your null rod prevented the [colour] deity from brainwashing you." + return 0 + + if(colour == "red") + red_deity_followers += follower_mind + if(colour == "blue") + blue_deity_followers += follower_mind + + H.faction |= "[colour] god" + follower_mind.current << "You are now a follower of the [colour] deity! Follow your deity's prophet in order to complete your deity's objectives. Convert crewmembers to your cause by using your deity's nexus. And remember - there is no you, there is only the cult." + update_hog_icons_added(follower_mind, colour) + follower_mind.special_role = "Hand of God: [capitalize(colour)] Follower" + follower_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the [colour] follower cult!" + return 1 + + +/datum/game_mode/proc/add_god(datum/mind/god_mind, colour = "No Colour") + remove_hog_follower(god_mind, announce = 0) + if(colour == "red") + red_deities += god_mind + if(colour == "blue") + blue_deities += god_mind + god_mind.current.attack_log += "\[[time_stamp()]\] Has been made into a [colour] deity!" + god_mind.special_role = "Hand of God: [colour] God" + update_hog_icons_added(god_mind, colour) + +////////////////// +//Deconvert proc// +////////////////// + +/datum/game_mode/proc/remove_hog_follower(datum/mind/follower_mind, announce = 1)//deconverts both + follower_mind.remove_hog_follower_prophet() + update_hog_icons_removed(follower_mind,"red") + update_hog_icons_removed(follower_mind,"blue") + + if(follower_mind.current) + var/mob/living/carbon/human/H = follower_mind.current + H.faction -= "red god" + H.faction -= "blue god" + + if(announce) + follower_mind.current.attack_log += "\[[time_stamp()]\] Has been deconverted from a deity's cult!" + follower_mind.current << "Your mind has been cleared from the brainwashing the followers have done to you. Now you serve yourself and the crew." + for(var/mob/living/M in view(follower_mind.current)) + M << "[follower_mind.current] looks like their faith is shattered. They're no longer a cultist!" + + + +////////////////////// +// Mob helper procs // +////////////////////// + +/proc/is_handofgod_god(A) + if(istype(A, /mob/camera/god)) + return 1 + return 0 + + +/proc/is_handofgod_bluecultist(A) + if(ishuman(A)) + var/mob/living/carbon/human/H = A + if(H.mind) + if(H.mind in ticker.mode.blue_deity_followers|ticker.mode.blue_deity_prophets) + return 1 + return 0 + + +/proc/is_handofgod_redcultist(A) + if(ishuman(A)) + var/mob/living/carbon/human/H = A + if(H.mind) + if(H.mind in ticker.mode.red_deity_followers|ticker.mode.red_deity_prophets) + return 1 + return 0 + + +/proc/is_handofgod_blueprophet(A) + if(ishuman(A)) + var/mob/living/carbon/human/H = A + if(H.mind) + if(H.mind in ticker.mode.blue_deity_prophets) + return 1 + return 0 + + +/proc/is_handofgod_redprophet(A) + if(ishuman(A)) + var/mob/living/carbon/human/H = A + if(H.mind) + if(H.mind in ticker.mode.red_deity_prophets) + return 1 + return 0 + + + +/proc/is_handofgod_cultist(A) //any of them what so ever, blue, red, hot pink, whatever. + if(is_handofgod_redcultist(A)) + return 1 + if(is_handofgod_bluecultist(A)) + return 1 + return 0 + + +/proc/is_handofgod_prophet(A) //any of them what so ever, blue, red, hot pink, whatever + if(ishuman(A)) + var/mob/living/carbon/human/H = A + if(H.mind) + if(H.mind in ticker.mode.blue_deity_prophets|ticker.mode.red_deity_prophets) + return 1 + return 0 + + +/mob/camera/god/proc/is_handofgod_myprophet(A) + if(!ishuman(A)) + return 0 + var/mob/living/carbon/human/H = A + if(!H.mind) + return 0 + if(side == "red") + if(H.mind in ticker.mode.red_deity_prophets) + return 1 + else if(side == "blue") + if(H.mind in ticker.mode.blue_deity_prophets) + return 1 + + + +////////////////////// +//Roundend Reporting// +////////////////////// + + +/datum/game_mode/hand_of_god/declare_completion() + if(red_deities.len) + var/text = "
The red cult:" + for(var/datum/mind/red_god in red_deities) + var/godwin = 1 + + text += "
[red_god.key] was the red deity, [red_god.name] (" + if(red_god.current) + if(red_god.current.stat == DEAD) + text += "died" + else + text += "survived" + else + text += "ceased existing" + text += ")" + if(red_deity_prophets.len) + for(var/datum/mind/red_prophet in red_deity_prophets) + text += "
The red prophet was [red_prophet.name] ([red_prophet.key])" + else + text += "
the red prophet was killed for their beliefs." + + text += "
Red follower count: [red_deity_followers.len]" + text += "
Red followers: " + for(var/datum/mind/player in red_deity_followers) + text += "[player.name] ([player.key])" + + var/objectives = "" + if(red_god.objectives.len) + var/count = 1 + for(var/datum/objective/O in red_god.objectives) + if(O.check_completion()) + objectives += "
Objective #[count]: [O.explanation_text] Success!" + feedback_add_details("god_objective","[O.type]|SUCCESS") + else + objectives += "
Objective #[count]: [O.explanation_text] Fail." + feedback_add_details("god_objective","[O.type]|FAIL") + godwin = 0 + count++ + + text += objectives + + if(godwin) + text += "
The red cult and deity were successful!" + feedback_add_details("god_success","SUCCESS") + else + text += "
The red cult and deity have failed!" + feedback_add_details("god_success","FAIL") + + text += "
" + + world << text + + if(blue_deities.len) + var/text = "
The blue cult:" + for(var/datum/mind/blue_god in blue_deities) + var/godwin = 1 + + text += "
[blue_god.key] was the blue deity, [blue_god.name] (" + if(blue_god.current) + if(blue_god.current.stat == DEAD) + text += "died" + else + text += "survived" + else + text += "ceased existing" + text += ")" + if(blue_deity_prophets.len) + for(var/datum/mind/blue_prophet in blue_deity_prophets) + text += "
The blue prophet was [blue_prophet.name] ([blue_prophet.key])" + else + text += "
the blue prophet was killed for their beliefs." + + text += "
Blue follower count: [blue_deity_followers.len]" + text += "
Blue followers: " + for(var/datum/mind/player in blue_deity_followers) + text += "[player.name] ([player.key])" + + var/objectives = "" + if(blue_god.objectives.len) + var/count = 1 + for(var/datum/objective/O in blue_god.objectives) + if(O.check_completion()) + objectives += "
Objective #[count]: [O.explanation_text] Success!" + feedback_add_details("god_objective","[O.type]|SUCCESS") + else + objectives += "
Objective #[count]: [O.explanation_text] Fail." + feedback_add_details("god_objective","[O.type]|FAIL") + godwin = 0 + count++ + + text += objectives + + if(godwin) + text += "
The blue cult and deity were successful!" + feedback_add_details("god_success","SUCCESS") + else + text += "
The blue cult and deity have failed!" + feedback_add_details("god_success","FAIL") + + text += "
" + + world << text + + ..() + return 1 + + +/datum/game_mode/proc/update_hog_icons_added(datum/mind/hog_mind,side) + var/hud_key + var/rank = 0 + if(side == "red") + hud_key = ANTAG_HUD_HOG_RED + if(is_handofgod_redprophet(hog_mind.current)) + rank = 1 + + else if(side == "blue") + hud_key = ANTAG_HUD_HOG_BLUE + if(is_handofgod_blueprophet(hog_mind.current)) + rank = 1 + + if(is_handofgod_god(hog_mind.current)) + rank = 2 + + if(hud_key) + var/datum/atom_hud/antag/hog_hud = huds[hud_key] + hog_hud.join_hud(hog_mind.current) + set_antag_hud(hog_mind.current, "hog-[side]-[rank]") + + +/datum/game_mode/proc/update_hog_icons_removed(datum/mind/hog_mind,side) + var/hud_key + if(side == "red") + hud_key = ANTAG_HUD_HOG_RED + else if(side == "blue") + hud_key = ANTAG_HUD_HOG_BLUE + + if(hud_key) + var/datum/atom_hud/antag/hog_hud = huds[hud_key] + hog_hud.leave_hud(hog_mind.current) + set_antag_hud(hog_mind.current,null) diff --git a/code/game/gamemodes/handofgod/actions.dm b/code/game/gamemodes/handofgod/actions.dm new file mode 100644 index 00000000000..76949a66487 --- /dev/null +++ b/code/game/gamemodes/handofgod/actions.dm @@ -0,0 +1,21 @@ + + + +/datum/action/innate/godspeak + name = "Godspeak" + button_icon_state = "godspeak" + check_flags = AB_CHECK_ALIVE + var/mob/camera/god/god = null + +/datum/action/innate/godspeak/IsAvailable() + if(..()) + if(god) + return 1 + return 0 + +/datum/action/innate/godspeak/Activate() + var/msg = input(owner,"Speak to your god","Godspeak","") as null|text + if(!msg) + return + god << "[owner]: [msg]" + owner << "You say: [msg]" diff --git a/code/game/gamemodes/handofgod/god.dm b/code/game/gamemodes/handofgod/god.dm new file mode 100644 index 00000000000..9b30a016ff2 --- /dev/null +++ b/code/game/gamemodes/handofgod/god.dm @@ -0,0 +1,273 @@ + +/mob/camera/god + name = "deity" //Auto changes to the player's deity name/random name + real_name = "deity" + icon = 'icons/mob/mob.dmi' + icon_state = "marker" + invisibility = 60 + see_in_dark = 0 + sight = SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF + languages = HUMAN | MONKEY | ALIEN | ROBOT | SLIME | DRONE | SWARMER + hud_possible = list(ANTAG_HUD) + mouse_opacity = 0 //can't be clicked + + var/faith = 100 //For initial prophet appointing/stupid purchase + var/max_faith = 100 + var/side = "neutral" //Red or Blue for the gamemode + var/obj/structure/divine/nexus/god_nexus = null //The source of the god's power in this realm, kill it and the god is kill + var/nexus_required = FALSE //If the god dies from losing it's nexus, defaults to off so that gods don't instantly die at roundstart + var/followers_required = 0 //Same as above + var/alive_followers = 0 + var/list/structures = list() + var/list/conduits = list() + var/prophets_sacrificed_in_name = 0 + + +/mob/camera/god/New() + ..() + update_icons() + build_hog_construction_lists() + + //Force nexuses after 2 minutes in hand of god mode + if(ticker && ticker.mode && ticker.mode.name == "hand of god") + addtimer(src,"forceplacenexus",1200) + + +//Rebuilds the list based on the gamemode's lists +//As they are the most accurate each tick +/mob/camera/god/proc/get_my_followers() + switch(side) + if("red") + . = ticker.mode.red_deity_followers|ticker.mode.red_deity_prophets + if("blue") + . = ticker.mode.blue_deity_followers|ticker.mode.blue_deity_prophets + else + . = list() + + +/mob/camera/god/Destroy() + var/list/followers = get_my_followers() + for(var/datum/mind/F in followers) + if(F.current) + F.current << "Your god is DEAD!" + + return ..() + + + +/mob/camera/god/proc/forceplacenexus() + if(god_nexus) + return + + if(ability_cost(0,1,0)) + place_nexus() + + else + if(blobstart.len) //we're on invalid turf, try to pick from blobstart + loc = pick(blobstart) + place_nexus() //if blobstart fails, places on dense turf, but better than nothing + src << "You failed to place your nexus, and it has been placed for you!" + + +/mob/camera/god/update_icons() + icon_state = "[initial(icon_state)]-[side]" + + +/mob/camera/god/Stat() + ..() + if(statpanel("Status")) + if(god_nexus) + stat("Nexus health: ", god_nexus.health) + stat("Followers: ", alive_followers) + stat("Faith: ", "[faith]/[max_faith]") + + +/mob/camera/god/Login() + ..() + sync_mind() + src << "You are a deity!" + src << "You are a deity and are worshipped by a cult! You are rather weak right now, but that will change as you gain more followers." + src << "You will need to place an anchor to this world, a Nexus, in two minutes. If you don't, one will be placed immediately below you." + src << "Your Follower count determines how many people believe in you and are a part of your cult." + src << "Your Nexus Integrity tells you the condition of your nexus. If your nexus is destroyed, you will die. Place your Nexus on a safe, isolated place, that is still accessible to your followers." + src << "Your Faith is used to interact with the world. This will regenerate on its own, and it goes faster when you have more followers and power pylons." + src << "The first thing you should do after placing your nexus is to appoint a prophet. Only prophets can hear you talk, unless you use an expensive power." + update_health_hud() + + +/mob/camera/god/proc/update_health_hud() + if(god_nexus && hud_used && hud_used.deity_health_display) + hud_used.deity_health_display.maptext = "
[god_nexus.health]
"
+
+
+/mob/camera/god/proc/add_faith(faith_amt)
+ if(faith_amt)
+ faith = round(Clamp(faith+faith_amt, 0, max_faith))
+ if(hud_used && hud_used.deity_power_display)
+ hud_used.deity_power_display.maptext = " [faith]
"
+
+
+
+/mob/camera/god/proc/place_nexus()
+ if(god_nexus || (z != 1))
+ return 0
+
+ var/obj/structure/divine/nexus/N = new(get_turf(src))
+ N.assign_deity(src)
+ god_nexus = N
+ nexus_required = TRUE
+ verbs -= /mob/camera/god/verb/constructnexus
+ //verbs += /mob/camera/god/verb/movenexus //Translocators have no sprite
+ update_health_hud()
+
+ var/area/A = get_area(src)
+ if(A)
+ var/areaname = A.name
+ var/list/followers = get_my_followers()
+ for(var/datum/mind/F in followers)
+ if(F.current)
+ F.current << "Your god's nexus is in \the [areaname]"
+
+
+/mob/camera/god/verb/freeturret()
+ set category = "Deity"
+ set name = "Free Turret (0)"
+ set desc = "Place a single turret, for 0 faith."
+
+ if(!ability_cost(0,1,1))
+ return
+ var/obj/structure/divine/defensepylon/DP = new(get_turf(src))
+ DP.assign_deity(src)
+ verbs -= /mob/camera/god/verb/freeturret
+
+
+
+/mob/camera/god/proc/update_followers()
+ alive_followers = 0
+ var/list/all_followers = get_my_followers()
+ for(var/datum/mind/F in all_followers)
+ if(F.current && F.current.stat != DEAD)
+ alive_followers++
+
+ if(hud_used && hud_used.deity_follower_display)
+ hud_used.deity_follower_display.maptext = " [alive_followers]
"
+
+
+/mob/camera/god/proc/check_death()
+ if(!alive_followers)
+ src << "You no longer have any followers. You shudder as you feel your existence cease..."
+ if(god_nexus && !qdeleted(god_nexus))
+ god_nexus.visible_message("\The [src] suddenly disappears!")
+ qdel(god_nexus)
+ qdel(src)
+
+
+/mob/camera/god/say(msg)
+ if(!msg)
+ return
+ if(client)
+ if(client.prefs.muted & MUTE_IC)
+ src << "You cannot send IC messages (muted)."
+ return
+ if(src.client.handle_spam_prevention(msg,MUTE_IC))
+ return
+ if(stat)
+ return
+
+ god_speak(msg)
+
+
+/mob/camera/god/proc/god_speak(msg)
+ log_say("Hand of God: [capitalize(side)] God/[key_name(src)] : [msg]")
+ msg = trim(copytext(sanitize(msg), 1, MAX_MESSAGE_LEN))
+ if(!msg)
+ return
+
+ msg = say_quote(msg, get_spans())
+ var/rendered = "Divine Telepathy, [name] "
+
+ for(var/mob/M in mob_list)
+ if(is_handofgod_myprophet(M) || isobserver(M))
+ M.show_message(rendered, 2)
+ src << rendered
+
+
+/mob/camera/god/emote(act,m_type = 1 ,msg = null)
+ return
+
+
+/mob/camera/god/Move(NewLoc, Dir = 0)
+ loc = NewLoc
+
+
+
+/mob/camera/god/Topic(href, href_list)
+ if(href_list["create_structure"])
+ if(!ability_cost(75,1,1))
+ return
+
+ var/obj/structure/divine/construct_type = text2path(href_list["create_structure"]) //it's a path but we need to initial() some vars
+ if(!construct_type)
+ return
+
+ add_faith(-75)
+ var/obj/structure/divine/construction_holder/CH = new(get_turf(src))
+ CH.assign_deity(src)
+ CH.setup_construction(construct_type)
+ CH.visible_message("[src] has created a transparent, unfinished [initial(construct_type.name)]. It can be finished by adding materials.")
+ src << "You may click a construction site to cancel it, but only faith is refunded."
+ structure_construction_ui(src)
+ return
+
+ if(href_list["place_trap"])
+ if(!ability_cost(20,1,1))
+ return
+
+ var/atom/trap_type = text2path(href_list["place_trap"])
+ if(!trap_type)
+ return
+
+ src << "You lay \a [initial(trap_type.name)]"
+ add_faith(-20)
+ new trap_type(get_turf(src))
+ return
+
+ ..()
+
+
+/mob/camera/god/proc/structure_construction_ui(mob/camera/god/user)
+ var/dat = ""
+ for(var/t in global_handofgod_structuretypes)
+ if(global_handofgod_structuretypes[t])
+ var/obj/structure/divine/apath = global_handofgod_structuretypes[t]
+ dat += "" + var/imgstate = initial(apath.autocolours) ? "[initial(apath.icon_state)]-[side]" : "[initial(apath.icon_state)]" + var/icon/I = icon('icons/obj/hand_of_god_structures.dmi',imgstate) + var/img_component = lowertext(t) + //I hate byond, but atleast it autocaches these so it's only 1*number_of_structures worth of actual calls + user << browse_rsc(I,"hog_structure-[img_component].png") + dat += "
" + dat += "
" + + var/datum/browser/popup = new(src, "structures","Construct Structure",350,500) + popup.set_content(dat) + popup.open() + + +/mob/camera/god/proc/trap_construction_ui(mob/camera/god/user) + var/dat = "" + for(var/t in global_handofgod_traptypes) + if(global_handofgod_traptypes[t]) + var/obj/structure/divine/trap/T = global_handofgod_traptypes[t] + dat += "
" + var/icon/I = icon('icons/obj/hand_of_god_structures.dmi',"[initial(T.icon_state)]") + var/img_component = lowertext(t) + user << browse_rsc(I,"hog_trap-[img_component].png") + dat += "
" + dat += "
" + + var/datum/browser/popup = new(src, "traps", "Place Trap",350,500) + popup.set_content(dat) + popup.open() \ No newline at end of file diff --git a/code/game/gamemodes/handofgod/items.dm b/code/game/gamemodes/handofgod/items.dm new file mode 100644 index 00000000000..57658f6cdc7 --- /dev/null +++ b/code/game/gamemodes/handofgod/items.dm @@ -0,0 +1,286 @@ + + +/obj/item/weapon/banner + name = "banner" + icon = 'icons/obj/items.dmi' + icon_state = "banner" + item_state = "banner" + desc = "A banner with Nanotrasen's logo on it." + var/moralecooldown = 0 + var/moralewait = 600 + + +/obj/item/weapon/banner/attack_self(mob/living/carbon/human/user) + if(moralecooldown + moralewait > world.time) + return + var/side = "" + if(is_handofgod_redcultist(user)) + side = "red" + else if (is_handofgod_bluecultist(user)) + side = "blue" + + if(!side) + return + user << "You increase the morale of your fellows!" + moralecooldown = world.time + + for(var/mob/living/carbon/human/H in range(4,get_turf(src))) + if((side == "red") && is_handofgod_redcultist(H) || (side == "blue") && is_handofgod_bluecultist(H)) + H << "Your morale is increased by [user]'s banner!" + H.adjustBruteLoss(-15) + H.adjustFireLoss(-15) + H.AdjustStunned(-2) + H.AdjustWeakened(-2) + H.AdjustParalysis(-2) + + +/obj/item/weapon/banner/red + name = "red banner" + icon_state = "banner-red" + item_state = "banner-red" + desc = "A banner with the logo of the red deity." + +/obj/item/weapon/banner/red/examine(mob/user) + ..() + if(is_handofgod_redcultist(user)) + user << "A banner representing our might against the heretics. We may use it to increase the morale of our fellow members!" + else if(is_handofgod_bluecultist(user)) + user << "A heretical banner that should be destroyed posthaste." + + +/obj/item/weapon/banner/blue + name = "blue banner" + icon_state = "banner-blue" + item_state = "banner-blue" + desc = "A banner with the logo of the blue deity" + +/obj/item/weapon/banner/blue/examine(mob/user) + ..() + + if(is_handofgod_redcultist(user)) + user << "A heretical banner that should be destroyed posthaste." + else if(is_handofgod_bluecultist(user)) + user << "A banner representing our might against the heretics. We may use it to increase the morale of our fellow members!" + + +/obj/item/weapon/storage/backpack/bannerpack + name = "nanotrasen banner backpack" + desc = "It's a backpack with lots of extra room. A banner with Nanotrasen's logo is attached, that can't be removed." + max_combined_w_class = 27 //6 more then normal, for the tradeoff of declaring yourself an antag at all times. + icon_state = "bannerpack" + + +/obj/item/weapon/storage/backpack/bannerpack/red + name = "red banner backpack" + desc = "It's a backpack with lots of extra room. A red banner is attached, that can't be removed." + icon_state = "bannerpack-red" + + +/obj/item/weapon/storage/backpack/bannerpack/blue + name = "blue banner backpack" + desc = "It's a backpack with lots of extra room. A blue banner is attached, that can't be removed." + icon_state = "bannerpack-blue" + + + +//this is all part of one item set +/obj/item/clothing/suit/armor/plate/crusader + name = "Crusader's Armour" + icon_state = "crusader" + w_class = 4 //bulky + slowdown = 2.0 //gotta pretend we're balanced. + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list(melee = 50, bullet = 50, laser = 50, energy = 40, bomb = 60, bio = 0, rad = 0) + +/obj/item/clothing/suit/armor/plate/crusader/red + icon_state = "crusader-red" + +/obj/item/clothing/suit/armor/plate/crusader/blue + icon_state = "crusader-blue" + +/obj/item/clothing/suit/armor/plate/crusader/examine(mob/user) + ..() + if(!is_handofgod_cultist(user)) + user << "Armour that's comprised of metal and cloth." + else + user << "Armour that was used to protect from backstabs, gunshots, explosives, and lasers. The original wearers of this type of armour were trying to avoid being murdered. Since they're not around anymore, you're not sure if they were successful or not." + + +/obj/item/clothing/head/helmet/plate/crusader + name = "Crusader's Hood" + icon_state = "crusader" + w_class = 3 //normal + flags = BLOCKHAIR + armor = list(melee = 50, bullet = 50, laser = 50, energy = 40, bomb = 60, bio = 0, rad = 0) + +/obj/item/clothing/head/helmet/plate/crusader/blue + icon_state = "crusader-blue" + +/obj/item/clothing/head/helmet/plate/crusader/red + icon_state = "crusader-red" + + +/obj/item/clothing/head/helmet/plate/crusader/examine(mob/user) + ..() + if(!is_handofgod_cultist(user)) + user << "A brownish hood." + else + user << "A hood that's very protective, despite being made of cloth. Due to the tendency of the wearer to be targeted for assassinations, being protected from being shot in the face was very important.." + + + +//Prophet helmet +/obj/item/clothing/head/helmet/plate/crusader/prophet + name = "Prophet's Hat" + alternate_worn_icon = 'icons/mob/large-worn-icons/64x64/head.dmi' + flags = 0 + armor = list(melee = 60, bullet = 60, laser = 60, energy = 50, bomb = 70, bio = 50, rad = 50) //religion protects you from disease and radiation, honk. + worn_x_dimension = 64 + worn_y_dimension = 64 + var/datum/action/innate/godspeak/speak2god + + +/obj/item/clothing/head/helmet/plate/crusader/prophet/proc/assign_deity(mob/camera/god/G) + if(speak2god) + if(speak2god.owner) + speak2god.Remove(speak2god.owner) + else + speak2god = new() + speak2god.god = G + + +/obj/item/clothing/head/helmet/plate/crusader/prophet/equipped(mob/user, slot) + if(slot == slot_head) + if(speak2god) + speak2god.Grant(user) + user << "You gain the ability to speak to the god this hat belongs to!" + + +/obj/item/clothing/head/helmet/plate/crusader/prophet/dropped(mob/user) + if(speak2god) + if(speak2god.owner == user) + speak2god.Remove(user) + user << "You lose the ability to speak to the god this hat belongs to!" + + +/obj/item/clothing/head/helmet/plate/crusader/prophet/red + icon_state = "prophet-red" + + +/obj/item/clothing/head/helmet/plate/crusader/prophet/blue + icon_state = "prophet-blue" + + +/obj/item/clothing/head/helmet/plate/crusader/prophet/examine(mob/user) + ..() + if(!is_handofgod_cultist(user)) + user << "A brownish, religious-looking hat." + else + user << "A hat bestowed upon a prophet of gods and demigods." + if(speak2god && speak2god.god) + user << "This hat belongs to the [speak2god.god.side] god." + + + +//Structure conversion staff +/obj/item/weapon/godstaff + name = "godstaff" + icon_state = "godstaff-red" + var/mob/camera/god/god = null + +/obj/item/weapon/godstaff/examine(mob/user) + ..() + if(!is_handofgod_cultist(user)) + user << "It's a stick..?" + else + user << "A powerful staff capable of changing the allegiance of god/demigod structures." + + +/obj/item/weapon/godstaff/red + icon_state = "godstaff-red" + +/obj/item/weapon/godstaff/blue + icon_state = "godstaff-blue" + + + +/obj/item/clothing/gloves/plate + name = "Plate Gauntlets" + icon_state = "crusader" + siemens_coefficient = 0 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + + +/obj/item/clothing/gloves/plate/red + icon_state = "crusader-red" + +/obj/item/clothing/gloves/plate/blue + icon_state = "crusader-blue" + + +/obj/item/clothing/gloves/plate/examine(mob/user) + ..() + if(!is_handofgod_cultist(user)) + usr << "They're like gloves, but made of metal." + else + usr << "Protective gloves that are also blessed to protect from heat and shock." + + +/obj/item/clothing/shoes/plate + name = "Plate Boots" + icon_state = "crusader" + w_class = 3 //normal + armor = list(melee = 50, bullet = 50, laser = 50, energy = 40, bomb = 60, bio = 0, rad = 0) //does this even do anything on boots? + flags = NOSLIP + cold_protection = FEET + min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT + heat_protection = FEET + max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT + + +/obj/item/clothing/shoes/plate/red + icon_state = "crusader-red" + +/obj/item/clothing/shoes/plate/blue + icon_state = "crusader-blue" + + +/obj/item/clothing/shoes/plate/examine(mob/user) + ..() + if(!is_handofgod_cultist(user)) + usr << "Metal boots, they look heavy." + else + usr << "Heavy boots that are blessed for sure footing. You'll be safe from being taken down by the heresy that is the banana peel." + + +/obj/item/weapon/storage/box/itemset/crusader + name = "Crusader's Armour Set" //i can't into ck2 references + desc = "This armour is said to be based on the armor of kings on another world thousands of years ago, who tended to assassinate, conspire, and plot against everyone who tried to do the same to them. Some things never change." + + +/obj/item/weapon/storage/box/itemset/crusader/blue/New() + ..() + contents = list() + sleep(1) + new /obj/item/clothing/suit/armor/plate/crusader/blue(src) + new /obj/item/clothing/head/helmet/plate/crusader/blue(src) + new /obj/item/clothing/gloves/plate/blue(src) + new /obj/item/clothing/shoes/plate/blue(src) + + +/obj/item/weapon/storage/box/itemset/crusader/red/New() + ..() + contents = list() + sleep(1) + new /obj/item/clothing/suit/armor/plate/crusader/red(src) + new /obj/item/clothing/head/helmet/plate/crusader/red(src) + new /obj/item/clothing/gloves/plate/red(src) + new /obj/item/clothing/shoes/plate/red(src) + + +/obj/item/weapon/claymore/hog + force = 30 + armour_penetration = 15 \ No newline at end of file diff --git a/code/game/gamemodes/handofgod/objectives.dm b/code/game/gamemodes/handofgod/objectives.dm new file mode 100644 index 00000000000..2d5585ca372 --- /dev/null +++ b/code/game/gamemodes/handofgod/objectives.dm @@ -0,0 +1,126 @@ + +/datum/objective/build + dangerrating = 15 + martyr_compatible = 1 + + +/datum/objective/build/proc/gen_amount_goal(lower, upper) + target_amount = rand(lower, upper) + explanation_text = "Build [target_amount] shrines." + return target_amount + + +/datum/objective/build/check_completion() + if(!owner || !owner.current) + return 0 + + var/shrines = 0 + if(is_handofgod_god(owner.current)) + var/mob/camera/god/G = owner.current + for(var/obj/structure/divine/shrine/S in G.structures) + S++ + + return (shrines >= target_amount) + + + +/datum/objective/deicide + dangerrating = 20 + martyr_compatible = 1 + +/datum/objective/deicide/check_completion() + if(target) + if(target.current) //Gods are deleted when they lose + return 0 + return 1 + + +/datum/objective/deicide/find_target() + if(!owner || !owner.current) + return + + if(is_handofgod_god(owner.current)) + var/mob/camera/god/G = owner.current + if(G.side == "red") + target = ticker.mode.blue_deities[1] + if(G.side == "blue") + target = ticker.mode.red_deities[1] + + update_explanation_text() + +/datum/objective/deicide/update_explanation_text() + ..() + if(target && target.current) + explanation_text = "Phase [target.name], the false god, out of this plane of existence.." + else + explanation_text = "Free Objective" + + + +/datum/objective/follower_block + explanation_text = "Do not allow any followers of the false god to escape on the station's shuttle alive." + dangerrating = 25 + martyr_compatible = 1 + +/datum/objective/follower_block/check_completion() + var/side = "ABORT" + if(is_handofgod_redcultist(owner.current)) + side = "red" + else if(is_handofgod_bluecultist(owner.current)) + side = "blue" + if(side == "ABORT") + return 0 + + var/area/A = SSshuttle.emergency.areaInstance + + for(var/mob/living/player in player_list) + if(player.mind && player.stat != DEAD && get_area(player) == A) + if(side == "red") + if(is_handofgod_bluecultist(player)) + return 0 + else if(side == "blue") + if(is_handofgod_redcultist(player)) + return 0 + return 1 + + + +/datum/objective/escape_followers + dangerrating = 5 + + +/datum/objective/escape_followers/proc/gen_amount_goal(lower,upper) + target_amount = rand(lower,upper) + explanation_text = "Your will must surpass this station. Having [target_amount] followers escape on the shuttle or pods will allow that." + return target_amount + + +/datum/objective/escape_followers/check_completion() + var/escaped = 0 + if(is_handofgod_god(owner.current)) + var/mob/camera/god/G = owner.current + if(G.side == "red") + for(var/datum/mind/follower_mind in ticker.mode.red_deity_followers) + if(follower_mind.current && follower_mind.current.stat != DEAD) + if(follower_mind.current.onCentcom()) + escaped++ + + if(G.side == "blue") + for(var/datum/mind/follower_mind in ticker.mode.blue_deity_followers) + if(follower_mind.current && follower_mind.current.stat != DEAD) + if(follower_mind.current.onCentcom()) + escaped++ + + return (escaped >= target_amount) + + +/datum/objective/sacrifice_prophet + explanation_text = "A false prophet is preaching their god's faith on the station. Sacrificing them will show the mortals who the true god is." + dangerrating = 10 + + +/datum/objective/sacrifice_prophet/check_completion() + var/mob/camera/god/G = owner.current + if(istype(G)) + return G.prophets_sacrificed_in_name + return 0 diff --git a/code/game/gamemodes/handofgod/powers.dm b/code/game/gamemodes/handofgod/powers.dm new file mode 100644 index 00000000000..109eaf6972c --- /dev/null +++ b/code/game/gamemodes/handofgod/powers.dm @@ -0,0 +1,305 @@ + +/mob/camera/god/proc/ability_cost(cost = 0,structures = 0, requires_conduit = 0, can_place_near_enemy_nexus = 0) + if(faith < cost) + src << "You lack the faith!" + return 0 + + if(structures) + if(!isturf(loc) || istype(loc, /turf/space)) + src << "Your structure would just float away, you need stable ground!" + return 0 + + var/turf/T = get_turf(src) + if(T) + if(T.density) + src << "There is something blocking your structure!" + return 0 + + for(var/atom/movable/AM in T) + if(AM == src) + continue + if(AM.density) + src << "There is something blocking your structure!" + return 0 + + if(requires_conduit) + //Organised this way as there can be multiple conduits, so it's more likely to be a conduit check. + var/valid = 0 + + for(var/obj/structure/divine/conduit/C in conduits) + if(get_dist(src, C) <= CONDUIT_RANGE) + valid++ + break + + if(!valid) + if(get_dist(src, god_nexus) <= CONDUIT_RANGE) + valid++ + + if(!valid) + src << "You must be near your Nexus or a Conduit to do this!" + return 0 + + if(!can_place_near_enemy_nexus) + var/datum/mind/enemy + switch(side) + if("red") + enemy = ticker.mode.blue_deities[1] + if("blue") + enemy = ticker.mode.red_deities[1] + + if(enemy && is_handofgod_god(enemy.current)) + var/mob/camera/god/enemy_god = enemy.current + if(enemy_god.god_nexus && (get_dist(src,enemy_god.god_nexus) <= CONDUIT_RANGE*2)) + src << "You are too close to the other god's stronghold!" + return 0 + + return 1 + + +/mob/camera/god/verb/returntonexus() + set category = "Deity" + set name = "Goto Nexus" + set desc = "Teleports you to your next instantly." + + if(god_nexus) + Move(get_turf(god_nexus)) + else + src << "You don't even have a Nexus, construct one." + + +/mob/camera/god/verb/jumptofollower() + set category = "Deity" + set name = "Jump to Follower" + set desc = "Teleports you to one of your followers." + var/list/following = list() + if(side == "red") + following = ticker.mode.red_deity_followers|ticker.mode.red_deity_prophets + else if(side == "blue") + following = ticker.mode.blue_deity_followers|ticker.mode.blue_deity_prophets + else + src << "You are unaligned, and thus do not have followers" + return + + var/datum/mind/choice = input("Choose a follower","Jump to Follower") as null|anything in following + if(choice && choice.current) + Move(get_turf(choice.current)) + + +/mob/camera/god/verb/newprophet() + set category = "Deity" + set name = "Appoint Prophet (100)" + set desc = "Appoint one of your followers as your Prophet, who can hear your words" + + var/list/following = list() + + if(!ability_cost(100)) + return + if(side == "red") + var/datum/mind/old_proph = locate() in ticker.mode.red_deity_prophets + if(old_proph && old_proph.current && old_proph.current.stat != DEAD) + src << "You can only have one prophet alive at a time." + return + else + following = ticker.mode.red_deity_followers + else if(side == "blue") + var/datum/mind/old_proph = locate() in ticker.mode.blue_deity_prophets + if(old_proph && old_proph.current && old_proph.current.stat != DEAD) + src << "You can only have one prophet alive at a time." + return + else + following = ticker.mode.blue_deity_followers + + else + src << "You are unalligned, and thus do not have prophets" + return + + var/datum/mind/choice = input("Choose a follower to make into your prophet","Prophet Uplifting") as null|anything in following + if(choice && choice.current && choice.current.stat != DEAD) + src << "You choose [choice.current] as your prophet." + choice.make_Handofgod_prophet(side) + + + //Prophet gear + var/mob/living/carbon/human/H = choice.current + var/popehat = null + var/popestick = null + + switch(side) + if("red") + popehat = /obj/item/clothing/head/helmet/plate/crusader/prophet/red + popestick = /obj/item/weapon/godstaff/red + if("blue") + popehat = /obj/item/clothing/head/helmet/plate/crusader/prophet/blue + popestick = /obj/item/weapon/godstaff/blue + + if(popehat) + var/obj/item/clothing/head/helmet/plate/crusader/prophet/P = new popehat() + P.assign_deity(src) + + H.unEquip(H.head) + H << "A powerful hat has been bestowed upon your head, you will need to wear this to speak with your god..." + H.equip_to_slot_or_del(P,slot_head) + + if(popestick) + var/obj/item/weapon/godstaff/G = new popestick() + G.god = src + var/success = "" + if(!H.put_in_any_hand_if_possible(G, qdel_on_fail = 0, disable_warning = 1, redraw_mob = 1)) + if(!H.equip_to_slot_if_possible(G,slot_in_backpack,0,1,1)) + G.loc = get_turf(H) + success = "It is on the floor..." + else + success = "It is in your backpack..." + else + success = "It is in your hands..." + + if(success) + H << "A powerful staff has been bestowed upon you, you can use this to convert the false god's structures!" + H << "[success]" + //end prophet gear + + add_faith(-100) + + +/mob/camera/god/verb/talk(msg as text) + set category = "Deity" + set name = "Talk to Anyone (20)" + set desc = "Allows you to send a message to anyone, regardless of their faith." + if(!ability_cost(20)) + return + var/mob/choice = input("Choose who you wish to talk to", "Talk to ANYONE") as null|anything in mob_list + if(choice) + var/original = msg + msg = "You hear a voice coming from everywhere and nowhere... [msg]" + choice << msg + src << "You say the following to [choice], [original]" + add_faith(-20) + + +/mob/camera/god/verb/smite() + set category = "Deity" + set name = "Smite (40)" + set desc = "Hits anything under you with a moderate amount of damage." + + if(!ability_cost(40,0,1)) + return + if(!range(7,god_nexus)) + src << "You lack the strength to smite this far from your nexus." + return + + var/has_smitten = 0 //Hast thou been smitten, infidel? + for(var/mob/living/L in get_turf(src)) + L.adjustFireLoss(20) + L.adjustBruteLoss(20) + L << "You feel the wrath of [name]!" + has_smitten = 1 + if(has_smitten) + add_faith(-40) + + +/mob/camera/god/verb/disaster() + set category = "Deity" + set name = "Invoke Disaster (300)" //difficult to reach without lots of followers + set desc = "Tug at the fibres of reality itself and bend it to your whims!" + + if(!ability_cost(300,0,1)) + return + + var/event = pick(/datum/round_event/meteor_wave, /datum/round_event/communications_blackout, /datum/round_event/radiation_storm, /datum/round_event/carp_migration, + /datum/round_event/spacevine, /datum/round_event/vent_clog, /datum/round_event/wormholes) + if(event) + new event() + add_faith(-300) + + +/mob/camera/god/verb/constructnexus() + set category = "Deity" + set name = "Construct Nexus" + set desc = "Instantly creates your nexus, You can only do this once, make sure you're happy with it!" + + if(!ability_cost(0,1,0)) + return + + place_nexus() + + +/* //Transolocators have no sprite +/mob/camera/god/verb/movenexus() + set category = "Deity" + set name = "Relocate Nexus (50)" + set desc = "Instantly relocates your nexus to an existing translocator belonging to your faith, this destroys the translocator in the process" + + if(ability_cost(50,0,0) && god_nexus) + var/list/translocators = list() + var/list/used_keys = list() + for(var/obj/structure/divine/translocator/T in structures) + translocators["[T.name] ([get_area(T)])"] = T + + if(!translocators.len) + src << "You have no translocators!" + return + + var/picked = input(src,"Choose a translocator","Relocate Nexus") as null|anything in translocators + if(!picked || !translocators[picked]) + return + + var/obj/structure/divine/translocator/T = translocators[T] + var/turf/Tturf = get_turf(T) + god_nexus.loc = T + translocators[picked] = null + add_faith(-50) + qdel(T) +*/ + +/mob/camera/god/verb/construct_structures() + set category = "Deity" + set name = "Construct Structure (75)" + set desc = "Create the foundation of a divine object." + + if(!ability_cost(75,1,1)) + return + + structure_construction_ui(src) + + +/mob/camera/god/verb/construct_traps() + set category = "Deity" + set name = "Construct Trap (20)" + set desc = "Creates a ward or trap." + + if(!ability_cost(20,1,1)) + return + + trap_construction_ui(src) + + + +/mob/camera/god/verb/construct_items() + set category = "Deity" + set name = "Construct Items (20)" + set desc = "Construct some items for your followers" + + if(!ability_cost(20,1,1)) + return + + var/list/item_types = list("claymore sword" = /obj/item/weapon/claymore/hog) + if(side == "red") + item_types["red banner"] = /obj/item/weapon/banner/red + item_types["red bannerbackpack"] = /obj/item/weapon/storage/backpack/bannerpack/red + item_types["red armour"] = /obj/item/weapon/storage/box/itemset/crusader/red + + else if(side == "blue") + item_types["blue banner"] = /obj/item/weapon/banner/blue + item_types["blue bannerbackpack"] = /obj/item/weapon/storage/backpack/bannerpack/blue + item_types["blue armour"] = /obj/item/weapon/storage/box/itemset/crusader/blue + + + var/item = input("Choose what you wish to create.", "Divine Items") as null|anything in item_types + if(!item || !item_types[item] || !ability_cost(20,1,1)) + return + + src << "You produce \a [item]" + add_faith(-20) + + var/itemtype = item_types[item] + new itemtype (get_turf(src)) diff --git a/code/game/gamemodes/handofgod/structures.dm b/code/game/gamemodes/handofgod/structures.dm new file mode 100644 index 00000000000..97e6ede44c0 --- /dev/null +++ b/code/game/gamemodes/handofgod/structures.dm @@ -0,0 +1,586 @@ + +/proc/build_hog_construction_lists() + if(global_handofgod_traptypes.len && global_handofgod_structuretypes.len) + return + + var/list/types = typesof(/obj/structure/divine) - /obj/structure/divine - /obj/structure/divine/trap + for(var/T in types) + var/obj/structure/divine/D = T + if(initial(D.constructable)) + if(initial(D.trap)) + global_handofgod_traptypes[initial(D.name)] = T + else + global_handofgod_structuretypes[initial(D.name)] = T + +/obj/structure/divine + name = "divine construction site" + icon = 'icons/obj/hand_of_god_structures.dmi' + desc = "An unfinished divine building" + anchored = 1 + density = 1 + var/constructable = TRUE + var/trap = FALSE + var/metal_cost = 0 + var/glass_cost = 0 + var/lesser_gem_cost = 0 + var/greater_gem_cost = 0 + var/mob/camera/god/deity + var/side = "neutral" //"blue" or "red", also used for colouring structures when construction is started by a deity + var/health = 100 + var/maxhealth = 100 + var/autocolours = TRUE //do we colour to our side? + +/obj/structure/divine/New() + ..() + + +/obj/structure/divine/proc/update_icons() + if(autocolours) + icon_state = "[initial(icon_state)]-[side]" + + +/obj/structure/divine/Destroy() + if(deity) + deity.structures -= src + return ..() + + +/obj/structure/divine/proc/healthcheck() + if(!health) + visible_message("\The [src] was destroyed!") + qdel(src) + + +/obj/structure/divine/attackby(obj/item/I, mob/user) + if(!I || (I.flags & ABSTRACT)) + return 0 + + //Structure conversion/capture + if(istype(I, /obj/item/weapon/godstaff)) + var/obj/item/weapon/godstaff/G = I + if(G.god && deity != G.god) + assign_deity(G.god, alert_old_deity = TRUE) + visible_message("\The [src] has been captured by [user]!") + return + + user.changeNext_move(CLICK_CD_MELEE) + user.do_attack_animation(src) + playsound(get_turf(src), I.hitsound, 50, 1) + visible_message("\The [src] has been attacked with \the [I][(user ? " by [user]" : ".")]!") + health = max(0, health-I.force) + healthcheck() + + +/obj/structure/divine/bullet_act(obj/item/projectile/Proj) + if(!Proj) + return 0 + + if(Proj.damage_type == BRUTE || Proj.damage_type == BURN) + health = max(0, health-Proj.damage) + healthcheck() + + +/obj/structure/divine/attack_animal(mob/living/simple_animal/M) + if(!M) + return 0 + + visible_message("\The [src] has been attacked by \the [M]!") + var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) + if(!damage) + return + health = max(0, health-damage) + healthcheck() + + +/obj/structure/divine/proc/assign_deity(mob/camera/god/new_deity, alert_old_deity = TRUE) + if(!new_deity) + return 0 + if(deity) + if(alert_old_deity) + deity << "Your [name] was captured by [new_deity]'s cult!" + deity.structures -= src + deity = new_deity + deity.structures |= src + side = deity.side + update_icons() + return 1 + + +/obj/structure/divine/construction_holder + alpha = 125 + constructable = FALSE + var/obj/structure/divine/construction_result = /obj/structure/divine //a path, but typed to /obj/structure/divine for initial() + + + +/obj/structure/divine/construction_holder/assign_deity(mob/camera/god/new_deity, alert_old_deity = TRUE) + if(..()) + color = side + + +/obj/structure/divine/construction_holder/attack_god(mob/camera/god/user) + if(user.side == side && construction_result) + user.add_faith(75) + visible_message("[user] has cancelled \the [initial(construction_result.name)]") + qdel(src) + + +/obj/structure/divine/construction_holder/proc/setup_construction(construct_type) + if(ispath(construct_type)) + construction_result = construct_type + name = "[initial(construction_result.name)] construction site " + icon_state = initial(construction_result.icon_state) + metal_cost = initial(construction_result.metal_cost) + glass_cost = initial(construction_result.glass_cost) + lesser_gem_cost = initial(construction_result.lesser_gem_cost) + greater_gem_cost = initial(construction_result.greater_gem_cost) + desc = "An unfinished [initial(construction_result.name)]." + + +/obj/structure/divine/construction_holder/attackby(obj/item/I, mob/user) + if(!I || !user) + return 0 + + if(istype(I, /obj/item/stack/sheet/metal)) + var/obj/item/stack/sheet/metal/M = I + if(metal_cost) + var/spend = min(metal_cost, M.amount) + user << "You add [spend] metal to \the [src]." + metal_cost = max(0, metal_cost - spend) + M.use(spend) + check_completion() + else + user << "\The [src] does not require any more metal!" + return + + if(istype(I, /obj/item/stack/sheet/glass)) + var/obj/item/stack/sheet/glass/G = I + if(glass_cost) + var/spend = min(glass_cost, G.amount) + user << "You add [spend] glass to \the [src]." + glass_cost = max(0, glass_cost - spend) + G.use(spend) + check_completion() + else + user << "\The [src] does not require any more glass!" + return + + if(istype(I, /obj/item/stack/sheet/lessergem)) + var/obj/item/stack/sheet/lessergem/LG = I + if(lesser_gem_cost) + var/spend = min(lesser_gem_cost, LG.amount) + user << "You add [spend] lesser gems to \the [src]." + lesser_gem_cost = max(0, lesser_gem_cost - spend) + LG.use(spend) + check_completion() + else + user << "\The [src] does not require any more lesser gems!" + return + + if(istype(I, /obj/item/stack/sheet/greatergem)) + var/obj/item/stack/sheet/greatergem/GG = I //GG! + if(greater_gem_cost) + var/spend = min(greater_gem_cost, GG.amount) + user << "You add [spend] greater gems to \the [src]." + greater_gem_cost = max(0, greater_gem_cost - spend) + GG.use(spend) + check_completion() + else + user << "\The [src] does not require any more greater gems!" + return + + ..() + + +/obj/structure/divine/construction_holder/proc/check_completion() + if(!metal_cost && !glass_cost && !lesser_gem_cost && !greater_gem_cost) + visible_message("\The [initial(construction_result.name)] is complete!") + var/obj/structure/divine/D = new construction_result (get_turf(src)) + D.assign_deity(deity) + qdel(src) + + +/obj/structure/divine/construction_holder/examine(mob/user) + ..() + + if(metal_cost || glass_cost || lesser_gem_cost || greater_gem_cost) + user << "To finish construction it requires the following materials:" + if(metal_cost) + user << "[metal_cost] metal
" return . +/datum/spellbook_entry/summon/multisword + name = "Multiverse War" + category = "Rituals" + desc = "Triggers a multiverse war in which the crew (and you) must summon copies of yourself from alternate realities to do battle and hijack the emergency shuttle. Automatically triggers a shuttle call on purchase." + log_name = "MW" + cost = 8 +/datum/spellbook_entry/summon/multisword/IsAvailible() + if(!ticker.mode) // In case spellbook is placed on map + return 0 + return (ticker.mode.name != "ragin' mages" && !config.no_summon_magic) + +/datum/spellbook_entry/summon/multisword/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) + feedback_add_details("wizard_spell_learned",log_name) + only_me() + new /obj/item/weapon/multisword(get_turf(user)) //Because the proc skips special roles + SSshuttle.emergency.request() + playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) + user << "You have triggerd a multiverse war!" + return 1 /obj/item/weapon/spellbook name = "spell book" diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index dcbaf76c965..8575558e323 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -4,7 +4,7 @@ /datum/game_mode/wizard name = "wizard" config_tag = "wizard" - antag_flag = BE_WIZARD + antag_flag = ROLE_WIZARD required_players = 20 required_enemies = 1 recommended_enemies = 1 diff --git a/code/game/jobs/job/cargo_service.dm b/code/game/jobs/job/cargo_service.dm index 1eeca19eaa5..496aa1d9a38 100644 --- a/code/game/jobs/job/cargo_service.dm +++ b/code/game/jobs/job/cargo_service.dm @@ -111,6 +111,7 @@ Bartender /datum/outfit/job/bartender name = "Bartender" + glasses = /obj/item/clothing/glasses/sunglasses/reagent belt = /obj/item/device/pda/bar ears = /obj/item/device/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/bartender diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index ca5fb09823c..12b5328e579 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -170,6 +170,6 @@ /datum/outfit/job/proc/announce_head(var/mob/living/carbon/human/H, var/channels) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. spawn(4) //to allow some initialization - if(announcement_systems.len) + if(H && announcement_systems.len) var/obj/machinery/announcement_system/announcer = pick(announcement_systems) announcer.announce("NEWHEAD", H.real_name, H.job, channels) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 4566d4fb2a7..e2f5df21dbe 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -98,6 +98,7 @@ Chemist /datum/outfit/job/chemist name = "Chemist" + glasses = /obj/item/clothing/glasses/science belt = /obj/item/device/pda/chemist ears = /obj/item/device/radio/headset/headset_med uniform = /obj/item/clothing/under/rank/chemist diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index e994bd45030..727527b47d3 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -221,12 +221,13 @@ var/obj/item/stack/N = new being_built.build_path(T) N.amount = multiplier N.update_icon() + N.autolathe_crafted(src) else var/list/materials_used = list(MAT_METAL=metal_cost/coeff, MAT_GLASS=glass_cost/coeff) materials.use_amount(materials_used) var/obj/item/new_item = new being_built.build_path(T) - new_item.materials[MAT_METAL] /= coeff - new_item.materials[MAT_GLASS] /= coeff + new_item.materials = materials_used.Copy() + new_item.autolathe_crafted(src) busy = 0 src.updateUsrDialog() @@ -380,3 +381,8 @@ for(var/datum/design/D in files.known_designs) if("hacked" in D.category) files.known_designs -= D + +//Called when the object is constructed by an autolathe +//Has a reference to the autolathe so you can do !!FUN!! things with hacked lathes +/obj/item/proc/autolathe_crafted(obj/machinery/autolathe/A) + return diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 0f2a506a7ab..5073441a097 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -447,7 +447,7 @@ Auto Patrol[]"}, shoot_sound = 'sound/weapons/laser.ogg' if(emagged == 2) if(lasercolor) - projectile = /obj/item/projectile/lasertag + projectile = /obj/item/projectile/beam/lasertag else projectile = /obj/item/projectile/beam else @@ -455,9 +455,9 @@ Auto Patrol[]"}, shoot_sound = 'sound/weapons/Taser.ogg' projectile = /obj/item/projectile/energy/electrode else if(lasercolor == "b") - projectile = /obj/item/projectile/lasertag/bluetag + projectile = /obj/item/projectile/beam/lasertag/bluetag else if(lasercolor == "r") - projectile = /obj/item/projectile/lasertag/redtag + projectile = /obj/item/projectile/beam/lasertag/redtag /obj/machinery/bot/ed209/proc/shootAt(mob/target) if(lastfired && world.time - lastfired < shot_delay) @@ -685,10 +685,10 @@ Auto Patrol[]"}, if(!disabled) var/lasertag_check = 0 if((lasercolor == "b")) - if(istype(Proj, /obj/item/projectile/lasertag/redtag)) + if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag)) lasertag_check++ else if((lasercolor == "r")) - if(istype(Proj, /obj/item/projectile/lasertag/bluetag)) + if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag)) lasertag_check++ if(lasertag_check) icon_state = "[lasercolor]ed2090" diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index bcc7e4fa730..e2aa7e2f5e1 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -482,7 +482,7 @@ if(reagent_id == "internal_beaker") if(use_beaker && reagent_glass && reagent_glass.reagents.total_volume) var/fraction = min(injection_amount/reagent_glass.reagents.total_volume, 1) - reagent_glass.reagents.reaction(patient, INGEST, fraction) + reagent_glass.reagents.reaction(patient, INJECT, fraction) reagent_glass.reagents.trans_to(patient,injection_amount) //Inject from beaker instead. else patient.reagents.add_reagent(reagent_id,injection_amount) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm deleted file mode 100644 index 0ba57253e61..00000000000 --- a/code/game/machinery/computer/HolodeckControl.dm +++ /dev/null @@ -1,528 +0,0 @@ -/obj/machinery/computer/HolodeckControl - name = "holodeck control console" - desc = "A computer used to control a nearby holodeck." - icon_screen = "holocontrol" - icon_keyboard = "tech_key" - var/area/linkedholodeck = null - var/area/target = null - var/active = 0 - var/list/holographic_items = list() - var/damaged = 0 - var/last_change = 0 - -/obj/machinery/computer/HolodeckControl/attack_hand(mob/user) - - if(..()) - return - user.set_machine(src) - - var/dat = "
Current Loaded Programs
" - dat += "((Empty Court))" - dat += "((Dodgeball Arena))
" - dat += "((Basketball Court))
" - dat += "((Thunderdome Court))
" - dat += "((Beach))
" -// dat += "((Shutdown System))
" - - dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.
" - - if(emagged) - dat += "(Begin Atmospheric Burn Simulation)
" - dat += "Ensure the holodeck is empty before testing.
" - dat += "
" - dat += "(Begin Wildlife Simulation)
" - dat += "Ensure the holodeck is empty before testing.
" - dat += "
" - if(issilicon(user)) - dat += "(Re-Enable Safety Protocols?)
" - dat += "Safety Protocols are DISABLED
" - else - if(issilicon(user)) - dat += "(Override Safety Protocols?)
" - dat += "
" - dat += "Safety Protocols are ENABLED
" - - //user << browse(dat, "window=computer;size=400x500") - //onclose(user, "computer") - var/datum/browser/popup = new(user, "computer", name, 400, 500) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - - -/obj/machinery/computer/HolodeckControl/Topic(href, href_list) - if(..()) - return - if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.set_machine(src) - - if(href_list["emptycourt"]) - target = locate(/area/holodeck/source_emptycourt) - if(target) - loadProgram(target) - - else if(href_list["boxingcourt"]) - target = locate(/area/holodeck/source_boxingcourt) - if(target) - loadProgram(target) - - else if(href_list["basketball"]) - target = locate(/area/holodeck/source_basketball) - if(target) - loadProgram(target) - - else if(href_list["thunderdomecourt"]) - target = locate(/area/holodeck/source_thunderdomecourt) - if(target) - loadProgram(target) - - else if(href_list["beach"]) - target = locate(/area/holodeck/source_beach) - if(target) - loadProgram(target) - - else if(href_list["turnoff"]) - target = locate(/area/holodeck/source_plating) - if(target) - loadProgram(target) - - else if(href_list["burntest"]) - if(!emagged) return - target = locate(/area/holodeck/source_burntest) - if(target) - loadProgram(target) - - else if(href_list["wildlifecarp"]) - if(!emagged) return - target = locate(/area/holodeck/source_wildlife) - if(target) - loadProgram(target) - - else if(href_list["AIoverride"]) - if(!issilicon(usr)) return - emagged = !emagged - if(emagged) - message_admins("[key_name_admin(usr)] overrode the holodeck's safeties") - log_game("[key_name(usr)] overrided the holodeck's safeties") - else - message_admins("[key_name_admin(usr)] restored the holodeck's safeties") - log_game("[key_name(usr)] restored the holodeck's safeties") - - src.add_fingerprint(usr) - src.updateUsrDialog() - return - - - -/obj/machinery/computer/HolodeckControl/emag_act(mob/user) - if(!emagged) - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) - emagged = 1 - user << "You vastly increase projector power and override the safety and security protocols." - user << "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator." - log_game("[key_name(user)] emagged the Holodeck Control Console") - src.updateUsrDialog() - -/obj/machinery/computer/HolodeckControl/New() - ..() - linkedholodeck = locate(/area/holodeck/alphadeck) - //if(linkedholodeck) - // target = locate(/area/holodeck/source_emptycourt) - // if(target) - // loadProgram(target) - -//This could all be done better, but it works for now. -/obj/machinery/computer/HolodeckControl/Destroy() - emergencyShutdown() - return ..() - - -/obj/machinery/computer/HolodeckControl/emp_act(severity) - emergencyShutdown() - ..() - - -/obj/machinery/computer/HolodeckControl/ex_act(severity, target) - emergencyShutdown() - ..() - - -/obj/machinery/computer/HolodeckControl/blob_act() - emergencyShutdown() - ..() - - -/obj/machinery/computer/HolodeckControl/process() - - if(!..()) - return - if(active) - - if(!checkInteg(linkedholodeck)) - damaged = 1 - target = locate(/area/holodeck/source_plating) - if(target) - loadProgram(target) - active = 0 - for(var/mob/M in ultra_range(10,src)) - M.show_message("The holodeck overloads!") - - - for(var/turf/T in linkedholodeck) - if(prob(30)) - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(2, 1, T) - s.start() - T.ex_act(3) - T.hotspot_expose(1000,500,1) - - - for(var/item in holographic_items) - if(!(get_turf(item) in linkedholodeck)) - derez(item, 0) - - - -/obj/machinery/computer/HolodeckControl/proc/derez(obj/obj , silent = 1) - holographic_items.Remove(obj) - - if(obj == null) - return - - if(isobj(obj)) - var/mob/M = obj.loc - if(ismob(M)) - M.unEquip(obj, 1) //Holoweapons should always drop. - - if(!silent) - var/obj/oldobj = obj - visible_message("The [oldobj.name] fades away!") - qdel(obj) - -/obj/machinery/computer/HolodeckControl/proc/checkInteg(area/A) - for(var/turf/T in A) - if(istype(T, /turf/space)) - return 0 - - return 1 - -/obj/machinery/computer/HolodeckControl/power_change() - ..() - if(stat & NOPOWER) - emergencyShutdown() - -/obj/machinery/computer/HolodeckControl/proc/loadProgram(area/A) - - if(world.time < (last_change + 25)) - if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve - return - for(var/mob/M in range(3,src)) - M.show_message("\b ERROR. Recalibrating projection apparatus.") - last_change = world.time - return - - last_change = world.time - active = 1 - - for(var/item in holographic_items) - derez(item) - - holographic_items = A.copy_contents_to(linkedholodeck , 1) - - if(emagged) - for(var/obj/item/weapon/holo/esword/H in linkedholodeck) - H.damtype = BRUTE - - spawn(30) - for(var/obj/effect/landmark/L in linkedholodeck) - if(L.name=="Atmospheric Test Start") - spawn(20) - if(istype(target,/area/holodeck/source_burntest)) - var/turf/T = get_turf(L) - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(2, 1, T) - s.start() - if(T) - T.temperature = 5000 - T.hotspot_expose(50000,50000,1) - if(L.name=="Holocarp Spawn") - new /mob/living/simple_animal/hostile/carp/holocarp(L.loc) - - -/obj/machinery/computer/HolodeckControl/proc/emergencyShutdown() - if(!istype(target,/area/holodeck/source_plating)) - //Get rid of any items - for(var/item in holographic_items) - derez(item) - //Turn it back to the regular non-holographic room - target = locate(/area/holodeck/source_plating) - if(target) - loadProgram(target) - - var/area/targetsource = locate(/area/holodeck/source_plating) - targetsource.copy_contents_to(linkedholodeck , 1) - active = 0 - - - - - - - -// Holographic Items! - -/turf/simulated/floor/holofloor - icon_state = "floor" - thermal_conductivity = 0 - -/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W, mob/user, params) - return - // HOLOFLOOR DOES NOT GIVE A FUCK - -/turf/simulated/floor/grass/holo - thermal_conductivity = 0 - gender = PLURAL - name = "lush grass" - -/turf/simulated/floor/grass/holo/attackby(obj/item/weapon/W, mob/user, params) - return - // HOLOGRASS DOES NOT GIVE A FUCK - -/obj/structure/table/holotable - name = "table" - -/obj/structure/table/holotable/attack_paw(mob/user) - return attack_hand(user) - -/obj/structure/table/holotable/attack_alien(mob/user) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N - return attack_hand(user) - -/obj/structure/table/holotable/attack_animal(mob/living/simple_animal/user) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N - return attack_hand(user) - -/obj/structure/table/holotable/attack_hand(mob/user) - return // HOLOTABLE DOES NOT GIVE A FUCK - - -/obj/structure/table/holotable/attackby(obj/item/weapon/W, mob/user, params) - if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) - var/obj/item/weapon/grab/G = W - if(G.state < GRAB_AGGRESSIVE) - user << "You need a better grip to do that!" - return - G.affecting.loc = src.loc - G.affecting.Weaken(5) - visible_message("[G.assailant] puts [G.affecting] on the table.") - qdel(W) - return - - if (istype(W, /obj/item/weapon/wrench)) - user << "It's a holotable! There are no bolts!" - return - - if(isrobot(user)) - return - -/obj/structure/holowindow - name = "reinforced window" - icon = 'icons/obj/structures.dmi' - icon_state = "rwindow" - desc = "A window." - density = 1 - layer = 3.2//Just above doors - pressure_resistance = 4*ONE_ATMOSPHERE - anchored = 1 - flags = ON_BORDER - - -/obj/item/weapon/holo - damtype = STAMINA - -/obj/item/weapon/holo/esword - name = "holographic energy sword" - desc = "May the force be with you. Sorta" - icon_state = "sword0" - force = 3 - throw_speed = 2 - throw_range = 5 - throwforce = 0 - w_class = 2 - hitsound = "swing_hit" - flags = NOSHIELD - var/active = 0 - -/obj/item/weapon/holo/esword/green - New() - item_color = "green" - -/obj/item/weapon/holo/esword/red - New() - item_color = "red" - -/obj/item/weapon/holo/esword/IsShield() - if(active) - return 1 - return 0 - -/obj/item/weapon/holo/esword/attack(mob/target, mob/user) - ..() - -/obj/item/weapon/holo/esword/New() - item_color = pick("red","blue","green","purple") - -/obj/item/weapon/holo/esword/attack_self(mob/living/user) - active = !active - if (active) - force = 30 - icon_state = "sword[item_color]" - w_class = 4 - hitsound = 'sound/weapons/blade1.ogg' - playsound(user, 'sound/weapons/saberon.ogg', 20, 1) - user << "[src] is now active." - else - force = 3 - icon_state = "sword0" - w_class = 2 - hitsound = "swing_hit" - playsound(user, 'sound/weapons/saberoff.ogg', 20, 1) - user << "[src] can now be concealed." - return - -//BASKETBALL OBJECTS - -/obj/item/toy/beach_ball/holoball - name = "basketball" - icon = 'icons/obj/basketball.dmi' - icon_state = "basketball" - item_state = "basketball" - desc = "Here's your chance, do your dance at the Space Jam." - -/obj/item/toy/beach_ball/holoball/dodgeball - name = "dodgeball" - icon_state = "dodgeball" - item_state = "dodgeball" - desc = "Used for playing the most violent and degrading of childhood games." - -/obj/item/toy/beach_ball/holoball/dodgeball/throw_impact(atom/hit_atom) - ..() - if((ishuman(hit_atom))) - var/mob/living/carbon/M = hit_atom - playsound(src, 'sound/items/dodgeball.ogg', 50, 1) - M.apply_damage(10, STAMINA) - loc = get_turf(hit_atom) //drop at the target's feet - if(prob(5)) - M.Weaken(3) - visible_message("[M] is knocked right off \his feet!", 3) - -/obj/structure/holohoop - name = "basketball hoop" - desc = "Boom, shakalaka!" - icon = 'icons/obj/basketball.dmi' - icon_state = "hoop" - anchored = 1 - density = 1 - -/obj/structure/holohoop/attackby(obj/item/weapon/W, mob/user, params) - if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) - var/obj/item/weapon/grab/G = W - if(G.state < GRAB_AGGRESSIVE) - user << "You need a better grip to do that!" - return - G.affecting.loc = src.loc - G.affecting.Weaken(5) - visible_message("[G.assailant] dunks [G.affecting] into \the [src]!", 3) - qdel(W) - return - else if (istype(W, /obj/item) && get_dist(src,user)<2) - user.drop_item(src) - visible_message("[user] dunks [W] into \the [src]!", 3) - return - -/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0) - if (istype(mover,/obj/item) && mover.throwing) - var/obj/item/I = mover - if(istype(I, /obj/item/projectile)) - return - if(prob(50)) - I.loc = src.loc - visible_message("Swish! \the [I] lands in \the [src].", 3) - else - visible_message("\the [I] bounces off of \the [src]'s rim!", 3) - return 0 - else - return ..(mover, target, height) - - -/obj/machinery/readybutton - name = "ready declaration device" - desc = "This device is used to declare ready. If all devices in an area are ready, the event will begin!" - icon = 'icons/obj/monitors.dmi' - icon_state = "auth_off" - var/ready = 0 - var/area/currentarea = null - var/eventstarted = 0 - - anchored = 1 - use_power = 1 - idle_power_usage = 2 - active_power_usage = 6 - power_channel = ENVIRON - -/obj/machinery/readybutton/attack_ai(mob/user) - user << "The station AI is not to interact with these devices" - return - -/obj/machinery/readybutton/attack_paw(mob/user) - user << "You are too primitive to use this device!" - return - -/obj/machinery/readybutton/New() - ..() - - -/obj/machinery/readybutton/attackby(obj/item/weapon/W, mob/user, params) - user << "The device is a solid button, there's nothing you can do with it!" - -/obj/machinery/readybutton/attack_hand(mob/user) - if(user.stat || stat & (NOPOWER|BROKEN)) - user << "This device is not powered!" - return - - currentarea = get_area(src.loc) - if(!currentarea) - qdel(src) - - if(eventstarted) - usr << "The event has already begun!" - return - - ready = !ready - - update_icon() - - var/numbuttons = 0 - var/numready = 0 - for(var/obj/machinery/readybutton/button in currentarea) - numbuttons++ - if (button.ready) - numready++ - - if(numbuttons == numready) - begin_event() - -/obj/machinery/readybutton/update_icon() - if(ready) - icon_state = "auth_on" - else - icon_state = "auth_off" - -/obj/machinery/readybutton/proc/begin_event() - - eventstarted = 1 - - for(var/obj/structure/holowindow/W in currentarea) - qdel(W) - - for(var/mob/M in currentarea) - M << "FIGHT!" diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index a0b79dd7dad..ea7a6a1c704 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -5,7 +5,7 @@ icon_keyboard = "med_key" circuit = /obj/item/weapon/circuitboard/operating var/mob/living/carbon/human/patient = null - var/obj/structure/optable/table = null + var/obj/structure/table/optable/table = null /obj/machinery/computer/operating/New() @@ -18,7 +18,7 @@ /obj/machinery/computer/operating/proc/find_table() for(var/dir in cardinal) - table = locate(/obj/structure/optable, get_step(src, dir)) + table = locate(/obj/structure/table/optable, get_step(src, dir)) if(table) table.computer = src break diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 61edbb6fcd6..dffd5241c8c 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -216,9 +216,9 @@ /obj/item/weapon/circuitboard/white_ship name = "circuit Board (White Ship)" build_path = /obj/machinery/computer/shuttle/white_ship -/obj/item/weapon/circuitboard/HolodeckControl // Not going to let people get this, but it's just here for future +/obj/item/weapon/circuitboard/holodeck// Not going to let people get this, but it's just here for future name = "circuit board (Holodeck Control)" - build_path = /obj/machinery/computer/HolodeckControl + build_path = /obj/machinery/computer/holodeck origin_tech = "programming=4" /obj/item/weapon/circuitboard/aifixer name = "circuit board (AI Integrity Restorer)" diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index faf89bdba12..996b181c534 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -21,7 +21,8 @@ /obj/machinery/computer/camera_advanced/check_eye(mob/user) if (get_dist(user, src) > 1 || user.eye_blind) - off_action.Activate() + if(user == current_user) + off_action.Activate() return 0 return 1 diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 26e03797653..67be162a428 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -572,7 +572,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(!input || !user.canUseTopic(src)) return if(is_silicon) - minor_announce(input) + minor_announce(input,"[user.name] Announces:") ai_message_cooldown = 1 spawn(600)//One minute cooldown ai_message_cooldown = 0 diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 4f00df16887..d2dad1792e2 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -1,4 +1,4 @@ -#define INJECTOR_TIMEOUT 300 +#define INJECTOR_TIMEOUT 100 #define REJUVENATORS_INJECT 15 #define REJUVENATORS_MAX 90 #define NUMBER_OF_BUFFERS 3 @@ -11,6 +11,11 @@ #define RADIATION_IRRADIATION_MULTIPLIER 0.2 //multiplier for how much radiation a test subject recieves +#define SCANNER_ACTION_SE 1 +#define SCANNER_ACTION_UI 2 +#define SCANNER_ACTION_UE 3 +#define SCANNER_ACTION_MIXED 4 + /obj/machinery/computer/scan_consolenew name = "\improper DNA scanner access console" desc = "Scan DNA." @@ -27,6 +32,7 @@ var/current_screen = "mainmenu" var/obj/machinery/dna_scannernew/connected = null var/obj/item/weapon/disk/data/diskette = null + var/list/delayed_action = null anchored = 1 use_power = 1 idle_power_usage = 10 @@ -185,6 +191,7 @@ temp_html += "
\tUE: [ue] " if(viable_occupant) temp_html += "Occupant " else temp_html += "Occupant" + temp_html += "Occupant:Delayed " if(injectorready) temp_html += "Injector" else temp_html += "Injector" else @@ -194,14 +201,23 @@ temp_html += "
\tUI: [ui] " if(viable_occupant) temp_html += "Occupant " else temp_html += "Occupant" + temp_html += "Occupant:Delayed " if(injectorready) temp_html += "Injector" else temp_html += "Injector" else temp_html += "
\tUI: No Data" + if(ue && name && blood_type && ui) + temp_html += "
\tUI+UE: [ui]/[ue] " + if(viable_occupant) temp_html += "Occupant " + else temp_html += "Occupant" + temp_html += "Occupant:Delayed " + if(injectorready) temp_html += "UI+UE Injector" + else temp_html += "UI+UE Injector" if(se) temp_html += "
\tSE: [se] " if(viable_occupant) temp_html += "Occupant " else temp_html += "Occupant " + temp_html += "Occupant:Delayed " if(injectorready) temp_html += "Injector" else temp_html += "Injector" else @@ -269,11 +285,7 @@ add_fingerprint(usr) usr.set_machine(src) - var/mob/living/carbon/viable_occupant - if(connected) - viable_occupant = connected.occupant - if(!istype(viable_occupant) || !viable_occupant.dna || (viable_occupant.disabilities & NOCLONE)) - viable_occupant = null + var/mob/living/carbon/viable_occupant = get_viable_occupant() //Basic Tasks/////////////////////////////////////////// var/num = round(text2num(href_list["num"])) @@ -326,25 +338,15 @@ buffer_slot.Cut() if("transferbuffer") if(num && viable_occupant) - num = Clamp(num, 1, NUMBER_OF_BUFFERS) - var/list/buffer_slot = buffer[num] - if(istype(buffer_slot)) //15 and 40 are just magic numbers that were here before so i didnt touch them, they are initial boundaries of damage - viable_occupant.radiation += rand(15/(connected.damage_coeff ** 2),40/(connected.damage_coeff ** 2)) //Each laser level reduces damage by lvl^2, so no effect on 1 lvl, 4 times less damage on 2 and 9 times less damage on 3 - switch(href_list["text"]) //Numbers are this high because other way upgrading laser is just not worth the hassle, and i cant think of anything better to inmrove - if("se") - if(buffer_slot["SE"]) - viable_occupant.dna.struc_enzymes = buffer_slot["SE"] - viable_occupant.domutcheck() - if("ui") - if(buffer_slot["UI"]) - viable_occupant.dna.uni_identity = buffer_slot["UI"] - viable_occupant.updateappearance(mutations_overlay_update=1) - else - if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) - viable_occupant.real_name = buffer_slot["name"] - viable_occupant.name = buffer_slot["name"] - viable_occupant.dna.unique_enzymes = buffer_slot["UE"] - viable_occupant.dna.blood_type = buffer_slot["blood_type"] + switch(href_list["text"]) //Numbers are this high because other way upgrading laser is just not worth the hassle, and i cant think of anything better to inmrove + if("se") + apply_buffer(SCANNER_ACTION_SE,num) + if("ui") + apply_buffer(SCANNER_ACTION_UI,num) + if("ue") + apply_buffer(SCANNER_ACTION_UE,num) + if("mixed") + apply_buffer(SCANNER_ACTION_MIXED,num) if("injector") if(num && injectorready) num = Clamp(num, 1, NUMBER_OF_BUFFERS) @@ -357,21 +359,38 @@ I = new /obj/item/weapon/dnainjector(loc) for(var/datum/mutation/human/HM in good_mutations + bad_mutations + not_good_mutations) if(HM.check_block_string(buffer_slot["SE"])) - if(prob(HM.get_chance)) - I.add_mutations.Add(HM) + I.add_mutations.Add(HM) else I.remove_mutations.Add(HM) - I.damage_coeff = connected.damage_coeff +/* + var/time_coeff + for(var/datum/mutation/human/HM in I.add_mutations) + if(!time_coeff) + time_coeff = HM.time_coeff + continue + time_coeff = min(time_coeff,HM.time_coeff) +*/ + if(connected) + //I.duration = I.duration * time_coeff * connected.damage_coeff //this is for timed injectors; the code is being left in case someone wants to add timed injectors to the console again + I.damage_coeff = connected.damage_coeff if("ui") if(buffer_slot["UI"]) I = new /obj/item/weapon/dnainjector(loc) I.fields = list("UI"=buffer_slot["UI"]) - I.damage_coeff = connected.damage_coeff - else + if(connected) + I.damage_coeff = connected.damage_coeff + if("ue") if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) I = new /obj/item/weapon/dnainjector(loc) I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"]) - I.damage_coeff = connected.damage_coeff + if(connected) + I.damage_coeff = connected.damage_coeff + if("mixed") + if(buffer_slot["UI"] && buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) + I = new /obj/item/weapon/dnainjector(loc) + I.fields = list("UI"=buffer_slot["UI"],"name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"]) + if(connected) + I.damage_coeff = connected.damage_coeff if(I) injectorready = 0 spawn(INJECTOR_TIMEOUT) @@ -391,6 +410,9 @@ if(diskette) diskette.loc = get_turf(src) diskette = null + if("setdelayed") + if(num) + delayed_action = list("action"=text2num(href_list["delayaction"]),"buffer"=num) if("pulseui","pulsese") if(num && viable_occupant && connected) radduration = Wrap(radduration, 1, RADIATION_DURATION_MAX+1) @@ -459,7 +481,54 @@ /obj/machinery/computer/scan_consolenew/proc/randomize_radiation_accuracy(position_we_were_supposed_to_hit, radduration, number_of_blocks) return Wrap(round(position_we_were_supposed_to_hit + gaussian(0, RADIATION_ACCURACY_MULTIPLIER/radduration), 1), 1, number_of_blocks+1) +/obj/machinery/computer/scan_consolenew/proc/get_viable_occupant() + var/mob/living/carbon/viable_occupant = null + if(connected) + viable_occupant = connected.occupant + if(!istype(viable_occupant) || !viable_occupant.dna || (viable_occupant.disabilities & NOCLONE)) + viable_occupant = null + return viable_occupant +/obj/machinery/computer/scan_consolenew/proc/apply_buffer(action,buffer_num) + buffer_num = Clamp(buffer_num, 1, NUMBER_OF_BUFFERS) + var/list/buffer_slot = buffer[buffer_num] + var/mob/living/carbon/viable_occupant = get_viable_occupant() + if(istype(buffer_slot)) + viable_occupant.radiation += rand(10/(connected.damage_coeff ** 2),25/(connected.damage_coeff ** 2)) + //15 and 40 are just magic numbers that were here before so i didnt touch them, they are initial boundaries of damage + //Each laser level reduces damage by lvl^2, so no effect on 1 lvl, 4 times less damage on 2 and 9 times less damage on 3 + //Numbers are this high because other way upgrading laser is just not worth the hassle, and i cant think of anything better to inmrove + switch(action) + if(SCANNER_ACTION_SE) + if(buffer_slot["SE"]) + viable_occupant.dna.struc_enzymes = buffer_slot["SE"] + viable_occupant.domutcheck() + if(SCANNER_ACTION_UI) + if(buffer_slot["UI"]) + viable_occupant.dna.uni_identity = buffer_slot["UI"] + viable_occupant.updateappearance(mutations_overlay_update=1) + if(SCANNER_ACTION_UE) + if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) + viable_occupant.real_name = buffer_slot["name"] + viable_occupant.name = buffer_slot["name"] + viable_occupant.dna.unique_enzymes = buffer_slot["UE"] + viable_occupant.dna.blood_type = buffer_slot["blood_type"] + if(SCANNER_ACTION_MIXED) + if(buffer_slot["UI"]) + viable_occupant.dna.uni_identity = buffer_slot["UI"] + viable_occupant.updateappearance(mutations_overlay_update=1) + if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) + viable_occupant.real_name = buffer_slot["name"] + viable_occupant.name = buffer_slot["name"] + viable_occupant.dna.unique_enzymes = buffer_slot["UE"] + viable_occupant.dna.blood_type = buffer_slot["blood_type"] + +/obj/machinery/computer/scan_consolenew/proc/on_scanner_close() + connected.occupant << "[src] activates!" + if(delayed_action) + apply_buffer(delayed_action["action"],delayed_action["buffer"]) + delayed_action = null //or make it stick + reset button ? + return /////////////////////////// DNA MACHINES #undef INJECTOR_TIMEOUT @@ -475,6 +544,11 @@ #undef RADIATION_IRRADIATION_MULTIPLIER +#undef SCANNER_ACTION_SE +#undef SCANNER_ACTION_UI +#undef SCANNER_ACTION_UE +#undef SCANNER_ACTION_MIXED + //#undef BAD_MUTATION_DIFFICULTY //#undef GOOD_MUTATION_DIFFICULTY -//#undef OP_MUTATION_DIFFICULTY \ No newline at end of file +//#undef OP_MUTATION_DIFFICULTY diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 6597ee9fd2e..a67091a4cad 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -93,10 +93,8 @@ else dat += "
" - dat += "
| X | Channel | Nick | Message |
|---|---|---|---|
| [msg.channel] | [msg.sender] | [msg.message] |
Swipe ID card to unlock interface
"
- else
- if (!istype(user, /mob/living/silicon))
- t += "Swipe ID card to lock interface
"
- t += text("Turrets [] - []?\n", src.enabled?"activated":"deactivated", src, src.enabled?"Disable":"Enable") - t += text("Currently set for [] - Change to []?
\n", src.lethal?"lethal":"stun repeatedly", src, src.lethal?"Stun repeatedly":"Lethal") - - //user << browse(t, "window=turretid") - //onclose(user, "turretid") - var/datum/browser/popup = new(user, "turretid", "Turret Control Panel ([area.name])") - popup.set_content(t) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - -/obj/machinery/areaturretid/Topic(href, href_list) - if(..()) - return - if (src.locked) - if (!istype(usr, /mob/living/silicon)) - usr << "Control panel is locked!" - return - if (href_list["toggleOn"]) - src.enabled = !src.enabled - src.updateTurrets() - else if (href_list["toggleLethal"]) - src.lethal = !src.lethal - src.updateTurrets() - src.attack_hand(usr) - -/obj/machinery/areaturretid/proc/updateTurrets() - if(control_area) - for (var/obj/machinery/turret/aTurret in get_area_all_atoms(control_area)) - aTurret.setState(enabled, lethal) - src.update_icon() - -/obj/machinery/areaturretid/power_change() - ..() - update_icon() - -/obj/machinery/areaturretid/update_icon() - ..() - if(stat & NOPOWER) - icon_state = "control_off" - else if (enabled) - if (lethal) - icon_state = "control_kill" - else - icon_state = "control_stun" - else - icon_state = "control_standby" \ No newline at end of file diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 6ce6246dbad..ae89085fdb2 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -109,7 +109,7 @@ icon_state = "mecha_plasmacutter" item_state = "plasmacutter" energy_drain = 60 - origin_tech = "materials=3;combat=2;powerstorage=3;plasma=3" + origin_tech = "materials=3;combat=2;powerstorage=3;plasmatech=3" projectile = /obj/item/projectile/plasma/adv/mech fire_sound = 'sound/weapons/Laser.ogg' diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 2fc1888e9f9..f318ec85e7f 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -19,6 +19,7 @@ layer = MOB_LAYER - 0.2//icon draw layer infra_luminosity = 15 //byond implementation is bugged. force = 5 + flags = HEAR var/can_move = 1 var/mob/living/carbon/occupant = null var/step_in = 10 //make a step in step_in/10 sec. @@ -76,6 +77,7 @@ var/datum/action/innate/mecha/mech_toggle_lights/lights_action = new var/datum/action/innate/mecha/mech_view_stats/stats_action = new + hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD) /obj/mecha/New() ..() @@ -88,8 +90,16 @@ spark_system.attach(src) add_cell() SSobj.processing |= src + poi_list |= src log_message("[src.name] created.") mechas_list += src //global mech list + prepare_huds() + var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC] + diag_hud.add_to_hud(src) + diag_hud_set_mechhealth() + diag_hud_set_mechcell() + diag_hud_set_mechstat() + return /obj/mecha/Destroy() @@ -130,6 +140,7 @@ if(internal_tank) qdel(internal_tank) SSobj.processing.Remove(src) + poi_list.Remove(src) equipment.Cut() cell = null internal_tank = null @@ -314,15 +325,26 @@ var/lights_energy_drain = 2 use_power(lights_energy_drain) - +//Diagnostic HUD updates + diag_hud_set_mechhealth() + diag_hud_set_mechcell() + diag_hud_set_mechstat() /obj/mecha/proc/drop_item()//Derpfix, but may be useful in future for engineering exosuits. return /obj/mecha/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans) - if(speaker == occupant && radio.broadcasting) - radio.talk_into(speaker, text, , spans) + if(speaker == occupant) + if(radio.broadcasting) + radio.talk_into(speaker, text, , spans) + //flick speech bubble + var/list/speech_bubble_recipients = list() + for(var/mob/M in get_hearers_in_view(7,src)) + if(M.client) + speech_bubble_recipients.Add(M.client) + spawn(0) + flick_overlay(image('icons/mob/talk.dmi', src, "hR[say_test(raw_message)]",MOB_LAYER+1), speech_bubble_recipients, 30) return //////////////////////////// @@ -482,6 +504,7 @@ internal_damage |= int_dam_flag log_append_to_last("Internal damage of type [int_dam_flag].",1) occupant << sound('sound/machines/warning-buzzer.ogg',wait=0) + diag_hud_set_mechstat() return /obj/mecha/proc/clearInternalDamage(int_dam_flag) @@ -494,7 +517,7 @@ if(MECHA_INT_TANK_BREACH) occupant_message("Damaged internal tank has been sealed.") internal_damage &= ~int_dam_flag - + diag_hud_set_mechstat() ///////////////////////////////////// //////////// AI piloting //////////// diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index 6e72db4a2f8..efb5b3d31b4 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -16,7 +16,7 @@ if(H.glasses && istype(H.glasses, /obj/item/clothing/glasses/hud)) occupant_message("Your [H.glasses] prevent you from using the built-in medical hud.") else - var/datum/atom_hud/data/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED] + var/datum/atom_hud/data/human/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED] A.add_hud_to(H) builtin_hud_user = 1 return 1 @@ -26,7 +26,7 @@ /obj/mecha/medical/odysseus/go_out() if(ishuman(occupant) && builtin_hud_user) var/mob/living/carbon/human/H = occupant - var/datum/atom_hud/data/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED] + var/datum/atom_hud/data/human/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED] A.remove_hud_from(H) ..() return diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 309cf84765e..f1a5e55db55 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -42,7 +42,7 @@ buckled_mob = M M.update_canmove() post_buckle_mob(M) - M.throw_alert("buckled", /obj/screen/alert/buckled, new_master = src) + M.throw_alert("buckled", /obj/screen/alert/restrained/buckled, new_master = src) return 1 diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 30bc38bf624..458e11920ba 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -9,6 +9,7 @@ density = 0 anchored = 1 luminosity = 3 + var/movechance = 70 var/obj/item/device/assembly/signaler/anomaly/aSignal = null /obj/effect/anomaly/New() @@ -22,10 +23,14 @@ /obj/effect/anomaly/proc/anomalyEffect() - if(prob(50)) + if(prob(movechance)) step(src,pick(alldirs)) +/obj/effect/anomaly/ex_act(severity, target) + if(severity == 1) + qdel(src) + /obj/effect/anomaly/proc/anomalyNeutralize() PoolOrNew(/obj/effect/particle_effect/smoke/bad, loc) @@ -37,7 +42,7 @@ /obj/effect/anomaly/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/analyzer)) - user << "Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)]." + user << "Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code]." /////////////////////// @@ -53,20 +58,18 @@ /obj/effect/anomaly/grav/anomalyEffect() ..() - boing = 1 for(var/obj/O in orange(4, src)) if(!O.anchored) step_towards(O,src) for(var/mob/living/M in orange(4, src)) step_towards(M,src) - for(var/obj/O in orange(1,src)) + for(var/obj/O in range(0,src)) if(!O.anchored) - var/mob/living/target = locate() in view(10,src) - if(!target) + var/mob/living/target = locate() in view(4,src) + if(target && !target.stat) O.throw_at(target, 5, 10) - /obj/effect/anomaly/grav/Bump(mob/A) gravShock(A) return @@ -88,11 +91,39 @@ /obj/effect/anomaly/flux name = "flux wave anomaly" icon_state = "electricity2" + density = 1 + var/canshock = 0 + var/shockdamage = 20 /obj/effect/anomaly/flux/New() ..() aSignal.origin_tech = "powerstorage=6;programming=4;plasmatech=4" +/obj/effect/anomaly/flux/anomalyEffect() + ..() + canshock = 1 + +/obj/effect/anomaly/flux/Bump(mob/living/M) + mobShock(M) + +/obj/effect/anomaly/flux/Bumped(mob/living/M) + mobShock(M) + +/obj/effect/anomaly/flux/proc/mobShock(mob/living/M) + if(canshock && istype(M)) + canshock = 0 //Just so you don't instakill yourself if you slam into the anomaly five times in a second. + if(iscarbon(M)) + if(ishuman(M)) + M.electrocute_act(shockdamage, "[name]", safety=1) + return + M.electrocute_act(shockdamage, "[name]") + return + else + M.adjustFireLoss(shockdamage) + M.visible_message("[M] was shocked by \the [name]!", \ + "You feel a powerful shock coursing through your body!", \ + "You hear a heavy electrical crack.") + ///////////////////// /obj/effect/anomaly/bluespace @@ -105,9 +136,14 @@ ..() aSignal.origin_tech = "bluespace=5;magnets=5;powerstorage=3" +/obj/effect/anomaly/bluespace/anomalyEffect() + ..() + for(var/mob/living/M in range(1,src)) + do_teleport(M, locate(M.x, M.y, M.z), 4) + /obj/effect/anomaly/bluespace/Bumped(atom/A) if(isliving(A)) - do_teleport(A, locate(A.x, A.y, A.z), 10) + do_teleport(A, locate(A.x, A.y, A.z), 8) return ///////////////////// @@ -124,7 +160,7 @@ ..() var/turf/simulated/T = get_turf(src) if(istype(T)) - T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 3) + T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS | SPAWN_OXYGEN, 15) ///////////////////// @@ -146,13 +182,13 @@ grav(rand(0,3), rand(2,3), 50, 25) //Throwing stuff around! - for(var/obj/O in orange(1,src)) + for(var/obj/O in range(2,src)) + if(O == src) + return //DON'T DELETE YOURSELF GOD DAMN if(!O.anchored) - var/mob/living/target = locate() in view(5,src) - if(!target) - return - O.throw_at(target, 5, 10) - return + var/mob/living/target = locate() in view(4,src) + if(target && !target.stat) + O.throw_at(target, 7, 5) else O.ex_act(2) diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index 98177d53658..fb738123e0a 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -11,7 +11,10 @@ /obj/effect/forcefield/CanAtmosPass(turf/T) return !density - +/obj/effect/forcefield/cult + desc = "An unholy shield that blocks all attacks." + name = "glowing wall" + icon_state = "cultshield" ///////////Mimewalls/////////// diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 6e95048bd7f..e27a24e299c 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -20,36 +20,56 @@ spawn(10) qdel(src) /obj/effect/overlay/temp + icon = 'icons/effects/effects.dmi' + icon_state = "nothing" anchored = 1 - layer = 3.3 + layer = 4.1 + mouse_opacity = 0 var/duration = 10 var/randomdir = 1 +/obj/effect/overlay/temp/Destroy() + ..() + return QDEL_HINT_PUTINPOOL + /obj/effect/overlay/temp/New() if(randomdir) dir = pick(cardinal) + flick("[icon_state]", src) //Because we might be pulling it from a pool, flick whatever icon it uses so it starts at the start of the icon's animation. spawn(duration) qdel(src) + +/obj/effect/overlay/temp/cult + name = "unholy glow" + icon_state = "wallglow" + layer = 2.01 + randomdir = 0 + duration = 10 + +/obj/effect/overlay/temp/cult/floor + icon_state = "floorglow" + duration = 5 + + /obj/effect/overlay/temp/revenant name = "spooky lights" - icon = 'icons/effects/effects.dmi' icon_state = "purplesparkles" /obj/effect/overlay/temp/revenant/cracks - name = "spooky lights" + name = "glowing cracks" icon_state = "purplecrack" duration = 6 + /obj/effect/overlay/temp/emp name = "emp sparks" - icon = 'icons/effects/effects.dmi' icon_state = "empdisable" /obj/effect/overlay/temp/emp/pulse name = "emp pulse" icon_state = "emp pulse" - duration = 20 + duration = 8 randomdir = 0 diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index b6b3866915c..109a8c7de4e 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -198,7 +198,7 @@ S.poison_per_bite = poison_per_bite S.poison_type = poison_type if(player_spiders) - var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET) + var/list/candidates = get_candidates(ROLE_ALIEN, ALIEN_AFK_BRACKET) shuffle(candidates) diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 2e057a088e9..04df8194e9d 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -9,7 +9,7 @@ log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ") if(heavy_range > 1) - new/obj/effect/overlay/temp/emp/pulse(epicenter) + PoolOrNew(/obj/effect/overlay/temp/emp/pulse, epicenter) if(heavy_range > light_range) light_range = heavy_range diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 1f72ec2e519..bcc57984f30 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -150,7 +150,7 @@ for(var/i,i<=doppler_arrays.len,i++) var/obj/machinery/doppler_array/Array = doppler_arrays[i] if(Array) - Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range) + Array.sense_explosion(epicenter,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range) return 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 62d1d8a6538..f06293ac369 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -230,12 +230,13 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s pickup(user) add_fingerprint(user) - user.put_in_active_hand(src) + if(!user.put_in_active_hand(src)) + dropped(user) return /obj/item/attack_paw(mob/user) - + var/picked_up = 0 if (istype(src.loc, /obj/item/weapon/storage)) for(var/mob/M in range(1, src.loc)) if (M.s_active == src.loc) @@ -249,8 +250,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s if(istype(src.loc, /mob/living)) return src.pickup(user) + picked_up = 1 - user.put_in_active_hand(src) + if(!user.put_in_active_hand(src) && picked_up) + dropped(user) return diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 1dacdc3764f..89c1826deb4 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -184,7 +184,7 @@ RA.name = str usr << "You rename the '[prevname]' to '[str]'." interact() - return + return 1 /obj/item/areaeditor/proc/set_area_machinery_title(area/A,title,oldtitle) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 66b97a5b5d1..907697bac1e 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -1,42 +1,42 @@ /obj/item/toy/crayon/red icon_state = "crayonred" - colour = "#DA0000" + paint_color = "#DA0000" colourName = "red" /obj/item/toy/crayon/orange icon_state = "crayonorange" - colour = "#FF9300" + paint_color = "#FF9300" colourName = "orange" /obj/item/toy/crayon/yellow icon_state = "crayonyellow" - colour = "#FFF200" + paint_color = "#FFF200" colourName = "yellow" /obj/item/toy/crayon/green icon_state = "crayongreen" - colour = "#A8E61D" + paint_color = "#A8E61D" colourName = "green" /obj/item/toy/crayon/blue icon_state = "crayonblue" - colour = "#00B7EF" + paint_color = "#00B7EF" colourName = "blue" /obj/item/toy/crayon/purple icon_state = "crayonpurple" - colour = "#DA00FF" + paint_color = "#DA00FF" colourName = "purple" /obj/item/toy/crayon/white icon_state = "crayonwhite" - colour = "#FFFFFF" + paint_color = "#FFFFFF" colourName = "white" /obj/item/toy/crayon/mime icon_state = "crayonmime" desc = "A very sad-looking crayon." - colour = "#FFFFFF" + paint_color = "#FFFFFF" colourName = "mime" uses = -1 @@ -44,24 +44,24 @@ update_window(user) /obj/item/toy/crayon/mime/update_window(mob/living/user) - dat += "
Close"
if ((!isnull(cartridge)) && (mode == 0))
dat += " | 
Eject [cartridge]"
- if (mode && !noreturn)
+ if (mode)
dat += " | 
Return"
dat += " | 
Refresh"
@@ -307,7 +296,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "- "
dat += "
Notekeeper "
dat += "
Messenger "
- dat += "
Nanotrasen Relay Chat ([new_ntrc_msg] unread) "
if (cartridge)
if (cartridge.access_clown)
@@ -451,17 +439,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "Temperature: [round(environment.temperature-T0C)]°C
" dat += "
" - if (5) - new_ntrc_msg = 0 - dat += "
Nanotrasen Relay Chat Network V1.2
"
-
- dat += "[nick] | "
- dat += "[chat_channel] | "
- dat += "Write message | "
- dat += "Help" - if(chat_channel) - dat += ntrclog[chat_channel] - else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub. dat += cart @@ -528,8 +505,6 @@ var/global/list/obj/item/device/pda/PDAs = list() mode = 3 if("4")//Redirects to hub mode = 0 - if("5")//Chatroom - mode = 5 //MAIN FUNCTIONS=================================== @@ -639,41 +614,6 @@ var/global/list/obj/item/device/pda/PDAs = list() U << browse(null, "window=pda") return - -//CHATROOM FUNCTIONS==================================== - - if("Set Nick") - var/n = trim(stripped_input(U, "Please enter nickname", name, nick, 9)) - if(n) - nick = n - - if("Set Channel") - var/t = replacetext(trim(stripped_input(U, "Please enter channel", name, chat_channel, 15)), " ", "_") - if(t) - var/datum/chatroom/C = chatchannels[chat_channel] - var/ret = C.parse_msg(src, nick, "/join [t]") - if((ret in chatchannels) && (ret != chat_channel)) - ntrclog[chat_channel] = "
" + ntrclog[chat_channel] - chat_channel = ret - - if("NTRC Message") - var/t = msg_input(U) - if(t) - var/datum/chatroom/C = chatchannels[chat_channel] - if(C) - var/ret = C.parse_msg(src, nick, t) - if(findtextEx(ret, "BAD_", 1, 5)) - ntrclog[chat_channel] = "[ret]
" + ntrclog[chat_channel] - else if(ret in chatchannels) - chat_channel = ret - - if("NTRC Help") - var/helptext = "NTRC Commands:
" - helptext += "/join \[#\](channel name)
/register
/log (amount of lines)
" - usr << browse(helptext, "window=ntrchelp;size=200x200;border=1;can_resize=1;can_close=1;can_minimize=1") - - - //SYNDICATE FUNCTIONS=================================== if("Toggle Door") @@ -1144,17 +1084,6 @@ var/global/list/obj/item/device/pda/PDAs = list() else usr << "You do not have a PDA. You should make an issue report about this." -/mob/living/silicon/ai/verb/cmd_use_chatroom() - set category = "AI Commands" - set name = "PDA - Chatrooms" - if(usr.stat == 2) - return //won't work if dead - if(!isnull(aiPDA)) - aiPDA.mode = 5 - aiPDA.attack_self(src) - else - usr << "You do not have a PDA. You should make an issue report about this." - /mob/living/silicon/ai/proc/cmd_show_message_log(mob/user) if(user.stat == 2) return //won't work if dead @@ -1194,25 +1123,6 @@ var/global/list/obj/item/device/pda/PDAs = list() spawn(200 * severity) emped -= 1 -//ntrc handler proc -/obj/item/device/pda/proc/msg_chat(channel as text, sender as text, message as text) - var/msg = "[html_encode(sender)]| [html_encode(message)]
" - if(!channel) - for(var/C in ntrclog) - ntrclog[C] = msg + ntrclog[C] - else - ntrclog[channel] = msg + ntrclog[channel] - if (findtext(message, nick) && !silent) - audible_message("\icon[src] *[ttone]*", null, 3) - new_ntrc_msg++ - -/obj/item/device/pda/proc/setup_chatrooms() //this can't be done on New() because the messaging server needs to be instanced first - if(!nick) //first time using the PDA - //join the default chat channel - nick = copytext(sanitize(owner), 1, 9) - var/datum/chatroom/C = chatchannels[chat_channel] - C.parse_msg(src, nick, "/join [chat_channel]") - /proc/get_viewable_pdas() . = list() // Returns a list of PDAs which can be viewed from another PDA/message monitor. diff --git a/code/game/objects/items/devices/PDA/chatroom.dm b/code/game/objects/items/devices/PDA/chatroom.dm deleted file mode 100644 index a46b4def36f..00000000000 --- a/code/game/objects/items/devices/PDA/chatroom.dm +++ /dev/null @@ -1,111 +0,0 @@ -var/datum/chatroom/default_ntrc_chatroom = new() -var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom) - -//procs that can be used directly: -//channel.parse_msg - -/datum/chatroom - var/name = "#ss13" - var/list/logs = list() // chat logs - var/list/auth = list() // authenticated clients - var/list/authed = list() //authenticated users - var/datum/events/events = new () - var/list/datum/event/evlist = list() - -//parse_msg() is the exposed interface chat -//clients should interact with parse_msg() and parse_msg() only - -/datum/chatroom/proc/parse_msg(client,nick,message) - var/obj/machinery/message_server/MS = check_server(client) - if(!MS) - return "BAD_TCOM" - - if(!get_auth(client,nick) || !nick || length(nick) > 8) - return "BAD_NICK" - - MS.send_chat_message(nick,name,message) - - if(findtext(message,"/",1,2)) - var/list/cmd=text2list(message, " ") - switch(cmd[1]) - if("/register") - if(cmd.len == 1) - return register_auth(client,nick) - else - return "BAD_COMMAND_ARGUMENTS" - if("/join") - if(cmd.len == 2 && cmd[2]) - if((findtext(cmd[2],"#",1,2) && length(cmd[2]) > 1) || (!findtext(cmd[2],"#",1,2) && length(cmd[2]) > 0)) - return channel_join(client,nick,copytext(cmd[2], 1, 15)) - else // Happens only if "" or "#" is entered as a channel name. - return "BAD_CHANNEL" - else - return "BAD_COMMAND_ARGUMENTS" - if("/log") - if(cmd.len == 2 && cmd[2]) - return get_log(client,nick,cmd[2]) - else - return "BAD_COMMAND_ARGUMENTS" - else - return "BAD_COMMAND" - - return send_message(client,nick,message) - -//the following are helper procs, FOR INTERNAL USE ONLY - -/datum/chatroom/proc/check_server(client) - var/atom/C = client - var/turf/CT = get_turf(C) - if(message_servers) - for (var/obj/machinery/message_server/MS in message_servers) - var/turf/T = get_turf(MS) - if(MS.active && (T.z == CT.z)) - return MS - return null - -/datum/chatroom/proc/send_message(client,nick,message) //standard message - if(!message) - return 0 - logs.Insert(1,"[html_encode(nick)]> [html_encode(message)]") - log_chat("[usr]/([usr.ckey]) as [nick] sent to [name]: [message]") - events.fireEvent("msg_chat",name,nick,message) - return 1 - -/datum/chatroom/proc/get_auth(client,nick) //check auth - if((!(nick in authed)) || (auth[client] == nick)) - return 1 - return 0 - -//chat commands go here, FOR INTERNAL USE ONLY -/datum/chatroom/proc/register_auth(client,nick) //register - if(!get_auth(client,nick)) - return "BAD_REGS" - auth[client] = nick - authed += nick - return 1 - -/datum/chatroom/proc/channel_join(client,nick,channel) //join - if(!findtext(channel,"#",1,2)) - channel = "#" + channel - if(channel == name) //join this channel - if(!(client in evlist)) - evlist[client] = events.addEvent("msg_chat",client,"msg_chat") - return name - - else //leave this channel, join another one - if(client in evlist) - events.clearEvent("msg_chat",evlist[client]) - evlist -= client - if(!(channel in chatchannels)) - var/datum/chatroom/NC = new /datum/chatroom() - NC.name = channel - chatchannels[channel] = NC - var/datum/chatroom/C = chatchannels[channel] - return C.parse_msg(client,nick,"/join [channel]") - -/datum/chatroom/proc/get_log(client,nick,lines) //log - lines = text2num(lines) - lines = min(lines, logs.len) - for(var/i=0;i
" //ADMINVERBS -/client/proc/investigate_show( subject in list("hrefs","notes","watchlist","ntsl","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "kudzu") ) +/client/proc/investigate_show( subject in list("hrefs","notes","watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "kudzu") ) set name = "Investigate" set category = "Admin" if(!holder) return switch(subject) - if("singulo", "ntsl", "wires", "telesci", "gravity", "records", "cargo", "supermatter", "atmos", "kudzu") //general one-round-only stuff + if("singulo", "wires", "telesci", "gravity", "records", "cargo", "supermatter", "atmos", "kudzu") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index d8c04a9bbd6..39f37bc3d1a 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -351,7 +351,7 @@ else dat += "
| Nuclear Disk(s) | |
| [N.name], " var/atom/disk_loc = N.loc while(!istype(disk_loc, /turf)) @@ -440,6 +440,54 @@ dat += " | PM |
| Red Deity | |
| Red Deity: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "
| Blue Deity | |
| Blue Deity: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "
| Red Deity Prophets | |
| Red Deity Prophet: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "
| Blue Deity Prophets | |
| Blue Deity Prophet: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "
| Red Deity Followers | |
| Red Deity Followers: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "
| Blue Deity Followers | |
| Blue Deity Followers: [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "
| Traitors | "
- dat += "Antagonist Settings" + dat += "Special Role Settings" if(jobban_isbanned(user, "Syndicate")) dat += "You are banned from antagonist roles." - src.be_special = 0 - var/n = 0 + src.be_special = list() + + for (var/i in special_roles) if(jobban_isbanned(user, i)) - dat += "Be [i]: BANNED" + dat += "Be [capitalize(i)]: BANNED " else var/days_remaining = null if(config.use_age_restriction_for_jobs && ispath(special_roles[i])) //If it's a game mode antag, check if the player meets the minimum age @@ -394,10 +384,10 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set days_remaining = temp_mode.get_remaining_days(user.client) if(days_remaining) - dat += "Be [i]: \[IN [days_remaining] DAYS] " + dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS] " else - dat += "Be [i]: [src.be_special&(1< " - n++ + dat += "Be [capitalize(i)]: [(i in be_special) ? "Yes" : "No"] " + dat += " |
" + for (var/O in listofitems) + if(listofitems[O] <= 0) + continue + var/N = listofitems[O] + var/itemName = url_encode(O) + dat += "[capitalize(O)]:" + dat += " [N] " + dat += "Vend " + if(N > 5) + dat += "(x5)" + if(N > 10) + dat += "(x10)" + if(N > 25) + dat += "(x25)" + if(N > 1) + dat += "(All)" + + dat += "
" dat += "" user << browse("
Current Loaded Programs
" + dat += "Power Off" + for(var/area/A in program_cache) + dat += "[A.name]
" + if(emagged && emag_programs.len) + dat += "SUPERVISOR ACCESS - SAFETY PROTOCOLS DISABLED - CAUTION: EMITTER ANOMALY
" + for(var/area/A in emag_programs) + dat += "[A.name]
" + + var/datum/browser/popup = new(user, "computer", name, 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/computer/holodeck/attack_ai(var/mob/user as mob) + var/dat = "
Current Loaded Programs
" + + dat += "Power Off" + for(var/area/A in program_cache) + dat += "[A.name]
" + + if(emag_programs.len) + dat += "
" + if(emagged) + dat += "Safety protocol: Offline Engage
" + for(var/area/A in emag_programs) + dat += "[A.name]
" + else + dat += "Safety protocol: Online Disengage
" + + var/datum/browser/popup = new(user, "computer", name, 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + + +/obj/machinery/computer/holodeck/proc/load_program(var/area/A, var/force = 0, var/delay = 0) + if(stat) + A = offline_program + force = 1 + delay = 0 + if(program == A) + return + if(world.time < (last_change + 25 + (damaged?500:0)) && !force) + if(delay) + sleep(25) + else + if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve + return + if(get_dist(usr,src) <= 3) + usr << "ERROR. Recalibrating projection apparatus." + return + + last_change = world.time + active = (A != offline_program) + use_power = active+1 + + for(var/obj/effect/holodeck_effect/HE in effects) + HE.deactivate(src) + + for(var/item in spawned) + derez(item, forced=force) + + program = A + // note nerfing does not yet work on guns, should + // should also remove/limit/filter reagents? + // this is an exercise left to others I'm afraid. -Sayu + spawned = A.copy_contents_to(linked, 1, nerf_weapons = !emagged) + effects = list() + + spawn(30) + for(var/obj/effect/holodeck_effect/HE in spawned) + effects += HE + spawned -= HE + var/atom/x = HE.activate(src) + if(istype(x) || islist(x)) + spawned += x // holocarp are not forever + +/obj/machinery/computer/holodeck/proc/derez(var/obj/obj, var/silent = 1, var/forced = 0) + // Emagging a machine creates an anomaly in the derez systems. + if(obj && src.emagged && !src.stat && !forced) + if((ismob(obj) || istype(obj.loc,/mob)) && prob(50)) + spawn(50) .(obj,silent) // may last a disturbingly long time + return + spawned.Remove(obj) + + if(!obj) + return + var/turf/T = get_turf(obj) + for(var/atom/movable/AM in obj.contents) // these should be derezed if they were generated + AM.loc = T // otherwise make sure they are dropped + + if(istype(obj)) + var/mob/M = obj.loc + if(ismob(M)) + M.unEquip(obj, 1) //Holoweapons should always drop. + + for(var/mob/M in obj.contents) + M.loc = obj.loc + silent = 0 + + if(!silent) + var/obj/oldobj = obj + visible_message("The [oldobj.name] fades away!") + qdel(obj) \ No newline at end of file diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm new file mode 100644 index 00000000000..e547b1ca813 --- /dev/null +++ b/code/modules/holodeck/holo_effect.dm @@ -0,0 +1,87 @@ +/* + The holodeck activates these shortly after the program loads, + and deactivates them immediately before changing or disabling the holodeck. + + These remove snowflake code for special holodeck functions. +*/ +/obj/effect/holodeck_effect + icon = 'icons/mob/screen_gen.dmi' + icon_state = "x2" + invisibility = 101 + proc/activate(var/obj/machinery/computer/holodeck/HC) + return + proc/deactivate(var/obj/machinery/computer/holodeck/HC) + qdel(src) + return + // Called by the holodeck computer as long as the program is running + proc/tick(var/obj/machinery/computer/holodeck/HC) + return + + proc/safety(var/active) + return + + +// Generates a holodeck-tracked card deck +/obj/effect/holodeck_effect/cards + icon = 'icons/obj/toy.dmi' + icon_state = "deck_nanotrasen_full" + var/obj/item/toy/cards/deck/D + +/obj/effect/holodeck_effect/cards/activate(var/obj/machinery/computer/holodeck/HC) + D = new(loc) + safety(!HC.emagged) + D.holo = HC + return D + +/obj/effect/holodeck_effect/cards/safety(active) + if(!D) return + if(active) + D.card_hitsound = null + D.card_force = 0 + D.card_throwforce = 0 + D.card_throw_speed = 3 + D.card_throw_range = 7 + D.card_attack_verb = list("attacked") + else + D.card_hitsound = 'sound/weapons/bladeslice.ogg' + D.card_force = 5 + D.card_throwforce = 10 + D.card_throw_speed = 3 + D.card_throw_range = 7 + D.card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut") + + +/obj/effect/holodeck_effect/sparks/activate(var/obj/machinery/computer/holodeck/HC) + var/turf/T = get_turf(src) + if(T) + var/datum/effect_system/spark_spread/s = new + s.set_up(3, 1, T) + s.start() + T.temperature = 5000 + T.hotspot_expose(50000,50000,1) + + + +/obj/effect/holodeck_effect/mobspawner + var/mobtype = /mob/living/simple_animal/hostile/carp/holocarp + var/mob/mob = null + +/obj/effect/holodeck_effect/mobspawner/activate(var/obj/machinery/computer/holodeck/HC) + if(islist(mobtype)) mobtype = pick(mobtype) + mob = new mobtype(loc) + + // these vars are not really standardized but all would theoretically create stuff on death + for(var/v in list("butcher_results","corpse","weapon1","weapon2") & mob.vars) + mob.vars[v] = null + return mob + +/obj/effect/holodeck_effect/mobspawner/deactivate(var/obj/machinery/computer/holodeck/HC) + if(mob) HC.derez(mob) + qdel(src) + +/obj/effect/holodeck_effect/mobspawner/pet + mobtype = list( + /mob/living/simple_animal/butterfly, /mob/living/simple_animal/chick/holo, + /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten, + /mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/dog/corgi/puppy, + /mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/pet/fox) \ No newline at end of file diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm new file mode 100644 index 00000000000..755fcfcca20 --- /dev/null +++ b/code/modules/holodeck/items.dm @@ -0,0 +1,220 @@ +/* + Items, Structures, Machines +*/ + + +// +// Items +// + +/obj/item/weapon/holo + damtype = STAMINA + +/obj/item/weapon/holo/esword + name = "holographic energy sword" + desc = "May the force be with you. Sorta" + icon_state = "sword0" + force = 3.0 + throw_speed = 2 + throw_range = 5 + throwforce = 0 + w_class = 2.0 + hitsound = "swing_hit" + flags = NOSHIELD + var/active = 0 + +/obj/item/weapon/holo/esword/green + New() + item_color = "green" + +/obj/item/weapon/holo/esword/red + New() + item_color = "red" + +/obj/item/weapon/holo/esword/IsShield() + if(active) + return 1 + return 0 + +/obj/item/weapon/holo/esword/attack(target as mob, mob/user as mob) + ..() + +/obj/item/weapon/holo/esword/New() + item_color = pick("red","blue","green","purple") + +/obj/item/weapon/holo/esword/attack_self(mob/living/user as mob) + active = !active + if (active) + force = 30 + icon_state = "sword[item_color]" + w_class = 4 + hitsound = 'sound/weapons/blade1.ogg' + playsound(user, 'sound/weapons/saberon.ogg', 20, 1) + user << "[src] is now active." + else + force = 3 + icon_state = "sword0" + w_class = 2 + hitsound = "swing_hit" + playsound(user, 'sound/weapons/saberoff.ogg', 20, 1) + user << "[src] can now be concealed." + return + +//BASKETBALL OBJECTS + +/obj/item/toy/beach_ball/holoball + name = "basketball" + icon = 'icons/obj/basketball.dmi' + icon_state = "basketball" + item_state = "basketball" + desc = "Here's your chance, do your dance at the Space Jam." + w_class = 4 //Stops people from hiding it in their bags/pockets + +/obj/item/toy/beach_ball/holoball/dodgeball + name = "dodgeball" + icon_state = "dodgeball" + item_state = "dodgeball" + desc = "Used for playing the most violent and degrading of childhood games." + +/obj/item/toy/beach_ball/holoball/dodgeball/throw_impact(atom/hit_atom) + ..() + if((ishuman(hit_atom))) + var/mob/living/carbon/M = hit_atom + playsound(src, 'sound/items/dodgeball.ogg', 50, 1) + M.apply_damage(10, STAMINA) + if(prob(5)) + M.Weaken(3) + visible_message("[M] is knocked right off \his feet!", 3) + +// +// Structures +// + +/obj/structure/stool/bed/chair/holo/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/wrench)) + user << "It's holographic! There's no taking it apart." + return + ..() + +/obj/structure/stool/bed/chair/holo/comfy + name = "comfy chair" + desc = "It looks comfy." + icon_state = "comfychair" + color = rgb(255,113,0) + +/obj/structure/holohoop + name = "basketball hoop" + desc = "Boom, shakalaka!" + icon = 'icons/obj/basketball.dmi' + icon_state = "hoop" + anchored = 1 + density = 1 + +/obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob, params) + if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) + var/obj/item/weapon/grab/G = W + if(G.state < GRAB_AGGRESSIVE) + user << "You need a better grip to do that!" + return + G.affecting.loc = src.loc + G.affecting.Weaken(5) + visible_message("[G.assailant] dunks [G.affecting] into \the [src]!", 3) + qdel(W) + return + else if (istype(W, /obj/item) && get_dist(src,user)<2) + user.drop_item(src) + visible_message(" [user] dunks [W] into \the [src]!", 3) + return + +/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0) + if (istype(mover,/obj/item) && mover.throwing) + var/obj/item/I = mover + if(istype(I, /obj/item/projectile)) + return + if(prob(50)) + I.loc = src.loc + visible_message(" Swish! \the [I] lands in \the [src].", 3) + else + visible_message(" \the [I] bounces off of \the [src]'s rim!", 3) + return 0 + else + return ..(mover, target, height) + + + +// +// Machines +// + +/obj/machinery/readybutton + name = "ready declaration device" + desc = "This device is used to declare ready. If all devices in an area are ready, the event will begin!" + icon = 'icons/obj/monitors.dmi' + icon_state = "auth_off" + var/ready = 0 + var/area/currentarea = null + var/eventstarted = 0 + + anchored = 1.0 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 6 + power_channel = ENVIRON + +/obj/machinery/readybutton/attack_ai(mob/user as mob) + user << "The station AI is not to interact with these devices" + return + +/obj/machinery/readybutton/attack_paw(mob/user as mob) + user << "You are too primitive to use this device!" + return + +/obj/machinery/readybutton/New() + ..() + + +/obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params) + user << "The device is a solid button, there's nothing you can do with it!" + +/obj/machinery/readybutton/attack_hand(mob/user as mob) + if(user.stat || stat & (NOPOWER|BROKEN)) + user << "This device is not powered!" + return + + currentarea = get_area(src.loc) + if(!currentarea) + qdel(src) + + if(eventstarted) + usr << "The event has already begun!" + return + + ready = !ready + + update_icon() + + var/numbuttons = 0 + var/numready = 0 + for(var/obj/machinery/readybutton/button in currentarea) + numbuttons++ + if (button.ready) + numready++ + + if(numbuttons == numready) + begin_event() + +/obj/machinery/readybutton/update_icon() + if(ready) + icon_state = "auth_on" + else + icon_state = "auth_off" + +/obj/machinery/readybutton/proc/begin_event() + + eventstarted = 1 + + for(var/obj/structure/window/holo/W in currentarea) + qdel(W) + + for(var/mob/M in currentarea) + M << "FIGHT!" diff --git a/code/modules/holodeck/tables.dm b/code/modules/holodeck/tables.dm new file mode 100644 index 00000000000..b91731b33e8 --- /dev/null +++ b/code/modules/holodeck/tables.dm @@ -0,0 +1,68 @@ +/obj/structure/table/holo + name = "table" + frame = null + buildstackamount = 0 + framestackamount = 0 + canSmoothWith = null + +/obj/structure/table/holo/glass + name = "glass table" + icon = 'icons/obj/smooth_structures/glass_table.dmi' + icon_state = "glass_table" + +/obj/structure/table/holo/wood + name = "wood table" + icon = 'icons/obj/smooth_structures/wood_table.dmi' + icon_state = "wood_table" + canSmoothWith = list(/obj/structure/table/holo/wood, /obj/structure/table/holo/poker) + +/obj/structure/table/holo/poker + name = "poker table" + icon = 'icons/obj/smooth_structures/poker_table.dmi' + icon_state = "poker_table" + canSmoothWith = list(/obj/structure/table/holo/wood, /obj/structure/table/holo/poker) + +/obj/structure/table/holo/attack_paw(mob/user as mob) + return + +/obj/structure/table/holo/attack_alien(mob/user as mob) + return + +/obj/structure/table/holo/attack_animal(mob/living/simple_animal/user as mob) + return + +/obj/structure/table/holo/attack_hand(mob/user as mob) + return +/obj/structure/table/holo/attack_hulk() + return + +/obj/structure/table/holo/attackby(obj/item/I, mob/user, params) + if (istype(I, /obj/item/weapon/grab)) + tablepush(I, user) + return + if (istype(I, /obj/item/weapon/storage/bag/tray)) + var/obj/item/weapon/storage/bag/tray/T = I + if(T.contents.len > 0) // If the tray isn't empty + var/list/obj/item/oldContents = T.contents.Copy() + T.quick_empty() + + for(var/obj/item/C in oldContents) + C.loc = src.loc + + user.visible_message("[user] empties [I] on [src].") + return + // If the tray IS empty, continue on (tray will be placed on the table like other items) + + if(isrobot(user)) + return + + if(!(I.flags & ABSTRACT)) //rip more parems rip in peace ;_; + if(user.drop_item()) + I.Move(loc) + var/list/click_params = params2list(params) + //Center the icon where the user clicked. + if(!click_params || !click_params["icon-x"] || !click_params["icon-y"]) + return + //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf) + I.pixel_x = Clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2) + I.pixel_y = Clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2) diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm new file mode 100644 index 00000000000..b19c5bb019e --- /dev/null +++ b/code/modules/holodeck/turfs.dm @@ -0,0 +1,80 @@ +/turf/simulated/floor/holofloor + icon_state = "floor" + thermal_conductivity = 0 + broken_states = list() + burnt_states = list() + +/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob) + return // HOLOFLOOR DOES NOT GIVE A FUCK + +/turf/simulated/floor/holofloor/plating + name = "Holodeck Projector Floor" + icon_state = "engine" + +/turf/simulated/floor/holofloor/grass + gender = PLURAL + name = "lush grass" + icon_state = "grass" + +/turf/simulated/floor/holofloor/beach + name = "sand" + icon = 'icons/misc/beach.dmi' // what + icon_state = "sand" +/turf/simulated/floor/holofloor/beach/coast + name = "coastline" + icon = 'icons/misc/beach2.dmi' // why + icon_state = "sandwater" +/turf/simulated/floor/holofloor/beach/water + name = "water" + icon_state = "water" + +/turf/simulated/floor/holofloor/asteroid + name = "Asteroid" + icon_state = "asteroid0" + +/turf/simulated/floor/holofloor/asteroid/New() + icon_state = "asteroid[pick(0,1,2,3,4,5,6,7,8,9,10,11,12)]" + ..() + +/turf/simulated/floor/holofloor/space + name = "Space" + icon = 'icons/turf/space.dmi' + icon_state = "0" + +/turf/simulated/floor/holofloor/space/New() + icon_state = "[((x + y) ^ ~(x * y) + z) % 25]" // so realistic + ..() + +/turf/simulated/floor/holofloor/hyperspace + name = "Hyperspace" + icon = 'icons/turf/space.dmi' + icon_state = "speedspace_ew_1" + +/turf/simulated/floor/holofloor/hyperspace/New() + icon_state = "speedspace_ew_[(x + 5*y + (y%2+1)*7)%15+1]" + ..() + +/turf/simulated/floor/holofloor/hyperspace/ns/New() + ..() + icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]" + +/turf/simulated/floor/holofloor/carpet + name = "Carpet" + desc = "Electrically inviting." + icon = 'icons/turf/floors/carpet.dmi' + icon_state = "carpet" + floor_tile = /obj/item/stack/tile/carpet + broken_states = list("damaged") + smooth = SMOOTH_TRUE + canSmoothWith = null + +/turf/simulated/floor/holofloor/carpet/New() + ..() + spawn(1) + update_icon() + +/turf/simulated/floor/holofloor/carpet/update_icon() + if(!..()) + return 0 + if(intact) + smooth_icon(src) diff --git a/code/modules/holodeck/windows.dm b/code/modules/holodeck/windows.dm new file mode 100644 index 00000000000..41d3de65da7 --- /dev/null +++ b/code/modules/holodeck/windows.dm @@ -0,0 +1,44 @@ +/obj/structure/window/holo + name = "reinforced window" + icon = 'icons/obj/structures.dmi' + icon_state = "rwindow" + desc = "A window. It has an electric hum to it." + density = 1 + layer = 3.2//Just above doors + pressure_resistance = 4*ONE_ATMOSPHERE + anchored = 1.0 + flags = ON_BORDER + maxhealth = 100 + disassembled = 1 // prevents noise on destruction + +/obj/structure/window/holo/New() + ..() + for(var/O in contents) + qdel(O) // standard window code generates stuff no matter what we want + +/obj/structure/window/holo/spawnfragments() + qdel(src) + return + +/obj/structure/window/holo/attackby(var/obj/item/I, var/mob/user) + if(istype(I,/obj/item/weapon/screwdriver)) + user << "You see no screws to unfasten!" + return + return ..() + +/obj/structure/window/holo/hit(var/damage, var/sound_effect = 1) + . = ..() + spawn(50) // self-healing + health += damage + +/obj/structure/window/holo/opaque + name = "tinted window" + opacity = 1 + +/obj/structure/window/holo/fulltile + dir = 5 + maxhealth = 250 + +/obj/structure/window/holo/opaque/fulltile + dir = 5 + maxhealth = 250 \ No newline at end of file diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index b45639c8e00..85d0851f300 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -53,6 +53,12 @@ waterlevel = maxwater nutrilevel = 3 +/obj/machinery/hydroponics/Destroy() + if(myseed) + qdel(myseed) + myseed = null + return ..() + /obj/machinery/hydroponics/constructable/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I)) return diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index fd0ce010d97..bf4d6f79586 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -173,7 +173,8 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums var/list/inventory = list() var/checkoutperiod = 5 // In minutes var/obj/machinery/libraryscanner/scanner // Book scanner that will be used when uploading books to the Archive - var/libcomp_menu + var/list/libcomp_menu = list("") + var/page = 1 //current page of the external archives var/bibledelay = 0 // LOL NO SPAM (1 minute delay) -- Doohl /obj/machinery/computer/libraryconsole/bookmanagement/proc/build_library_menu() @@ -182,9 +183,15 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums load_library_db_to_cache() if(!cachedbooks) return - libcomp_menu = "" - for(var/datum/cachedbook/C in cachedbooks) - libcomp_menu += "
" dat += "
| AUTHOR | TITLE | CATEGORY | |
| <<<< | >>>> |
(Return to main menu)
" if(5) @@ -308,7 +316,8 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums usr << browse(null, "window=library") onclose(usr, "library") return - + if(href_list["page"] && screenstate == 4 && isnum(href_list["page"])) + page = text2num(href_list["page"]) if(href_list["switchscreen"]) switch(href_list["switchscreen"]) if("0") diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm new file mode 100644 index 00000000000..9c703aec9c0 --- /dev/null +++ b/code/modules/library/random_books.dm @@ -0,0 +1,68 @@ +/obj/item/weapon/book/manual/random/New() + var/static/banned_books = list(/obj/item/weapon/book/manual,/obj/item/weapon/book/manual/random,/obj/item/weapon/book/manual/nuclear,/obj/item/weapon/book/manual/wiki) + var/newtype = pick(typesof(/obj/item/weapon/book/manual) - banned_books) + new newtype(loc) + qdel(src) + +/obj/structure/bookcase/random + var/category = null + var/book_count = 2 + anchored = 1 + state = 2 +/obj/structure/bookcase/random/New() + ..() + if(ticker && ticker.current_state >= GAME_STATE_PLAYING) + initialize() + +/obj/structure/bookcase/random/initialize() + if(!book_count || !isnum(book_count)) + update_icon() + return + if(!establish_db_connection()) + if(prob(5)) + var/obj/item/weapon/paper/P = new(get_turf(loc)) + P.info = "There once was a book from Nantucket
But the database failed us, so f*$! it.
I tried to be good to you
Now this is an I.O.U
If you're feeling entitled, well, stuff it!
~" + update_icon() + return + if(category && prob(25)) category = null + book_count += pick(-1,-1,0,1,1) + if(book_count <= 0) + update_icon() + return + + var/c = category? " AND category='[sanitizeSQL(category)]'" :"" + var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("library")] WHERE isnull(deleted)[c] GROUP BY title ORDER BY rand() LIMIT [book_count];") // isdeleted copyright (c) not me + if(query.Execute()) + while(query.NextRow()) + var/obj/item/weapon/book/B = new(src) + B.author = query.item[2] + B.title = query.item[3] + B.dat = query.item[4] + B.name = "Book: [B.title]" + B.icon_state= "book[rand(1,7)]" + else + log_game("SQL ERROR populating library bookshelf. Category: \[[category]\], Count: [book_count], Error: \[[query.ErrorMsg()]\]\n") + update_icon() + +/obj/structure/bookcase/random/fiction + name = "bookcase (Fiction)" + category = "Fiction" +/obj/structure/bookcase/random/nonfiction + name = "bookcase (Non-Fiction)" + category = "Non-fiction" +/obj/structure/bookcase/random/religion + name = "bookcase (Religion)" + category = "Religion" +/obj/structure/bookcase/random/adult + name = "bookcase (Adult)" + category = "Adult" + +/obj/structure/bookcase/random/reference + name = "bookcase (Reference)" + category = "Reference" + var/ref_book_prob = 20 +/obj/structure/bookcase/random/reference/initialize() + while(book_count > 0 && prob(ref_book_prob)) + book_count-- + new /obj/item/weapon/book/manual/random(src) + ..() diff --git a/code/modules/lighting/lighting_system.dm b/code/modules/lighting/lighting_system.dm index e332250336c..5d13be87ec6 100644 --- a/code/modules/lighting/lighting_system.dm +++ b/code/modules/lighting/lighting_system.dm @@ -38,6 +38,7 @@ /datum/light_source var/atom/owner var/radius = 0 + var/cap = 0 var/changed = 1 var/list/effect = list() var/__x = 0 //x coordinate at last update @@ -130,7 +131,7 @@ #else distance = max(abs(x - L.__x), abs(y - L.__y)) #endif - return LIGHTING_CAP * (L.radius - distance) / L.radius + return ( L.cap ? L.cap : LIGHTING_CAP ) * (L.radius - distance) / L.radius //LIGHTING_CAP == strength for now @@ -178,7 +179,8 @@ //If we are setting luminosity to 0 the light will be cleaned up by the controller and garbage collected once all its //queues are complete. //if we have a light already it is merely updated, rather than making a new one. -/atom/proc/SetLuminosity(new_luminosity) +//The second arg allows you to scale the light cap for calculating falloff. (0 for default, null for no change) +/atom/proc/SetLuminosity(new_luminosity, new_cap) if(new_luminosity < 0) new_luminosity = 0 @@ -187,10 +189,12 @@ return light = new(src) else - if(light.radius == new_luminosity) + if(light.radius == new_luminosity && (new_cap == null || light.cap == new_cap)) return light.radius = new_luminosity luminosity = new_luminosity + if (new_cap != null) + light.cap = new_cap light.changed() /atom/proc/AddLuminosity(delta_luminosity) @@ -281,7 +285,7 @@ /turf/proc/init_lighting() var/area/A = loc - if(!A.lighting_use_dynamic || istype(src, /turf/space)) + if(!IS_DYNAMIC_LIGHTING(A) || istype(src, /turf/space)) lighting_changed = 0 if(lighting_object) lighting_object.alpha = 0 @@ -310,25 +314,39 @@ newalpha = 0 if(lighting_object.alpha != newalpha) - var/change_time = LIGHTING_TIME if(instantly) - change_time = 0 - animate(lighting_object, alpha = newalpha, time = change_time) + lighting_object.alpha = newalpha + else + animate(lighting_object, alpha = newalpha, time = LIGHTING_TIME) if(newalpha >= LIGHTING_DARKEST_VISIBLE_ALPHA) //Doesn't actually make it darker or anything, just tells byond you can't see the tile - animate(luminosity = 0, time = 0) + luminosity = 0 lighting_changed = 0 +/turf/proc/get_lumcount() + var/light_amount + if(!src || !istype(src)) + return + var/area/A = src.loc + if(!A || !istype(src)) + return + if(IS_DYNAMIC_LIGHTING(A)) + light_amount = src.lighting_lumcount + else + light_amount = LIGHTING_CAP + return light_amount + /area - var/lighting_use_dynamic = 1 //Turn this flag off to make the area fullbright + var/lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED //Turn this flag off to make the area fullbright /area/New() . = ..() - if(!lighting_use_dynamic) + if(lighting_use_dynamic != DYNAMIC_LIGHTING_ENABLED) luminosity = 1 /area/proc/SetDynamicLighting() - lighting_use_dynamic = 1 + if (lighting_use_dynamic == DYNAMIC_LIGHTING_DISABLED) + lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED luminosity = 0 for(var/turf/T in src.contents) T.init_lighting() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 3df906627e0..644f580afe9 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -108,8 +108,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/Move(NewLoc, direct) - if (orbiting) - stop_orbit() if(NewLoc) loc = NewLoc for(var/obj/effect/step_trigger/S in NewLoc) @@ -129,8 +127,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp for(var/obj/effect/step_trigger/S in locate(x, y, z)) //<-- this is dumb S.Crossed(src) -/mob/dead/observer/can_use_hands() return 0 -/mob/dead/observer/is_active() return 0 +/mob/dead/observer/is_active() + return 0 /mob/dead/observer/Stat() ..() @@ -209,7 +207,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Orbit" // "Haunt" set desc = "Follow and orbit a mob." - var/list/mobs = getmobs() + var/list/mobs = getpois() var/input = input("Please, select a mob!", "Haunt", null, null) as null|anything in mobs var/mob/target = mobs[input] ManualFollow(target) @@ -248,7 +246,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/list/dest = list() //List of possible destinations (mobs) var/target = null //Chosen target. - dest += getmobs() //Fill list, prompt user with list + dest += getpois(mobs_only=1) //Fill list, prompt user with list target = input("Please, select a player!", "Jump to Mob", null, null) as null|anything in dest if (!target)//Make sure we actually have a target @@ -387,6 +385,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(href_list["reenter"]) reenter_corpse() +//We don't want to update the current var +//But we will still carry a mind. +/mob/dead/observer/mind_initialize() + return + /mob/dead/observer/verb/toggle_ghosthud() set name = "Toggle Ghost HUD" set desc = "Toggles your ghost's on-screen HUD" @@ -415,3 +418,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) if(DATA_HUD_MEDICAL_ADVANCED) data_hud_seen = 0 + +/mob/dead/observer/canUseTopic() + if(check_rights(R_ADMIN, 0)) + return diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index ddab69b58f1..aa47b177b88 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -52,8 +52,12 @@ obj/effect/dummy/slaughter/relaymove(mob/user, direction) playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1) var/obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,mobloc) src.ExtinguishMob() - if(src.buckled) - src.buckled.unbuckle_mob() + if(buckled) + buckled.unbuckle_mob(force=1) + if(buckled_mob) + unbuckle_mob(force=1) + if(pulledby) + pulledby.stop_pulling() if(src.pulling && src.bloodcrawl == BLOODCRAWL_EAT) if(istype(src.pulling, /mob/living)) var/mob/living/victim = src.pulling diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 77c1aefa88e..08cb72c42ef 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -128,7 +128,6 @@ if(statpanel("Status")) stat(null, "Intent: [a_intent]") - stat(null, "Move Mode: [m_intent]") /mob/living/carbon/alien/Stun(amount) if(status_flags & CANSTUN) @@ -139,8 +138,10 @@ return /mob/living/carbon/alien/getTrail() - return "xltrails" - + if(getBruteLoss() < 200) + return pick (list("xltrails_1", "xltrails2")) + else + return pick (list("xttrails_1", "xttrails2")) /*---------------------------------------- Proc: AddInfectionImages() Des: Gives the client of the alien an image on each infected mob. diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index a0c39c21c27..a86233294e0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -285,6 +285,24 @@ Doesn't work on other aliens/AI.*/ return 1 +/obj/effect/proc_holder/alien/sneak + name = "Sneak" + desc = "Blend into the shadows to stalk your prey." + var/active = 0 + + action_icon_state = "alien_sneak" + +/obj/effect/proc_holder/alien/sneak/fire(mob/living/carbon/alien/humanoid/user) + if(!active) + user.alpha = 75 //Still easy to see in lit areas with bright tiles, almost invisible on resin. + user.sneaking = 1 + active = 1 + user << "You blend into the shadows..." + else + user.alpha = initial(user.alpha) + user.sneaking = 0 + active = 0 + user << "You reveal yourself!" /mob/living/carbon/proc/getPlasma() diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index aa86fe90a52..8e5b88cf393 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -10,6 +10,7 @@ internal_organs += new /obj/item/organ/internal/alien/plasmavessel internal_organs += new /obj/item/organ/internal/alien/acid internal_organs += new /obj/item/organ/internal/alien/neurotoxin + AddAbility(new /obj/effect/proc_holder/alien/sneak) ..() /mob/living/carbon/alien/humanoid/sentinel/handle_hud_icons_health() diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index f82f4ca38c0..cca0f0cdbab 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -12,6 +12,7 @@ var/pounce_cooldown_time = 30 var/custom_pixel_x_offset = 0 //for admin fuckery. var/custom_pixel_y_offset = 0 + var/sneaking = 0 //For sneaky-sneaky mode and appropriate slowdown //This is fine right now, if we're adding organ specific damage this needs to be updated /mob/living/carbon/alien/humanoid/New() @@ -21,7 +22,7 @@ /mob/living/carbon/alien/humanoid/movement_delay() . = ..() - . += move_delay_add + config.alien_delay //move_delay_add is used to slow aliens with stuns + . += move_delay_add + config.alien_delay + sneaking //move_delay_add is used to slow aliens with stuns /mob/living/carbon/alien/humanoid/emp_act(severity) if(r_store) r_store.emp_act(severity) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 230115528a3..ac68aa01542 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -8,6 +8,7 @@ mob_size = MOB_SIZE_LARGE layer = 6 pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper. + butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3) var/alt_inhands_file = 'icons/mob/alienqueen.dmi' diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm index dce532bbe14..9d8853c6c0d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm @@ -19,8 +19,6 @@ else if(lying || resting || sleeping) icon_state = "alien[caste]_sleep" - else if(m_intent == "run") - icon_state = "alien[caste]_running" else if(mob_size == MOB_SIZE_LARGE) icon_state = "alien[caste]" else diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index e1cf8dc0284..4162a583675 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -63,4 +63,7 @@ /mob/living/carbon/alien/CheckStamina() setStaminaLoss(max((staminaloss - 2), 0)) + return + +/mob/living/carbon/alien/handle_changeling() return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 8e64f7820cc..180084a981f 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -30,7 +30,7 @@ /obj/item/organ/internal/alien/plasmavessel name = "plasma vessel" icon_state = "plasma" - origin_tech = "biotech=5;plasma=2" + origin_tech = "biotech=5;plasmatech=2" w_class = 3 zone = "chest" slot = "plasmavessel" @@ -55,7 +55,7 @@ plasma_rate = 15 /obj/item/organ/internal/alien/plasmavessel/large/queen - origin_tech = "biotech=6;plasma=3" + origin_tech = "biotech=6;plasmatech=3" plasma_rate = 20 /obj/item/organ/internal/alien/plasmavessel/small 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 b0a7954a461..68d14b3a75b 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -67,7 +67,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds /obj/item/organ/internal/body_egg/alien_embryo/proc/AttemptGrow(gib_on_success = 1) if(!owner) return - var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET, "alien candidate") + var/list/candidates = get_candidates(ROLE_ALIEN, ALIEN_AFK_BRACKET, "alien candidate") var/client/C = null // To stop clientless larva, we will check that our host has a client diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 48b71893397..fbaa5e16486 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -38,3 +38,9 @@ /mob/living/carbon/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default return + +/mob/living/carbon/brain/check_ear_prot() + return 1 + +/mob/living/carbon/brain/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0) + return // no eyes, no flashing \ No newline at end of file diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index cb16be5dc03..752219b0815 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -144,8 +144,12 @@ /mob/living/carbon/brain/handle_status_effects() return +/mob/living/carbon/brain/handle_changeling() + return + /mob/living/carbon/brain/handle_regular_hud_updates() handle_vision() handle_hud_icons_health() update_action_buttons() return 1 + diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index c8f9a5b6067..27d29ef4e50 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -9,6 +9,7 @@ var/global/posibrain_notif_cooldown = 0 origin_tech = "biotech=3;programming=2" var/notified = 0 var/askDelay = 10 * 60 * 1 + var/used = 0 //Prevents split personality virus. May be reset if personality deletion code is added. brainmob = null req_access = list(access_robotics) mecha = null//This does not appear to be used outside of reference in mecha.dm. @@ -22,17 +23,18 @@ var/global/posibrain_notif_cooldown = 0 /obj/item/device/mmi/posibrain/proc/ping_ghosts(msg) if(!posibrain_notif_cooldown) - notify_ghosts("Positronic brain [msg] in [get_area(src)]! (Click to enter)", 'sound/effects/ghost2.ogg', source = src) + notify_ghosts("Positronic brain [msg] in [get_area(src)]!", 'sound/effects/ghost2.ogg', enter_link="(Click to enter)", source = src, attack_not_jump = 1) posibrain_notif_cooldown = 1 spawn(askDelay) //Global one minute cooldown to avoid spam. posibrain_notif_cooldown = 0 /obj/item/device/mmi/posibrain/attack_self(mob/user) if(brainmob && !brainmob.key && !notified) - //Start the process of notified for a new user. + //Start the process of requesting a new ghost. user << "You carefully locate the manual activation switch and start the positronic brain's boot process." ping_ghosts("requested") notified = 1 + used = 0 update_icon() spawn(askDelay) //Seperate from the global cooldown. notified = 0 @@ -47,7 +49,7 @@ var/global/posibrain_notif_cooldown = 0 //Two ways to activate a positronic brain. A clickable link in the ghost notif, or simply clicking the object itself. /obj/item/device/mmi/posibrain/proc/activate(mob/user) - if((brainmob && brainmob.key) || jobban_isbanned(user,"posibrain")) + if(used || (brainmob && brainmob.key) || jobban_isbanned(user,"posibrain")) return var/posi_ask = alert("Become a positronic brain? (Warning, You can no longer be cloned, and all past lives will be forgotten!)","Are you positive?","Yes","No") @@ -81,7 +83,7 @@ var/global/posibrain_notif_cooldown = 0 return /obj/item/device/mmi/posibrain/proc/transfer_personality(mob/candidate) - if(brainmob && brainmob.key) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain. + if(used || (brainmob && brainmob.key)) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain. candidate << "This brain has already been taken! Please try your possesion again later!" return notified = 0 @@ -97,6 +99,7 @@ var/global/posibrain_notif_cooldown = 0 visible_message("The positronic brain chimes quietly.") update_icon() + used = 1 /obj/item/device/mmi/posibrain/examine() @@ -118,7 +121,7 @@ var/global/posibrain_notif_cooldown = 0 if(UNCONSCIOUS) msg += "It doesn't seem to be responsive.\n" if(DEAD) msg += "It appears to be completely inactive.\n" else - msg += "It appears to be completely inactive.\n" + msg += "It appears to be completely inactive. The reset light is blinking.\n" msg += "*---------*" usr << msg return @@ -126,7 +129,7 @@ var/global/posibrain_notif_cooldown = 0 /obj/item/device/mmi/posibrain/New() brainmob = new(src) - brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI","HBL","MSO","RR"))]-[rand(100, 999)]" + brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI","HBL","MSO","RR","CHRI","CDB","HG","XSI","ORNG","GUN","KOR","MET","FRE","XIS","SLI","PKP","HOG","RZH","GOOF","MRPR","JJR","FIRC","INC","PHL","BGB","ANTR","MIW","WJ","JRD","CHOC","ANCL","JLLO","ANNS","KOS","TKRG","XAL","STLP","CBOS","DNCN","FXMC","DRSD"))]-[rand(100, 999)]" brainmob.real_name = brainmob.name brainmob.loc = src brainmob.container = src diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 76cb994555c..ad3c0b21371 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -37,7 +37,7 @@ src.bodytemperature += 2 /mob/living/carbon/movement_delay() - . = 0 + . = ..() if(legcuffed) . += legcuffed.slowdown @@ -84,6 +84,8 @@ shock_damage *= siemens_coeff if(shock_damage<1 && !override) return 0 + if(reagents.has_reagent("teslium")) + shock_damage *= 1.5 //If the mob has teslium in their body, shocks are 50% more damaging! take_overall_damage(0,shock_damage) //src.burn_skin(shock_damage) //src.adjustFireLoss(shock_damage) //burn_skin will do this for us @@ -269,13 +271,6 @@ item.throw_at(target, item.throw_range, item.throw_speed, src) -/mob/living/carbon/can_use_hands() - if(handcuffed) - return 0 - if(buckled && ! istype(buckled, /obj/structure/bed/chair)) // buckling does not restrict hands - return 0 - return 1 - /mob/living/carbon/restrained() if (handcuffed) return 1 diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 35f2619cfcf..f31fd834c05 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -24,7 +24,6 @@ has_limbs = 1 var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/ - var/remote_view = 0 var/list/obj/effect/proc_holder/alien/abilities = list() var/gib_type = /obj/effect/decal/cleanable/blood/gibs diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index 86ab99bf505..ae8d90f7985 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -121,6 +121,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 blood_max += 2 if(bleedsuppress) blood_max = 0 + if(reagents.has_reagent("heparin") && getBruteLoss()) //Heparin is a powerful toxin that causes bleeding + blood_max += 3 drip(blood_max) //Makes a blood drop, leaking amt units of blood from the mob diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 2ab52c617ef..b969552279b 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -72,6 +72,13 @@ m_type = 2 if ("custom") + if(jobban_isbanned(src, "emote")) + src << "You cannot send custom emotes (banned)" + return + if(src.client) + if(client.prefs.muted & MUTE_IC) + src << "You cannot send IC messages (muted)." + return var/input = copytext(sanitize(input("Choose an emote to display.") as text|null),1,MAX_MESSAGE_LEN) if (!input) return @@ -189,6 +196,9 @@ if ("me") if(silent) return + if(jobban_isbanned(src, "emote")) + src << "You cannot send custom emotes (banned)" + return if (src.client) if (client.prefs.muted & MUTE_IC) src << "You cannot send IC messages (muted)." diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d7bcfb9549d..752e796573f 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -241,8 +241,14 @@ if(bleedsuppress) msg += "[t_He] [t_is] bandaged with something.\n" - else if(blood_max) - msg += "[t_He] [t_is] bleeding!\n" + if(blood_max) + if(reagents.has_reagent("heparin")) + msg += "[t_He] [t_is] bleeding uncontrollably!\n" + else + msg += "[t_He] [t_is] bleeding!\n" + + if(reagents.has_reagent("teslium")) + msg += "[t_He] is emitting a gentle blue glow!\n" msg += "" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index fdbe76af769..e3cb4945259 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -48,7 +48,7 @@ sec_hud_set_implants() sec_hud_set_security_status() //...and display them. - add_to_all_data_huds() + add_to_all_human_data_huds() /mob/living/carbon/human/Destroy() for(var/atom/movable/organelle in organs) @@ -841,4 +841,16 @@ for(var/mob/M in viewers(src)) if(M.client) viewing += M.client - flick_overlay(image(icon,src,"electrocuted_generic",MOB_LAYER+1), viewing, anim_duration) \ No newline at end of file + flick_overlay(image(icon,src,"electrocuted_generic",MOB_LAYER+1), viewing, anim_duration) + +/mob/living/carbon/human/canUseTopic(atom/movable/M, be_close = 0) + if(incapacitated() || lying ) + return + if(!Adjacent(M)) + if((be_close == 0) && (dna.check_mutation(TK))) + if(tkMaxRangeCheck(src, M)) + return 1 + return + if(!isturf(M.loc) && M.loc != src) + return + return 1 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 63d4d57afae..e5e66dd7e27 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -40,29 +40,30 @@ emp_act dna.species.on_hit(proj_type, src) /mob/living/carbon/human/bullet_act(obj/item/projectile/P, def_zone) - if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) - if(check_reflect(def_zone)) // Checks if you've passed a reflection% check - visible_message("The [P.name] gets reflected by [src]!", \ - "The [P.name] gets reflected by [src]!") - // Find a turf near or on the original location to bounce to - if(P.starting) - var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) - var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) - var/turf/curloc = get_turf(src) + if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself + if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) + if(check_reflect(def_zone)) // Checks if you've passed a reflection% check + visible_message("The [P.name] gets reflected by [src]!", \ + "The [P.name] gets reflected by [src]!") + // Find a turf near or on the original location to bounce to + if(P.starting) + var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) + var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) + var/turf/curloc = get_turf(src) - // redirect the projectile - P.original = locate(new_x, new_y, P.z) - P.starting = curloc - P.current = curloc - P.firer = src - P.yo = new_y - curloc.y - P.xo = new_x - curloc.x + // redirect the projectile + P.original = locate(new_x, new_y, P.z) + P.starting = curloc + P.current = curloc + P.firer = src + P.yo = new_y - curloc.y + P.xo = new_x - curloc.x - return -1 // complete projectile permutation + return -1 // complete projectile permutation - if(check_shields(P.damage, "the [P.name]", P, 0, P.armour_penetration)) - P.on_hit(src, 100, def_zone) - return 2 + if(check_shields(P.damage, "the [P.name]", P, 0, P.armour_penetration)) + P.on_hit(src, 100, def_zone) + return 2 return (..(P , def_zone)) /mob/living/carbon/human/proc/check_reflect(def_zone) //Reflection checks for anything in your l_hand, r_hand, or wear_suit based on the reflection chance of the object diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e5adae3a750..47eea854d4d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -266,7 +266,7 @@ if(machine) if(!machine.check_eye(src)) reset_view(null) else - if(!client.adminobs) reset_view(null) + if(!remote_view && !client.adminobs) reset_view(null) dna.species.handle_vision(src) @@ -295,16 +295,6 @@ // make it so you can only puke so fast lastpuke = 0 - -/mob/living/carbon/human/handle_changeling() - if(mind && hud_used) - if(mind.changeling) - mind.changeling.regenerate(src) - hud_used.lingchemdisplay.invisibility = 0 - hud_used.lingchemdisplay.maptext = "
[round(mind.changeling.chem_charges)]
"
- else
- hud_used.lingchemdisplay.invisibility = 101
-
/mob/living/carbon/human/has_smoke_protection()
if(wear_mask)
if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 272270cc317..58118a145c4 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -33,6 +33,7 @@
var/hair_color = null // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color
var/hair_alpha = 255 // the alpha used by the hair. 255 is completely solid, 0 is transparent.
var/use_skintones = 0 // does it use skintones or not? (spoiler alert this is only used by humans)
+ var/need_nutrition = 1 //Does it need to eat food on a regular basis?
var/exotic_blood = null // If your race wants to bleed something other than bog standard blood, change this.
var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
var/list/no_equip = list() // slots the race can't equip stuff to
@@ -613,7 +614,7 @@
H.update_inv_wear_suit()
// nutrition decrease and satiety
- if (H.nutrition > 0 && H.stat != DEAD)
+ if (H.nutrition > 0 && H.stat != DEAD && !H.dna.species.need_nutrition)
var/hunger_rate = HUNGER_FACTOR
if(H.satiety > 0)
H.satiety--
@@ -821,7 +822,7 @@
////////////////
/datum/species/proc/movement_delay(mob/living/carbon/human/H)
- var/mspeed = 0
+ . = 0
if(!(H.status_flags & IGNORESLOWDOWN))
@@ -843,39 +844,37 @@
if(P.allow_thrust(0.01, H))
hasjetpack = 1
- mspeed = -1 - hasjetpack
+ . = -1 - hasjetpack
if(grav || !hasjetpack)
var/health_deficiency = (100 - H.health + H.staminaloss)
if(health_deficiency >= 40)
- mspeed += (health_deficiency / 25)
+ . += (health_deficiency / 25)
var/hungry = (500 - H.nutrition) / 5 //So overeat would be 100 and default level would be 80
if(hungry >= 70)
- mspeed += hungry / 50
+ . += hungry / 50
if(H.wear_suit)
- mspeed += H.wear_suit.slowdown
+ . += H.wear_suit.slowdown
if(H.shoes)
- mspeed += H.shoes.slowdown
+ . += H.shoes.slowdown
if(H.back)
- mspeed += H.back.slowdown
+ . += H.back.slowdown
if((H.disabilities & FAT))
- mspeed += 1.5
+ . += 1.5
if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
- mspeed += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
+ . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
- mspeed += speedmod
+ . += speedmod
if(grav)
if(H.status_flags & GOTTAGOFAST)
- mspeed -= 1
+ . -= 1
if(H.status_flags & GOTTAGOREALLYFAST)
- mspeed -= 2
-
- return mspeed
+ . -= 2
//////////////////
// ATTACK PROCS //
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index e972494831e..03b3a1f3aab 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -116,10 +116,7 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
if(isturf(H.loc)) //else, there's considered to be no light
var/turf/T = H.loc
- var/area/A = T.loc
- if(A)
- if(A.lighting_use_dynamic) light_amount = min(10,T.lighting_lumcount) - 5
- else light_amount = 5
+ light_amount = min(10,T.get_lumcount()) - 5
H.nutrition += light_amount
if(H.nutrition > NUTRITION_LEVEL_FULL)
H.nutrition = NUTRITION_LEVEL_FULL
@@ -175,10 +172,8 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
var/light_amount = 0
if(isturf(H.loc))
var/turf/T = H.loc
- var/area/A = T.loc
- if(A)
- if(A.lighting_use_dynamic) light_amount = T.lighting_lumcount
- else light_amount = 10
+ light_amount = T.get_lumcount()
+
if(light_amount > 2) //if there's enough light, start dying
H.take_overall_damage(1,1)
else if (light_amount < 2) //heal in the dark
@@ -216,7 +211,7 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
if(S.volume < 100)
if(H.nutrition >= NUTRITION_LEVEL_STARVING)
H.reagents.add_reagent("slimejelly", 0.5)
- H.nutrition -= 5
+ H.nutrition -= 2.5
if(S.volume < 50)
if(prob(5))
H << "You feel drained!"
@@ -244,6 +239,91 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
hair_color = "mutcolor"
hair_alpha = 150
ignored_by = list(/mob/living/simple_animal/slime)
+ burnmod = 0.5
+ coldmod = 2
+ heatmod = 0.5
+
+/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H)
+ if(recently_changed)
+ var/datum/action/innate/split_body/S = new
+ S.Grant(H)
+
+ for(var/datum/reagent/toxin/slimejelly/S in H.reagents.reagent_list)
+ if(S.volume >= 200)
+ if(prob(5))
+ H << "You feel very bloated!"
+ if(S.volume < 200)
+ if(H.nutrition >= NUTRITION_LEVEL_WELL_FED)
+ H.reagents.add_reagent("slimejelly", 0.5)
+ H.nutrition -= 2.5
+
+ ..()
+
+/datum/action/innate/split_body
+ name = "Split Body"
+ check_flags = AB_CHECK_ALIVE
+ button_icon_state = "slimesplit"
+ background_icon_state = "bg_alien"
+
+/datum/action/innate/split_body/CheckRemoval()
+ var/mob/living/carbon/human/H = owner
+ if(!ishuman(H) || !H.dna || !H.dna.species || H.dna.species.id != "slime")
+ return 1
+ return 0
+
+/datum/action/innate/split_body/Activate()
+ var/mob/living/carbon/human/H = owner
+ H << "You focus intently on moving your body while standing perfectly still..."
+ H.notransform = 1
+ for(var/datum/reagent/toxin/slimejelly/S in H.reagents.reagent_list)
+ if(S.volume >= 200)
+ var/mob/living/carbon/human/spare = new /mob/living/carbon/human(H.loc)
+ spare.underwear = "Nude"
+ H.dna.transfer_identity(spare, transfer_SE=1)
+ H.dna.features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
+ spare.real_name = spare.dna.real_name
+ spare.name = spare.dna.real_name
+ spare.updateappearance(mutcolor_update=1)
+ spare.domutcheck()
+ spare.Move(get_step(H.loc, pick(NORTH,SOUTH,EAST,WEST)))
+ S.volume = 80
+ H.notransform = 0
+ var/datum/action/innate/swap_body/callforward = new /datum/action/innate/swap_body()
+ var/datum/action/innate/swap_body/callback = new /datum/action/innate/swap_body()
+ callforward.body = spare
+ callforward.Grant(H)
+ callback.body = H
+ callback.Grant(spare)
+ H.mind.transfer_to(spare)
+ spare << "...and after a moment of disorentation, you're besides yourself!"
+ return
+
+ H << "...but there is not enough of you to go around! You must attain more mass to split!"
+ H.notransform = 0
+
+/datum/action/innate/swap_body
+ name = "Swap Body"
+ check_flags = AB_CHECK_ALIVE
+ button_icon_state = "slimeswap"
+ background_icon_state = "bg_alien"
+ var/mob/living/carbon/human/body
+
+/datum/action/innate/swap_body/CheckRemoval()
+ var/mob/living/carbon/human/H = owner
+ if(!ishuman(H) || !H.dna || !H.dna.species || H.dna.species.id != "slime")
+ return 1
+ return 0
+
+/datum/action/innate/swap_body/Activate()
+ if(!body || !istype(body) || !body.dna || !body.dna.species || body.dna.species.id != "slime" || body.stat == DEAD || qdeleted(body))
+ owner << "Something is wrong, you cannot sense your other body!"
+ Remove(owner)
+ return
+ if(body.stat == UNCONSCIOUS)
+ owner << "You sense this body has passed out for some reason. Best to stay away."
+ return
+
+ owner.mind.transfer_to(body)
/*
GOLEMS
@@ -257,7 +337,7 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
speedmod = 3
armor = 55
punchmod = 5
- no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_head, slot_w_uniform)
+ no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform)
nojumpsuit = 1
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem
@@ -300,6 +380,7 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
name = "Spooky Scary Skeleton"
id = "skeleton"
say_mod = "rattles"
+ need_nutrition = 0
sexes = 0
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
specflags = list(NOBREATH,HEATRES,COLDRES,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE)
@@ -382,16 +463,17 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_state"="plasmaman")
/datum/species/plasmaman
- name = "Plasbone"
+ name = "Plasmaman"
id = "plasmaman"
say_mod = "rattles"
sexes = 0
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
- specflags = list(NOBLOOD,RADIMMUNE)
+ meat = /obj/item/stack/sheet/mineral/plasma
+ specflags = list(NOBLOOD,RADIMMUNE,NOTRANSSTING)
safe_oxygen_min = 0 //We don't breath this
safe_toxins_min = 16 //We breath THIS!
safe_toxins_max = 0
dangerous_existence = 1 //So so much
+ need_nutrition = 0 //Hard to eat through a helmet
var/skin = 0
/datum/species/plasmaman/skin
@@ -407,7 +489,7 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_
/datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
var/datum/gas_mixture/environment = H.loc.return_air()
- if(!istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/plasmaman))
+ if(!istype(H.w_uniform, /obj/item/clothing/under/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/plasmaman))
if(environment)
var/total_moles = environment.total_moles()
if(total_moles)
@@ -418,19 +500,22 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_
H.IgniteMob()
else
if(H.fire_stacks)
- var/obj/item/clothing/suit/space/eva/plasmaman/P = H.wear_suit
+ var/obj/item/clothing/under/plasmaman/P = H.w_uniform
if(istype(P))
P.Extinguish(H)
H.update_fire()
-//Heal from plasma
-/datum/species/plasmaman/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
- if(chem.id == "plasma")
- H.adjustBruteLoss(-5)
- H.adjustFireLoss(-5)
- H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
- return 1
-
-
+/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H)
+ var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman
+ H.equipOutfit(O)
+ return 0
+/datum/species/plasmaman/qualifies_for_rank(rank, list/features)
+ if(rank in command_positions)
+ return 0
+ if(rank in security_positions)
+ return 0
+ if(rank == "Clown" || rank == "Mime")//No funny bussiness
+ return 0
+ return 1
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 99c4c0c541e..f5b8eb3a86a 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -392,9 +392,11 @@ Please contact me on #coderbus IRC. ~Carnie x
/mob/living/carbon/human/update_inv_legcuffed()
remove_overlay(LEGCUFF_LAYER)
+ clear_alert("legcuffed")
if(legcuffed)
overlays_standing[LEGCUFF_LAYER] = image("icon"='icons/mob/mob.dmi', "icon_state"="legcuff1", "layer"=-LEGCUFF_LAYER)
- apply_overlay(LEGCUFF_LAYER)
+ apply_overlay(LEGCUFF_LAYER)
+ throw_alert("legcuffed", /obj/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
/mob/living/carbon/human/update_hud() //TODO: do away with this if possible
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index f74ba6f4330..27ea1b59382 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -197,9 +197,44 @@
/mob/living/carbon/proc/handle_changeling()
- return
+ if(mind && hud_used)
+ if(mind.changeling)
+ mind.changeling.regenerate(src)
+ hud_used.lingchemdisplay.invisibility = 0
+ hud_used.lingchemdisplay.maptext = "[round(mind.changeling.chem_charges)]
"
+ else
+ hud_used.lingchemdisplay.invisibility = 101
+
/mob/living/carbon/handle_mutations_and_radiation()
+ if(dna && dna.temporary_mutations.len)
+ var/datum/mutation/human/HM
+ for(var/mut in dna.temporary_mutations)
+ if(dna.temporary_mutations[mut] < world.time)
+ if(mut == UI_CHANGED)
+ if(dna.previous["UI"])
+ dna.uni_identity = merge_text(dna.uni_identity,dna.previous["UI"])
+ updateappearance(mutations_overlay_update=1)
+ dna.previous.Remove("UI")
+ dna.temporary_mutations.Remove(mut)
+ continue
+ if(mut == UE_CHANGED)
+ if(dna.previous["name"])
+ real_name = dna.previous["name"]
+ name = real_name
+ dna.previous.Remove("name")
+ if(dna.previous["UE"])
+ dna.unique_enzymes = dna.previous["UE"]
+ dna.previous.Remove("UE")
+ if(dna.previous["blood_type"])
+ dna.blood_type = dna.previous["blood_type"]
+ dna.previous.Remove("blood_type")
+ dna.temporary_mutations.Remove(mut)
+ continue
+ HM = mutations_list[mut]
+ HM.force_lose(src)
+ dna.temporary_mutations.Remove(mut)
+
if(radiation)
switch(radiation)
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index a5b06559b32..db7a3cf58d7 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -143,16 +143,6 @@
emote("scratch")
return
-
-/mob/living/carbon/monkey/handle_changeling()
- if(mind && hud_used)
- if(mind.changeling)
- mind.changeling.regenerate(src)
- hud_used.lingchemdisplay.invisibility = 0
- hud_used.lingchemdisplay.maptext = "[round(mind.changeling.chem_charges)]
"
- else
- hud_used.lingchemdisplay.invisibility = 101
-
/mob/living/carbon/monkey/has_smoke_protection()
if(wear_mask)
if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 844ebd793ae..68e666e6911 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -39,22 +39,25 @@
//Prepare our med HUD...
..()
//...and display it.
- for(var/datum/atom_hud/data/medical/hud in huds)
+ for(var/datum/atom_hud/data/human/medical/hud in huds)
hud.add_to_hud(src)
/mob/living/carbon/monkey/movement_delay()
- var/tally = 0
if(reagents)
- if(reagents.has_reagent("morphine")) return -1
+ if(reagents.has_reagent("morphine"))
+ return -1
- if(reagents.has_reagent("nuka_cola")) return -1
+ if(reagents.has_reagent("nuka_cola"))
+ return -1
+ . = ..()
var/health_deficiency = (100 - health)
- if(health_deficiency >= 45) tally += (health_deficiency / 25)
+ if(health_deficiency >= 45)
+ . += (health_deficiency / 25)
if (bodytemperature < 283.222)
- tally += (283.222 - bodytemperature) / 10 * 1.75
- return tally+config.monkey_delay
+ . += (283.222 - bodytemperature) / 10 * 1.75
+ return . + config.monkey_delay
/mob/living/carbon/monkey/attack_paw(mob/living/M)
if(..()) //successful monkey bite.
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index 22b438cc53e..595609f1ccb 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -129,10 +129,12 @@
/mob/living/carbon/update_inv_handcuffed()
remove_overlay(HANDCUFF_LAYER)
+ clear_alert("handcuffed")
if(handcuffed)
drop_r_hand()
drop_l_hand()
stop_pulling() //TODO: should be handled elsewhere
+ throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = src.handcuffed)
if(hud_used) //hud handcuff icons
var/obj/screen/inventory/R = hud_used.r_hand_hud_object
var/obj/screen/inventory/L = hud_used.l_hand_hud_object
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index a3092fb9228..094ed866db3 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -144,6 +144,9 @@
m_type = 1
if ("me")
+ if(jobban_isbanned(src, "emote"))
+ src << "You cannot send custom emotes (banned)"
+ return
if (src.client)
if(client.prefs.muted & MUTE_IC)
src << "You cannot send IC messages (muted)."
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 72893f0d48e..af5c3b5e4bb 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -217,7 +217,7 @@
if (!( machine.check_eye(src) ))
reset_view(null)
else
- if(!client.adminobs)
+ if(!remote_view && !client.adminobs)
reset_view(null)
/mob/living/proc/update_sight()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 960675fbd51..e50ee8d2787 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -577,6 +577,19 @@ Sorry Giacom. Please don't be mad :(
// It's ugly. But everything related to inventory/storage is. -- c0
s_active.close(src)
+/mob/living/movement_delay()
+ . = ..()
+ if(isturf(loc))
+ var/turf/T = loc
+ . += T.slowdown
+ switch(m_intent)
+ if("run")
+ if(drowsyness > 0)
+ . += 6
+ . += config.run_speed
+ if("walk")
+ . += config.walk_speed
+
/mob/living/proc/makeTrail(turf/T, mob/living/M)
if(!has_gravity(M))
return
@@ -904,4 +917,14 @@ Sorry Giacom. Please don't be mad :(
new path(src.loc)
butcher_results.Remove(path) //In case you want to have things like simple_animals drop their butcher results on gib, so it won't double up below.
visible_message("[user] butchers [src].")
- gib()
\ No newline at end of file
+ gib()
+
+/mob/living/canUseTopic(atom/movable/M, be_close = 0, no_dextery = 0)
+ if(incapacitated())
+ return
+ if(no_dextery)
+ if(be_close && in_range(M, src))
+ return 1
+ else
+ src << "You don't have the dexterity to do this!"
+ return
\ No newline at end of file
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index cee4d42582c..462c2912e93 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -127,7 +127,7 @@
return
/mob/living/proc/adjust_fire_stacks(add_fire_stacks) //Adjusting the amount of fire_stacks we have on person
- fire_stacks = Clamp(fire_stacks + add_fire_stacks, min = -20, max = 20)
+ fire_stacks = Clamp(fire_stacks + add_fire_stacks, -20, 20)
if(on_fire && fire_stacks <= 0)
ExtinguishMob()
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 0c4d370dca7..27bd2ccb751 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -42,7 +42,6 @@
var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
var/list/image/staticOverlays = list()
var/has_limbs = 0 //does the mob have distinct limbs?(arms,legs, chest,head)
- var/list/datum/action/actions = list()
var/list/pipes_shown = list()
var/last_played_vent
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 02eb1a3d8c4..2077fd65399 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -842,4 +842,16 @@ var/list/ai_list = list()
return ..()
/mob/living/silicon/ai/can_buckle()
- return 0
\ No newline at end of file
+ return 0
+
+/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close = 0)
+ if(stat)
+ return
+ if(be_close && !in_range(M, src))
+ return
+ //stop AIs from leaving windows open and using then after they lose vision
+ //apc_override is needed here because AIs use their own APC when powerless
+ //get_turf_pixel() is because APCs in maint aren't actually in view of the inner camera
+ if(cameranet && !cameranet.checkTurfVis(get_turf_pixel(M)) && !apc_override)
+ return
+ return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 840f19ef3bb..cb5851e1012 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -177,3 +177,5 @@
health = maxHealth - getOxyLoss() - getToxLoss() - getBruteLoss()
if(!fire_res_on_core)
health -= getFireLoss()
+ diag_hud_set_status()
+ diag_hud_set_health()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm
index 2c0cbfbc247..fd1e5cf1701 100644
--- a/code/modules/mob/living/silicon/login.dm
+++ b/code/modules/mob/living/silicon/login.dm
@@ -5,4 +5,5 @@
ticker.mode.remove_gangster(mind, remove_bosses=1)
ticker.mode.remove_thrall(mind,0)
ticker.mode.remove_shadowling(mind)
+ ticker.mode.remove_hog_follower(mind,0)
..()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index ccabb8a7ece..4aea4929e76 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -9,7 +9,6 @@
/mob/living/silicon/pai/var/list/available_software = list(
"crew manifest" = 5,
"digital messenger" = 5,
- "chatroom client" = 5,
"medical records" = 15,
"security records" = 15,
//"camera jack" = 10,
@@ -67,8 +66,6 @@
left_part = src.softwareCamera()
if("signaller")
left_part = src.softwareSignal()
- if("chatroom")
- src.chatroom() //snowflake? maybe, but it's less effort this way
//usr << browse_rsc('windowbak.png') // This has been moved to the mob's Login() proc
@@ -287,8 +284,6 @@
for(var/s in src.software)
if(s == "digital messenger")
dat += "Digital Messenger " - if(s == "chatroom client") - dat += "Chatroom Client
" if(s == "crew manifest") dat += "Crew Manifest
" if(s == "medical records") @@ -645,7 +640,3 @@ dat += "
" dat += "Messages:
[pda.tnote]" return dat - -/mob/living/silicon/pai/proc/chatroom() - pda.mode = 5 - pda.attack_self(src) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 4280be744bc..a3094207873 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -79,6 +79,13 @@ m_type = 2 if ("custom") + if(jobban_isbanned(src, "emote")) + src << "You cannot send custom emotes (banned)" + return + if(src.client) + if(client.prefs.muted & MUTE_IC) + src << "You cannot send IC messages (muted)." + return var/input = copytext(sanitize(input("Choose an emote to display.") as text|null),1,MAX_MESSAGE_LEN) if (!input) return @@ -135,6 +142,9 @@ message = "[src] looks." if ("me") + if(jobban_isbanned(src, "emote")) + src << "You cannot send custom emotes (banned)" + return if (src.client) if(client.prefs.muted & MUTE_IC) src << "You cannot send IC messages (muted)." diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 30fdc2e0b37..00d15ce022c 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -31,6 +31,7 @@ uneq_all() stat = UNCONSCIOUS update_headlamp(1) + diag_hud_set_borgcell() /mob/living/silicon/robot/handle_regular_status_updates() @@ -44,6 +45,7 @@ if(health <= -maxHealth) //die only once death() + diag_hud_set_status() return if(health < maxHealth*0.5) //Gradual break down of modules as more damage is sustained @@ -62,6 +64,8 @@ if (paralysis || stunned || weakened) //Stunned etc. stat = UNCONSCIOUS update_headlamp() + diag_hud_set_health() + diag_hud_set_status() return 1 diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm index bfa2a039960..390315559e9 100644 --- a/code/modules/mob/living/silicon/robot/login.dm +++ b/code/modules/mob/living/silicon/robot/login.dm @@ -3,10 +3,12 @@ ..() regenerate_icons() show_laws(0) - if(mind) ticker.mode.remove_revolutionary(mind) - if(mind) ticker.mode.remove_gangster(mind,1,remove_bosses=1) - if(mind) ticker.mode.remove_thrall(mind,0) - if(mind) ticker.mode.remove_shadowling(mind) + if(mind) + ticker.mode.remove_revolutionary(mind) + ticker.mode.remove_gangster(mind,1,remove_bosses=1) + ticker.mode.remove_thrall(mind,0) + ticker.mode.remove_shadowling(mind) + ticker.mode.remove_hog_follower(mind, 0) /mob/living/silicon/robot/update_hotkey_mode() winset(src, null, "mainwindow.macro=borghotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#F0F0F0") diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 524cb6c70fe..9b363dd48eb 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -68,6 +68,7 @@ var/lamp_recharging = 0 //Flag for if the lamp is on cooldown after being forcibly disabled. var/updating = 0 //portable camera camerachunk update + hud_possible = list(ANTAG_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD) /mob/living/silicon/robot/New(loc) spark_system = new /datum/effect_system/spark_spread() @@ -125,6 +126,7 @@ playsound(loc, 'sound/voice/liveagain.ogg', 75, 1) aicamera = new/obj/item/device/camera/siliconcam/robot_camera(src) toner = 40 + diag_hud_set_borgcell() //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO /mob/living/silicon/robot/Destroy() @@ -480,6 +482,7 @@ cell = W user << "You insert the power cell." update_icons() + diag_hud_set_borgcell() else if (wires.IsInteractionTool(W)) if (wiresexposed) @@ -711,6 +714,7 @@ user << "You remove \the [cell]." cell = null update_icons() + diag_hud_set_borgcell() if(!opened) if(..()) // hulk attack @@ -1155,4 +1159,11 @@ if(2) //New Module connected_ai << "
NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.
" if(3) //New Name - connected_ai << "
NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
" \ No newline at end of file + connected_ai << "
NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
" + +/mob/living/silicon/robot/canUseTopic(atom/movable/M, be_close = 0) + if(stat || lockcharge || stunned || weakened) + return + if(be_close && !in_range(M, src)) + return + return 1 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index bb643c16811..5b714c1e0d5 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -6,13 +6,12 @@ if(..()) return 1 return 0 - //No longer needed, but I'll leave it here incase we plan to re-use it. /mob/living/silicon/robot/movement_delay() - var/tally = 0 //Incase I need to add stuff other than "speed" later + . = ..() - tally = speed + . += speed - return tally+config.robot_delay + . += config.robot_delay /mob/living/silicon/robot/mob_negates_gravity() return magpulse diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 30d0f635f67..b4604dbc0b9 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -14,6 +14,8 @@ var/designation = "" var/radiomod = "" //Radio character used before state laws/arrivals announce to allow department transmissions, default, or none at all. var/obj/item/device/camera/siliconcam/aicamera = null //photography + //hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD) + hud_possible = list(ANTAG_HUD, DIAG_STAT_HUD, DIAG_HUD) var/obj/item/device/radio/borg/radio = null //AIs dont use this but this is at the silicon level to advoid copypasta in say() @@ -25,9 +27,17 @@ var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use + var/d_hud = DATA_HUD_DIAGNOSTIC //There is only one kind of diag hud var/law_change_counter = 0 +/mob/living/silicon/New() + ..() + var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC] + diag_hud.add_to_hud(src) + diag_hud_set_status() + diag_hud_set_health() + /mob/living/silicon/Destroy() radio = null aicamera = null @@ -338,8 +348,10 @@ /mob/living/silicon/proc/remove_med_sec_hud() var/datum/atom_hud/secsensor = huds[sec_hud] var/datum/atom_hud/medsensor = huds[med_hud] + var/datum/atom_hud/diagsensor = huds[d_hud] secsensor.remove_hud_from(src) medsensor.remove_hud_from(src) + diagsensor.remove_hud_from(src) /mob/living/silicon/proc/add_sec_hud() var/datum/atom_hud/secsensor = huds[sec_hud] @@ -349,9 +361,13 @@ var/datum/atom_hud/medsensor = huds[med_hud] medsensor.add_hud_to(src) +/mob/living/silicon/proc/add_diag_hud() + var/datum/atom_hud/diagsensor = huds[d_hud] + diagsensor.add_hud_to(src) + /mob/living/silicon/proc/sensor_mode() set name = "Set Sensor Augmentation" - var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security", "Medical","Disable") + var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security", "Medical","Diagnostic","Disable") remove_med_sec_hud() switch(sensor_type) if ("Security") @@ -360,6 +376,9 @@ if ("Medical") add_med_hud() src << "Life signs monitor overlay enabled." + if ("Diagnostic") + add_diag_hud() + src << "Robotics diagnostic overlay enabled." if ("Disable") src << "Sensor augmentations disabled." @@ -450,6 +469,9 @@ if(affect_silicon) return ..() +/mob/living/silicon/check_ear_prot() + return 1 + /mob/living/silicon/update_transform() var/matrix/ntransform = matrix(transform) //aka transform.Copy() var/changed = 0 diff --git a/code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm b/code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm index 5667cbc61be..70f84ceea60 100644 --- a/code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm +++ b/code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm @@ -6,7 +6,7 @@ icon_state = "swarmer_unactivated" /obj/item/unactivated_swarmer/New() - notify_ghosts("An unactivated swarmer has been created in [get_area(src)]! (Click to enter)", source = src) + notify_ghosts("An unactivated swarmer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, attack_not_jump = 1) ..() /obj/item/unactivated_swarmer/Topic(href, href_list) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 00068884b21..ab354044d90 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -27,7 +27,7 @@ /mob/living/simple_animal/construct/New() ..() for(var/spell in construct_spells) - mob_spell_list += new spell(src) + AddSpell(new spell(null)) /mob/living/simple_animal/construct/death() ..(1) @@ -165,10 +165,10 @@ speed = 0 environment_smash = 2 attack_sound = 'sound/weapons/punch2.ogg' - construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser, - /obj/effect/proc_holder/spell/aoe_turf/conjure/wall, + construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/wall, /obj/effect/proc_holder/spell/aoe_turf/conjure/floor, /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone, + /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser, /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser) playstyle_string = "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, \ use magic missile, repair allied constructs (by clicking on them), \ diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index c4ed12ded00..378fcf6be69 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -19,7 +19,7 @@ ..() var/area/A = get_area(src) if(A) - notify_ghosts("A drone shell has been created in \the [A.name].", source = src) + notify_ghosts("A drone shell has been created in \the [A.name].", source = src, attack_not_jump = 1) /obj/item/drone_shell/attack_ghost(mob/user) if(jobban_isbanned(user,"drone")) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 2a1a2e140e7..178bfef7b25 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -33,7 +33,7 @@ /mob/living/simple_animal/hostile/retaliate/goat/Destroy() qdel(udder) udder = null - ..() + return ..() /mob/living/simple_animal/hostile/retaliate/goat/Life() . = ..() @@ -107,7 +107,7 @@ /mob/living/simple_animal/cow/Destroy() qdel(udder) udder = null - ..() + return ..() /mob/living/simple_animal/cow/attackby(obj/item/O, mob/user, params) if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) @@ -177,6 +177,10 @@ new /mob/living/simple_animal/chicken(src.loc) qdel(src) +/mob/living/simple_animal/chick/holo/Life() + ..() + amount_grown = 0 + var/const/MAX_CHICKENS = 50 var/global/chicken_count = 0 @@ -292,4 +296,4 @@ var/global/chicken_count = 0 /obj/udder/Destroy() qdel(reagents) - ..() \ No newline at end of file + return ..() diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 9c0d195af4e..5faa40dbe20 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -16,6 +16,7 @@ attack_sound = 'sound/weapons/punch1.ogg' atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 + maxbodytemp = 10000000 attacktext = "punches" maxHealth = 100000 //The spirit itself is invincible health = 100000 @@ -39,12 +40,17 @@ if(summoner) if(summoner.stat == DEAD) src << "Your summoner has died!" - visible_message("The [src] dies along with its user!") + visible_message("The [src] dies along with its user!") + summoner.visible_message("[summoner]'s body is completely consumed by the strain of sustaining [src]!") + for(var/obj/item/W in summoner) + if(!summoner.unEquip(W)) + qdel(W) + summoner.dust() ghostize() qdel(src) else src << "Your summoner has died!" - visible_message("The [src] dies along with its user!") + visible_message("The [src] dies along with its user!") ghostize() qdel(src) if(summoner) @@ -74,7 +80,7 @@ summoner.adjustBruteLoss(damage) if(damage) summoner << "Your [name] is under attack! You take damage!" - summoner.visible_message("Blood sprays from [summoner] as [src] takes damage!") + summoner.visible_message("Blood sprays from [summoner] as [src] takes damage!") if(summoner.stat == UNCONSCIOUS) summoner << "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!" summoner.adjustCloneLoss(damage/2) @@ -99,10 +105,7 @@ //Manifest, Recall, Communicate -/mob/living/simple_animal/hostile/guardian/verb/Manifest() - set name = "Manifest" - set category = "Guardian" - set desc = "Spring forth into battle!" +/mob/living/simple_animal/hostile/guardian/proc/Manifest() if(cooldown > world.time) return if(loc == summoner) @@ -114,20 +117,14 @@ spawn(6) icon_state = end_icon -/mob/living/simple_animal/hostile/guardian/verb/Recall() - set name = "Recall" - set category = "Guardian" - set desc = "Return to your summoner." +/mob/living/simple_animal/hostile/guardian/proc/Recall() if(cooldown > world.time) return loc = summoner buckled = null cooldown = world.time + 30 -/mob/living/simple_animal/hostile/guardian/verb/Communicate() - set name = "Communicate" - set category = "Guardian" - set desc = "Communicate telepathically with your summoner." +/mob/living/simple_animal/hostile/guardian/proc/Communicate() var/input = stripped_input(src, "Please enter a message to tell your summoner.", "Guardian", "") if(!input) return @@ -137,6 +134,10 @@ src << "[src]: [input]" log_say("[src.real_name]/[src.key] : [input]") +/mob/living/simple_animal/hostile/guardian/proc/ToggleMode() + src << "You dont have another mode!" + + /mob/living/proc/guardian_comm() set name = "Communicate" set category = "Guardian" @@ -155,6 +156,13 @@ log_say("[src.real_name]/[src.key] : [text]") +/mob/living/simple_animal/hostile/guardian/proc/ToggleLight() + if(!luminosity) + SetLuminosity(3) + else + SetLuminosity(0) + + //////////////////////////TYPES OF GUARDIANS @@ -182,7 +190,7 @@ /mob/living/simple_animal/hostile/guardian/fire/AttackingTarget() ..() - if(prob(30)) + if(prob(45)) if(istype(target, /atom/movable)) var/atom/movable/M = target if(!M.anchored && M != summoner) @@ -203,8 +211,8 @@ /mob/living/simple_animal/hostile/guardian/fire/proc/collision_ignite(AM as mob|obj) if(istype(AM, /mob/living/)) var/mob/living/M = AM - if(AM != summoner) - M.adjust_fire_stacks(7) + if(AM != summoner && M.fire_stacks < 7) + M.fire_stacks = 7 M.IgniteMob() /mob/living/simple_animal/hostile/guardian/fire/Bump(AM as mob|obj) @@ -277,10 +285,7 @@ C.adjustOxyLoss(-5) C.adjustToxLoss(-5) -/mob/living/simple_animal/hostile/guardian/healer/verb/ToggleMode() - set name = "Toggle Mode" - set category = "Guardian" - set desc = "Toggle between combat and healing modes." +/mob/living/simple_animal/hostile/guardian/healer/ToggleMode() if(src.loc == summoner) if(toggle) a_intent = "harm" @@ -366,6 +371,7 @@ icon_state = "guardian" damage = 5 damage_type = BRUTE + armour_penetration = 100 /mob/living/simple_animal/hostile/guardian/ranged a_intent = "help" @@ -385,10 +391,7 @@ var/list/snares = list() var/toggle = FALSE -/mob/living/simple_animal/hostile/guardian/ranged/verb/ToggleMode() - set name = "Toggle Mode" - set category = "Guardian" - set desc = "Toggle between combat and scout modes." +/mob/living/simple_animal/hostile/guardian/ranged/ToggleMode() if(src.loc == summoner) if(toggle) ranged = 1 @@ -475,11 +478,11 @@ if(bomb_cooldown <= world.time && !stat) var/obj/item/weapon/guardian_bomb/B = new /obj/item/weapon/guardian_bomb(get_turf(A)) src << "Success! Bomb armed!" - bomb_cooldown = world.time + 400 + bomb_cooldown = world.time + 200 B.spawner = src B.disguise (A) else - src << "Your powers are on cooldown! You must wait 40 seconds between bombs." + src << "Your powers are on cooldown! You must wait 20 seconds between bombs." /obj/item/weapon/guardian_bomb name = "bomb" @@ -551,7 +554,7 @@ return used = TRUE user << "[use_message]" - var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?", "pAI", null, FALSE, 100) + var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100) var/mob/dead/observer/theghost = null if(candidates.len) @@ -677,3 +680,100 @@ new /obj/item/weapon/guardiancreator/tech/choose(src) new /obj/item/weapon/paper/guardian(src) return + + + + + + + +///HUD + +/datum/hud/proc/guardian_hud(ui_style = 'icons/mob/screen_midnight.dmi') + adding = list() + + var/obj/screen/using + + using = new /obj/screen/guardian/Manifest() + using.screen_loc = ui_rhand + adding += using + + using = new /obj/screen/guardian/Recall() + using.screen_loc = ui_lhand + adding += using + + using = new /obj/screen/guardian/ToggleMode() + using.screen_loc = ui_storage1 + adding += using + + using = new /obj/screen/guardian/ToggleLight() + using.screen_loc = ui_inventory + adding += using + + using = new /obj/screen/guardian/Communicate() + using.screen_loc = ui_back + adding += using + + mymob.client.screen = list() + mymob.client.screen += mymob.client.void + mymob.client.screen += adding + + + + +//HUD BUTTONS + +/obj/screen/guardian + icon = 'icons/mob/guardian.dmi' + +/obj/screen/guardian/Manifest + icon_state = "manifest" + name = "Manifest" + desc = "Spring forth into battle!" + +/obj/screen/guardian/Manifest/Click() + if(isguardian(usr)) + var/mob/living/simple_animal/hostile/guardian/G = usr + G.Manifest() + + +/obj/screen/guardian/Recall + icon_state = "recall" + name = "Recall" + desc = "Return to your user." + +/obj/screen/guardian/Recall/Click() + if(isguardian(usr)) + var/mob/living/simple_animal/hostile/guardian/G = usr + G.Recall() + +/obj/screen/guardian/ToggleMode + icon_state = "toggle" + name = "Toggle Mode" + desc = "Switch between ability modes." + +/obj/screen/guardian/ToggleMode/Click() + if(isguardian(usr)) + var/mob/living/simple_animal/hostile/guardian/G = usr + G.ToggleMode() + +/obj/screen/guardian/Communicate + icon_state = "communicate" + name = "Communicate" + desc = "Communicate telepathically with your user." + +/obj/screen/guardian/Communicate/Click() + if(isguardian(usr)) + var/mob/living/simple_animal/hostile/guardian/G = usr + G.Communicate() + + +/obj/screen/guardian/ToggleLight + icon_state = "light" + name = "Toggle Light" + desc = "Glow like star dust." + +/obj/screen/guardian/ToggleLight/Click() + if(isguardian(usr)) + var/mob/living/simple_animal/hostile/guardian/G = usr + G.ToggleLight() diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 56465782b39..93388f20261 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -2,8 +2,8 @@ name = "alien hunter" desc = "Hiss!" icon = 'icons/mob/alien.dmi' - icon_state = "alienh_running" - icon_living = "alienh_running" + icon_state = "alienh_s" + icon_living = "alienh_s" icon_dead = "alienh_dead" icon_gib = "syndicate_gib" response_help = "pokes" @@ -33,8 +33,8 @@ /mob/living/simple_animal/hostile/alien/drone name = "alien drone" - icon_state = "aliend_running" - icon_living = "aliend_running" + icon_state = "aliend_s" + icon_living = "aliend_s" icon_dead = "aliend_dead" health = 60 melee_damage_lower = 15 @@ -53,8 +53,8 @@ /mob/living/simple_animal/hostile/alien/sentinel name = "alien sentinel" - icon_state = "aliens_running" - icon_living = "aliens_running" + icon_state = "aliens_s" + icon_living = "aliens_s" icon_dead = "aliens_dead" health = 120 melee_damage_lower = 15 @@ -68,8 +68,8 @@ /mob/living/simple_animal/hostile/alien/queen name = "alien queen" - icon_state = "alienq_running" - icon_living = "alienq_running" + icon_state = "alienq_s" + icon_living = "alienq_s" icon_dead = "alienq_dead" health = 250 maxHealth = 250 @@ -122,9 +122,9 @@ /mob/living/simple_animal/hostile/alien/queen/large name = "alien empress" icon = 'icons/mob/alienqueen.dmi' - icon_state = "queen_s" - icon_living = "queen_s" - icon_dead = "queen_dead" + icon_state = "alienq" + icon_living = "alienq" + icon_dead = "alienq_dead" move_to_delay = 4 maxHealth = 400 health = 400 diff --git a/code/modules/mob/living/simple_animal/morph/morph.dm b/code/modules/mob/living/simple_animal/morph/morph.dm index dd6e4f36fa2..01653d3731c 100644 --- a/code/modules/mob/living/simple_animal/morph/morph.dm +++ b/code/modules/mob/living/simple_animal/morph/morph.dm @@ -129,6 +129,11 @@ visible_message("[src] twists and dissolves into a pile of green flesh!", \ "Your skin ruptures! Your flesh breaks apart! No disguise can ward off de--") restore() + if(gibbed) + for(var/atom/movable/AM in src) + AM.loc = loc + if(prob(90)) + step(AM, pick(alldirs)) ..(gibbed) /mob/living/simple_animal/hostile/morph/Aggro() // automated only @@ -171,24 +176,6 @@ return target.attack_animal(src) -/mob/living/simple_animal/hostile/morph/harvest(mob/living/user) - if(qdeleted(src)) - return - if(contents.len) - var/amount = min(contents.len, 10) - for(var/atom/movable/AM in src) - if(amount) - amount-- - AM.loc = loc - if(prob(90)) - spawn(3) - step(AM, pick(alldirs)) - else - break - visible_message("[user] [contents.len?"extracts some of":"empties"] the content of [src].") - else - ..() - /mob/living/simple_animal/hostile/morph/update_action_buttons() //So all eaten objects are not counted every life return @@ -206,7 +193,7 @@ /datum/round_event/morph/proc/get_morph(end_if_fail = 0) key_of_morph = null if(!key_of_morph) - var/list/candidates = get_candidates(BE_ALIEN) + var/list/candidates = get_candidates(ROLE_ALIEN) if(!candidates.len) if(end_if_fail) return 0 diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 4ec6e2f3bff..2f6e8ac0f61 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -595,7 +595,8 @@ /mob/living/simple_animal/parrot/movement_delay() if(client && stat == CONSCIOUS && parrot_state != "parrot_fly") icon_state = "parrot_fly" - ..() + //Because the most appropriate place to set icon_state is movement_delay(), clearly + return ..() /mob/living/simple_animal/parrot/proc/isStuck() //Check to see if the parrot is stuck due to things like windows or doors or windowdoors diff --git a/code/modules/mob/living/simple_animal/revenant/revenant.dm b/code/modules/mob/living/simple_animal/revenant/revenant.dm index 68f4233eae2..07b181ca4dc 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant.dm @@ -3,7 +3,7 @@ //Don't hear deadchat and are NOT normal ghosts //Admin-spawn or random event -#define INVISIBILITY_REVENANT 30 +#define INVISIBILITY_REVENANT 50 /mob/living/simple_animal/revenant name = "revenant" @@ -14,6 +14,7 @@ invisibility = INVISIBILITY_REVENANT health = INFINITY //Revenants don't use health, they use essence instead maxHealth = INFINITY + layer = 5 healable = 0 see_invisible = SEE_INVISIBLE_MINIMUM see_in_dark = 8 @@ -22,6 +23,7 @@ response_disarm = "swings at" response_harm = "punches through" unsuitable_atmos_damage = 0 + ignored_damage_types = list(BRUTE = 0, BURN = 0, TOX = 1, CLONE = 1, STAMINA = 1, OXY = 1) //I don't know how you'd apply those, but revenants no-sell them anyway. atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = INFINITY @@ -32,6 +34,7 @@ density = 0 flying = 1 anchored = 1 + unique_name = 1 var/essence = 75 //The resource, and health, of revenants. var/essence_regen_cap = 75 //The regeneration cap of essence (go figure); regenerates every Life() tick up to this amount. @@ -49,19 +52,23 @@ /mob/living/simple_animal/revenant/Life() + ear_damage = 0 + ear_deaf = 0 //YOU CAN'T DEAFEN A REVENANT if(revealed && essence <= 0) death() if(unreveal_time && world.time >= unreveal_time) unreveal_time = 0 revealed = 0 invisibility = INVISIBILITY_REVENANT - src << "You are once more concealed." + src << "You are once more concealed." if(unstun_time && world.time >= unstun_time) unstun_time = 0 notransform = 0 - src << "You can move again!" + src << "You can move again!" if(essence_regenerating && !inhibited && essence < essence_regen_cap) //While inhibited, essence will not regenerate essence = min(essence_regen_cap, essence+essence_regen_amount) + update_spooky_icon() + ..() /mob/living/simple_animal/revenant/proc/reveal(time) @@ -72,10 +79,12 @@ revealed = 1 invisibility = 0 if(!unreveal_time) - src << "You have been revealed!" + src << "You have been revealed!" + unreveal_time = world.time + time else - src << "You have been revealed!" - unreveal_time = world.time + time + src << "You have been revealed!" + unreveal_time = unreveal_time + time + update_spooky_icon() /mob/living/simple_animal/revenant/proc/stun(time) if(!src) @@ -84,10 +93,24 @@ return notransform = 1 if(!unstun_time) - src << "You cannot move!" + src << "You cannot move!" + unstun_time = world.time + time else - src << "You cannot move!" - unstun_time = world.time + time + src << "You cannot move!" + unstun_time = unstun_time + time + update_spooky_icon() + +/mob/living/simple_animal/revenant/proc/update_spooky_icon() + if(revealed) + if(draining) + icon_state = "revenant_draining" + return + if(notransform) + icon_state = "revenant_stun" + return + icon_state = "revenant_revealed" + return + icon_state = "revenant_idle" /mob/living/simple_animal/revenant/ex_act(severity, target) return 1 //Immune to the effects of explosions. @@ -103,12 +126,11 @@ return essence = max(0, essence-amount) if(essence == 0) - src << "You feel your essence fraying!" + src << "You feel your essence fraying!" /mob/living/simple_animal/revenant/ClickOn(atom/A, params) //Copypaste from ghost code - revenants can't interact with the world directly. - if(client.inquisitive_ghost) - A.examine(src) + A.examine(src) if(ishuman(A) && in_range(src, A)) Harvest(A) @@ -116,73 +138,81 @@ if(!castcheck(0)) return if(draining) - src << "You are already siphoning the essence of a soul!" + src << "You are already siphoning the essence of a soul!" return if(target in drained_mobs) - src << "[target]'s soul is dead and empty." + src << "[target]'s soul is dead and empty." return if(!target.stat) - src << "This being's soul is too strong to harvest." + src << "This being's soul is too strong to harvest." if(prob(10)) target << "You feel as if you are being watched." return draining = 1 - essence_drained = rand(15, 20) - src << "You search for the soul of [target]." + essence_drained += rand(15, 20) + src << "You search for the soul of [target]." if(do_after(src, 10, 3, 0, target)) //did they get deleted in that second? if(target.ckey) - src << "Their soul burns with intelligence." + src << "Their soul burns with intelligence." essence_drained += rand(20, 30) if(target.stat != DEAD) - src << "Their soul blazes with life!" + src << "Their soul blazes with life!" essence_drained += rand(40, 50) else - src << "Their soul is weak and faltering." + src << "Their soul is weak and faltering." if(do_after(src, 20, 6, 0, target)) //did they get deleted NOW? switch(essence_drained) if(1 to 30) - src << "[target] will not yield much essence. Still, every bit counts." + src << "[target] will not yield much essence. Still, every bit counts." if(30 to 70) - src << "[target] will yield an average amount of essence." + src << "[target] will yield an average amount of essence." if(70 to 90) - src << "Such a feast! [target] will yield much essence to you." + src << "Such a feast! [target] will yield much essence to you." if(90 to INFINITY) - src << "Ah, the perfect soul. [target] will yield massive amounts of essence to you." + src << "Ah, the perfect soul. [target] will yield massive amounts of essence to you." if(do_after(src, 20, 6, 0, target)) //how about now if(!target.stat) - src << "They are now powerful enough to fight off your draining." + src << "They are now powerful enough to fight off your draining." target << "You feel something tugging across your body before subsiding." draining = 0 + essence_drained = 0 return //hey, wait a minute... - src << "You begin siphoning essence from [target]'s soul." + src << "You begin siphoning essence from [target]'s soul." if(target.stat != DEAD) target << "You feel a horribly unpleasant draining sensation as your grip on life weakens..." - icon_state = "revenant_draining" - reveal(30) - stun(30) + reveal(46) + stun(46) target.visible_message("[target] suddenly rises slightly into the air, their skin turning an ashy gray.") - target.Beam(src,icon_state="drain_life",icon='icons/effects/effects.dmi',time=25) - if(do_after(src, 30, 9, 0, target)) //As one cannot prove the existance of ghosts, ghosts cannot prove the existance of the target they were draining. + Beam(target,icon_state="drain_life",icon='icons/effects/effects.dmi',time=44) + if(do_after(src, 50, 15, 0, target)) //As one cannot prove the existance of ghosts, ghosts cannot prove the existance of the target they were draining. change_essence_amount(essence_drained, 0, target) + if(essence_drained <= 90 && target.stat != DEAD) + essence_regen_cap += 5 + src << "The absorption of [target]'s living soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap]." if(essence_drained > 90) - essence_regen_cap += 25 + essence_regen_cap += 15 perfectsouls += 1 - src << "The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap]." - src << "[target]'s soul has been considerably weakened and will yield no more essence for the time being." + src << "The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap]." + src << "[target]'s soul has been considerably weakened and will yield no more essence for the time being." target.visible_message("[target] slumps onto the ground.", \ - "Violets lights, dancing in your vision, getting clo--") + "Violets lights, dancing in your vision, getting clo--") drained_mobs.Add(target) target.death(0) else - src << "[target] has been drawn out of your grasp. The link has been broken." - target.visible_message("[target] slumps onto the ground.", \ - "Violets lights, dancing in your vision, receding--") - icon_state = "revenant_idle" + src << "[target ? "[target] has":"They have"] been drawn out of your grasp. The link has been broken." + draining = 0 + essence_drained = 0 + if(target) //Wait, target is WHERE NOW? + target.visible_message("[target] slumps onto the ground.", \ + "Violets lights, dancing in your vision, receding--") + return else - src << "You are not close enough to siphon [target]'s soul. The link has been broken." + src << "You are not close enough to siphon [target ? "[target]'s":"their"] soul. The link has been broken." draining = 0 + essence_drained = 0 return draining = 0 + essence_drained = 0 return @@ -191,7 +221,7 @@ if (istype(M, /mob/new_player)) continue if(istype(M, /mob/living/simple_animal/revenant) || M.stat == DEAD) - M << "REVENANT: [src] says, \"[message]\"" //Can commune with the dead + M << "[src] says, \"[message]\"" //Can commune with the dead return @@ -228,16 +258,17 @@ src << "Objective #2: [objective2.explanation_text]" ticker.mode.traitors |= src.mind //Necessary for announcing AddSpell(new /obj/effect/proc_holder/spell/targeted/revenant_transmit(null)) - AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant_light(null)) - AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant_defile(null)) - AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant_malf(null)) + AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/defile(null)) + AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/overload(null)) + AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction(null)) + AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/blight(null)) /mob/living/simple_animal/revenant/death() if(!revealed) //Revenants cannot die if they aren't revealed return 0 ..(1) - src << "NO! No... it's too late, you can feel your essence breaking apart..." + src << "NO! No... it's too late, you can feel your essence breaking apart..." notransform = 1 revealed = 1 invisibility = 0 @@ -258,7 +289,7 @@ /mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params) if(istype(W, /obj/item/weapon/nullrod)) visible_message("[src] violently flinches!", \ - "As the null rod passes through you, you feel your essence draining away!") + "As the null rod passes through you, you feel your essence draining away!") adjustBruteLoss(25) //hella effective inhibited = 1 spawn(30) @@ -270,13 +301,13 @@ return var/turf/T = get_turf(src) if(istype(T, /turf/simulated/wall)) - src << "You cannot use abilities from inside of a wall." + src << "You cannot use abilities from inside of a wall." return 0 if(src.inhibited) - src << "Your powers have been suppressed by nulling energy!" + src << "Your powers have been suppressed by nulling energy!" return 0 if(!src.change_essence_amount(essence_cost, 1)) - src << "You lack the essence to use that ability." + src << "You lack the essence to use that ability." return 0 return 1 @@ -290,9 +321,9 @@ essence_accumulated = max(0, essence_accumulated+essence_amt) if(!silent) if(essence_amt > 0) - src << "Gained [essence_amt]E from [source]." + src << "Gained [essence_amt]E from [source]." else - src << "Lost [essence_amt]E from [source]." + src << "Lost [essence_amt]E from [source]." return 1 /datum/objective/revenant @@ -338,18 +369,18 @@ icon = 'icons/effects/effects.dmi' icon_state = "revenantEctoplasm" w_class = 2 - var/reforming = 0 + var/reforming = 1 var/inert = 0 var/client/client_to_revive /obj/item/weapon/ectoplasm/revenant/New() ..() - reforming = 1 spawn(600) //1 minute if(src && reforming) + reforming = 0 return reform() - if(src && !reforming) - reforming = 1 + else + inert = 1 visible_message("[src] settles down and seems lifeless.") return @@ -370,36 +401,39 @@ /obj/item/weapon/ectoplasm/revenant/examine(mob/user) ..() - if(reforming) - user << "It is shifting and distorted. It would be wise to destroy this." - else if(!reforming) - user << "It seems inert." + if(inert) + user << "It seems inert." + else if(reforming) + user << "It is shifting and distorted. It would be wise to destroy this." /obj/item/weapon/ectoplasm/revenant/proc/reform() - if(!reforming || !src) + if(inert || !src) return var/key_of_revenant - message_admins("Revenant ectoplasm was left undestroyed for 1 minute and has reformed into a new revenant.") + message_admins("Revenant ectoplasm was left undestroyed for 1 minute and is reforming into a new revenant.") loc = get_turf(src) //In case it's in a backpack or someone's hand - visible_message("[src] suddenly rises into the air before fading away.") var/mob/living/simple_animal/revenant/R = new(get_turf(src)) if(client_to_revive) - for(var/mob/M in mob_list) - if(M.client == client_to_revive && M.stat == DEAD) //Only recreates the mob if the mob the client is in is dead - message_admins("[R.client] was a revenant and died. Re-making them into the new revenant formed by ectoplasm.") + for(var/mob/M in dead_mob_list) + if(M.client == client_to_revive) //Only recreates the mob if the mob the client is in is dead R.client = client_to_revive key_of_revenant = client_to_revive.key - break + if(!key_of_revenant) message_admins("The new revenant's old client either could not be found or is in a new, living mob - grabbing a random candidate instead...") - else - var/list/candidates = get_candidates(BE_REVENANT) + var/list/candidates = get_candidates(ROLE_REVENANT) if(!candidates.len) + qdel(R) message_admins("No candidates were found for the new revenant. Oh well!") + inert = 1 + visible_message("[src] settles down and seems lifeless.") return 0 var/client/C = pick(candidates) key_of_revenant = C.key if(!key_of_revenant) + qdel(R) message_admins("No ckey was found for the new revenant. Oh well!") + inert = 1 + visible_message("[src] settles down and seems lifeless.") return 0 var/datum/mind/player_mind = new /datum/mind(key_of_revenant) player_mind.active = 1 @@ -407,8 +441,9 @@ player_mind.assigned_role = "revenant" player_mind.special_role = "Revenant" ticker.mode.traitors |= player_mind - message_admins("[key_of_revenant] has been made into a revenant by reforming ectoplasm.") - log_game("[key_of_revenant] was spawned as a revenant by reforming ectoplasm.") + message_admins("[key_of_revenant] has been [client_to_revive ? "re":""]made into a revenant by reforming ectoplasm.") + log_game("[key_of_revenant] was [client_to_revive ? "re":""]made as a revenant by reforming ectoplasm.") + visible_message("[src] suddenly rises into the air before fading away.") qdel(src) if(src) //Should never happen, but just in case inert = 1 diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm index e649148140a..2fb6d94e61e 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm @@ -1,4 +1,4 @@ -//Transmit: the revemant's only direct way to communicate. Sends a single message silently to a single mob for 5E. +//Transmit: the revemant's only direct way to communicate. Sends a single message silently to a single mob /obj/effect/proc_holder/spell/targeted/revenant_transmit name = "Transmit" desc = "Telepathically transmits a message to the target." @@ -17,173 +17,254 @@ if(!msg) charge_counter = charge_max return - usr << "You transmit to [M]: [msg]" - M << "An alien voice resonates from all around... [msg]" + user << "You transmit to [M]: [msg]" + M << "An alien voice resonates from all around... [msg]" +/obj/effect/proc_holder/spell/aoe_turf/revenant + clothes_req = 0 + action_background_icon_state = "bg_revenant" + panel = "Revenant Abilities (Locked)" + name = "Report this to a coder" + var/reveal = 80 //How long it reveals the revenant in deciseconds + var/stun = 20 //How long it stuns the revenant in deciseconds + var/locked = 1 //If it's locked and needs to be unlocked before use + var/unlock_amount = 100 //How much essence it costs to unlock + var/cast_amount = 50 //How much essence it costs to use + +/obj/effect/proc_holder/spell/aoe_turf/revenant/New() + ..() + if(locked) + name = "[initial(name)] ([unlock_amount]E)" + else + name = "[initial(name)] ([cast_amount]E)" + +/obj/effect/proc_holder/spell/aoe_turf/revenant/can_cast(mob/living/simple_animal/revenant/user = usr) + if(!istype(user)) //Badmins, no. Badmins, don't do it. + if(charge_counter < charge_max) + return 0 + return 1 + if(user.inhibited) + return 0 + if(charge_counter < charge_max) + return 0 + if(locked) + if(user.essence <= unlock_amount) + return 0 + if(user.essence <= cast_amount) + return 0 + return 1 + +/obj/effect/proc_holder/spell/aoe_turf/revenant/proc/attempt_cast(mob/living/simple_animal/revenant/user = usr) + if(!istype(user)) //If you're not a revenant, it works. Please, please, please don't give this to a non-revenant. + name = "[initial(name)]" + if(locked) + panel = "Revenant Abilities" + locked = 0 + return 1 + if(locked) + if(!user.castcheck(-unlock_amount)) + charge_counter = charge_max + return 0 + name = "[initial(name)] ([cast_amount]E)" + user << "You have unlocked [initial(name)]!" + panel = "Revenant Abilities" + locked = 0 + charge_counter = charge_max + return 0 + if(!user.castcheck(-cast_amount)) + charge_counter = charge_max + return 0 + name = "[initial(name)] ([cast_amount]E)" + user.reveal(reveal) + user.stun(stun) + user.update_action_buttons() + return 1 + //Overload Light: Breaks a light that's online and sends out lightning bolts to all nearby people. -/obj/effect/proc_holder/spell/aoe_turf/revenant_light - name = "Overload Lights (100E)" +/obj/effect/proc_holder/spell/aoe_turf/revenant/overload + name = "Overload Lights" desc = "Directs a large amount of essence into nearby electrical lights, causing lights to shock those nearby." - panel = "Revenant Abilities (Locked)" charge_max = 200 - clothes_req = 0 range = 5 + stun = 30 + cast_amount = 40 var/shock_range = 2 - var/shock_damage = 20 - var/reveal = 80 - var/stun = 40 - var/locked = 1 + var/shock_damage = 18 action_icon_state = "overload_lights" - action_background_icon_state = "bg_revenant" -/obj/effect/proc_holder/spell/aoe_turf/revenant_light/cast(list/targets, mob/living/simple_animal/revenant/user = usr) - if(locked) - if(!user.castcheck(-100)) - charge_counter = charge_max - return - user << "You have unlocked Overload Lights!" - name = "Overload Lights (40E)" - panel = "Revenant Abilities" - locked = 0 - charge_counter = charge_max - return - if(!user.castcheck(-40)) - charge_counter = charge_max - return - for(var/turf/T in targets) - spawn(0) - for(var/obj/machinery/light/L in T.contents) - spawn(0) - if(!L.on) - return - L.visible_message("\The [L] suddenly flares brightly and begins to spark!") - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(4, 0, L) - s.start() - new/obj/effect/overlay/temp/revenant(L.loc) - sleep(20) - for(var/mob/living/carbon/human/M in range(shock_range, L)) - if(M == user) +/obj/effect/proc_holder/spell/aoe_turf/revenant/overload/cast(list/targets, mob/living/simple_animal/revenant/user = usr) + if(attempt_cast(user)) + for(var/turf/T in targets) + spawn(0) + for(var/obj/machinery/light/L in T.contents) + spawn(0) + if(!L.on) return - M.Beam(L,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5) - M.electrocute_act(shock_damage, "[L.name]", safety=1) - var/datum/effect_system/spark_spread/z = new /datum/effect_system/spark_spread - z.set_up(4, 0, M) - z.start() - playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1) - user.reveal(reveal) - user.stun(stun) - + L.visible_message("\The [L] suddenly flares brightly and begins to spark!") + var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread + s.set_up(4, 0, L) + s.start() + PoolOrNew(/obj/effect/overlay/temp/revenant, L.loc) + sleep(20) + if(!L.on) //wait, wait, don't shock me + return + flick("[L.base_state]2", L) + for(var/mob/living/carbon/human/M in view(shock_range, L)) + if(M == user) + continue + L.Beam(M,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5) + M.electrocute_act(shock_damage, "[L.name]", safety=1) + var/datum/effect_system/spark_spread/z = new /datum/effect_system/spark_spread + z.set_up(4, 0, M) + z.start() + playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1) //Defile: Corrupts nearby stuff, unblesses floor tiles. -/obj/effect/proc_holder/spell/aoe_turf/revenant_defile - name = "Defile (75E)" - desc = "Twists and corrupts the nearby area. Also dispels holy auras on floors." - panel = "Revenant Abilities (Locked)" +/obj/effect/proc_holder/spell/aoe_turf/revenant/defile + name = "Defile" + desc = "Twists and corrupts the nearby area as well as dispelling holy auras on floors." charge_max = 150 - clothes_req = 0 range = 3 - var/reveal = 80 - var/stun = 20 - var/locked = 1 + stun = 10 + unlock_amount = 75 + cast_amount = 30 action_icon_state = "defile" - action_background_icon_state = "bg_revenant" - -/obj/effect/proc_holder/spell/aoe_turf/revenant_defile/cast(list/targets, mob/living/simple_animal/revenant/user = usr) - if(locked) - if(!user.castcheck(-75)) - charge_counter = charge_max - return - user << "You have unlocked Defile!" - name = "Defile (30E)" - panel = "Revenant Abilities" - locked = 0 - charge_counter = charge_max - return - if(!user.castcheck(-30)) - charge_counter = charge_max - return - for(var/turf/T in targets) - spawn(0) - if(T.flags & NOJAUNT) - T.flags -= NOJAUNT - new/obj/effect/overlay/temp/revenant(T) - for(var/mob/living/carbon/human/human in T.contents) - human << "You suddenly feel tired." - human.adjustStaminaLoss(40) - new/obj/effect/overlay/temp/revenant(human.loc) - if(!istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15)) - new/obj/effect/overlay/temp/revenant(T) - T.ChangeTurf(/turf/simulated/wall/rust) - if(!istype(T, /turf/simulated/wall/r_wall/rust) && istype(T, /turf/simulated/wall/r_wall) && prob(15)) - new/obj/effect/overlay/temp/revenant(T) - T.ChangeTurf(/turf/simulated/wall/r_wall/rust) - for(var/obj/structure/window/window in T.contents) - window.hit(rand(50,100)) - if(window && window.fulltile) - new/obj/effect/overlay/temp/revenant/cracks(window.loc) - for(var/obj/machinery/light/light in T.contents) - light.flicker(30) //spooky - user.reveal(reveal) - user.stun(stun) +/obj/effect/proc_holder/spell/aoe_turf/revenant/defile/cast(list/targets, mob/living/simple_animal/revenant/user = usr) + if(attempt_cast(user)) + for(var/turf/T in targets) + spawn(0) + if(T.flags & NOJAUNT) + T.flags -= NOJAUNT + PoolOrNew(/obj/effect/overlay/temp/revenant, T) + if(!istype(T, /turf/simulated/floor/plating) && !istype(T, /turf/simulated/floor/engine/cult) && istype(T, /turf/simulated/floor) && prob(15)) + var/turf/simulated/floor/floor = T + if(floor.intact) + floor.builtin_tile.loc = floor + floor.broken = 0 + floor.burnt = 0 + floor.make_plating(1) + if(!istype(T, /turf/simulated/wall/shuttle) && !istype(T, /turf/simulated/wall/cult) && !istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15)) + PoolOrNew(/obj/effect/overlay/temp/revenant, T) + T.ChangeTurf(/turf/simulated/wall/rust) + if(!istype(T, /turf/simulated/wall/r_wall/rust) && istype(T, /turf/simulated/wall/r_wall) && prob(15)) + PoolOrNew(/obj/effect/overlay/temp/revenant, T) + T.ChangeTurf(/turf/simulated/wall/r_wall/rust) + for(var/obj/structure/closet/closet in T.contents) + closet.open() + for(var/obj/structure/bodycontainer/corpseholder in T.contents) + if(corpseholder.connected.loc == corpseholder) + corpseholder.open() + for(var/obj/machinery/dna_scannernew/dna in T.contents) + dna.open_machine() + for(var/obj/structure/window/window in T.contents) + window.hit(rand(50,90)) + if(window && window.fulltile) + PoolOrNew(/obj/effect/overlay/temp/revenant/cracks, window.loc) + for(var/obj/machinery/light/light in T.contents) + light.flicker(20) //spooky //Malfunction: Makes bad stuff happen to robots and machines. -/obj/effect/proc_holder/spell/aoe_turf/revenant_malf - name = "Malfunction (150E)" +/obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction + name = "Malfunction" desc = "Corrupts and damages nearby machines and mechanical objects." - panel = "Revenant Abilities (Locked)" charge_max = 200 - clothes_req = 0 range = 4 - var/reveal = 80 - var/stun = 20 - var/locked = 1 + cast_amount = 45 + unlock_amount = 150 action_icon_state = "malfunction" - action_background_icon_state = "bg_revenant" -/obj/effect/proc_holder/spell/aoe_turf/revenant_malf/cast(list/targets, mob/living/simple_animal/revenant/user = usr) - if(locked) - if(!user.castcheck(-150)) - charge_counter = charge_max - return - user << "You have unlocked Malfunction!" - name = "Malfunction (45E)" - panel = "Revenant Abilities" - locked = 0 - charge_counter = charge_max - return - if(!user.castcheck(-45)) - charge_counter = charge_max - return - for(var/turf/T in targets) - spawn(0) - for(var/obj/machinery/bot/bot in T.contents) - if(!bot.emagged) - new/obj/effect/overlay/temp/revenant(bot.loc) - bot.locked = 0 - bot.open = 1 - bot.Emag(null) - for(var/mob/living/carbon/human/human in T.contents) - human << "You feel disoriented." - new/obj/effect/overlay/temp/revenant(human.loc) - human.emp_act(1) - for(var/obj/machinery/mach in T.contents) - if(istype(mach, /obj/machinery/dominator) || istype(mach, /obj/machinery/power/apc) || istype(mach, /obj/machinery/power/smes) || istype(mach, /obj/machinery/bot)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery //Also doesn't work on bots so they can go do stuff faster(god this is so ugly) - continue - if(prob(30)) - new/obj/effect/overlay/temp/revenant(mach.loc) - mach.emag_act(null) - else - if(istype(mach, /obj/machinery/clonepod)) //I hate everything but mostly the fact there's no better way to do this without just not affecting it at all - mach.emp_act(1) - for(var/mob/living/silicon/robot/S in T.contents) //Only works on cyborgs, not AI - S << "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#" - S << 'sound/misc/interference.ogg' - playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1) - new/obj/effect/overlay/temp/revenant(S.loc) - S.spark_system.start() - S.Weaken(6) - user.reveal(reveal) - user.stun(stun) \ No newline at end of file +//A note to future coders: do not replace this with an EMP because it will wreck malf AIs and gang dominators and everyone will hate you. +/obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/cast(list/targets, mob/living/simple_animal/revenant/user = usr) + if(attempt_cast(user)) + for(var/turf/T in targets) + spawn(0) + for(var/obj/machinery/bot/bot in T.contents) + if(!bot.emagged) + PoolOrNew(/obj/effect/overlay/temp/revenant, bot.loc) + bot.locked = 0 + bot.open = 1 + bot.Emag(null) + for(var/mob/living/carbon/human/human in T.contents) + if(human == user) + continue + human << "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")]." + PoolOrNew(/obj/effect/overlay/temp/revenant, human.loc) + human.emp_act(1) + for(var/obj/thing in T.contents) + if(istype(thing, /obj/machinery/dominator) || istype(thing, /obj/machinery/power/apc) || istype(thing, /obj/machinery/power/smes) || istype(thing, /obj/machinery/bot)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery + continue + if(prob(20)) + if(prob(50)) + PoolOrNew(/obj/effect/overlay/temp/revenant, thing.loc) + thing.emag_act(null) + else + if(!istype(thing, /obj/machinery/clonepod)) //I hate everything but mostly the fact there's no better way to do this without just not affecting it at all + thing.emp_act(1) + for(var/mob/living/silicon/robot/S in T.contents) //Only works on cyborgs, not AI + playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1) + PoolOrNew(/obj/effect/overlay/temp/revenant, S.loc) + S.spark_system.start() + S.emp_act(1) + +//Blight: Infects nearby humans and in general messes living stuff up. +/obj/effect/proc_holder/spell/aoe_turf/revenant/blight + name = "Blight" + desc = "Causes nearby living things to waste away." + charge_max = 200 + range = 3 + cast_amount = 50 + unlock_amount = 200 + action_icon_state = "blight" + +/obj/effect/proc_holder/spell/aoe_turf/revenant/blight/cast(list/targets, mob/living/simple_animal/revenant/user = usr) + if(attempt_cast(user)) + for(var/turf/T in targets) + spawn(0) + for(var/mob/living/mob in T.contents) + if(mob == user) + continue + PoolOrNew(/obj/effect/overlay/temp/revenant, mob.loc) + if(iscarbon(mob)) + if(ishuman(mob)) + var/mob/living/carbon/human/H = mob + if(H.dna && H.dna.species) + H.dna.species.handle_mutant_bodyparts(H,"#1d2953") + H.dna.species.handle_hair(H,"#1d2953") + H.dna.species.update_color(H,"#1d2953") + spawn(20) + if(H && H.dna && H.dna.species) + H.dna.species.handle_mutant_bodyparts(H) + H.dna.species.handle_hair(H) + H.dna.species.update_color(H) + var/blightfound = 0 + for(var/datum/disease/revblight/blight in H.viruses) + blightfound = 1 + if(blight.stage < 5) + blight.stage++ + if(!blightfound) + H.AddDisease(new /datum/disease/revblight) + H << "You feel [pick("suddenly sick", "a surge of nausea", "like your skin is wrong")]." + else + if(mob.reagents) + mob.reagents.add_reagent("plasma", 5) + else + mob.adjustToxLoss(5) + for(var/obj/effect/spacevine/vine in T.contents) //Fucking with botanists, the ability. + vine.color = "#823abb" + PoolOrNew(/obj/effect/overlay/temp/revenant, vine.loc) + spawn(20) + if(vine) + qdel(vine) + for(var/obj/effect/glowshroom/shroom in T.contents) + shroom.color = "#823abb" + PoolOrNew(/obj/effect/overlay/temp/revenant, shroom.loc) + spawn(20) + if(shroom) + qdel(shroom) + for(var/obj/machinery/hydroponics/tray in T.contents) + PoolOrNew(/obj/effect/overlay/temp/revenant, tray.loc) + tray.pestlevel = rand(8, 10) + tray.weedlevel = rand(8, 10) + tray.toxic = rand(45, 55) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_blight.dm b/code/modules/mob/living/simple_animal/revenant/revenant_blight.dm new file mode 100644 index 00000000000..a0b8f813c4f --- /dev/null +++ b/code/modules/mob/living/simple_animal/revenant/revenant_blight.dm @@ -0,0 +1,60 @@ +/datum/disease/revblight + name = "Unnatural Wasting" + max_stages = 5 + stage_prob = 10 + spread_flags = NON_CONTAGIOUS + cure_text = "Holy water or extensive rest." + spread_text = "A burst of unholy energy" + cures = list("holywater") + cure_chance = 50 //higher chance to cure, because revenants are assholes + agent = "Unholy Forces" + viable_mobtypes = list(/mob/living/carbon/human) + disease_flags = CURABLE + permeability_mod = 1 + severity = BIOHAZARD + var/stagedamage = 0 //Highest stage reached. + +/datum/disease/revblight/stage_act() + if(affected_mob.lying && prob(stage*2)) + affected_mob << "You feel better." + cure() + return + if(prob(stage*3)) + affected_mob << "You suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]..." + affected_mob.confused += 10 + affected_mob.adjustStaminaLoss(10) + PoolOrNew(/obj/effect/overlay/temp/revenant, affected_mob.loc) + if(stagedamage < stage) + stagedamage++ + affected_mob.adjustToxLoss(stage*3) //should, normally, do about 45 toxin damage. + PoolOrNew(/obj/effect/overlay/temp/revenant, affected_mob.loc) + ..() //So we don't increase a stage before applying the stage damage. + switch(stage) + if(2) + if(prob(45)) + affected_mob.adjustStaminaLoss(4) + if(prob(5)) + affected_mob.emote("pale") + if(3) + if(prob(10)) + affected_mob.emote(pick("pale","shiver")) + if(4) + if(prob(15)) + affected_mob.emote(pick("pale","shiver","cries")) + if(5) + affected_mob << "You feel like [pick("nothing's worth it anymore", "nobody ever needed your help", "nothing you did mattered", "everything you tried to do was worthless")]." + affected_mob.adjustStaminaLoss(45) + PoolOrNew(/obj/effect/overlay/temp/revenant, affected_mob.loc) + if(affected_mob.dna && affected_mob.dna.species) + affected_mob.dna.species.handle_mutant_bodyparts(affected_mob,"#1d2953") + affected_mob.dna.species.handle_hair(affected_mob,"#1d2953") + affected_mob.dna.species.update_color(affected_mob,"#1d2953") + spawn(100) + if(affected_mob && affected_mob.dna && affected_mob.dna.species) + affected_mob.dna.species.handle_mutant_bodyparts(affected_mob) + affected_mob.dna.species.handle_hair(affected_mob) + affected_mob.dna.species.update_color(affected_mob) + affected_mob.visible_message("[affected_mob] looks terrifyingly gaunt...", "Your skin suddenly looks wrong and awful...") + cure() + else + return \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm index 0cb19dab3da..d21e9c04b03 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm @@ -21,7 +21,7 @@ return key_of_revenant = null if(!key_of_revenant) - var/list/candidates = get_candidates(BE_REVENANT) + var/list/candidates = get_candidates(ROLE_REVENANT) if(!candidates.len) if(end_if_fail) return 0 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 324a121a982..5e6c14e5df5 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -370,11 +370,11 @@ ..() /mob/living/simple_animal/movement_delay() - var/tally = 0 //Incase I need to add stuff other than "speed" later + . = ..() - tally = speed + . = speed - return tally+config.animal_delay + . += config.animal_delay /mob/living/simple_animal/Stat() ..() diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm index cbc845bc69d..557271fc79b 100644 --- a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm +++ b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm @@ -15,7 +15,7 @@ /datum/round_event/slaughter/proc/get_slaughter(end_if_fail = 0) key_of_slaughter = null if(!key_of_slaughter) - var/list/candidates = get_candidates(BE_ALIEN) + var/list/candidates = get_candidates(ROLE_ALIEN) if(!candidates.len) if(end_if_fail) return 0 diff --git a/code/modules/mob/living/simple_animal/slime/death.dm b/code/modules/mob/living/simple_animal/slime/death.dm index 549a4e2c728..31542c8051c 100644 --- a/code/modules/mob/living/simple_animal/slime/death.dm +++ b/code/modules/mob/living/simple_animal/slime/death.dm @@ -9,6 +9,8 @@ M.regenerate_icons() is_adult = 0 maxHealth = 150 + var/datum/action/innate/slime/evolve/E = new + E.Grant(src) revive() regenerate_icons() number = rand(1, 1000) @@ -33,3 +35,10 @@ /mob/living/simple_animal/slime/gib() death(1) qdel(src) + + +/mob/living/simple_animal/slime/Destroy() + for(var/obj/machinery/computer/camera_advanced/xenobio/X in machines) + if(src in X.stored_slimes) + X.stored_slimes -= src + return ..() diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index f65100a6d64..1774f2e592d 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -222,11 +222,11 @@ if(prob(75)) adjustBruteLoss(rand(0,5)) - else if (nutrition >= get_grow_nutrition() && amount_grown < 10) + else if (nutrition >= get_grow_nutrition() && amount_grown < SLIME_EVOLUTION_THRESHOLD) nutrition -= 20 amount_grown++ - if(amount_grown >= 10 && !buckled && !Target && !ckey) + if(amount_grown >= SLIME_EVOLUTION_THRESHOLD && !buckled && !Target && !ckey) if(is_adult) Reproduce() else diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index bc64b2168c2..286b63ad9d1 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -1,3 +1,36 @@ +#define SIZE_DOESNT_MATTER -1 +#define BABIES_ONLY 0 +#define ADULTS_ONLY 1 + +#define NO_GROWTH_NEEDED 0 +#define GROWTH_NEEDED 1 + +/datum/action/innate/slime + check_flags = AB_CHECK_ALIVE + background_icon_state = "bg_alien" + var/adult_action = SIZE_DOESNT_MATTER + var/needs_growth = NO_GROWTH_NEEDED + +/datum/action/innate/slime/CheckRemoval() + if(!isslime(owner)) + return 1 + var/mob/living/simple_animal/slime/S = owner + if(adult_action != SIZE_DOESNT_MATTER) + if(adult_action == ADULTS_ONLY && !S.is_adult) + return 1 + else if(adult_action == BABIES_ONLY && S.is_adult) + return 1 + return 0 + +/datum/action/innate/slime/IsAvailable() + if(..()) + var/mob/living/simple_animal/slime/S = owner + if(needs_growth == GROWTH_NEEDED) + if(S.amount_grown >= SLIME_EVOLUTION_THRESHOLD) + return 1 + return 0 + return 1 + /mob/living/simple_animal/slime/verb/Feed() set category = "Slime" set desc = "This will let you feed on any valid creature in the surrounding area. This should also be used to halt the feeding process." @@ -16,6 +49,15 @@ Feedon(M) return 1 +/datum/action/innate/slime/feed + name = "Feed" + button_icon_state = "slimeeat" + + +/datum/action/innate/slime/feed/Activate() + var/mob/living/simple_animal/slime/S = owner + S.Feed() + /mob/living/simple_animal/slime/proc/CanFeedon(mob/living/M) if(!Adjacent(M)) return 0 @@ -68,7 +110,7 @@ src << "I must be conscious to do this..." return if(!is_adult) - if(amount_grown >= 10) + if(amount_grown >= SLIME_EVOLUTION_THRESHOLD) is_adult = 1 maxHealth = 200 amount_grown = 0 @@ -79,6 +121,19 @@ else src << "I have already evolved..." +/datum/action/innate/slime/evolve + name = "Evolve" + button_icon_state = "slimegrow" + adult_action = BABIES_ONLY + needs_growth = GROWTH_NEEDED + +/datum/action/innate/slime/evolve/Activate() + var/mob/living/simple_animal/slime/S = owner + S.Evolve() + if(S.is_adult) + var/datum/action/innate/slime/reproduce/A = new + A.Grant(S) + /mob/living/simple_animal/slime/verb/Reproduce() set category = "Slime" set desc = "This will make you split into four Slimes." @@ -88,7 +143,7 @@ return if(is_adult) - if(amount_grown >= 10) + if(amount_grown >= SLIME_EVOLUTION_THRESHOLD) if(stat) src << "I must be conscious to do this..." return @@ -123,4 +178,14 @@ else src << "I am not ready to reproduce yet..." else - src << "I am not old enough to reproduce yet..." \ No newline at end of file + src << "I am not old enough to reproduce yet..." + +/datum/action/innate/slime/reproduce + name = "Reproduce" + button_icon_state = "slimesplit" + adult_action = ADULTS_ONLY + needs_growth = GROWTH_NEEDED + +/datum/action/innate/slime/reproduce/Activate() + var/mob/living/simple_animal/slime/S = owner + S.Reproduce() diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index f6ed7d222e8..02b052d8263 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -70,9 +70,16 @@ var/list/slime_mutation[4] /mob/living/simple_animal/slime/New() + var/datum/action/innate/slime/feed/F = new + F.Grant(src) if(is_adult) + var/datum/action/innate/slime/reproduce/R = new + R.Grant(src) health = 200 maxHealth = 200 + else + var/datum/action/innate/slime/evolve/E = new + E.Grant(src) create_reagents(100) spawn (0) number = rand(1, 1000) @@ -101,26 +108,26 @@ if(bodytemperature >= 330.23) // 135 F return -1 // slimes become supercharged at high temperatures - var/tally = 0 + . = ..() var/health_deficiency = (100 - health) if(health_deficiency >= 45) - tally += (health_deficiency / 25) + . += (health_deficiency / 25) if(bodytemperature < 183.222) - tally += (283.222 - bodytemperature) / 10 * 1.75 + . += (283.222 - bodytemperature) / 10 * 1.75 if(reagents) if(reagents.has_reagent("morphine")) // morphine slows slimes down - tally *= 2 + . *= 2 if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow - tally *= 5 + . *= 5 if(health <= 0) // if damaged, the slime moves twice as slow - tally *= 2 + . *= 2 - return tally + config.slime_delay + . += config.slime_delay /mob/living/simple_animal/slime/ObjBump(obj/O) if(!client && powerlevel > 0) @@ -149,7 +156,7 @@ if(!docile) stat(null, "Nutrition: [nutrition]/[get_max_nutrition()]") - if(amount_grown >= 10) + if(amount_grown >= SLIME_EVOLUTION_THRESHOLD) if(is_adult) stat(null, "You can reproduce!") else diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index f262ddefc1f..082296dcaf2 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -51,10 +51,13 @@ //readd this mob's HUDs (antag, med, etc) reload_huds() + if(ckey in deadmins) verbs += /client/proc/readmin - client.screen += client.void + add_click_catcher() + + sync_mind() // Calling update_interface() in /mob/Login() causes the Cyborg to immediately be ghosted; because of winget(). // Calling it in the overriden Login, such as /mob/living/Login() doesn't cause this. diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index de53d5999cd..6c84616a672 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -24,7 +24,7 @@ var/next_mob_id = 0 prepare_huds() ..() -/mob/proc/prepare_huds() +/atom/proc/prepare_huds() for(var/hud in hud_possible) hud_list[hud] = image('icons/mob/hud.dmi', src, "") @@ -539,55 +539,7 @@ var/list/slot_equipment_priority = list( \ if(is_admin && stat == DEAD) is_admin = 0 - var/list/names = list() - var/list/namecounts = list() - var/list/creatures = list() - - for(var/obj/O in world) //EWWWWWWWWWWWWWWWWWWWWWWWW ~needs to be optimised - if(!O.loc) - continue - if(istype(O, /obj/item/weapon/disk/nuclear)) - var/name = "Nuclear Disk" - if (names.Find(name)) - namecounts[name]++ - name = "[name] ([namecounts[name]])" - else - names.Add(name) - namecounts[name] = 1 - creatures[name] = O - - if(istype(O, /obj/singularity)) - var/name = "Singularity" - if (names.Find(name)) - namecounts[name]++ - name = "[name] ([namecounts[name]])" - else - names.Add(name) - namecounts[name] = 1 - creatures[name] = O - - if(istype(O, /obj/machinery/bot)) - var/name = "BOT: [O.name]" - if (names.Find(name)) - namecounts[name]++ - name = "[name] ([namecounts[name]])" - else - names.Add(name) - namecounts[name] = 1 - creatures[name] = O - - - for(var/mob/M in sortNames(mob_list)) - var/name = M.name - if (names.Find(name)) - namecounts[name]++ - name = "[name] ([namecounts[name]])" - else - names.Add(name) - namecounts[name] = 1 - - creatures[name] = M - + var/list/creatures = getpois() client.perspective = EYE_PERSPECTIVE @@ -658,9 +610,6 @@ var/list/slot_equipment_priority = list( \ if(istype(M, /mob/living/silicon/ai)) return show_inv(usr) -/mob/proc/can_use_hands() - return - /mob/proc/is_active() return (0 >= usr.stat) @@ -1009,4 +958,28 @@ var/list/slot_equipment_priority = list( \ //can the mob be unbuckled from something by default? /mob/proc/can_unbuckle() - return 1 \ No newline at end of file + return 1 + +//Can the mob see reagents inside of containers? +/mob/proc/can_see_reagents() + if(stat == DEAD) //Ghosts and such can always see reagents + return 1 + if(has_unlimited_silicon_privilege) //Silicons can automatically view reagents + return 1 + if(ishuman(src)) + var/mob/living/carbon/human/H = src + if(H.head && istype(H.head, /obj/item/clothing)) + var/obj/item/clothing/CL = H.head + if(CL.scan_reagents) + return 1 + if(H.wear_mask && H.wear_mask.scan_reagents) + return 1 + if(H.glasses && istype(H.glasses, /obj/item/clothing)) + var/obj/item/clothing/CL = H.glasses + if(CL.scan_reagents) + return 1 + return 0 + +//Can the mob use Topic to interact with machines +/mob/proc/canUseTopic() + return diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index c7b11967914..16f1e4a9c60 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -6,6 +6,7 @@ hud_possible = list(ANTAG_HUD) pressure_resistance = 8 var/datum/mind/mind + var/list/datum/action/actions = list() var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak @@ -134,8 +135,6 @@ var/status_flags = CANSTUN|CANWEAKEN|CANPARALYSE|CANPUSH //bitflags defining which status effects can be inflicted (replaces canweaken, canstun, etc) - var/area/lastarea = null - var/digitalcamo = 0 // Can they be tracked by the AI? var/digitalinvis = 0 //Are they ivisible to the AI? var/image/digitaldisguise = null //what does the AI see instead of them? @@ -149,6 +148,8 @@ var/obj/control_object //Used by admins to possess objects. All mobs should have this var var/atom/movable/remote_control //Calls relaymove() to whatever it is + var/remote_view = 0 // Set to 1 to prevent view resets on Life + var/turf/listed_turf = null //the current turf being examined in the stat panel var/list/permanent_huds = list() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 5292688863c..9962dc9f279 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -326,17 +326,18 @@ It's fairly easy to fix if dealing with single letters but not so much with comp /mob/proc/reagent_check(datum/reagent/R) // utilized in the species code return 1 -/proc/notify_ghosts(var/message, var/ghost_sound = null, var/atom/source = null, var/image/alert_overlay = null) //Easy notification of ghosts. +/proc/notify_ghosts(var/message, var/ghost_sound = null, var/enter_link = null, var/atom/source = null, var/image/alert_overlay = null, var/attack_not_jump = 0) //Easy notification of ghosts. for(var/mob/dead/observer/O in player_list) if(O.client) - O << "[message]" + O << "[message][(enter_link) ? " [enter_link]" : ""]" if(ghost_sound) O << sound(ghost_sound) if(source) var/obj/screen/alert/notify_jump/A = O.throw_alert("\ref[source]_notify_jump", /obj/screen/alert/notify_jump) if(A) A.desc = message - A.jump_target = get_turf(source) + A.attack_not_jump = attack_not_jump + A.jump_target = source if(!alert_overlay) var/old_layer = source.layer source.layer = FLOAT_LAYER diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 5ead7ca5132..a38cc7b7ca0 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -92,7 +92,7 @@ /client/Move(n, direct) - if(!mob) + if(!mob || !mob.loc) return 0 if(mob.notransform) return 0 //This is sota the goto stop mobs from moving var @@ -127,10 +127,6 @@ if(!mob.canmove) return 0 - if(!mob.lastarea) - mob.lastarea = get_area(mob.loc) - - if(isobj(mob.loc) || ismob(mob.loc)) //Inside an object, tell it we moved var/atom/O = mob.loc return O.relaymove(mob, direct) @@ -138,89 +134,70 @@ if(!mob.Process_Spacemove(direct)) return 0 - if(isturf(mob.loc)) - - - var/turf/T = mob.loc - move_delay = world.time//set move delay - - move_delay += T.slowdown - - if(mob.restrained()) //Why being pulled while cuffed prevents you from moving - for(var/mob/M in range(1, mob)) - if(M.pulling == mob) - if(!M.incapacitated() && mob.Adjacent(M)) - src << "You're restrained! You can't move!" - move_delay += 10 - return 0 - else - M.stop_pulling() - - switch(mob.m_intent) - if("run") - if(mob.drowsyness > 0) - move_delay += 6 - move_delay += config.run_speed - if("walk") - move_delay += config.walk_speed - move_delay += mob.movement_delay() - - if(config.Tickcomp) - move_delay -= 1.3 - var/tickcomp = (1 / (world.tick_lag)) * 1.3 - move_delay = move_delay + tickcomp - - //We are now going to move - moving = 1 - //Something with pulling things - if(locate(/obj/item/weapon/grab, mob)) - move_delay = max(move_delay, world.time + 7) - var/list/L = mob.ret_grab() - if(istype(L, /list)) - if(L.len == 2) - L -= mob - var/mob/M = L[1] - if(M) - if ((get_dist(mob, M) <= 1 || M.loc == mob.loc)) - . = ..() - if (isturf(M.loc)) - var/diag = get_dir(mob, M) - if ((diag - 1) & diag) - else - diag = null - if ((get_dist(mob, M) > 1 || diag)) - step(M, get_dir(M.loc, T)) + if(mob.restrained()) //Why being pulled while cuffed prevents you from moving + for(var/mob/M in orange(1, mob)) + if(M.pulling == mob) + if(!M.incapacitated() && mob.Adjacent(M)) + src << "You're restrained! You can't move!" + move_delay = world.time + 10 + return 0 else - for(var/mob/M in L) - M.other_mobs = 1 - if(mob != M) - M.animate_movement = 3 - for(var/mob/M in L) - spawn( 0 ) - step(M, direct) - return - spawn( 1 ) - M.other_mobs = null - M.animate_movement = 2 - return + M.stop_pulling() - if(mob.confused) - if(mob.confused > 40) - step(mob, pick(cardinal)) - else if(prob(mob.confused * 1.5)) - step(mob, angle2dir(dir2angle(direct) + pick(90, -90))) - else if(prob(mob.confused * 3)) - step(mob, angle2dir(dir2angle(direct) + pick(45, -45))) + + //We are now going to move + moving = 1 + move_delay = mob.movement_delay() + world.time + + //Something with pulling things + if(locate(/obj/item/weapon/grab, mob)) + move_delay = max(move_delay, world.time + 7) + var/list/L = mob.ret_grab() + if(istype(L, /list)) + if(L.len == 2) + L -= mob + var/mob/M = L[1] + if(M) + if ((get_dist(mob, M) <= 1 || M.loc == mob.loc)) + . = ..() + if (isturf(M.loc)) + var/diag = get_dir(mob, M) + if ((diag - 1) & diag) + else + diag = null + if ((get_dist(mob, M) > 1 || diag)) + step(M, get_dir(M.loc, mob.loc)) else - step(mob, direct) + for(var/mob/M in L) + M.other_mobs = 1 + if(mob != M) + M.animate_movement = 3 + for(var/mob/M in L) + spawn( 0 ) + step(M, direct) + return + spawn( 1 ) + M.other_mobs = null + M.animate_movement = 2 + return + + if(mob.confused) + if(mob.confused > 40) + step(mob, pick(cardinal)) + else if(prob(mob.confused * 1.5)) + step(mob, angle2dir(dir2angle(direct) + pick(90, -90))) + else if(prob(mob.confused * 3)) + step(mob, angle2dir(dir2angle(direct) + pick(45, -45))) else - . = ..() + step(mob, direct) + else + . = ..() - moving = 0 - if(mob && .) - mob.throwing = 0 + moving = 0 + if(mob && .) + mob.throwing = 0 - return . + return . ///Process_Grab() diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index e1e039fb6e3..1b188f6b601 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -1,5 +1,6 @@ /mob/new_player/Login() - update_Login_details() //handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying + ..() + if(join_motd) src << "
[join_motd]
"
@@ -18,10 +19,8 @@
loc = pick(newplayer_start)
else
loc = locate(1,1,1)
- lastarea = loc
sight |= SEE_TURFS
- player_list |= src
/*
var/list/watch_locations = list()
@@ -33,8 +32,7 @@
loc = pick(watch_locations)
*/
new_player_panel()
- if(ckey in deadmins)
- verbs += /client/proc/readmin
+
spawn(40)
if(client)
client.playtitlemusic()
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 31c16a07373..82f40f51a3a 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -282,7 +282,6 @@
continue
character.loc = D
- character.lastarea = get_area(loc)
if(character.mind.assigned_role != "Cyborg")
data_core.manifest_inject(character)
@@ -364,7 +363,6 @@
close_spawn_windows()
var/mob/living/carbon/human/new_character = new(loc)
- new_character.lastarea = get_area(loc)
if(config.force_random_names || appearance_isbanned(src))
client.prefs.random_character()
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 71bd77ffef5..ede338d56de 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -25,7 +25,7 @@
usr.emote("me",1,message)
/mob/proc/say_dead(var/message)
- var/name = src.real_name
+ var/name = real_name
var/alt_name = ""
if(say_disabled) //This is here to try to identify lag problems
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 7a2aa6fd408..85afb664104 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -433,6 +433,23 @@
gib(src)
+/mob/proc/become_god(var/side_colour)
+ var/mob/camera/god/G = new /mob/camera/god(loc)
+ G.side = side_colour
+ G.invisibility = 40
+ if(mind)
+ mind.transfer_to(G)
+ else
+ G.key = key
+
+ G.job = "Deity"
+ G.rename_self("deity", 0)
+ G.update_icons()
+
+ . = G
+ qdel(src)
+
+
/mob/living/carbon/human/proc/corgize()
if (notransform)
diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm
index 2e1e6528256..fda579af7ef 100644
--- a/code/modules/ninja/ninja_event.dm
+++ b/code/modules/ninja/ninja_event.dm
@@ -54,7 +54,7 @@ Contents:
//selecting a candidate player
if(!key)
- var/list/candidates = get_candidates(BE_NINJA)
+ var/list/candidates = get_candidates(ROLE_NINJA)
if(!candidates.len)
return kill()
var/client/C = pick(candidates)
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
index 63073768eb6..8487a3c2d47 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
@@ -20,7 +20,7 @@
spawn(70)
if(reagents.total_volume)
var/fraction = min(a_transfer/reagents.total_volume, 1)
- reagents.reaction(H, INGEST, fraction)
+ reagents.reaction(H, INJECT, fraction)
reagents.trans_id_to(H, "radium", a_transfer)
H << "You are beginning to feel the after-effect of the injection."
a_boost--
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 414aaba7db2..47ce86e6afd 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -66,6 +66,7 @@
*/
/obj/item/weapon/pen/sleepy
origin_tech = "materials=2;syndicate=5"
+ flags = OPENCONTAINER
/obj/item/weapon/pen/sleepy/attack(mob/living/M, mob/user)
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index d8027356d11..009dfeba438 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -147,7 +147,7 @@
/obj/item/weapon/stock_parts/cell/crap
name = "\improper Nanotrasen brand rechargable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
- origin_tech = "powerstorage=0"
+ origin_tech = null
maxcharge = 500
materials = list(MAT_GLASS=40)
rating = 2
@@ -158,7 +158,7 @@
/obj/item/weapon/stock_parts/cell/secborg
name = "security borg rechargable D battery"
- origin_tech = "powerstorage=0"
+ origin_tech = null
maxcharge = 600 //600 max charge / 100 charge per shot = six shots
materials = list(MAT_GLASS=40)
rating = 2.5
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 673767faa5c..63c1566b534 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -23,6 +23,10 @@
var/state = 0
var/locked = 0
+ var/projectile_type = /obj/item/projectile/beam/emitter
+
+ var/projectile_sound = 'sound/weapons/emitter.ogg'
+
/obj/machinery/power/emitter/New()
..()
component_parts = list()
@@ -62,7 +66,7 @@
/obj/machinery/power/emitter/AltClick(mob/user)
..()
- if(!user.canUseTopic(user))
+ if(user.incapacitated())
user << "You can't do that right now!"
return
if(!in_range(src, user))
@@ -157,10 +161,10 @@
src.fire_delay = rand(minimum_fire_delay,maximum_fire_delay)
src.shot_number = 0
- var/obj/item/projectile/beam/emitter/A = PoolOrNew(/obj/item/projectile/beam/emitter,src.loc)
+ var/obj/item/projectile/A = PoolOrNew(projectile_type,src.loc)
A.dir = src.dir
- playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1)
+ playsound(src.loc, projectile_sound, 25, 1)
if(prob(35))
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index c64e244f0bf..78564886196 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -24,13 +24,13 @@
/obj/singularity/narsie/large/New()
..()
- world << "NAR-SIE HAS RISEN"
+ world << "NAR-SIE HAS RISEN"
world << pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg')
var/area/A = get_area(src)
if(A)
var/image/alert_overlay = image('icons/mob/mob.dmi', "harvester")
- notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay)
+ notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, attack_not_jump = 1)
narsie_spawn_animation()
@@ -39,11 +39,8 @@
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
- if(!(src in view()))
- user << "Your soul is too far away."
- return
- makeNewConstruct(/mob/living/simple_animal/construct/harvester, user, null, 1)
- PoolOrNew(/obj/effect/particle_effect/smoke/sleeping, user.loc)
+ makeNewConstruct(/mob/living/simple_animal/construct/harvester, user, null, 0, loc_override = src.loc)
+ PoolOrNew(/obj/effect/particle_effect/smoke/sleeping, src.loc)
/obj/singularity/narsie/process()
@@ -78,7 +75,7 @@
for(var/mob/living/carbon/M in oviewers(8, src))
if(M.stat == CONSCIOUS)
if(!iscultist(M))
- M << "You feel conscious thought crumble away in an instant as you gaze upon [src.name]..."
+ M << "You feel conscious thought crumble away in an instant as you gaze upon [src.name]..."
M.apply_effect(3, STUN)
@@ -125,12 +122,14 @@
/obj/singularity/narsie/proc/acquire(mob/food)
- target << "NAR-SIE HAS LOST INTEREST IN YOU"
+ if(food == target)
+ return
+ target << "NAR-SIE HAS LOST INTEREST IN YOU."
target = food
- if(ishuman(target))
- target << "NAR-SIE HUNGERS FOR YOUR SOUL"
+ if(isliving(target))
+ target << "NAR-SIE HUNGERS FOR YOUR SOUL."
else
- target << "NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL"
+ target << "NAR-SIE HAS CHOSEN YOU TO LEAD HER TO HER NEXT MEAL."
//Wizard narsie
/obj/singularity/narsie/wizard
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 99ec21831a9..c9f6d832c5e 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -107,7 +107,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/structure/particle_accelerator/AltClick(mob/user)
..()
- if(!user.canUseTopic(user))
+ if(user.incapacitated())
user << "You can't do that right now!"
return
if(!in_range(src, user))
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index b2a8f3d3a99..6fe3f6f91b8 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -34,6 +34,7 @@
src.energy = starting_energy
..()
SSobj.processing |= src
+ poi_list |= src
for(var/obj/machinery/power/singularity_beacon/singubeacon in machines)
if(singubeacon.active)
target = singubeacon
@@ -42,6 +43,7 @@
/obj/singularity/Destroy()
SSobj.processing.Remove(src)
+ poi_list.Remove(src)
return ..()
/obj/singularity/Move(atom/newloc, direct)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 2873fb753e0..646bd7eb81d 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -158,10 +158,10 @@
terminal.dismantle(user)
//crowbarring it !
- default_deconstruction_crowbar(I)
- message_admins("[src] has been deconstructed by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1)
- log_game("[src] has been deconstructed by [key_name(user)]")
- investigate_log("SMES deconstructed by [key_name(user)]","singulo")
+ if(default_deconstruction_crowbar(I))
+ message_admins("[src] has been deconstructed by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1)
+ log_game("[src] has been deconstructed by [key_name(user)]")
+ investigate_log("SMES deconstructed by [key_name(user)]","singulo")
/obj/machinery/power/smes/Destroy()
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 2eca138ffff..4b56bc61a0f 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -41,11 +41,11 @@
fire_sound = 'sound/weapons/pulse.ogg'
/obj/item/ammo_casing/energy/laser/bluetag
- projectile_type = /obj/item/projectile/lasertag/bluetag
+ projectile_type = /obj/item/projectile/beam/lasertag/bluetag
select_name = "bluetag"
/obj/item/ammo_casing/energy/laser/redtag
- projectile_type = /obj/item/projectile/lasertag/redtag
+ projectile_type = /obj/item/projectile/beam/lasertag/redtag
select_name = "redtag"
/obj/item/ammo_casing/energy/xray
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index dbe0225dd79..d95c659374c 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -27,7 +27,7 @@
name = "\improper DRAGnet"
desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology."
icon_state = "dragnet"
- origin_tech = "combat=3;magnets=3;materials=4; bluespace=4"
+ origin_tech = "combat=3;magnets=3;materials=4;bluespace=4"
ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
can_flashlight = 0
ammo_x_offset = 1
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 46f44c40a4a..7cf1c1ba5b2 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -7,6 +7,7 @@
pass_flags = PASSTABLE
mouse_opacity = 0
hitsound = 'sound/weapons/pierce.ogg'
+ pressure_resistance = INFINITY
var/def_zone = "" //Aiming at
var/mob/firer = null//Who shot it
var/suppressed = 0 //Attack message
@@ -25,7 +26,7 @@
var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
var/flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb
var/projectile_type = "/obj/item/projectile"
- var/kill_count = 50 //This will de-increment every step. When 0, it will delete the projectile.
+ var/range = 50 //This will de-increment every step. When 0, it will delete the projectile.
//Effects
var/stun = 0
var/weaken = 0
@@ -39,19 +40,15 @@
var/jitter = 0
var/forcedodge = 0
// 1 to pass solid objects, 2 to pass solid turfs (results in bugs, bugs and tons of bugs)
- var/range = 0
/obj/item/projectile/New()
permutated = list()
return ..()
/obj/item/projectile/proc/Range()
- if(range)
- range--
- if(range <= 0)
- on_range()
- else
- return
+ range--
+ if(range <= 0 && loc)
+ on_range()
/obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range
qdel(src)
@@ -125,13 +122,9 @@
/obj/item/projectile/proc/fire()
- spawn()
+ spawn(1)
while(loc)
- if(kill_count < 1)
- qdel(src)
- return
if(!paused)
- kill_count--
if((!( current ) || loc == current))
current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
step_towards(src, current)
@@ -139,11 +132,11 @@
if(loc == get_turf(original))
if(!(original in permutated))
Bump(original, 1)
- Range()
+ Range()
sleep(1)
/obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
..()
if(isliving(AM) && AM.density && !checkpass(PASSMOB))
- Bump(AM, 1)
\ No newline at end of file
+ Bump(AM, 1)
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 73ca533cd76..043ba75060f 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -67,17 +67,16 @@
..()
return QDEL_HINT_PUTINPOOL
-/obj/item/projectile/lasertag
+/obj/item/projectile/beam/lasertag
name = "laser tag beam"
icon_state = "omnilaser"
hitsound = null
damage = 0
damage_type = STAMINA
flag = "laser"
- pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
-/obj/item/projectile/lasertag/on_hit(atom/target, blocked = 0)
+/obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/M = target
@@ -86,10 +85,10 @@
M.adjustStaminaLoss(34)
-/obj/item/projectile/lasertag/redtag
+/obj/item/projectile/beam/lasertag/redtag
icon_state = "laser"
suit_types = list(/obj/item/clothing/suit/bluetag)
-/obj/item/projectile/lasertag/bluetag
+/obj/item/projectile/beam/lasertag/bluetag
icon_state = "bluelaser"
suit_types = list(/obj/item/clothing/suit/redtag)
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 924853ba21b..fb48228024c 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -134,11 +134,9 @@ obj/item/projectile/kinetic/New()
damage *= 4
..()
-/obj/item/projectile/kinetic/Range()
- range--
- if(range <= 0)
- new /obj/item/effect/kinetic_blast(src.loc)
- qdel(src)
+/obj/item/projectile/kinetic/on_range()
+ new /obj/item/effect/kinetic_blast(src.loc)
+ ..()
/obj/item/projectile/kinetic/on_hit(atom/target)
. = ..()
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 4aafe9ccf62..a66727f01d9 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -1,9 +1,10 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
var/const/TOUCH = 1 //splashing
-var/const/INGEST = 2 //injection, ingestion
+var/const/INGEST = 2 //ingestion
var/const/VAPOR = 3 //foam, spray, blob attack
var/const/PATCH = 4 //patches
+var/const/INJECT = 5 //injection
///////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/reagents/Chemistry-Readme.dm b/code/modules/reagents/Chemistry-Readme.dm
index bd28dcb79f1..b754f17596f 100644
--- a/code/modules/reagents/Chemistry-Readme.dm
+++ b/code/modules/reagents/Chemistry-Readme.dm
@@ -69,7 +69,8 @@ About the Holder:
This proc calls the appropriate reaction procs of the reagents.
I.e. if A is an object, it will call the reagents reaction_obj
proc. The method var is used for reaction on mobs. It simply tells
- us if the mob TOUCHed the reagent, if it INGESTed the reagent, if the reagent was VAPORIZEd on them, or transfered via a PATCH to them..
+ us if the mob TOUCHed the reagent, if it INGESTed the reagent, if the reagent
+ was VAPORIZEd on them, if the reagent was INJECTed, or transfered via a PATCH to them.
Since the volume can be checked in a reagents proc, you might want to
use the volume_modifier var to modifiy the passed value without actually
changing the volume of the reagents.
diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
index a6bb05181a7..4d5fe8c92c0 100644
--- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
@@ -46,7 +46,8 @@
reac_volume = ..()
M.apply_damage(0.6*reac_volume, TOX)
M.hallucination += 0.6*reac_volume
- M.reagents.add_reagent("spore", 0.4*reac_volume)
+ if(M.reagents)
+ M.reagents.add_reagent("spore", 0.4*reac_volume)
/datum/reagent/blob/lexorin_jelly //does tons of oxygen damage and a little brute
name = "Lexorin Jelly"
@@ -82,7 +83,8 @@
reac_volume = ..()
M.apply_damage(0.4*reac_volume, BURN)
M.adjustStaminaLoss(0.4*reac_volume)
- M.reagents.add_reagent("frostoil", 0.4*reac_volume)
+ if(M.reagents)
+ M.reagents.add_reagent("frostoil", 0.4*reac_volume)
/datum/reagent/blob/dark_matter //does brute damage and throws or pulls nearby objects at the target
name = "Dark Matter"
diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
index 7f45e8c9f7c..a88a9f4cb66 100644
--- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
@@ -16,7 +16,7 @@
/datum/reagent/medicine/leporazine
name = "Leporazine"
id = "leporazine"
- description = "Leporazine can be use to stabilize an individuals body temperature."
+ description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
color = "#C8A5DC" // rgb: 200, 165, 220
/datum/reagent/medicine/leporazine/on_mob_life(mob/living/M)
@@ -68,12 +68,12 @@
/datum/reagent/medicine/adminordrazine/nanites
name = "Nanites"
id = "nanites"
- description = "Tiny machines capable of rapid cellular regeneration."
+ description = "Tiny nanomachines capable of rapid cellular regeneration."
/datum/reagent/medicine/synaptizine
name = "Synaptizine"
id = "synaptizine"
- description = "Synaptizine is used to treat various diseases."
+ description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
color = "#C8A5DC" // rgb: 200, 165, 220
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/M)
@@ -84,14 +84,15 @@
if(holder.has_reagent("mindbreaker"))
holder.remove_reagent("mindbreaker", 5)
M.hallucination = max(0, M.hallucination - 10)
- if(prob(60))
+ if(prob(30))
M.adjustToxLoss(1)
..()
return
+
/datum/reagent/medicine/inacusiate
name = "Inacusiate"
id = "inacusiate"
- description = "Heals ear damage."
+ description = "Instantly restores all hearing to the patient, but does not cure deafness."
color = "#6600FF" // rgb: 100, 165, 255
/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/M)
@@ -102,7 +103,7 @@
/datum/reagent/medicine/cryoxadone
name = "Cryoxadone"
id = "cryoxadone"
- description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
+ description = "A chemical mixture with almost magical healing powers. Its main limitation is that the patient's body temperature must be under 170K for it to metabolise correctly."
color = "#0000C8"
/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/M)
@@ -113,67 +114,57 @@
M.adjustFireLoss(-3)
M.adjustToxLoss(-3)
M.status_flags &= ~DISFIGURED
-
..()
return
/datum/reagent/medicine/rezadone
name = "Rezadone"
id = "rezadone"
- description = "A powder derived from fish toxin, this substance can effectively treat cellular damage in humanoids, though excessive consumption has side effects."
+ description = "A powder derived from fish toxin, Rezadone can effectively treat genetic damage as well as restoring minor wounds. Overdose will cause intense nausea and minor toxin damage."
reagent_state = SOLID
color = "#669900" // rgb: 102, 153, 0
+ overdose_threshold = 30
/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M)
- switch(current_cycle)
- if(1 to 15)
- M.adjustCloneLoss(-1)
- M.heal_organ_damage(1,1)
- if(15 to 35)
- M.adjustCloneLoss(-2)
- M.heal_organ_damage(2,1)
- M.status_flags &= ~DISFIGURED
- if(35 to INFINITY)
- M.adjustToxLoss(1)
- M.Dizzy(5)
- M.Jitter(5)
+ M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
+ M.heal_organ_damage(1,1)
+ M.status_flags &= ~DISFIGURED
+ ..()
+ return
+/datum/reagent/medicine/rezadone/overdose_process(mob/living/M)
+ M.adjustToxLoss(1)
+ M.Dizzy(5)
+ M.Jitter(5)
..()
return
/datum/reagent/medicine/spaceacillin
name = "Spaceacillin"
id = "spaceacillin"
- description = "An all-purpose antiviral agent."
+ description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with."
color = "#C8A5DC" // rgb: 200, 165, 220
metabolization_rate = 0.5 * REAGENTS_METABOLISM
-
-
-
-//------------------------------------------------------------------------------------------------------
- //GOON MEDICINE
-//------------------------------------------------------------------------------------------------------
-
-
+//Goon Chems. Ported mainly from Goonstation. Easily mixable (or not so easily) and provide a variety of effects.
/datum/reagent/medicine/silver_sulfadiazine
name = "Silver Sulfadiazine"
id = "silver_sulfadiazine"
- description = "On touch, quickly heals burn damage. Basic anti-burn healing drug. On ingestion, deals minor toxin damage."
+ description = "If used in touch-based applications, immediately restores burn wounds as well as restoring more over time. If ingested through other means, deals minor toxin damage."
reagent_state = LIQUID
color = "#C8A5DC"
/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 == PATCH)
- M.adjustFireLoss(-reac_volume)
- if(show_message)
- M << "You feel your burns healing!"
- M.emote("scream")
- if(method == INGEST)
+ if(method in list(INGEST, VAPOR, INJECT))
M.adjustToxLoss(0.5*reac_volume)
if(show_message)
- M << "You probably shouldn't have eaten that. Maybe you should have splashed it on, or applied a patch?"
+ M << "You don't feel so good..."
+ else if(M.getFireLoss())
+ M.adjustFireLoss(-reac_volume)
+ if(show_message)
+ M << "You feel your burns healing! It stings like hell!"
+ M.emote("scream")
..()
/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M)
@@ -183,7 +174,7 @@
/datum/reagent/medicine/oxandrolone
name = "Oxandrolone"
id = "oxandrolone"
- description = "Stimulates healing of severe burns. If you have more than 50 burn damage, it heals 2 units; otherwise, 0.5. If overdosed it will exacerbate existing burns, causing burn and brute damage."
+ description = "Stimulates the healing of severe burns. Extremely rapidly heals severe burns and slowly heals minor ones. Overdose will worsen existing burns."
reagent_state = LIQUID
color = "#f7ffa5"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -191,36 +182,36 @@
/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/M)
if(M.getFireLoss() > 50)
- M.adjustFireLoss(-2*REM)
+ M.adjustFireLoss(-4*REM) //Twice as effective as silver sulfadiazine for severe burns
else
- M.adjustFireLoss(-0.5*REM)
+ M.adjustFireLoss(-0.5*REM) //But only a quarter as effective for more minor ones
..()
return
/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/M)
- M.adjustFireLoss(2.5*REM) // it's going to be healing either 2 or 0.5
- M.adjustBruteLoss(0.5*REM)
+ if(M.getFireLoss()) //It only makes existing burns worse
+ M.adjustFireLoss(4.5*REM) // it's going to be healing either 4 or 0.5
..()
return
/datum/reagent/medicine/styptic_powder
name = "Styptic Powder"
id = "styptic_powder"
- description = "On touch, quickly heals brute damage. Basic anti-brute healing drug. On ingestion, deals minor toxin damage."
+ description = "If used in touch-based applications, immediately restores bruising as well as restoring more over time. If ingested through other means, deals minor toxin damage."
reagent_state = LIQUID
color = "#C8A5DC"
/datum/reagent/medicine/styptic_powder/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
- if(method == PATCH)
- M.adjustBruteLoss(-reac_volume)
- if(show_message)
- M << "You feel your wounds knitting back together!"
- M.emote("scream")
- if(method == INGEST)
+ if(method in list(INGEST, VAPOR, INJECT))
M.adjustToxLoss(0.5*reac_volume)
if(show_message)
- M << "You feel kind of ill. Maybe you ate a medicine you shouldn't have?"
+ M << "You don't feel so good..."
+ else if(M.getFireLoss())
+ M.adjustBruteLoss(-reac_volume)
+ if(show_message)
+ M << "You feel your bruises healing! It stings like hell!"
+ M.emote("scream")
..()
@@ -231,7 +222,7 @@
/datum/reagent/medicine/salglu_solution
name = "Saline-Glucose Solution"
id = "salglu_solution"
- description = "Has a 33% chance per metabolism cycle to heal brute and burn damage."
+ description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a blood substitute on an IV drip."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -242,10 +233,20 @@
M.adjustFireLoss(-0.5*REM)
..()
+/datum/reagent/medicine/salglu_solution/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
+ if(iscarbon(M) && method == INJECT)
+ var/mob/living/carbon/human/H = M
+ //The lower the blood of the patient, the better it is as a blood substitute.
+ var/efficiency = (560-H.vessel.get_reagent_amount("blood"))/700 + 0.2
+ efficiency = min(0.75,efficiency)
+ //As it's designed for an IV drip, make large injections not as effective as repeated small injections.
+ H.vessel.add_reagent("blood", efficiency * min(5,reac_volume))
+ ..()
+
/datum/reagent/medicine/mine_salve
name = "Miner's Salve"
id = "mine_salve"
- description = "Slowly heals burn and brute damage, and causes subject to believe they are fully healed."
+ description = "A powerful painkiller. Restores bruising and burns in addition to making the patient believe they are fully healed."
reagent_state = LIQUID
color = "#6D6374"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
@@ -259,16 +260,15 @@
..()
/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
- if(iscarbon(M))
- if(method == TOUCH)
+ if(iscarbon(M) && M.stat != DEAD)
+ if(method in list(INGEST, VAPOR, INJECT))
+ M.Stun(4)
+ M.Weaken(4)
if(show_message)
- M << "You feel your wounds knitting back together!"
- method = VAPOR //so it's correctly absorbed in reagent/reaction_mob()
- if(method == INGEST)
+ M << "Your stomach agonizingly cramps!"
+ else
if(show_message)
- M << "That tasted horrible."
- M.AdjustStunned(2)
- M.AdjustWeakened(2)
+ M << "You feel your wounds fade away to nothing!" //It's a painkiller, after all
..()
/datum/reagent/medicine/mine_salve/on_mob_delete(mob/living/M)
@@ -286,18 +286,17 @@
/datum/reagent/medicine/synthflesh/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
- if(method == PATCH)
- M.adjustBruteLoss(-1.5*reac_volume)
- M.adjustFireLoss(-1.5*reac_volume)
+ if(method in list(PATCH, TOUCH))
+ M.adjustBruteLoss(-1.25 * reac_volume)
+ M.adjustFireLoss(-1.25 * reac_volume)
if(show_message)
- M << "You feel your burns healing and your flesh knitting together!"
+ M << "You feel your burns and bruises healing! It stings like hell!"
..()
-
/datum/reagent/medicine/charcoal
name = "Charcoal"
id = "charcoal"
- description = "Heals toxin damage, and will also slowly remove any other chemicals."
+ description = "Heals toxin damage as well as slowly removing any other chemicals the patient has in their bloodstream."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -313,7 +312,7 @@
/datum/reagent/medicine/omnizine
name = "Omnizine"
id = "omnizine"
- description = "Heals 1 of each damage type a cycle. If overdosed it will deal significant amounts of each damage type."
+ description = "Slowly heals all damage types. Overdose will cause damage in all types instead."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -338,7 +337,7 @@
/datum/reagent/medicine/calomel
name = "Calomel"
id = "calomel"
- description = "Quickly purges the body of all chemicals. If your health is above 20, toxin damage is dealt. When you hit 20 health or lower, the damage will cease."
+ description = "Quickly purges the body of all chemicals. Toxin damage is dealt if the patient is in good condition."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -355,7 +354,7 @@
/datum/reagent/medicine/potass_iodide
name = "Potassium Iodide"
id = "potass_iodide"
- description = "Reduces low radiation damage very effectively."
+ description = "Efficiently restores low radiation damage."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 2 * REAGENTS_METABOLISM
@@ -380,8 +379,6 @@
if(M.radiation > 0)
M.radiation -= 4
M.adjustToxLoss(-2*REM)
- if(prob(33))
- M.adjustBruteLoss(0.5*REM)
if(M.radiation < 0)
M.radiation = 0
for(var/datum/reagent/R in M.reagents.reagent_list)
@@ -393,7 +390,7 @@
/datum/reagent/medicine/sal_acid
name = "Salicyclic Acid"
id = "sal_acid"
- description = "If you have less than 50 brute damage, it heals 0.25 unit. If overdosed it will deal 0.5 brute damage if the patient has less than 50 brute damage already."
+ description = "Very slowly restores low bruising. Primarily used as an ingredient in other medicines. Overdose causes slight bruising."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -414,7 +411,7 @@
/datum/reagent/medicine/salbutamol
name = "Salbutamol"
id = "salbutamol"
- description = "Quickly heals oxygen damage while slowing down suffocation. Great for stabilizing critical patients!"
+ description = "Rapidly restores oxygen deprivation as well as preventing more of it to an extent."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -429,7 +426,7 @@
/datum/reagent/medicine/perfluorodecalin
name = "Perfluorodecalin"
id = "perfluorodecalin"
- description = "Heals suffocation damage so quickly that you could have a spacewalk, but it mutes your voice. Has a 33% chance of healing brute and burn damage per cycle as well."
+ description = "Extremely rapidly restores oxygen deprivation, but inhibits speech. May also heal small amounts of bruising and burns."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -446,7 +443,7 @@
/datum/reagent/medicine/ephedrine
name = "Ephedrine"
id = "ephedrine"
- description = "Reduces stun times, increases run speed. If overdosed it will deal toxin and oxyloss damage."
+ description = "Increases stun resistance and movement speed. Overdose deals toxin damage and inhibits breathing."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -497,23 +494,23 @@
/datum/reagent/medicine/diphenhydramine
name = "Diphenhydramine"
id = "diphenhydramine"
- description = "Purges body of lethal Histamine and reduces jitteriness while causing minor drowsiness."
+ description = "Rapidly purges the body of Histamine and reduces jitteriness. Slight chance of causing drowsiness."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/M)
- if(prob(50))
+ if(prob(10))
M.drowsyness += 1
M.jitteriness -= 1
- M.reagents.remove_reagent("histamine",1.5)
+ M.reagents.remove_reagent("histamine",3)
..()
return
/datum/reagent/medicine/morphine
name = "Morphine"
id = "morphine"
- description = "Will allow you to ignore slowdown from equipment and damage. Will eventually knock you out if you take too much. If overdosed it will cause jitteriness, dizziness, force the victim to drop items in their hands and eventually deal toxin damage."
+ description = "A painkiller that allows the patient to move at full speed even in bulky objects. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -523,7 +520,11 @@
/datum/reagent/medicine/morphine/on_mob_life(mob/living/M)
M.status_flags |= IGNORESLOWDOWN
- if(current_cycle >= 12)
+ if(current_cycle == 11)
+ M << "You start to feel tired..." //Warning when the victim is starting to pass out
+ if(current_cycle >= 12 && current_cycle < 24)
+ M.drowsyness += 1
+ else if(current_cycle >= 24)
M.sleeping += 1
..()
return
@@ -581,51 +582,49 @@
/datum/reagent/medicine/oculine
name = "Oculine"
id = "oculine"
- description = "Cures blindness and heals eye damage over time."
+ description = "Quickly restores eye damage, cures nearsightedness, and has a chance to restore vision to the blind."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
- if(current_cycle > 15)
- if(M.disabilities & BLIND)
- if(prob(20))
- M.disabilities &= ~BLIND
- M.disabilities &= NEARSIGHT
- M.eye_blurry = 35
+ if(M.disabilities & BLIND)
+ if(prob(20))
+ M << "Your vision slowly returns..."
+ M.disabilities &= ~BLIND
+ M.disabilities &= NEARSIGHT
+ M.eye_blurry = 35
- else if(M.disabilities & NEARSIGHT)
- M.disabilities &= ~NEARSIGHT
- M.eye_blurry = 10
-
- else if(M.eye_blind || M.eye_blurry)
- M.eye_blind = 0
- M.eye_blurry = 0
- else if(M.eye_stat > 0)
- M.eye_stat -= 1
+ else if(M.disabilities & NEARSIGHT)
+ M << "The blackness in your peripheral vision fades."
+ M.disabilities &= ~NEARSIGHT
+ M.eye_blurry = 10
+ else if(M.eye_blind || M.eye_blurry)
+ M.eye_blind = 0
+ M.eye_blurry = 0
+ else if(M.eye_stat > 0)
+ M.eye_stat -= 1
+ M.eye_stat = Clamp(M.eye_stat, 0, INFINITY)
..()
return
/datum/reagent/medicine/atropine
name = "Atropine"
id = "atropine"
- description = "If patients health is below -25 it will heal 1.5 brute and burn damage per cycle, as well as stop any oxyloss. Good for stabilising critical patients."
+ description = "If a patient is in critical condition, rapidly heals all damage types as well as regulating oxygen in the body. Excellent for stabilizing wounded patients."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 35
/datum/reagent/medicine/atropine/on_mob_life(mob/living/M)
- if(M.health > -60)
- M.adjustToxLoss(0.5*REM)
- if(M.health < -25)
- M.adjustBruteLoss(-1.5*REM)
- M.adjustFireLoss(-1.5*REM)
- if(M.oxyloss > 65)
- M.setOxyLoss(65)
- if(M.losebreath > 5)
- M.losebreath = 5
+ if(M.health < 0)
+ M.adjustToxLoss(-2*REM)
+ M.adjustBruteLoss(-2*REM)
+ M.adjustFireLoss(-2*REM)
+ M.adjustOxyLoss(-5*REM)
+ M.losebreath = 0
if(prob(20))
M.Dizzy(5)
M.Jitter(5)
@@ -642,14 +641,14 @@
/datum/reagent/medicine/epinephrine
name = "Epinephrine"
id = "epinephrine"
- description = "Reduces most of the knockout/stun effects, minor stamina regeneration buff. Attempts to stop you taking too much oxygen damage. If the patient is in low to severe crit, heals toxins, brute, and burn very effectively. Will not heal patients who are almost dead. If overdosed will stun and deal toxin damage"
+ description = "Minor boost to stun resistance. Slowly heals damage if a patient is in critical condition, as well as regulating oxygen loss. Overdose causes weakness and toxin damage."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 30
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M)
- if(M.health < -10 && M.health > -65)
+ if(M.health < 0)
M.adjustToxLoss(-0.5*REM)
M.adjustBruteLoss(-0.5*REM)
M.adjustFireLoss(-0.5*REM)
@@ -679,7 +678,7 @@
/datum/reagent/medicine/strange_reagent
name = "Strange Reagent"
id = "strange_reagent"
- description = "A miracle drug that can bring a dead body back to life! If the corpse has suffered too much damage, however, no change will occur to the body. If used on a living person it will deal Brute and Burn damage."
+ description = "A miracle drug capable of bringing the dead back to life. Only functions if the target has less than 100 brute and burn damage (independent of one another), and causes slight damage to the living."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -716,7 +715,7 @@
/datum/reagent/medicine/mannitol
name = "Mannitol"
id = "mannitol"
- description = "Heals brain damage effectively. Use it in cyro tubes alongside Cryoxadone."
+ description = "Efficiently restores brain damage."
color = "#C8A5DC"
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M)
@@ -727,7 +726,7 @@
/datum/reagent/medicine/mutadone
name = "Mutadone"
id = "mutadone"
- description = "Heals your genetic defects."
+ description = "Removes jitteriness and restores genetic defects."
color = "#C8A5DC"
/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/human/M)
@@ -740,7 +739,7 @@
/datum/reagent/medicine/antihol
name = "Antihol"
id = "antihol"
- description = "Helps remove Alcohol from someone's body, as well as eliminating its side effects."
+ description = "Purges alcoholic substance from the patient's body and eliminates its side effects."
color = "#C8A5DC"
/datum/reagent/medicine/antihol/on_mob_life(mob/living/M)
@@ -755,7 +754,7 @@
/datum/reagent/medicine/stimulants
name = "Stimulants"
id = "stimulants"
- description = "Increases run speed and eliminates stuns, can heal minor damage. If overdosed it will deal toxin damage and stun."
+ description = "Increases stun resistance and movement speed in addition to restoring minor damage and weakness. Overdose causes weakness and toxin damage."
color = "#C8A5DC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 60
@@ -795,11 +794,12 @@
M.reagents.remove_reagent("sugar", 3)
..()
return
- // TREK CHEMS
+
+//Trek Chems, used primarily by medibots. Only heals a specific damage type, but is very efficient.
datum/reagent/medicine/bicaridine
name = "Bicaridine"
id = "bicaridine"
- description = "Heals brute damage."
+ description = "Restores bruising. Overdose causes it instead."
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 30
@@ -810,14 +810,14 @@ datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
return
datum/reagent/medicine/bicaridine/overdose_process(mob/living/M)
- M.adjustBruteLoss(4*REM) // End result is 2 oxygen loss taken, because it heals 2 and then removes 4.
+ M.adjustBruteLoss(4*REM)
..()
return
datum/reagent/medicine/dexalin
name = "Dexalin"
id = "dexalin"
- description = "Heals oxygen damage."
+ description = "Restores oxygen loss. Overdose causes it instead."
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 30
@@ -828,14 +828,14 @@ datum/reagent/medicine/dexalin/on_mob_life(mob/living/M)
return
datum/reagent/medicine/dexalin/overdose_process(mob/living/M)
- M.adjustOxyLoss(4*REM) // End result is 2 oxygen loss taken, because it heals 2 and then removes 4.
+ M.adjustOxyLoss(4*REM)
..()
return
datum/reagent/medicine/kelotane
name = "Kelotane"
id = "kelotane"
- description = "Heals burn damage."
+ description = "Restores fire damage. Overdose causes it instead."
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 30
@@ -846,15 +846,15 @@ datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
return
datum/reagent/medicine/kelotane/overdose_process(mob/living/M)
- M.adjustFireLoss(4*REM) // End result is 2 burn loss taken, because it heals 2 and then removes 4.
+ M.adjustFireLoss(4*REM)
..()
return
datum/reagent/medicine/antitoxin
- name = "Anti-toxin"
+ name = "Anti-Toxin"
id = "antitoxin"
- description = "Heals toxin damage."
+ description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage."
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 30
@@ -876,7 +876,7 @@ datum/reagent/medicine/antitoxin/overdose_process(mob/living/M)
datum/reagent/medicine/inaprovaline
name = "Inaprovaline"
id = "inaprovaline"
- description = "Stabilizes critical condition patients."
+ description = "Stabilizes the breathing of patients. Good for those in critical condition."
reagent_state = LIQUID
color = "#C8A5DC"
@@ -889,7 +889,7 @@ datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/M)
datum/reagent/medicine/tricordrazine
name = "Tricordrazine"
id = "tricordrazine"
- description = "Chance to heal 1 of each damage type."
+ description = "Has a high chance to heal all types of damage. Overdose instead causes it."
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 30
@@ -914,14 +914,14 @@ datum/reagent/medicine/tricordrazine/overdose_process(mob/living/M)
datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs
name = "Restorative Nanites"
id = "syndicate_nanites"
- description = "Miniature medical robots that swiftly restore bodily damage. May begin to attack their host's cells in high amounts."
+ description = "Miniature medical robots that swiftly restore bodily damage."
reagent_state = SOLID
color = "#555555"
datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
M.adjustBruteLoss(-5*REM) //A ton of healing - this is a 50 telecrystal investment.
M.adjustFireLoss(-5*REM)
- M.adjustOxyLoss(-15*REM)
+ M.adjustOxyLoss(-15)
M.adjustToxLoss(-5*REM)
M.adjustBrainLoss(-15*REM)
M.adjustCloneLoss(-3*REM)
diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
index e9429314a51..d432ab1a3f6 100644
--- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
@@ -14,7 +14,7 @@
if(method == TOUCH || method == VAPOR)
M.ContractDisease(D)
- else //ingest or patch
+ else //ingest, patch or inject
M.ForceContractDisease(D)
/datum/reagent/blood/on_new(list/data)
@@ -97,7 +97,7 @@
color = "#C81040" // rgb: 200, 16, 64
/datum/reagent/vaccine/reaction_mob(mob/M, method=TOUCH, reac_volume)
- if(islist(data) && method == INGEST)
+ if(islist(data) && (method == INGEST || method == INJECT))
for(var/datum/disease/D in M.viruses)
if(D.GetDiseaseID() in data)
D.cure()
@@ -188,8 +188,9 @@
if(data >= 75 && prob(33)) // 30 units, 135 seconds
if (!M.confused) M.confused = 1
M.confused += 3
- if(iscultist(M))
+ if(iscultist(M) || (is_handofgod_cultist(M) && !is_handofgod_prophet(M)))
ticker.mode.remove_cultist(M.mind)
+ ticker.mode.remove_hog_follower(M.mind)
holder.remove_reagent(src.id, src.volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
M.jitteriness = 0
M.stuttering = 0
@@ -712,7 +713,7 @@
color = "#535E66" // rgb: 83, 94, 102
/datum/reagent/nanites/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
- if(method==PATCH || method==INGEST || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
+ if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
M.ForceContractDisease(new /datum/disease/transformation/robot(0))
/datum/reagent/xenomicrobes
@@ -722,7 +723,7 @@
color = "#535E66" // rgb: 83, 94, 102
/datum/reagent/xenomicrobes/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
- if(method==PATCH || method==INGEST || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
+ if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
M.ContractDisease(new /datum/disease/transformation/xeno(0))
/datum/reagent/fluorosurfactant//foam precursor
diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
index a523b04ce35..d6a0fac754f 100644
--- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
@@ -67,7 +67,7 @@
/datum/reagent/clf3/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(istype(M))
- if(method != INGEST)
+ if(method != INGEST && method != INJECT)
M.adjust_fire_stacks(min(reac_volume/5, 10))
M.IgniteMob()
PoolOrNew(/obj/effect/hotspot, M.loc)
@@ -152,7 +152,7 @@
/datum/reagent/napalm/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(istype(M))
- if(method != INGEST)
+ if(method != INGEST && method != INJECT)
M.adjust_fire_stacks(min(reac_volume/4, 20))
/datum/reagent/cryostylane
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
index 2fee0dd550b..b002165be98 100644
--- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -19,7 +19,7 @@
id = "amatoxin"
description = "A powerful poison derived from certain species of mushroom."
color = "#792300" // rgb: 121, 35, 0
- toxpwr = 1
+ toxpwr = 2.5
/datum/reagent/toxin/mutagen
name = "Unstable mutagen"
@@ -33,7 +33,7 @@
return
if(!M.has_dna())
return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
- if((method==VAPOR && prob(min(33, reac_volume))) || method==INGEST || method == PATCH)
+ if((method==VAPOR && prob(min(33, reac_volume))) || method==INGEST || method==PATCH || method==INJECT)
randmuti(M)
if(prob(98))
randmutb(M)
@@ -85,15 +85,16 @@
/datum/reagent/toxin/lexorin
name = "Lexorin"
id = "lexorin"
- description = "Lexorin temporarily stops respiration. Causes tissue damage."
+ description = "A powerful poison used to stop respiration."
color = "#C8A5DC" // rgb: 200, 165, 220
toxpwr = 0
/datum/reagent/toxin/lexorin/on_mob_life(mob/living/M)
if(M.stat != DEAD)
- if(prob(33))
- M.take_organ_damage(1*REM, 0)
- M.adjustOxyLoss(3)
+ M.adjustOxyLoss(5)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ C.losebreath += 2
if(prob(20))
M.emote("gasp")
..()
@@ -200,7 +201,6 @@
description = "A harmful toxic mixture to kill weeds. Do not ingest!"
color = "#4B004B" // rgb: 75, 0, 75
-
/datum/reagent/toxin/pestkiller
name = "Pest Killer"
id = "pestkiller"
@@ -219,7 +219,7 @@
/datum/reagent/toxin/spore
name = "Spore Toxin"
id = "spore"
- description = "A toxic spore cloud which blocks vision when ingested."
+ description = "A natural toxin produced by blob spores that inhibits vision when ingested."
color = "#9ACD32"
toxpwr = 1
@@ -233,7 +233,7 @@
/datum/reagent/toxin/spore_burning
name = "Burning Spore Toxin"
id = "spore_burning"
- description = "A burning spore cloud."
+ description = "A natural toxin produced by blob spores that induces combustion in its victim."
color = "#9ACD32"
toxpwr = 0.5
@@ -245,7 +245,7 @@
/datum/reagent/toxin/chloralhydrate
name = "Chloral Hydrate"
id = "chloralhydrate"
- description = "A powerful sedative."
+ description = "A powerful sedative that induces confusion and drowsiness before putting its target to sleep."
reagent_state = SOLID
color = "#000067" // rgb: 0, 0, 103
toxpwr = 0
@@ -267,7 +267,7 @@
/datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots
name = "Beer"
id = "beer2"
- description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
+ description = "A specially-engineered sedative disguised as beer. It induces instant sleep in its target."
color = "#664300" // rgb: 102, 67, 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -300,7 +300,7 @@
/datum/reagent/toxin/mutetoxin //the new zombie powder.
name = "Mute Toxin"
id = "mutetoxin"
- description = "A toxin that temporarily paralyzes the vocal cords."
+ description = "A nonlethal poison that inhibits speech in its victim."
color = "#F0F8FF" // rgb: 240, 248, 255
toxpwr = 0
@@ -311,7 +311,7 @@
/datum/reagent/toxin/staminatoxin
name = "Tirizene"
id = "tirizene"
- description = "A toxin that affects the stamina of a person when injected into the bloodstream."
+ description = "A nonlethal poison that causes extreme fatigue and weakness in its victim."
color = "#6E2828"
data = 13
toxpwr = 0
@@ -324,7 +324,7 @@
/datum/reagent/toxin/polonium
name = "Polonium"
id = "polonium"
- description = "Cause significant Radiation damage over time."
+ description = "An extremely radioactive material in liquid form. Ingestion results in fatal irradiation."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
@@ -337,7 +337,7 @@
/datum/reagent/toxin/histamine
name = "Histamine"
id = "histamine"
- description = "A dose-dependent toxin, ranges from annoying to incredibly lethal."
+ description = "Histamine's effects become more dangerous depending on the dosage amount. They range from mildly annoying to incredibly lethal."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -369,7 +369,7 @@
/datum/reagent/toxin/formaldehyde
name = "Formaldehyde"
id = "formaldehyde"
- description = "Deals a moderate amount of Toxin damage over time. 10% chance to decay into 10-15 histamine."
+ description = "Formaldehyde, on its own, is a fairly weak toxin. It contains trace amounts of Histamine, very rarely making it decay into Histamine.."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -385,7 +385,7 @@
/datum/reagent/toxin/venom
name = "Venom"
id = "venom"
- description = "Will deal scaling amounts of Toxin and Brute damage over time. 15% chance to decay into 5-10 histamine."
+ description = "An exotic poison extracted from highly toxic fauna. Causes scaling amounts of toxin damage and bruising depending and dosage. Often decays into Histamine."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -403,7 +403,7 @@
/datum/reagent/toxin/neurotoxin2
name = "Neurotoxin"
id = "neurotoxin2"
- description = "Deals toxin and brain damage up to 60 before it slows down, causing confusion and a knockout after 18 elapsed cycles."
+ description = "Neurotoxin will inhibit brain function and cause toxin damage before eventually knocking out its victim."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -420,7 +420,7 @@
/datum/reagent/toxin/cyanide
name = "Cyanide"
id = "cyanide"
- description = "Deals toxin damage, alongside some oxygen loss. 8% chance of stun and some extra toxin damage."
+ description = "An infamous poison known for its use in assassination. Causes small amounts of toxin damage with a small chance of oxygen damage or a stun."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
@@ -447,14 +447,14 @@
/datum/reagent/toxin/itching_powder
name = "Itching Powder"
id = "itching_powder"
- description = "Lots of annoying random effects, chances to do some brute damage from scratching. 6% chance to decay into 1-3 units of histamine."
+ description = "A powder that induces itching upon contact with the skin. Causes the victim to scratch at their itches and has a very low chance to decay into Histamine."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
toxpwr = 0
/datum/reagent/toxin/itching_powder/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- if(method != INGEST)
+ if(method == TOUCH || method == VAPOR)
M.reagents.add_reagent("itching_powder", reac_volume)
/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/M)
@@ -476,7 +476,7 @@
/datum/reagent/toxin/initropidril
name = "Initropidril"
id = "initropidril"
- description = "Causes some toxin damage, 5% chances to cause stunning, suffocation, or immediate heart failure."
+ description = "A powerful poison with insidious effects. It can cause stuns, lethal breathing failure, and cardiac arrest."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -507,7 +507,7 @@
/datum/reagent/toxin/pancuronium
name = "Pancuronium"
id = "pancuronium"
- description = "Knocks you out after 10 seconds, 20% chance to cause some oxygen loss."
+ description = "An undetectable toxin that swiftly incapacitates its victim. May also cause breathing failure."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -523,7 +523,7 @@
/datum/reagent/toxin/sodium_thiopental
name = "Sodium Thiopental"
id = "sodium_thiopental"
- description = "Puts you to sleep after 10 seconds, along with some major stamina loss."
+ description = "Sodium Thiopental induces heavy weakness in its target as well as unconsciousness."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.75 * REAGENTS_METABOLISM
@@ -538,7 +538,7 @@
/datum/reagent/toxin/sulfonal
name = "Sulfonal"
id = "sulfonal"
- description = "Deals some toxin damage, and puts you to sleep after 22 seconds."
+ description = "A stealthy poison that deals minor toxin damage and eventually puts the target to sleep."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
@@ -552,7 +552,7 @@
/datum/reagent/toxin/amanitin
name = "Amanitin"
id = "amanitin"
- description = "On the last second that it's in you, it hits you with a stack of toxin damage based on how long it's been in you. The more you use, the longer it takes before anything happens, but the harder it hits when it does."
+ description = "A very powerful delayed toxin. Upon full metabolization, a massive amount of toxin damage will be dealt depending on how long it has been in the victim's bloodstream."
reagent_state = LIQUID
color = "#CF3600"
toxpwr = 0
@@ -565,7 +565,7 @@
/datum/reagent/toxin/lipolicide
name = "Lipolicide"
id = "lipolicide"
- description = "Deals some toxin damage unless they keep eating food. Will reduce nutrition values."
+ description = "A powerful toxin that will destroy fat cells, massively reducing body weight in a short time. More deadly to those without nutriment in their body."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -583,7 +583,7 @@
/datum/reagent/toxin/coniine
name = "Coniine"
id = "coniine"
- description = "Does moderate toxin damage and oxygen loss."
+ description = "Coniine metabolizes extremely slowly, but deals high amounts of toxin damage and stops breathing."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.06 * REAGENTS_METABOLISM
@@ -596,7 +596,7 @@
/datum/reagent/toxin/curare
name = "Curare"
id = "curare"
- description = "Does some oxygen and toxin damage, weakens you after 11 seconds."
+ description = "Causes slight toxin damage followed by chain-stunning and oxygen damage."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.125 * REAGENTS_METABOLISM
@@ -608,6 +608,40 @@
M.adjustOxyLoss(1*REM)
..()
+/datum/reagent/toxin/heparin //Based on a real-life anticoagulant. I'm not a doctor, so this won't be realistic.
+ name = "Heparin"
+ id = "heparin"
+ description = "A powerful anticoagulant. Victims will bleed uncontrollably and suffer scaling bruising."
+ reagent_state = LIQUID
+ color = "#C8C8C8" //RGB: 200, 200, 200
+ metabolization_rate = 0.2 * REAGENTS_METABOLISM
+ toxpwr = 0
+
+/datum/reagent/toxin/heparin/on_mob_life(mob/living/M)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.blood_max += 2
+ H.adjustBruteLoss(1) //Brute damage increases with the amount they're bleeding
+ ..()
+
+/datum/reagent/toxin/teslium //Teslium. Causes periodic shocks, and makes shocks against the target much more effective.
+ name = "Teslium"
+ id = "teslium"
+ description = "An unstable, electrically-charged metallic slurry. Periodically electrocutes its victim, and makes electrocutions against them more deadly."
+ reagent_state = LIQUID
+ color = "#20324D" //RGB: 32, 50, 77
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ toxpwr = 0
+ var/shock_timer = 0
+
+/datum/reagent/toxin/teslium/on_mob_life(mob/living/M)
+ shock_timer++
+ if(shock_timer >= rand(5,30)) //Random shocks are wildly unpredictable
+ shock_timer = 0
+ M.electrocute_act(rand(5,20), "Teslium in their body", 1, 1) //Override because it's caused from INSIDE of you
+ playsound(M, "sparks", 50, 1)
+ ..()
+
//ACID
@@ -625,7 +659,10 @@
return
reac_volume = round(reac_volume,0.1)
if(method == INGEST)
- C.take_organ_damage(min(6*toxpwr, reac_volume * toxpwr))
+ C.adjustBruteLoss(min(6*toxpwr, reac_volume * toxpwr))
+ return
+ if(method == INJECT)
+ C.adjustBruteLoss(1.5 * min(6*toxpwr, reac_volume * toxpwr))
return
C.acid_act(acidpwr, toxpwr, reac_volume)
@@ -649,4 +686,3 @@
color = "#8E18A9" // rgb: 142, 24, 169
toxpwr = 2
acidpwr = 20
-
diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
index fd4cd0db45f..d99926987ab 100644
--- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
@@ -273,6 +273,21 @@
M.bodytemperature -= 240
M << "You feel a chill!"
+
+/datum/chemical_reaction/slimefireproof
+ name = "Slime Fireproof"
+ id = "m_fireproof"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/darkblue
+ required_other = 1
+
+/datum/chemical_reaction/slimefireproof/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/fireproof/P = new /obj/item/slimepotion/fireproof
+ P.loc = get_turf(holder.my_atom)
+
//Orange
/datum/chemical_reaction/slimecasp
name = "Slime Capsaicin Oil"
@@ -569,6 +584,22 @@
var/obj/item/slimepotion/enhancer/P = new /obj/item/slimepotion/enhancer
P.loc = get_turf(holder.my_atom)
+
+
+/datum/chemical_reaction/slime_territory
+ name = "Slime Territory"
+ id = "s_territory"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/cerulean
+ required_other = 1
+
+/datum/chemical_reaction/slime_territory/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/areaeditor/blueprints/slime/P = new /obj/item/areaeditor/blueprints/slime
+ P.loc = get_turf(holder.my_atom)
+
//Sepia
/datum/chemical_reaction/slimestop
name = "Slime Stop"
diff --git a/code/modules/reagents/Chemistry-Recipes/Toxins.dm b/code/modules/reagents/Chemistry-Recipes/Toxins.dm
index 5d89b3b9379..c83fa4176bf 100644
--- a/code/modules/reagents/Chemistry-Recipes/Toxins.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Toxins.dm
@@ -92,4 +92,21 @@
id = "mindbreaker"
result = "mindbreaker"
required_reagents = list("silicon" = 1, "hydrogen" = 1, "charcoal" = 1)
- result_amount = 5
\ No newline at end of file
+ result_amount = 5
+
+/datum/chemical_reaction/teslium
+ name = "Teslium"
+ id = "teslium"
+ result = "teslium"
+ required_reagents = list("plasma" = 1, "silver" = 1, "blackpowder" = 1)
+ result_amount = 3
+ mix_message = "A jet of sparks flies from the mixture as it merges into a flickering slurry."
+ required_temp = 400
+
+/datum/chemical_reaction/heparin
+ name = "Heparin"
+ id = "Heparin"
+ result = "heparin"
+ required_reagents = list("formaldehyde" = 1, "sodium" = 1, "chlorine" = 1, "lithium" = 1)
+ result_amount = 4
+ mix_message = "The mixture thins and loses all color."
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index 088c6ae2236..6b48a8eb4eb 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -49,4 +49,20 @@
/obj/item/weapon/reagent_containers/blood/empty
name = "empty blood pack"
desc = "Seems pretty useless... Maybe if there were a way to fill it?"
- icon_state = "empty"
\ No newline at end of file
+ icon_state = "empty"
+
+/obj/item/weapon/reagent_containers/blood/attackby(obj/item/I, mob/user, params)
+ if (istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/toy/crayon))
+
+ var/t = stripped_input(user, "What would you like to label the blood pack?", name, null, 53)
+ if(!user.canUseTopic(src))
+ return
+ if(user.get_active_hand() != I)
+ return
+ if(!in_range(src, user) && loc != user)
+ return
+ if(t)
+ name = "blood pack - [t]"
+ else
+ name = "blood pack"
+ return
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 57137f23ea8..abde5b1621b 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -94,7 +94,7 @@ Borg Hypospray
M << "You feel a tiny prick!"
user << "You inject [M] with the injector."
var/fraction = min(amount_per_transfer_from_this/R.total_volume, 1)
- R.reaction(M, INGEST, fraction)
+ R.reaction(M, INJECT, fraction)
if(M.reagents)
var/trans = R.trans_to(M, amount_per_transfer_from_this)
user << "[trans] unit\s injected. [R.total_volume] unit\s remaining."
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 9103f5f5666..df207b0b3cf 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -26,7 +26,7 @@
user << "You inject [M] with [src]."
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
- reagents.reaction(M, INGEST, fraction)
+ reagents.reaction(M, INJECT, fraction)
if(M.reagents)
var/list/injected = list()
for(var/datum/reagent/R in reagents.reagent_list)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index c8eefc60ecc..057c8aa21e5 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -152,7 +152,7 @@
var/mob/M = target
add_logs(user, M, "injected", src, addition="which had [contained]")
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
- reagents.reaction(target, INGEST, fraction)
+ reagents.reaction(target, INJECT, fraction)
if(ismob(target) && target == user)
//Attack log entries are produced here due to failure to produce elsewhere. Remove them here if you have doubles from normal syringes.
var/list/rinject = list()
@@ -163,7 +163,7 @@
log_attack("[user.name] ([user.ckey]) injected [M.name] ([M.ckey]) with [src.name], which had [contained] (INTENT: [uppertext(user.a_intent)])")
M.attack_log += text("\[[time_stamp()]\] Injected themselves ([contained]) with [src.name].")
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
- reagents.reaction(target, INGEST, fraction)
+ reagents.reaction(target, INJECT, fraction)
spawn(5)
var/datum/reagent/blood/B
for(var/datum/reagent/blood/d in src.reagents.reagent_list)
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 20cb7d40710..5d869bde26c 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -110,7 +110,7 @@
/obj/structure/disposalconstruct/AltClick(mob/user)
..()
- if(!user.canUseTopic(user))
+ if(user.incapacitated())
user << "You can't do that right now!"
return
if(!in_range(src, user))
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index cfcde5ffc32..0607f28e607 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -98,14 +98,16 @@
return 1
// mouse drop another mob or self
-//
+
/obj/machinery/disposal/MouseDrop_T(mob/living/target, mob/living/user)
- if(istype(target) && user == target)
+ if(istype(target))
stuff_mob_in(target, user)
/obj/machinery/disposal/proc/stuff_mob_in(mob/living/target, mob/living/user)
if(!iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
return
+ if(!istype(user.loc, /turf/)) //No magically doing it from inside closets
+ return
if(target.buckled || target.buckled_mob)
return
if(target.mob_size > MOB_SIZE_HUMAN)
@@ -132,6 +134,7 @@
target.visible_message("[user] has placed [target] in [src].", \
"[user] has placed [target] in [src].")
add_logs(user, target, "stuffed", addition="into [src]")
+ target.LAssailant = user
update()
// can breath normally in the disposal
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 6f358f77612..815c269b5e1 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -281,6 +281,26 @@ other types of metals and chemistry for reagents).
build_path = /obj/item/clothing/glasses/hud/security/night
category = list("Equipment")
+datum/design/diagnostic_hud
+ name = "Diagnostic HUD"
+ desc = "A HUD used to analyze and determine faults within robotic machinery."
+ id = "dianostic_hud"
+ req_tech = list("magnets" = 3, "engineering" = 3, "powerstorage" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/clothing/glasses/hud/diagnostic
+ category = list("Equipment")
+
+datum/design/diagnostic_hud_night
+ name = "Night Vision Diagnostic HUD"
+ desc = "Upgraded version of the diagnostic HUD designed to function during a power failure."
+ id = "dianostic_hud_night"
+ req_tech = list("magnets" = 5, "engineering" = 4, "powerstorage" = 4)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 300)
+ build_path = /obj/item/clothing/glasses/hud/diagnostic/night
+ category = list("Equipment")
+
/////////////////////////////////////////
//////////////////Test///////////////////
/////////////////////////////////////////
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 2d20c8371bf..1442ca00411 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -402,6 +402,16 @@
build_path = /obj/item/weapon/circuitboard/autolathe
category = list ("Misc. Machinery")
+/datum/design/recharger
+ name = "Machine Design (Weapon Recharger Board)"
+ desc = "The circuit board for a Weapon Recharger."
+ id = "recharger"
+ req_tech = list("powerstorage" = 3, "engineering" = 3, "materials" = 4)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100)
+ build_path = /obj/item/weapon/circuitboard/recharger
+ category = list("Misc. Machinery")
+
/datum/design/vendor
name = "Machine Design (Vendor Board)"
desc = "The circuit board for a Vendor."
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index cf283810d38..1d8d95cae67 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -107,6 +107,16 @@
build_path = /obj/item/bodybag/bluespace
category = list("Medical Designs")
+/datum/design/plasmarefiller
+ name = "Plasma-man jumpsuit refill"
+ desc = "A refill pack for the auto-extinguisher on Plasma-man suits."
+ id = "plasmarefiller"
+ req_tech = list("materials" = 2, "combat" = 2)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 4000, MAT_PLASMA = 1000)
+ reliability = 76
+ build_path = /obj/item/device/extinguisher_refill
+ category = list("Medical Designs")
/////////////////////////////////////////
//////////Cybernetic Implants////////////
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 0d5894c42fa..016be87dff1 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -16,7 +16,7 @@
name = "loyalty firing pin"
desc = "This is a security firing pin which only authorizes users who are loyalty-implanted."
id = "pin_loyalty"
- req_tech = list("combat" = 6, "materials" = 6, "powerstorage" = 3)
+ req_tech = list("combat" = 5, "materials" = 6, "powerstorage" = 3)
build_type = PROTOLATHE
materials = list(MAT_SILVER = 600, MAT_DIAMOND = 600, MAT_URANIUM = 200)
build_path = /obj/item/device/firing_pin/implant/loyalty
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 27395a49089..364e9bb392e 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -1,18 +1,5 @@
var/global/list/obj/machinery/message_server/message_servers = list()
-/datum/data_chat_msg
- var/sender = "Anon"
- var/channel = "ss13"
- var/message = "Blank"
-
-/datum/data_chat_msg/New(var/param_sen = "", var/param_chan = "", var/param_msg = "")
- if(param_sen)
- sender = param_sen
- if(param_chan)
- channel = param_chan
- if(param_msg)
- message = param_msg
-
/datum/data_pda_msg
var/recipient = "Unspecified" //name of the person
var/sender = "Unspecified" //name of the sender
@@ -81,7 +68,6 @@ var/global/list/obj/machinery/message_server/message_servers = list()
idle_power_usage = 10
active_power_usage = 100
- var/list/datum/data_chat_msg/chat_msgs = list()
var/list/datum/data_pda_msg/pda_msgs = list()
var/list/datum/data_rc_msg/rc_msgs = list()
var/active = 1
@@ -115,9 +101,6 @@ var/global/list/obj/machinery/message_server/message_servers = list()
update_icon()
return
-/obj/machinery/message_server/proc/send_chat_message(sender = "", channel = "", message = "")
- chat_msgs += new/datum/data_chat_msg(sender,channel,message)
-
/obj/machinery/message_server/proc/send_pda_message(recipient = "",sender = "",message = "",photo=null)
. = new/datum/data_pda_msg(recipient,sender,message,photo)
pda_msgs += .
@@ -272,13 +255,10 @@ var/obj/machinery/blackbox_recorder/blackbox
/obj/machinery/blackbox_recorder/proc/round_end_data_gathering()
- var/chat_msg_amt = 0
var/pda_msg_amt = 0
var/rc_msg_amt = 0
for (var/obj/machinery/message_server/MS in message_servers)
- if (MS.chat_msgs.len > chat_msg_amt)
- chat_msg_amt = MS.chat_msgs.len
if (MS.pda_msgs.len > pda_msg_amt)
pda_msg_amt = MS.pda_msgs.len
if (MS.rc_msgs.len > rc_msg_amt)
@@ -297,7 +277,6 @@ var/obj/machinery/blackbox_recorder/blackbox
feedback_add_details("radio_usage","SRV-[msg_service.len]")
feedback_add_details("radio_usage","CAR-[msg_cargo.len]")
feedback_add_details("radio_usage","OTH-[messages.len]")
- feedback_add_details("radio_usage","CHA-[chat_msg_amt]")
feedback_add_details("radio_usage","PDA-[pda_msg_amt]")
feedback_add_details("radio_usage","RC-[rc_msg_amt]")
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index f6f9c597150..95757a85469 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -161,7 +161,7 @@ proc/CallMaterialName(ID)
return
D.loc = src
user << "You add the disk to the machine!"
- else
+ else if(!(linked_destroy && linked_destroy.busy) && !(linked_lathe && linked_lathe.busy) && !(linked_imprinter && linked_imprinter.busy))
..()
src.updateUsrDialog()
return
@@ -407,8 +407,7 @@ proc/CallMaterialName(ID)
if( new_item.type == /obj/item/weapon/storage/backpack/holding )
new_item.investigate_log("built by [key]","singulo")
new_item.reliability = R
- new_item.materials[MAT_METAL] /= coeff
- new_item.materials[MAT_GLASS] /= coeff
+ new_item.materials = efficient_mats.Copy()
if(linked_lathe.hacked)
R = max((new_item.reliability/2), 0)
new_item.loc = linked_lathe.loc
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
new file mode 100644
index 00000000000..8345a4f9dd5
--- /dev/null
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -0,0 +1,166 @@
+//Xenobio control console
+/mob/camera/aiEye/remote/xenobio
+ visible_icon = 1
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "camera_target"
+
+
+/mob/camera/aiEye/remote/xenobio/setLoc(var/t)
+ var/area/new_area = get_area(t)
+ if(new_area && new_area.name == "Xenobiology Lab" || istype(new_area, /area/toxins/xenobiology ))
+ return ..()
+ else
+ return
+
+/obj/machinery/computer/camera_advanced/xenobio
+ name = "Slime management console"
+ desc = "A computer used for remotely handling slimes."
+ networks = list("SS13")
+ off_action = new/datum/action/innate/camera_off/xenobio
+ var/datum/action/innate/slime_place/slime_place_action = new
+ var/datum/action/innate/slime_pick_up/slime_up_action = new
+ var/datum/action/innate/feed_slime/feed_slime_action = new
+ var/datum/action/innate/monkey_recycle/monkey_recycle_action = new
+
+ var/list/stored_slimes = list()
+ var/max_slimes = 5
+ var/monkeys = 0
+
+ icon_screen = "slime_comp"
+ icon_keyboard = "rd_key"
+
+/obj/machinery/computer/camera_advanced/xenobio/CreateEye()
+ eyeobj = new /mob/camera/aiEye/remote/xenobio()
+ eyeobj.loc = get_turf(src)
+ eyeobj.origin = src
+ eyeobj.visible_icon = 1
+ eyeobj.icon = 'icons/obj/abductor.dmi'
+ eyeobj.icon_state = "camera_target"
+
+/obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/carbon/user)
+ off_action.target = user
+ off_action.Grant(user)
+
+ jump_action.target = user
+ jump_action.Grant(user)
+
+ slime_up_action.target = src
+ slime_up_action.Grant(user)
+
+ slime_place_action.target = src
+ slime_place_action.Grant(user)
+
+ feed_slime_action.target = src
+ feed_slime_action.Grant(user)
+
+ monkey_recycle_action.target = src
+ monkey_recycle_action.Grant(user)
+
+
+/obj/machinery/computer/camera_advanced/xenobio/attack_hand(mob/user)
+ if(!ishuman(user)) //AIs using it might be weird
+ return
+ return ..()
+
+/datum/action/innate/camera_off/xenobio/Activate()
+ if(!target || !ishuman(target))
+ return
+ var/mob/living/carbon/C = target
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/origin = remote_eye.origin
+ C.remote_view = 0
+ origin.current_user = null
+ origin.jump_action.Remove(C)
+ origin.slime_place_action.Remove(C)
+ origin.slime_up_action.Remove(C)
+ origin.feed_slime_action.Remove(C)
+ origin.monkey_recycle_action.Remove(C)
+ //All of this stuff below could probably be a proc for all advanced cameras, only the action removal needs to be camera specific
+ remote_eye.user = null
+ if(C.client)
+ C.client.perspective = MOB_PERSPECTIVE
+ C.client.eye = src
+ C.client.images -= remote_eye.user_image
+ for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
+ C.client.images -= chunk.obscured
+ C.remote_control = null
+ C.unset_machine()
+ src.Remove(C)
+
+
+/datum/action/innate/slime_place
+ name = "Place Slimes"
+ button_icon_state = "slime_down"
+
+/datum/action/innate/slime_place/Activate()
+ if(!target || !ishuman(owner))
+ return
+ var/mob/living/carbon/human/C = owner
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = target
+
+ if(cameranet.checkTurfVis(remote_eye.loc))
+ for(var/mob/living/simple_animal/slime/S in X.stored_slimes)
+ S.loc = remote_eye.loc
+ S.visible_message("[S] warps in!")
+ X.stored_slimes -= S
+
+/datum/action/innate/slime_pick_up
+ name = "Pick up Slime"
+ button_icon_state = "slime_up"
+
+/datum/action/innate/slime_pick_up/Activate()
+ if(!target || !ishuman(owner))
+ return
+ var/mob/living/carbon/human/C = owner
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = target
+
+ if(cameranet.checkTurfVis(remote_eye.loc))
+ for(var/mob/living/simple_animal/slime/S in remote_eye.loc)
+ if(X.stored_slimes.len >= X.max_slimes)
+ break
+ if(!S.ckey)
+ if(S.buckled)
+ S.Feedstop(silent=1)
+ S.visible_message("[S] vanishes in a flash of light!")
+ S.loc = X
+ X.stored_slimes += S
+
+
+/datum/action/innate/feed_slime
+ name = "Feed Slimes"
+ button_icon_state = "monkey_down"
+
+/datum/action/innate/feed_slime/Activate()
+ if(!target || !ishuman(owner))
+ return
+ var/mob/living/carbon/human/C = owner
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = target
+
+ if(cameranet.checkTurfVis(remote_eye.loc))
+ if(X.monkeys >= 1)
+ var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc)
+ food.LAssailant = C
+ X.monkeys --
+ owner << "[X] now has [X.monkeys] monkeys left."
+
+
+/datum/action/innate/monkey_recycle
+ name = "Recycle Monkeys"
+ button_icon_state = "monkey_up"
+
+/datum/action/innate/monkey_recycle/Activate()
+ if(!target || !ishuman(owner))
+ return
+ var/mob/living/carbon/human/C = owner
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = target
+
+ if(cameranet.checkTurfVis(remote_eye.loc))
+ for(var/mob/living/carbon/monkey/M in remote_eye.loc)
+ if(M.stat)
+ M.visible_message("[M] vanishes as they are reclaimed for recycling!")
+ X.monkeys += 0.2
+ qdel(M)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index e83d9b84cc2..f5bd20d279f 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -176,7 +176,7 @@
user << "You offer the sentience potion to [M]..."
being_used = 1
- var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
+ var/list/candidates = get_candidates(ROLE_ALIEN, ALIEN_AFK_BRACKET)
shuffle(candidates)
@@ -316,6 +316,35 @@
C.slowdown = 0
qdel(src)
+
+/obj/item/slimepotion/fireproof
+ name = "slime chill potion"
+ desc = "A potent chemical mix that will fireproof any article of clothing. Has three uses."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bottle17"
+ var/uses = 3
+
+/obj/item/slimepotion/fireproof/afterattack(obj/item/clothing/C, mob/user)
+ ..()
+ if(!uses)
+ qdel(src)
+ return
+ if(!istype(C))
+ user << "The potion can only be used on clothing!"
+ return
+ if(C.max_heat_protection_temperature == FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
+ user << "The [C] is already fireproof!"
+ return..()
+ user <<"You slather the blue gunk over the [C], fireproofing it."
+ C.name = "fireproofed [C.name]"
+ C.color = "#000080"
+ C.max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ C.heat_protection = C.body_parts_covered
+ C.burn_state = -1
+ uses --
+ if(!uses)
+ qdel(src)
+
////////Adamantine Golem stuff I dunno where else to put it
// This will eventually be removed.
@@ -543,3 +572,18 @@
icon_state = "sepia"
desc = "Time seems to flow very slowly around these tiles"
floor_tile = /obj/item/stack/tile/sepia
+
+
+/obj/item/areaeditor/blueprints/slime
+ name = "cerulean prints"
+ desc = "A one use yet of blueprints made of jelly like organic material. Renaming an area to 'Xenobiology Lab' will extend the reach of the management console."
+ color = "#2956B2"
+
+/obj/item/areaeditor/blueprints/slime/edit_area()
+ var/success = ..()
+ var/area/A = get_area(src)
+ if(success)
+ for(var/turf/T in A)
+ T.color = "#2956B2"
+ qdel(src)
+
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 7a20eda07af..96a203d17b2 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -21,7 +21,10 @@
//these objects are indestructable
/obj/docking_port/Destroy()
return QDEL_HINT_LETMELIVE
-
+/obj/docking_port/singularity_pull()
+ return
+/obj/docking_port/singularity_act()
+ return 0
/obj/docking_port/shuttleRotate()
return //we don't rotate with shuttles via this code.
//returns a list(x0,y0, x1,y1) where points 0 and 1 are bounding corners of the projected rectangle
@@ -633,4 +636,4 @@
T.color = color
if(T.dir != dir)
T.dir = dir
- return T
\ No newline at end of file
+ return T
diff --git a/code/modules/space transition/space_transition.dm b/code/modules/space transition/space_transition.dm
index b2e25764011..b821536bcd0 100644
--- a/code/modules/space transition/space_transition.dm
+++ b/code/modules/space transition/space_transition.dm
@@ -119,70 +119,41 @@ var/list/z_levels_list = list()
for(var/A in z_levels_list)
grid[A] = z_levels_list[A]
- for(var/turf/space/S in world) //Define the transistions of the z levels
- if(S.x <= TRANSITIONEDGE)
- D = grid["[S.z]"]
- if(!D)
- CRASH("[S.z] position has no space level datum")
- if(!(D.neigbours.len))
- continue
- if(D.neigbours[Z_LEVEL_WEST] && D.neigbours[Z_LEVEL_WEST] != D)
- D = D.neigbours[Z_LEVEL_WEST]
- S.destination_z = D.z_value
- else
- while(D.neigbours[Z_LEVEL_EAST] && D.neigbours[Z_LEVEL_EAST] != D)
- D = D.neigbours[Z_LEVEL_EAST]
- S.destination_z = D.z_value
- S.destination_x = world.maxx - TRANSITIONEDGE - 2
- S.destination_y = S.y
+ //Lists below are pre-calculated values arranged in the list in such a way to be easily accessable in the loop by the counter
+ //Its either this or madness with lotsa math
- if(S.x >= (world.maxx - TRANSITIONEDGE - 1))
- D = grid["[S.z]"]
- if(!D)
- CRASH("[S.z] position has no space level datum")
- if(!(D.neigbours.len))
- continue
- if(D.neigbours[Z_LEVEL_EAST] && D.neigbours[Z_LEVEL_EAST] != D)
- D = D.neigbours[Z_LEVEL_EAST]
- S.destination_z = D.z_value
- else
- while(D.neigbours[Z_LEVEL_WEST] && D.neigbours[Z_LEVEL_WEST] != D)
- D = D.neigbours[Z_LEVEL_WEST]
- S.destination_z = D.z_value
- S.destination_x = TRANSITIONEDGE + 2
- S.destination_y = S.y
+ var/list/x_pos_beginning = list(1, 1, world.maxx - TRANSITIONEDGE, 1) //x values of the lowest-leftest turfs of the respective 4 blocks on each side of zlevel
+ var/list/y_pos_beginning = list(world.maxy - TRANSITIONEDGE, 1, TRANSITIONEDGE, TRANSITIONEDGE) //y values respectively
+ var/list/x_pos_ending = list(world.maxx, world.maxx, world.maxx, TRANSITIONEDGE) //x values of the highest-rightest turfs of the respective 4 blocks on each side of zlevel
+ var/list/y_pos_ending = list(world.maxy, TRANSITIONEDGE, world.maxy - TRANSITIONEDGE, world.maxy - TRANSITIONEDGE) //y values respectively
+ var/list/x_pos_transition = list(1, 1, TRANSITIONEDGE + 2, world.maxx - TRANSITIONEDGE - 2) //values of x for the transition from respective blocks on the side of zlevel, 1 is being translated into turfs respective x value later in the code
+ var/list/y_pos_transition = list(TRANSITIONEDGE + 2, world.maxy - TRANSITIONEDGE - 2, 1, 1) //values of y for the transition from respective blocks on the side of zlevel, 1 is being translated into turfs respective y value later in the code
- if(S.y <= TRANSITIONEDGE)
- D = grid["[S.z]"]
- if(!D)
- CRASH("[S.z] position has no space level datum")
- if(!(D.neigbours.len))
- continue
- if(D.neigbours[Z_LEVEL_SOUTH] && D.neigbours[Z_LEVEL_SOUTH] != D)
- D = D.neigbours[Z_LEVEL_SOUTH]
- S.destination_z = D.z_value
+ for(var/zlevelnumber = 1, zlevelnumber<=grid.len, zlevelnumber++)
+ D = grid["[zlevelnumber]"]
+ if(!D)
+ CRASH("[zlevelnumber] position has no space level datum.")
+ if(!(D.neigbours.len))
+ continue
+ for(var/side = 1, side<5, side++)
+ var/turf/beginning = locate(x_pos_beginning[side], y_pos_beginning[side], zlevelnumber)
+ var/turf/ending = locate(x_pos_ending[side], y_pos_ending[side], zlevelnumber)
+ var/list/turfblock = block(beginning, ending)
+ var/dirside = 2**(side-1)
+ var/zdestination = zlevelnumber
+ if(D.neigbours["[dirside]"] && D.neigbours["[dirside]"] != D)
+ D = D.neigbours["[dirside]"]
+ zdestination = D.z_value
else
- while(D.neigbours[Z_LEVEL_NORTH] && D.neigbours[Z_LEVEL_NORTH] != D)
- D = D.neigbours[Z_LEVEL_NORTH]
- S.destination_z = D.z_value
- S.destination_x = S.x
- S.destination_y = world.maxy - TRANSITIONEDGE - 2
-
- if(S.y >= (world.maxy - TRANSITIONEDGE - 1))
- D = grid["[S.z]"]
- if(!D)
- CRASH("[S.z] position has no space level datum")
- if(!(D.neigbours.len))
- continue
- if(D.neigbours[Z_LEVEL_NORTH] && D.neigbours[Z_LEVEL_NORTH] != D)
- D = D.neigbours[Z_LEVEL_NORTH]
- S.destination_z = D.z_value
- else
- while(D.neigbours[Z_LEVEL_SOUTH] && D.neigbours[Z_LEVEL_SOUTH] != D)
- D = D.neigbours[Z_LEVEL_SOUTH]
- S.destination_z = D.z_value
- S.destination_x = S.x
- S.destination_y = TRANSITIONEDGE + 2
+ dirside = turn(dirside, 180)
+ while(D.neigbours["[dirside]"] && D.neigbours["[dirside]"] != D)
+ D = D.neigbours["[dirside]"]
+ zdestination = D.z_value
+ D = grid["[zlevelnumber]"]
+ for(var/turf/space/S in turfblock)
+ S.destination_x = x_pos_transition[side] == 1 ? S.x : x_pos_transition[side]
+ S.destination_y = y_pos_transition[side] == 1 ? S.y : y_pos_transition[side]
+ S.destination_z = zdestination
for(var/A in grid)
z_levels_list[A] = grid[A]
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
new file mode 100644
index 00000000000..3f6cb539baf
--- /dev/null
+++ b/code/modules/surgery/dental_implant.dm
@@ -0,0 +1,42 @@
+/datum/surgery/dental_implant
+ name = "dental implant"
+ steps = list(/datum/surgery_step/drill, /datum/surgery_step/insert_pill)
+ possible_locs = list("mouth")
+
+/datum/surgery_step/insert_pill
+ name = "insert pill"
+ implements = list(/obj/item/weapon/reagent_containers/pill = 100)
+ time = 16
+
+/datum/surgery_step/insert_pill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to wedge \the [tool] in [target]'s [parse_zone(target_zone)].", "You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]...")
+
+/datum/surgery_step/insert_pill/success(mob/user, mob/living/carbon/target, target_zone, var/obj/item/weapon/reagent_containers/pill/tool, datum/surgery/surgery)
+ if(!istype(tool))
+ return 0
+
+ user.drop_item()
+ target.internal_organs += tool
+ tool.loc = target
+
+ var/datum/action/item_action/hands_free/activate_pill/P = new
+ P.button_icon_state = tool.icon_state
+ P.target = tool
+ P.Grant(target)
+
+ user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "You wedge [tool] into [target]'s [parse_zone(target_zone)].")
+ return 1
+
+/datum/action/item_action/hands_free/activate_pill
+ name = "activate pill"
+
+/datum/action/item_action/hands_free/activate_pill/Trigger()
+ if(!..() || CheckRemoval(owner))
+ return 0
+ owner << "You grit your teeth and burst the implanted [target]!"
+ add_logs(owner, null, "swallowed an implanted pill", target)
+ if(target.reagents.total_volume)
+ target.reagents.reaction(owner, INGEST)
+ target.reagents.trans_to(owner, target.reagents.total_volume)
+ qdel(target)
+ return 1
\ No newline at end of file
diff --git a/code/modules/surgery/dethrall.dm b/code/modules/surgery/dethrall.dm
deleted file mode 100644
index 5a028336e9a..00000000000
--- a/code/modules/surgery/dethrall.dm
+++ /dev/null
@@ -1,58 +0,0 @@
-/datum/surgery/dethrall
- name = "dethralling"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/dethrall)
- possible_locs = list("head")
-
-/datum/surgery/dethrall/can_start(mob/user, mob/living/carbon/target)
- return is_thrall(target)
-
-/datum/surgery_step/dethrall
- name = "search head"
- accept_hand = 1
- time = 70
- var/obj/item/organ/internal/brain/B = null
-
-/datum/surgery_step/dethrall/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- B = target.getorgan(/obj/item/organ/internal/brain)
- if(B)
- user.visible_message("[user] begins looking around in [target]'s head.", "You begin looking for foreign influences on [target]'s brain...")
-
-/datum/surgery_step/dethrall/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(B)
- if(!is_thrall(target))
- user << "You are unable to locate anything on [target]'s brain."
- return 1
- sleep(30)
-
- user.visible_message("[user] begins removing something from [target]'s head.", \
- "You begin carefully extracting the tumor...")
- if(!do_mob(user, target, 50))
- if(prob(50))
- user.visible_message("[user] slips and rips the tumor out from [target]'s head!", \
- "You fumble and tear out [target]'s tumor!")
- ticker.mode.remove_thrall(target.mind,1)
- return 1
- else
- user.visible_message("[user] screws up!")
- return 0
- if(target.dna.species.id == "l_shadowling")
- target << "NOT LIKE THIS!"
- user.visible_message("[target] suddenly slams upward and knocks down [user]!", \
- "[target] suddenly bolts up and slams you with tremendous force!")
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- C.Weaken(6)
- C.apply_damage(20, "brute", "chest")
- else if(issilicon(user))
- var/mob/living/silicon/S = user
- S.Weaken(8)
- S.apply_damage(20, "brute")
- playsound(S, 'sound/effects/bang.ogg', 50, 1)
- return
-
- user.visible_message("[user] carefully extracts the tumor from [target]'s brain!", \
- "You extract the black tumor from [target]'s head. It quickly shrivels and burns away.")
- ticker.mode.remove_thrall(target.mind,0)
- else
- user << "[target] has no brain!"
- return 1
diff --git a/code/modules/surgery/dethralling.dm b/code/modules/surgery/dethralling.dm
new file mode 100644
index 00000000000..3eb2729f450
--- /dev/null
+++ b/code/modules/surgery/dethralling.dm
@@ -0,0 +1,41 @@
+/datum/surgery/remove_thrall
+ name = "dethralling"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/dethrall)
+ possible_locs = list("head")
+
+/datum/surgery/remove_thrall/can_start(mob/user, mob/living/carbon/target)
+ return is_thrall(target)
+
+/datum/surgery_step/dethrall
+ name = "cleanse contamination"
+ implements = list(/obj/item/device/assembly/flash = 100, /obj/item/device/flashlight/pen = 80, /obj/item/device/flashlight = 40)
+ time = 30
+
+/datum/surgery_step/dethrall/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] reaches into [target]'s head with [tool].", "You begin aligning [tool]'s light to the tumor on [target]'s brain...")
+
+/datum/surgery_step/dethrall/success(mob/user, mob/living/carbon/target, target_zone, datum/surgery/surgery)
+ if(target.dna.species.id == "l_shadowling") //Empowered thralls cannot be deconverted
+ target << "NOT LIKE THIS!"
+ user.visible_message("[target] suddenly slams upward and knocks down [user]!", \
+ "[target] suddenly bolts up and slams you with tremendous force!")
+ user.resting = 0 //Remove all stuns
+ user.sleeping = 0
+ user.SetStunned(0)
+ user.SetWeakened(0)
+ user.SetParalysis(0)
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.Weaken(6)
+ C.apply_damage(20, "brute", "chest")
+ else if(issilicon(user))
+ var/mob/living/silicon/S = user
+ S.Weaken(8)
+ S.apply_damage(20, "brute")
+ playsound(S, 'sound/effects/bang.ogg', 50, 1)
+ return 0
+ user.visible_message("[user] shines light onto the tumor in [target]'s head!", "You cleanse the contamination from [target]'s brain!")
+ ticker.mode.remove_thrall(target.mind, 0)
+ target.visible_message("A strange black mass falls from [target]'s head!")
+ new /obj/item/organ/internal/shadowtumor(get_turf(target))
+ return 1
diff --git a/code/modules/surgery/generic_steps.dm b/code/modules/surgery/generic_steps.dm
index 8ae69a48768..537ba293d36 100644
--- a/code/modules/surgery/generic_steps.dm
+++ b/code/modules/surgery/generic_steps.dm
@@ -86,4 +86,17 @@
H.apply_damage(50,"brute","[target_zone]")
user.visible_message("[user] saws [target]'s [parse_zone(target_zone)] open!", "You saw [target]'s [parse_zone(target_zone)] open.")
- return 1
\ No newline at end of file
+ return 1
+
+//drill bone
+/datum/surgery_step/drill
+ name = "drill bone"
+ implements = list(/obj/item/weapon/surgicaldrill = 100, /obj/item/weapon/pickaxe/drill = 60, /obj/item/mecha_parts/mecha_equipment/drill = 60, /obj/item/weapon/screwdriver = 20)
+ time = 30
+
+/datum/surgery_step/drill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to drill into the bone in [target]'s [parse_zone(target_zone)].", "You begin to drill into the bone in [target]'s [parse_zone(target_zone)]...")
+
+/datum/surgery_step/drill/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] drills into [target]'s [parse_zone(target_zone)]!", "You drill into [target]'s [parse_zone(target_zone)].")
+ return 1
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 46f4955584f..d7af75c311a 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -70,7 +70,7 @@
proc/get_location_modifier(mob/M)
var/turf/T = get_turf(M)
- if(locate(/obj/structure/optable, T))
+ if(locate(/obj/structure/table/optable, T))
return 1
else if(locate(/obj/structure/table, T))
return 0.8
diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm
index d333e8ee5a1..ee1293db5c5 100644
--- a/code/modules/surgery/limb augmentation.dm
+++ b/code/modules/surgery/limb augmentation.dm
@@ -77,31 +77,62 @@
/datum/surgery/chainsaw
- name = "chainsaw augmentation"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders,
- /datum/surgery_step/incise, /datum/surgery_step/chainsaw)
- species = list(/mob/living/carbon/human)
- possible_locs = list("r_arm", "l_arm")
- requires_organic_bodypart = 0
+ name = "chainsaw augmentation"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/incise, /datum/surgery_step/chainsaw)
+ species = list(/mob/living/carbon/human)
+ possible_locs = list("r_arm", "l_arm")
+ requires_organic_bodypart = 0
/datum/surgery_step/chainsaw
- time = 64
- name = "insert chainsaw"
- implements = list(/obj/item/weapon/twohanded/required/chainsaw = 100)
+ time = 64
+ name = "insert chainsaw"
+ implements = list(/obj/item/weapon/twohanded/required/chainsaw = 100)
/datum/surgery_step/chainsaw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to install the chainsaw onto [target].", "You begin to install the chainsaw onto [target]...")
+ user.visible_message("[user] begins to install the chainsaw onto [target].", "You begin to install the chainsaw onto [target]...")
/datum/surgery_step/chainsaw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(target.l_hand && target.r_hand)
- user << "You can't fit the chainsaw in while [target]'s hands are full!"
- return 0
- else
- user.visible_message("[user] finshes installing the chainsaw!", "You install the chainsaw.")
- user.unEquip(tool)
- qdel(tool)
- var/obj/item/weapon/mounted_chainsaw/sawarms = new(target)
- target.put_in_hands(sawarms)
+ if(target.l_hand && target.r_hand)
+ user << "You can't fit the chainsaw in while [target]'s hands are full!"
+ return 0
+ else
+ user.visible_message("[user] finishes installing the chainsaw!", "You install the chainsaw.")
+ user.unEquip(tool)
+ qdel(tool)
+ var/obj/item/weapon/mounted_chainsaw/sawarms = new(target)
+ target.put_in_hands(sawarms)
- return 1
+ return 1
+
+/datum/surgery/chainsaw_removal
+ name = "chainsaw removal"
+ steps = list(/datum/surgery_step/chainsaw_removal)
+ species = list(/mob/living/carbon/human)
+ possible_locs = list("r_arm", "l_arm")
+ requires_organic_bodypart = 0
+
+/datum/surgery/chainsaw_removal/can_start(mob/user, mob/living/carbon/target)
+ var/list/hands = get_both_hands(target)
+ var/M = locate(/obj/item/weapon/mounted_chainsaw) in hands
+ if(M)
+ return 1//can continue surgery
+ else
+ return 0//surgery will never be available
+
+/datum/surgery_step/chainsaw_removal
+ time = 128
+ name = "saw off chainsaw"
+ implements = list(/obj/item/weapon/circular_saw = 100, /obj/item/weapon/melee/energy/sword/cyborg/saw = 100, /obj/item/weapon/melee/arm_blade = 75, /obj/item/weapon/mounted_chainsaw = 65, /obj/item/weapon/twohanded/fireaxe = 50, /obj/item/weapon/twohanded/required/chainsaw = 50, /obj/item/weapon/hatchet = 35, /obj/item/weapon/kitchen/knife/butcher = 25)
+
+/datum/surgery_step/chainsaw_removal/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins sawing the chainsaw off of [target]'s arms.", "You begin removing [target]'s chainsaw...")
+
+/datum/surgery_step/chainsaw_removal/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/list/hands = get_both_hands(target)
+ for(var/obj/item/weapon/mounted_chainsaw/V in hands)
+ qdel(V)
+ new /obj/item/weapon/twohanded/required/chainsaw(get_turf(target))
+ user.visible_message("[user] carefully saws [target]'s arm free of the chainsaw.", "You remove the chainsaw.")
+ return 1
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 5e8b0b9d50e..e1e4ac7a3d5 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -145,4 +145,34 @@
var/obj/S = ..()
if(inflamed)
S.reagents.add_reagent("????", 5)
- return S
\ No newline at end of file
+ return S
+
+/obj/item/organ/internal/shadowtumor
+ name = "black tumor"
+ desc = "A tiny black mass with red tendrils trailing from it. It seems to shrivel in the light."
+ icon_state = "blacktumor"
+ origin_tech = "biotech=4"
+ w_class = 1
+ zone = "head"
+ slot = "brain_tumor"
+ var/health = 3
+
+/obj/item/organ/internal/shadowtumor/New()
+ ..()
+ SSobj.processing |= src
+
+/obj/item/organ/internal/shadowtumor/Destroy()
+ SSobj.processing.Remove(src)
+ ..()
+
+/obj/item/organ/internal/shadowtumor/process()
+ if(isturf(loc))
+ var/turf/T = loc
+ var/light_count = T.get_lumcount()
+ if(light_count > LIGHT_DAM_THRESHOLD && health > 0) //Die in the light
+ health--
+ else if(light_count < LIGHT_HEAL_THRESHOLD && health < 3) //Heal in the dark
+ health++
+ if(health <= 0)
+ visible_message("[src] collapses in on itself!")
+ qdel(src)
diff --git a/config/admins.txt b/config/admins.txt
index 43f14598caa..24afb4a7e9b 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -98,4 +98,6 @@ FoxPMcCloud = Game Master
Xhuis = Game Master
Astralenigma = Game Master
Tokiko1 = Game Master
-SuperSayu = Game Master
\ No newline at end of file
+SuperSayu = Game Master
+Lzimann = Game Master
+As334 = Game Master
\ No newline at end of file
diff --git a/_maps/RandomZLevels/fileList.txt b/config/awaymissionconfig.txt
similarity index 83%
rename from _maps/RandomZLevels/fileList.txt
rename to config/awaymissionconfig.txt
index 634f89c5937..a0597844c52 100644
--- a/_maps/RandomZLevels/fileList.txt
+++ b/config/awaymissionconfig.txt
@@ -1,23 +1,22 @@
-#List the potential random Z-levels here.
-#Maps must be the full path to them
-#Maps should be 255x255 or smaller and be bounded. Falling off the edge of the map will result in undefined behavior.
-#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
-#UNCOMMENT THE AWAY MISSION LINE IN SPACE_LEVELS.TXT IN THE CONFIG FOLDER IF YOU HAVE AWAY MISSIONS ENABLED! FAILURE TO DO THIS WILL CAUSE RUNTIMES!!
-
-#!!IMPORTANT NOTES FOR HOSTING AWAY MISSIONS!!:
-#Do NOT tick the maps during compile -- the game uses this list to decide which map to load. Ticking the maps will result in them ALL being loaded at once.
-#DO tick the associated code file for the away mission you are enabling. Otherwise, the map will be trying to reference objects which do not exist, which will cause runtime errors!
-
-#_maps/RandomZLevels/example.dmm
-#_maps/RandomZLevels/blackmarketpackers.dmm
-#_maps/RandomZLevels/stationCollision.dmm
-#_maps/RandomZLevels/spacebattle.dmm
-#_maps/RandomZLevels/beach.dmm
-#_maps/RandomZLevels/Academy.dmm
-#_maps/RandomZLevels/wildwest.dmm
-#_maps/RandomZLevels/challenge.dmm
-#_maps/RandomZLevels/listeningpost.dmm
-#_maps/RandomZLevels/spacehotel.dmm
-#_maps/RandomZLevels/centcomAway.dmm
-#_maps/RandomZLevels/moonoutpost19.dmm
+#List the potential random Z-levels here.
+#Maps must be the full path to them
+#Maps should be 255x255 or smaller and be bounded. Falling off the edge of the map will result in undefined behavior.
+#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
+
+#!!IMPORTANT NOTES FOR HOSTING AWAY MISSIONS!!:
+#Do NOT tick the maps during compile -- the game uses this list to decide which map to load. Ticking the maps will result in them ALL being loaded at once.
+#DO tick the associated code file for the away mission you are enabling. Otherwise, the map will be trying to reference objects which do not exist, which will cause runtime errors!
+
+#_maps/RandomZLevels/example.dmm
+#_maps/RandomZLevels/blackmarketpackers.dmm
+#_maps/RandomZLevels/stationCollision.dmm
+#_maps/RandomZLevels/spacebattle.dmm
+#_maps/RandomZLevels/beach.dmm
+#_maps/RandomZLevels/Academy.dmm
+#_maps/RandomZLevels/wildwest.dmm
+#_maps/RandomZLevels/challenge.dmm
+#_maps/RandomZLevels/listeningpost.dmm
+#_maps/RandomZLevels/spacehotel.dmm
+#_maps/RandomZLevels/centcomAway.dmm
+#_maps/RandomZLevels/moonoutpost19.dmm
#_maps/RandomZLevels/undergroundoutpost45.dmm
\ No newline at end of file
diff --git a/config/config.txt b/config/config.txt
index c19313e5025..6335574a29e 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -32,6 +32,9 @@ LOG_SAY
## log admin actions
LOG_ADMIN
+## log admin chat
+LOG_ADMINCHAT
+
## log client access (logon/logoff)
LOG_ACCESS
@@ -156,9 +159,6 @@ ALLOW_HOLIDAYS
##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother.
TICKLAG 0.9
-## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered.
-TICKCOMP 0
-
## Comment this out to disable automuting
#AUTOMUTE_ON
diff --git a/config/game_options.txt b/config/game_options.txt
index 293c691777c..70257783a38 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -252,6 +252,34 @@ SILICON_MAX_LAW_AMOUNT 12
## Uncomment to give players the choice of their species before they join the game
#JOIN_WITH_MUTANT_RACE
+
+## Roundstart Races
+##-------------------------------------------------------------------------------------------
+## Uncommenting races will allow them to be choosen at roundstart while join_with_muntant_race is on
+
+## Disabling humans is possible but a bit buggy. Some code relies on the notion that white people exist in space.
+ROUNDSTART_RACES human
+
+## Races that are strictly worse than humans that could probably be turned on without balance concerns
+ROUNDSTART_RACES lizard
+#ROUNDSTART_RACES fly
+#ROUNDSTART_RACES plasmaman
+#ROUNDSTART_RACES shadow
+#ROUNDSTART_RACES shadowling
+
+## Races that are better than humans in some ways, but worse in others
+#ROUNDSTART_RACES jelly
+#ROUNDSTART_RACES golem
+#ROUNDSTART_RACES adamantine
+#ROUNDSTART_RACES abductor
+
+## Races that are straight upgrades. If these are on expect powergamers to always pick them
+#ROUNDSTART_RACES skeleton
+#ROUNDSTART_RACES zombie
+#ROUNDSTART_RACES slime
+#ROUNDSTART_RACES pod
+##-------------------------------------------------------------------------------------------
+
## Uncomment to give players the choice of joining as a human with mutant bodyparts before they join the game
#JOIN_WITH_MUTANT_HUMANS
diff --git a/data/mode.txt b/data/mode.txt
index cf1ffd5c991..ef18df98db4 100644
--- a/data/mode.txt
+++ b/data/mode.txt
@@ -1 +1 @@
-extended
\ No newline at end of file
+extended
diff --git a/html/changelog.html b/html/changelog.html
index 70886d75149..ab48bc0d93c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,232 @@
-->
+
18 November 2015
+optimumtact updated:
+-
+
- Nanotrasen apologies for a recent bad batch of synthflesh that was shipped to the station, any rumours of death or serious injury are false and should be reported to your nearest political officer. At most, only light burns would result. +
phil235 updated:
+-
+
- Remotely detonating a planted c4 with a signaler now works again. +
17 November 2015
+Xhuis updated:
+-
+
- Many medicines have received rebalancing. Expect underused chemicals like Oxandralone to be much more effective in restoring damage. +
- Many toxins are now more or less efficient. +
- The descriptions of many reagents have been made more accurate. +
- New poison: Heparin. Made from Formaldehyde, Sodium, Chlorine, and Lithium. Functions as an anticoagulant, inducing uncontrollable bleeding and small amounts of bruising. +
- New poison: Teslium. Made from Plasma, Silver, and Black Powder, heated to 400K. Modifies examine text and induces periodic shocks in the victim as well as making all shocks against them more damaging. +
- Two Chemistry books have been placed in the lab. When used, they will link to the wiki page for chemistry in the same vein as other wiki books. +
16 November 2015
+Gun Hog updated:
+-
+
- The Combat tech requirement for Loyalty Firing Pins has been reduced from 6 to 5. +
Joan updated:
+-
+
- Plasmamen can now man the bar. +
- Defile no longer directly affects mobs. Instead, it rips up floors and opens most machines and lockers. +
- Blight added. Blight infects humans with a virus that does a set amount of damage over time and is relatively easily cured. Blight also badly affects nonhuman mobs and other living things. +
- While the cure to Blight is simple, it's not in this changelog. Use a medical analyzer to find the cure. +
- Tweaked costs and stuntimes of abilities; +
- Defile now costs 30 essence and stuns for about a second. +
- Overload Lights now costs 40 essence. +
- Malfunction now costs 45 essence. +
- Blight costs 50 essence and 200 essence to unlock. +
- Transmit has a new, spookier icon. +
- Revenant abilities can be given to non-revenants, and will work as normal spells instead of runtiming. +
bgobandit updated:
+-
+
- Blood packs can now be labeled with a pen. +
15 November 2015
+CosmicScientist updated:
+-
+
- Hopefully made the dehydrated carp's uplink description 100% clear. +
- Made the dehydrated carp cost 1 TC (instead of 3) to help with your traitor gear combos. +
Incoming5643 updated:
+-
+
- The supermatter sword was being far too kind in the hands of men. They should now have the desired effect when swung at people. +
Joan updated:
+-
+
- Anomalies move more often, are resistant to explosions and will only be destroyed if they are in devastation range. You shouldn't bomb them, though. +
- Hyper-energetic flux anomaly will shock mobs that run into it, or if it runs into them. +
- Bluespace anomaly will occasionally teleport mobs away from it in a small radius. +
- Vortex anomalies will sometimes throw objects at nearby living mobs. +
- Pyroclastic anomalies will produce bigger, hotter fires, and if not disabled, it will release an additional burst of flame. In addition, the resulting slime will be rabid and thus attack much more aggressively. +
- Gravitational anomalies will now properly throw objects at nearby living things. +
MrStonedOne updated:
+-
+
- Away mission loading will no longer improperly expand the width of the game world to two times the size of the away mission map. +
- This should also improve the speed of loading away missions, since the game doesn't have to resize the world +
RemieRichards updated:
+-
+
- Deities now start off with the ability to place 1 free turret +
- HoG Claymores now do 30 Brute (Down from 40) but now have 15 Armour Penetration (Up from 0) +
- Killing the other god objective is fixed +
- Turrets will no longer attack handcuffed people +
- Followers are now informed of their god's death +
- Followers are now informed of the location of their god's nexus when it is placed +
- Gods can no longer place structures near the enemy god's nexus +
13 November 2015
+as334 updated:
+-
+
- Nanotrasen has hired a brand new supply of ~~expendable labor~~ *LOYAL CREW MEMBERS* please welcome them with open arms. +
- Plasmamen are now a playable race. They require plasma gas to survive and will ignite in oxygen environments. +
12 November 2015
+Dunc updated:
+-
+
- DNA injectors have been restored to their original permanent RNG state from the impermanent guaranteed state. +
Xhuis updated:
+-
+
- Reagents can no longer be determined by examining a reagent container without the proper apparatus. Silicons and ghosts can always see reagents. +
- Science goggles now allow reagents to be seen on examine. In addition, chemists now start wearing them. The bartender has a pair that looks and functions like sunglasses. +
11 November 2015
+AnturK updated:
+-
+
- DNA Injectors now grant temporary powers on every use. Duration dependent on activated powers and machine upgrades +
- Delayed Transfer added to DNA Scanner - It will activate on the next closing of scanner door +
- UI+UE injectors/buffer transfers added for convinience +
- Injector creation timeout cut in half +
Firecage updated:
+-
+
- NanoTrasen specialists has developed a new type of operating table. You can now make one yourself with only some rods and a sheet of silver! +
Kor updated:
+-
+
- Adds immovable and indestructible reflector structures for badmin use. +
- The Mjolnir has been added to the wizards spellbook. +
- The Singularity Hammer has been added to the wizards spellbook. +
- The Supermatter Sword has been added to the wizards spellbook. +
- The Veil Render has been added to the wizards spellbook. +
- Trigger Multiverse War (give the entire crew multiswords) has been added to the wizards spellbook, at a cost of 8 points. +
- Converting (to cultist, rev, or gangster) a jobbaned player will now automatically offer control of their character to ghosts. +
- Emergency Response Teams and Deathsquads no longer accept non-human members if the server is configured to bar mutants from being heads of staff. +
LordPidey updated:
+-
+
- Nanotransen doctors have re-approved Saline-Glucose Solution for usage in IV drips, when blood supplies are low. Simple pills will not suffice. +
MMMiracles updated:
+-
+
- Water slips have been nerfed to a more reasonable duration. It is still a guaranteed way to disarm an opponent and obtain their weapon, but you can no longer manage to cuff/choke everyone who manages to slip without a problem. +
MrStonedOne updated:
+-
+
- Fixes the smartfridge not stacking items. +
Xhuis updated:
+-
+
- The emergency shuttle now plays unique sounds (thanks to Cuboos for creating them) when launching from the station and arriving at Central Command. +
torger597 updated:
+-
+
- Added a syringe to boxed poison kits. +
08 November 2015
+Cuboos updated:
+-
+
- Added a new and better sounding flashbang sound and a ringing sound for flashbang deaf effect +
JJRcop updated:
+-
+
- Chronosuits have had their movement revised, they now take time to teleport depending on how far you've traveled, and don't teleport automatically anymore unless you stop moving for a short moment, or press the new ' Teleport Now' button. +
- Added new outfit that allows admins to dress people up in the chrono equipment easier. +
Jalleo updated:
+-
+
- Due to a recently discovered report it turns out The Wizard Federation has devised a way for CEOs to stop having some teas from their Smartfridges due to this change all smartfridges will temporarily be unable to stack contents. +
Joan updated:
+-
+
- Revenant draining now takes about 5 seconds to complete and can be interrupted by dragging the target away. +
- Revenants can now tell if they are currently visible. +
- Revenant ability costs tweaked; Defile now costs 40 essence to cast, Overload Lights now costs 45 essence to cast, and Malfunction now costs 50 essence to cast. +
- Malfunction now affects non-machine objects, even if they're not being held by a human. +
- Defile does an extremely low amount of toxin damage to humans and confuses, but does much less stamina damage and stuns the revenant for slightly longer. +
- Overload Lights will no longer shock if the light is broken after a light is chosen to shock an area. +
Kor updated:
+-
+
- Using water on a dark blue slime extract will now yield a new potion capable of completely fireproofing clothing items. +
- You can once again click+drag mobs into disposal units. Xenobiologists rejoice. +
Xhuis updated:
+-
+
- Shadowling abilities now require the user to be human. +
- Enthralling now takes 21 seconds (down from 30). +
- Regenerate Chitin has been renamed to Rapid Re-Hatch. +
- Dethralling surgery's final step now requires a flash, penlight, or flashlight. +
- Dethralling surgery now produces a black tumor, which has a high biological tech origin but dies quickly in the light. +
- Shadowlings no longer have Enthrall before hatching. +
- Shadowling clothing now has icons to better reflect its existence. +
- Ascendant Broadcast has been removed. +
- Destroy Engines is now removed from the user after it is used once. +
05 November 2015
+AnturK updated:
+-
+
- Added wild shapeshift spell for wizards. +
01 November 2015
+Gun Hog updated:
+-
+
- Nanotrasen listens! After numerous complaints and petitions from Security personnel regarding energy weapon upkeep, we have authorized the construction and maintenance of your station's weapon rechargers. As an added bonus, we have also provided a more modular design for the devices, allowing for greater recharge rates if fitted with a more efficient capacitor! +
- Added Diagnostic HUDs! They can be used to view the health and cell status of borgs and mechs. Silicons have them built in, Roboticists get two in their locker, and the RD's hardsuit has one built in. +
Incoming5643 updated:
+-
+
- The number of roundstart head revolutionaries nows depends on the roundstart security force as well as the roundstart heads +
- The maximum number of head revs is 3, the minimum is 1. If there is fewer than three station heads there will never be more than that number of head revs at roundstart. For every three vacant security roles (Head of Security/Warden/Security Officer/Detective) at roundstart the number of starting head revs will be reduced by 1. +
- Head revolutionaries can be gained during play if the security/head roles are filled. They are drawn from existing revolutionaries. +
- Added dental implant surgery. While targeting the mouth drill a hole in a tooth then stick a pill in there for hands free later use. +
Kor updated:
+-
+
- Added an experimental control console for Xenobiology. Ask the admins if you'd like to try it out. It may not work on maps other than Box if they have renamed the Xenobiology Lab. +
- Injecting blood into a cerulean slime will yield a special one use set of blueprints that will allow you to expand the territory your camera can cover. +
Kor and Remie updated:
+-
+
- Added as series of laser reflector structures, the frame of which can be built with 5 metal sheets. +
- Completing the frame with 5 glass sheets creates a mirror that will reflect lasers at a 90 degree angle. +
- Completing the frame with 10 reinforced glass sheets creates a double sided mirror that reflects lasers at a 90 degree angle. +
- Completing the frame with a single diamond sheet creates a box that will redirect all lasers that hit it from any angle in a single direction. +
MMMiracles updated:
+-
+
- Energy Swords can now embed when thrown for a 75% chance. Embedding +
30 October 2015
+Incoming5643 updated:
+-
+
- Slimepeople can now split if they contain 200 units of slime jelly, and slimepeople will now slowly generate slime jelly up to 200 units provided they are very well fed. Split slimepeople are NOT player controlled, but rather the original slime person can swap between the two mobs at will. If one of the slimepeople should die under player control, the player won't be able to swap back to their living body. Splitting only creates a new body, any items you have on you are not duplicated. +
- Slimepeople now take half damage from sources of heat, but double damage from sources of cold. Lasers good, Space bad. +
29 October 2015
Kor updated:
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 19de93ec4c9..0937ddff6d7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2224,3 +2224,234 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Kor:
- tweak: Slightly changed what items spawn on the captain vs in his locker, hopefully
saving some annoying inventory shuffle at roundstart.
+2015-10-30:
+ Incoming5643:
+ - rscadd: Slimepeople can now split if they contain 200 units of slime jelly, and
+ slimepeople will now slowly generate slime jelly up to 200 units provided they
+ are very well fed. Split slimepeople are NOT player controlled, but rather the
+ original slime person can swap between the two mobs at will. If one of the slimepeople
+ should die under player control, the player won't be able to swap back to their
+ living body. Splitting only creates a new body, any items you have on you are
+ not duplicated.
+ - rscadd: Slimepeople now take half damage from sources of heat, but double damage
+ from sources of cold. Lasers good, Space bad.
+2015-11-01:
+ Gun Hog:
+ - rscadd: Nanotrasen listens! After numerous complaints and petitions from Security
+ personnel regarding energy weapon upkeep, we have authorized the construction
+ and maintenance of your station's weapon rechargers. As an added bonus, we have
+ also provided a more modular design for the devices, allowing for greater recharge
+ rates if fitted with a more efficient capacitor!
+ - rscadd: Added Diagnostic HUDs! They can be used to view the health and cell status
+ of borgs and mechs. Silicons have them built in, Roboticists get two in their
+ locker, and the RD's hardsuit has one built in.
+ Incoming5643:
+ - rscadd: The number of roundstart head revolutionaries nows depends on the roundstart
+ security force as well as the roundstart heads
+ - rscadd: The maximum number of head revs is 3, the minimum is 1. If there is fewer
+ than three station heads there will never be more than that number of head revs
+ at roundstart. For every three vacant security roles (Head of Security/Warden/Security
+ Officer/Detective) at roundstart the number of starting head revs will be reduced
+ by 1.
+ - rscadd: Head revolutionaries can be gained during play if the security/head roles
+ are filled. They are drawn from existing revolutionaries.
+ - rscadd: Added dental implant surgery. While targeting the mouth drill a hole in
+ a tooth then stick a pill in there for hands free later use.
+ Kor:
+ - rscadd: Added an experimental control console for Xenobiology. Ask the admins
+ if you'd like to try it out. It may not work on maps other than Box if they
+ have renamed the Xenobiology Lab.
+ - rscadd: Injecting blood into a cerulean slime will yield a special one use set
+ of blueprints that will allow you to expand the territory your camera can cover.
+ Kor and Remie:
+ - rscadd: Added as series of laser reflector structures, the frame of which can
+ be built with 5 metal sheets.
+ - rscadd: Completing the frame with 5 glass sheets creates a mirror that will reflect
+ lasers at a 90 degree angle.
+ - rscadd: Completing the frame with 10 reinforced glass sheets creates a double
+ sided mirror that reflects lasers at a 90 degree angle.
+ - rscadd: Completing the frame with a single diamond sheet creates a box that will
+ redirect all lasers that hit it from any angle in a single direction.
+ MMMiracles:
+ - tweak: Energy Swords can now embed when thrown for a 75% chance. Embedding
+2015-11-05:
+ AnturK:
+ - rscadd: Added wild shapeshift spell for wizards.
+2015-11-08:
+ Cuboos:
+ - soundadd: Added a new and better sounding flashbang sound and a ringing sound
+ for flashbang deaf effect
+ JJRcop:
+ - tweak: Chronosuits have had their movement revised, they now take time to teleport
+ depending on how far you've traveled, and don't teleport automatically anymore
+ unless you stop moving for a short moment, or press the new ' Teleport Now'
+ button.
+ - rscadd: Added new outfit that allows admins to dress people up in the chrono equipment
+ easier.
+ Jalleo:
+ - tweak: Due to a recently discovered report it turns out The Wizard Federation
+ has devised a way for CEOs to stop having some teas from their Smartfridges
+ due to this change all smartfridges will temporarily be unable to stack contents.
+ Joan:
+ - tweak: Revenant draining now takes about 5 seconds to complete and can be interrupted
+ by dragging the target away.
+ - tweak: Revenants can now tell if they are currently visible.
+ - tweak: Revenant ability costs tweaked; Defile now costs 40 essence to cast, Overload
+ Lights now costs 45 essence to cast, and Malfunction now costs 50 essence to
+ cast.
+ - tweak: Malfunction now affects non-machine objects, even if they're not being
+ held by a human.
+ - tweak: Defile does an extremely low amount of toxin damage to humans and confuses,
+ but does much less stamina damage and stuns the revenant for slightly longer.
+ - tweak: Overload Lights will no longer shock if the light is broken after a light
+ is chosen to shock an area.
+ Kor:
+ - rscadd: Using water on a dark blue slime extract will now yield a new potion capable
+ of completely fireproofing clothing items.
+ - rscadd: You can once again click+drag mobs into disposal units. Xenobiologists
+ rejoice.
+ Xhuis:
+ - tweak: Shadowling abilities now require the user to be human.
+ - tweak: Enthralling now takes 21 seconds (down from 30).
+ - tweak: Regenerate Chitin has been renamed to Rapid Re-Hatch.
+ - tweak: Dethralling surgery's final step now requires a flash, penlight, or flashlight.
+ - tweak: Dethralling surgery now produces a black tumor, which has a high biological
+ tech origin but dies quickly in the light.
+ - rscdel: Shadowlings no longer have Enthrall before hatching.
+ - rscadd: Shadowling clothing now has icons to better reflect its existence.
+ - rscdel: Ascendant Broadcast has been removed.
+ - rscdel: Destroy Engines is now removed from the user after it is used once.
+2015-11-11:
+ AnturK:
+ - tweak: DNA Injectors now grant temporary powers on every use. Duration dependent
+ on activated powers and machine upgrades
+ - rscadd: 'Delayed Transfer added to DNA Scanner - It will activate on the next
+ closing of scanner door '
+ - rscadd: 'UI+UE injectors/buffer transfers added for convinience '
+ - tweak: Injector creation timeout cut in half
+ Firecage:
+ - rscadd: NanoTrasen specialists has developed a new type of operating table. You
+ can now make one yourself with only some rods and a sheet of silver!
+ Kor:
+ - rscadd: Adds immovable and indestructible reflector structures for badmin use.
+ - rscadd: The Mjolnir has been added to the wizards spellbook.
+ - rscadd: The Singularity Hammer has been added to the wizards spellbook.
+ - rscadd: The Supermatter Sword has been added to the wizards spellbook.
+ - rscadd: The Veil Render has been added to the wizards spellbook.
+ - rscadd: Trigger Multiverse War (give the entire crew multiswords) has been added
+ to the wizards spellbook, at a cost of 8 points.
+ - rscadd: Converting (to cultist, rev, or gangster) a jobbaned player will now automatically
+ offer control of their character to ghosts.
+ - rscadd: Emergency Response Teams and Deathsquads no longer accept non-human members
+ if the server is configured to bar mutants from being heads of staff.
+ LordPidey:
+ - rscadd: Nanotransen doctors have re-approved Saline-Glucose Solution for usage
+ in IV drips, when blood supplies are low. Simple pills will not suffice.
+ MMMiracles:
+ - tweak: Water slips have been nerfed to a more reasonable duration. It is still
+ a guaranteed way to disarm an opponent and obtain their weapon, but you can
+ no longer manage to cuff/choke everyone who manages to slip without a problem.
+ MrStonedOne:
+ - bugfix: Fixes the smartfridge not stacking items.
+ Xhuis:
+ - soundadd: The emergency shuttle now plays unique sounds (thanks to Cuboos for
+ creating them) when launching from the station and arriving at Central Command.
+ torger597:
+ - rscadd: Added a syringe to boxed poison kits.
+2015-11-12:
+ Dunc:
+ - rscdel: DNA injectors have been restored to their original permanent RNG state
+ from the impermanent guaranteed state.
+ Xhuis:
+ - rscadd: Reagents can no longer be determined by examining a reagent container
+ without the proper apparatus. Silicons and ghosts can always see reagents.
+ - rscadd: Science goggles now allow reagents to be seen on examine. In addition,
+ chemists now start wearing them. The bartender has a pair that looks and functions
+ like sunglasses.
+2015-11-13:
+ as334:
+ - rscadd: Nanotrasen has hired a brand new supply of ~~expendable labor~~ *LOYAL
+ CREW MEMBERS* please welcome them with open arms.
+ - rscadd: Plasmamen are now a playable race. They require plasma gas to survive
+ and will ignite in oxygen environments.
+2015-11-15:
+ CosmicScientist:
+ - tweak: Hopefully made the dehydrated carp's uplink description 100% clear.
+ - tweak: Made the dehydrated carp cost 1 TC (instead of 3) to help with your traitor
+ gear combos.
+ Incoming5643:
+ - tweak: The supermatter sword was being far too kind in the hands of men. They
+ should now have the desired effect when swung at people.
+ Joan:
+ - tweak: Anomalies move more often, are resistant to explosions and will only be
+ destroyed if they are in devastation range. You shouldn't bomb them, though.
+ - tweak: Hyper-energetic flux anomaly will shock mobs that run into it, or if it
+ runs into them.
+ - tweak: Bluespace anomaly will occasionally teleport mobs away from it in a small
+ radius.
+ - tweak: Vortex anomalies will sometimes throw objects at nearby living mobs.
+ - tweak: Pyroclastic anomalies will produce bigger, hotter fires, and if not disabled,
+ it will release an additional burst of flame. In addition, the resulting slime
+ will be rabid and thus attack much more aggressively.
+ - bugfix: Gravitational anomalies will now properly throw objects at nearby living
+ things.
+ MrStonedOne:
+ - bugfix: Away mission loading will no longer improperly expand the width of the
+ game world to two times the size of the away mission map.
+ - tweak: This should also improve the speed of loading away missions, since the
+ game doesn't have to resize the world
+ RemieRichards:
+ - rscadd: Deities now start off with the ability to place 1 free turret
+ - tweak: HoG Claymores now do 30 Brute (Down from 40) but now have 15 Armour Penetration
+ (Up from 0)
+ - bugfix: Killing the other god objective is fixed
+ - tweak: Turrets will no longer attack handcuffed people
+ - rscadd: Followers are now informed of their god's death
+ - rscadd: Followers are now informed of the location of their god's nexus when it
+ is placed
+ - tweak: Gods can no longer place structures near the enemy god's nexus
+2015-11-16:
+ Gun Hog:
+ - tweak: The Combat tech requirement for Loyalty Firing Pins has been reduced from
+ 6 to 5.
+ Joan:
+ - tweak: Plasmamen can now man the bar.
+ - tweak: Defile no longer directly affects mobs. Instead, it rips up floors and
+ opens most machines and lockers.
+ - rscadd: Blight added. Blight infects humans with a virus that does a set amount
+ of damage over time and is relatively easily cured. Blight also badly affects
+ nonhuman mobs and other living things.
+ - experiment: While the cure to Blight is simple, it's not in this changelog. Use
+ a medical analyzer to find the cure.
+ - tweak: Tweaked costs and stuntimes of abilities;
+ - tweak: Defile now costs 30 essence and stuns for about a second.
+ - tweak: Overload Lights now costs 40 essence.
+ - tweak: Malfunction now costs 45 essence.
+ - rscadd: Blight costs 50 essence and 200 essence to unlock.
+ - imageadd: Transmit has a new, spookier icon.
+ - bugfix: Revenant abilities can be given to non-revenants, and will work as normal
+ spells instead of runtiming.
+ bgobandit:
+ - rscadd: Blood packs can now be labeled with a pen.
+2015-11-17:
+ Xhuis:
+ - tweak: Many medicines have received rebalancing. Expect underused chemicals like
+ Oxandralone to be much more effective in restoring damage.
+ - tweak: Many toxins are now more or less efficient.
+ - tweak: The descriptions of many reagents have been made more accurate.
+ - rscadd: 'New poison: Heparin. Made from Formaldehyde, Sodium, Chlorine, and Lithium.
+ Functions as an anticoagulant, inducing uncontrollable bleeding and small amounts
+ of bruising.'
+ - rscadd: 'New poison: Teslium. Made from Plasma, Silver, and Black Powder, heated
+ to 400K. Modifies examine text and induces periodic shocks in the victim as
+ well as making all shocks against them more damaging.'
+ - rscadd: Two Chemistry books have been placed in the lab. When used, they will
+ link to the wiki page for chemistry in the same vein as other wiki books.
+2015-11-18:
+ optimumtact:
+ - tweak: Nanotrasen apologies for a recent bad batch of synthflesh that was shipped
+ to the station, any rumours of death or serious injury are false and should
+ be reported to your nearest political officer. At most, only light burns would
+ result.
+ phil235:
+ - bugfix: Remotely detonating a planted c4 with a signaler now works again.
diff --git a/html/changelogs/AutoChangeLog-pr-13055.yml b/html/changelogs/AutoChangeLog-pr-13055.yml
new file mode 100644
index 00000000000..bc3ebc0f363
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13055.yml
@@ -0,0 +1,8 @@
+author: Joan
+delete-after: True
+changes:
+ - rscadd: "Constructs have action buttons for their spells."
+ - imageadd: "The Juggernaut forcewall now has a new, more cult-appropriate sprite."
+ - imageadd: "Cult floors and walls now have a glow effect when being created."
+ - bugfix: "Nar-Sie and Artificers will properly produce cult flooring.
+typofix: Nar-Sie is a she."
diff --git a/html/changelogs/example.yml b/html/changelogs/example.yml
index 9cf7d8b07de..48aa13aa116 100644
--- a/html/changelogs/example.yml
+++ b/html/changelogs/example.yml
@@ -18,11 +18,10 @@
# imagedel
# spellcheck (typo fixes)
# experiment
-# tgs (TG-ported fixes?)
#################################
# Your name.
-author: N3X15
+author: "
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
diff --git a/icons/effects/224x224.dmi b/icons/effects/224x224.dmi
index 4c43df93322..f6ef50c8f0f 100644
Binary files a/icons/effects/224x224.dmi and b/icons/effects/224x224.dmi differ
diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi
index 250ed8f3dc4..afef911cbdd 100644
Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 4788ef5b026..6706d7f6781 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/footprints.dmi b/icons/effects/footprints.dmi
index caf11cac108..a98344abe41 100644
Binary files a/icons/effects/footprints.dmi and b/icons/effects/footprints.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 868b6ff4b8e..b95549b5cc9 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi
index b188463b657..b082eb15418 100644
Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ
diff --git a/icons/mob/alienleap.dmi b/icons/mob/alienleap.dmi
index da092d4b9bd..7e10b8a5c5b 100644
Binary files a/icons/mob/alienleap.dmi and b/icons/mob/alienleap.dmi differ
diff --git a/icons/mob/alienqueen.dmi b/icons/mob/alienqueen.dmi
index f002d2635ce..e5def3e1685 100644
Binary files a/icons/mob/alienqueen.dmi and b/icons/mob/alienqueen.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index c745f3a0925..44c7746c266 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index af3b20ed303..b8f84216bd1 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 08e019fafc5..a1ede7661c1 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/guardian.dmi b/icons/mob/guardian.dmi
new file mode 100644
index 00000000000..9db3fbedc68
Binary files /dev/null and b/icons/mob/guardian.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index bc891041241..7ed5ea8a069 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 893024aa714..68a3ffd8d36 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 4fc1a449fb9..90afe2db200 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index e39c367d060..4d89f887e6d 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index b7f93f7fbba..34ddd7e18f2 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 876b0d6ebdc..5d2d51a2954 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index f24cc31534e..fd208439a5f 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/large-worn-icons/64x64/head.dmi b/icons/mob/large-worn-icons/64x64/head.dmi
new file mode 100644
index 00000000000..e66f3f19ed7
Binary files /dev/null and b/icons/mob/large-worn-icons/64x64/head.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 196bea07d40..efcede5b87b 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/screen_alien.dmi b/icons/mob/screen_alien.dmi
index 6cee26d4000..48005de524c 100644
Binary files a/icons/mob/screen_alien.dmi and b/icons/mob/screen_alien.dmi differ
diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi
index 88ba26d27c9..12772089da7 100644
Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ
diff --git a/icons/mob/screen_ghost.dmi b/icons/mob/screen_ghost.dmi
index 39975761afe..9d8d790797c 100644
Binary files a/icons/mob/screen_ghost.dmi and b/icons/mob/screen_ghost.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 9dc96f78dd2..c40db2c7fd5 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index c7e8ecdd828..42d0ef0e1cf 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 2882987689d..20a1cacfb1d 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 5d6f9793862..3a85304173d 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index d2eb2b45a70..e956cdf6991 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 4719ce0006e..40db1a19e16 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 0b2cf364302..f029613ca91 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index f452afa7719..35600cc0d29 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index d336d8158ed..a65538c0137 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 6c8fd8bc903..b7ea2da0147 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/hand_of_god_structures.dmi b/icons/obj/hand_of_god_structures.dmi
new file mode 100644
index 00000000000..8ec5c7e0052
Binary files /dev/null and b/icons/obj/hand_of_god_structures.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 2922a5b706d..c95df949642 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index 8b7d325f87e..2510e0153bb 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 023f6de8438..6a1b5c236c7 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 91979047793..03faadce202 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index cb8832b4d53..fedfc5f0aa0 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index d18b22686ae..3a99f8a99c2 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 1a7b8fb091c..10e54587abe 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index a8e3f3a23f1..d1bd812c93a 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index caa74f8f86c..01c99551ed6 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index eaea54a5c73..d94822eba5b 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 738a6964f27..7d0ddcd2fe8 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index f8ac44a7c49..fceaea75516 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -65,9 +65,18 @@ h1.alert, h2.alert {color: #000000;}
.suicide {color: #ff5050; font-style: italic;}
.green {color: #03ff39;}
.shadowling {color: #3b2769;}
+.cultsmall {color: #960000;}
.cult {color: #960000; font-weight: bold; font-size: 3;}
+.narsie {color: #960000; font-weight: bold; font-size: 15;}
.purple {color: #5e2d79;}
+.revennotice {color: #1d2953;}
+.revenboldnotice {color: #1d2953; font-weight: bold;}
+.revenbignotice {color: #1d2953; font-weight: bold; font-size: 3;}
+.revenminor {color: #823abb}
+.revenwarning {color: #760fbb; font-style: italic;}
+.revendanger {color: #760fbb; font-weight: bold; font-size: 3;}
+
.newscaster {color: #800000;}
.ghostalert {color: #5c00e6; font-style: italic; font-weight: bold;}
diff --git a/sound/effects/hyperspace_begin.ogg b/sound/effects/hyperspace_begin.ogg
new file mode 100644
index 00000000000..225e2d98820
Binary files /dev/null and b/sound/effects/hyperspace_begin.ogg differ
diff --git a/sound/effects/hyperspace_end.ogg b/sound/effects/hyperspace_end.ogg
new file mode 100644
index 00000000000..64fb5214a96
Binary files /dev/null and b/sound/effects/hyperspace_end.ogg differ
diff --git a/sound/effects/hyperspace_progress.ogg b/sound/effects/hyperspace_progress.ogg
new file mode 100644
index 00000000000..7cc11a864ae
Binary files /dev/null and b/sound/effects/hyperspace_progress.ogg differ
diff --git a/sound/weapons/flash_ring.ogg b/sound/weapons/flash_ring.ogg
new file mode 100644
index 00000000000..a5d2014b8a2
Binary files /dev/null and b/sound/weapons/flash_ring.ogg differ
diff --git a/sound/weapons/flashbang.ogg b/sound/weapons/flashbang.ogg
new file mode 100644
index 00000000000..389aad77bc2
Binary files /dev/null and b/sound/weapons/flashbang.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index c57f42076ae..c8e8d14641e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -36,6 +36,7 @@
#include "code\__DEFINES\pipe_construction.dm"
#include "code\__DEFINES\preferences.dm"
#include "code\__DEFINES\qdel.dm"
+#include "code\__DEFINES\role_preferences.dm"
#include "code\__DEFINES\say.dm"
#include "code\__DEFINES\sight.dm"
#include "code\__DEFINES\stat.dm"
@@ -80,6 +81,7 @@
#include "code\_onclick\click.dm"
#include "code\_onclick\cyborg.dm"
#include "code\_onclick\drag_drop.dm"
+#include "code\_onclick\god.dm"
#include "code\_onclick\item_attack.dm"
#include "code\_onclick\observer.dm"
#include "code\_onclick\other_mobs.dm"
@@ -255,6 +257,7 @@
#include "code\datums\spells\mind_transfer.dm"
#include "code\datums\spells\projectile.dm"
#include "code\datums\spells\santa.dm"
+#include "code\datums\spells\shapeshift.dm"
#include "code\datums\spells\summonitem.dm"
#include "code\datums\spells\touch_attacks.dm"
#include "code\datums\spells\trigger.dm"
@@ -356,6 +359,14 @@
#include "code\game\gamemodes\gang\gang_datum.dm"
#include "code\game\gamemodes\gang\gang_pen.dm"
#include "code\game\gamemodes\gang\recaller.dm"
+#include "code\game\gamemodes\handofgod\_handofgod.dm"
+#include "code\game\gamemodes\handofgod\actions.dm"
+#include "code\game\gamemodes\handofgod\god.dm"
+#include "code\game\gamemodes\handofgod\items.dm"
+#include "code\game\gamemodes\handofgod\objectives.dm"
+#include "code\game\gamemodes\handofgod\powers.dm"
+#include "code\game\gamemodes\handofgod\structures.dm"
+#include "code\game\gamemodes\handofgod\traps.dm"
#include "code\game\gamemodes\malfunction\Malf_Modules.dm"
#include "code\game\gamemodes\malfunction\malfunction.dm"
#include "code\game\gamemodes\meteor\meteor.dm"
@@ -474,7 +485,6 @@
#include "code\game\machinery\computer\computer.dm"
#include "code\game\machinery\computer\crew.dm"
#include "code\game\machinery\computer\dna_console.dm"
-#include "code\game\machinery\computer\HolodeckControl.dm"
#include "code\game\machinery\computer\law.dm"
#include "code\game\machinery\computer\medical.dm"
#include "code\game\machinery\computer\message.dm"
@@ -625,7 +635,6 @@
#include "code\game\objects\items\devices\transfer_valve.dm"
#include "code\game\objects\items\devices\uplinks.dm"
#include "code\game\objects\items\devices\PDA\cart.dm"
-#include "code\game\objects\items\devices\PDA\chatroom.dm"
#include "code\game\objects\items\devices\PDA\PDA.dm"
#include "code\game\objects\items\devices\PDA\radio.dm"
#include "code\game\objects\items\devices\radio\beacon.dm"
@@ -755,8 +764,8 @@
#include "code\game\objects\structures\morgue.dm"
#include "code\game\objects\structures\musician.dm"
#include "code\game\objects\structures\noticeboard.dm"
-#include "code\game\objects\structures\OpTable.dm"
#include "code\game\objects\structures\plasticflaps.dm"
+#include "code\game\objects\structures\reflector.dm"
#include "code\game\objects\structures\safe.dm"
#include "code\game\objects\structures\showcase.dm"
#include "code\game\objects\structures\signs.dm"
@@ -1079,6 +1088,15 @@
#include "code\modules\games\cards.dm"
#include "code\modules\holiday\easter.dm"
#include "code\modules\holiday\holidays.dm"
+#include "code\modules\holodeck\area_copy.dm"
+#include "code\modules\holodeck\areas.dm"
+#include "code\modules\holodeck\computer.dm"
+#include "code\modules\holodeck\computer_funcs.dm"
+#include "code\modules\holodeck\holo_effect.dm"
+#include "code\modules\holodeck\items.dm"
+#include "code\modules\holodeck\tables.dm"
+#include "code\modules\holodeck\turfs.dm"
+#include "code\modules\holodeck\windows.dm"
#include "code\modules\html_interface\html_interface.dm"
#include "code\modules\html_interface\html_interface_client.dm"
#include "code\modules\html_interface\cards\cards.dm"
@@ -1093,6 +1111,7 @@
#include "code\modules\library\lib_items.dm"
#include "code\modules\library\lib_machines.dm"
#include "code\modules\library\lib_readme.dm"
+#include "code\modules\library\random_books.dm"
#include "code\modules\lighting\lighting_system.dm"
#include "code\modules\mining\abandoned_crates.dm"
#include "code\modules\mining\equipment_locker.dm"
@@ -1310,6 +1329,7 @@
#include "code\modules\mob\living\simple_animal\morph\morph.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant_abilities.dm"
+#include "code\modules\mob\living\simple_animal\revenant\revenant_blight.dm"
#include "code\modules\mob\living\simple_animal\revenant\revenant_spawn_event.dm"
#include "code\modules\mob\living\simple_animal\slaughter\slaughter.dm"
#include "code\modules\mob\living\simple_animal\slaughter\slaughterevent.dm"
@@ -1506,6 +1526,7 @@
#include "code\modules\research\designs\stock_parts_designs.dm"
#include "code\modules\research\designs\telecomms_designs.dm"
#include "code\modules\research\designs\weapon_designs.dm"
+#include "code\modules\research\xenobiology\xenobio_camera.dm"
#include "code\modules\research\xenobiology\xenobiology.dm"
#include "code\modules\security levels\keycard authentication.dm"
#include "code\modules\security levels\security levels.dm"
@@ -1513,7 +1534,8 @@
#include "code\modules\space transition\space_transition.dm"
#include "code\modules\surgery\cavity_implant.dm"
#include "code\modules\surgery\core_removal.dm"
-#include "code\modules\surgery\dethrall.dm"
+#include "code\modules\surgery\dental_implant.dm"
+#include "code\modules\surgery\dethralling.dm"
#include "code\modules\surgery\eye_surgery.dm"
#include "code\modules\surgery\gender_reassignment.dm"
#include "code\modules\surgery\generic_steps.dm"
diff --git a/tools/Runtime Condenser/Main.cpp b/tools/Runtime Condenser/Main.cpp
index f1e778ff459..b1ba3546372 100644
--- a/tools/Runtime Condenser/Main.cpp
+++ b/tools/Runtime Condenser/Main.cpp
@@ -264,8 +264,7 @@ bool writeToFile()
outputFile << endl << "** Hard deletions **";
for(int i=0; i <= maxStorage; i++)
{
- if(numHardDel[i] != 0) outputFile << endl << endl << "The following path has failed to GC " << numHardDel[i] << " time(s).\n";
- if(storedHardDel[i] != "Blank") outputFile << storedHardDel[i] << endl;
+ if(numHardDel[i] != 0 && storedHardDel[i] != "Blank") outputFile << endl << storedHardDel[i] << " - " << numHardDel[i] << " time(s).\n";
}
}
outputFile.close();