From 89ec15543295ddd2a6a3228212ba9b6f0038c607 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Tue, 24 Jul 2018 19:49:10 -0400 Subject: [PATCH 1/4] Abductor Update --- code/__DEFINES/hud.dm | 2 + code/datums/hud.dm | 3 +- code/game/data_huds.dm | 3 + .../miniantags/abduction/abduction_gear.dm | 151 +++++++++++++++--- .../gamemodes/miniantags/abduction/gland.dm | 137 ++++++++++++++-- .../miniantags/abduction/machinery/console.dm | 65 +++++--- .../abduction/machinery/dispenser.dm | 8 +- .../abduction/machinery/experiment.dm | 5 +- .../mob/living/carbon/human/human_defines.dm | 2 +- .../living/carbon/human/species/abductor.dm | 9 +- goon/browserassets/css/browserOutput.css | 3 +- icons/mob/hud.dmi | Bin 14509 -> 14695 bytes icons/obj/abductor.dmi | Bin 55758 -> 57606 bytes 13 files changed, 318 insertions(+), 70 deletions(-) diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index 29392997893..60252fc11ba 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -27,6 +27,7 @@ #define PLANT_WEED_HUD "22"// Weed level #define DIAG_TRACK_HUD "23"// Mech tracking beacon #define DIAG_PATH_HUD "24"//Bot path indicators +#define GLAND_HUD "25"//Gland indicators for abductors //by default everything in the hud_list of an atom is an image //a value in hud_list with one of these will change that behavior @@ -54,6 +55,7 @@ #define ANTAG_HUD_CHANGELING 16 #define ANTAG_HUD_VAMPIRE 17 #define ANTAG_HUD_ABDUCTOR 18 +#define DATA_HUD_ABDUCTOR 19 // Notification action types #define NOTIFY_JUMP "jump" diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 04ebcc68ed5..84c45299ece 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -20,7 +20,8 @@ var/datum/atom_hud/huds = list( \ ANTAG_HUD_NINJA = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_CHANGELING = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_VAMPIRE = new/datum/atom_hud/antag/hidden(),\ - ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden()\ + ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden(),\ + DATA_HUD_ABDUCTOR = new/datum/atom_hud/abductor()\ ) /datum/atom_hud diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index a4faafcf91f..db2fb3c64df 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -52,6 +52,9 @@ /datum/atom_hud/data/bot_path hud_icons = list(DIAG_PATH_HUD) +/datum/atom_hud/abductor + hud_icons = list(GLAND_HUD) + /datum/atom_hud/data/hydroponic hud_icons = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 40d48f7fd59..f16028c35ba 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -2,6 +2,8 @@ #define VEST_COMBAT 2 #define GIZMO_SCAN 1 #define GIZMO_MARK 2 +#define MIND_DEVICE_MESSAGE 1 +#define MIND_DEVICE_CONTROL 2 //AGENT VEST /obj/item/clothing/suit/armor/abductor/vest @@ -14,6 +16,7 @@ origin_tech = "magnets=7;biotech=4;powerstorage=4;abductor=4" armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15) actions_types = list(/datum/action/item_action/hands_free/activate) + allowed = list(/obj/item/abductor, /obj/item/abductor_baton, /obj/item/melee/baton, /obj/item/gun/energy, /obj/item/restraints/handcuffs) var/mode = VEST_STEALTH var/stealth_active = 0 var/combat_cooldown = 10 @@ -23,6 +26,11 @@ species_fit = null sprite_sheets = null +/obj/item/clothing/suit/armor/abductor/vest/proc/toggle_nodrop() + flags ^= NODROP + if(ismob(loc)) + to_chat(loc, "Your vest is now [flags & NODROP ? "locked" : "unlocked"].") + /obj/item/clothing/suit/armor/abductor/vest/proc/flip_mode() switch(mode) if(VEST_STEALTH) @@ -53,7 +61,7 @@ return stealth_active = 1 if(ishuman(loc)) - var/mob/living/carbon/human/M = src.loc + var/mob/living/carbon/human/M = loc new /obj/effect/temp_visual/dir_setting/ninja/cloak(get_turf(M), M.dir) M.name_override = disguise.name M.icon = disguise.icon @@ -67,7 +75,7 @@ return stealth_active = 0 if(ishuman(loc)) - var/mob/living/carbon/human/M = src.loc + var/mob/living/carbon/human/M = loc new /obj/effect/temp_visual/dir_setting/ninja(get_turf(M), M.dir) M.name_override = null M.overlays.Cut() @@ -94,9 +102,9 @@ /obj/item/clothing/suit/armor/abductor/vest/proc/Adrenaline() if(ishuman(loc)) if(combat_cooldown != initial(combat_cooldown)) - to_chat(src.loc, "Combat injection is still recharging.") + to_chat(loc, "Combat injection is still recharging.") return - var/mob/living/carbon/human/M = src.loc + var/mob/living/carbon/human/M = loc M.adjustStaminaLoss(-75) M.SetParalysis(0) M.SetStunned(0) @@ -109,6 +117,17 @@ if(combat_cooldown==initial(combat_cooldown)) processing_objects.Remove(src) +/obj/item/clothing/suit/armor/abductor/Destroy() + processing_objects.Remove(src) + for(var/obj/machinery/abductor/console/C in machines) + if(C.vest == src) + C.vest = null + break + return ..() + +/obj/item/abductor + icon = 'icons/obj/abductor.dmi' + /obj/item/abductor/proc/AbductorCheck(user) if(isabductor(user)) return TRUE @@ -116,14 +135,19 @@ return FALSE /obj/item/abductor/proc/ScientistCheck(user) + if(!AbductorCheck(user)) + return FALSE + var/mob/living/carbon/human/H = user var/datum/species/abductor/S = H.dna.species - return S.scientist + if(S.scientist) + return TRUE + to_chat(user, "You're not trained to use this!") + return FALSE /obj/item/abductor/gizmo name = "science tool" desc = "A dual-mode tool for retrieving specimens and scanning appearances. Scanning can be done through cameras." - icon = 'icons/obj/abductor.dmi' icon_state = "gizmo_scan" item_state = "gizmo" origin_tech = "engineering=7;magnets=4;bluespace=4;abductor=3" @@ -132,11 +156,12 @@ var/obj/machinery/abductor/console/console /obj/item/abductor/gizmo/attack_self(mob/user) - if(!AbductorCheck(user)) - return if(!ScientistCheck(user)) - to_chat(user, "You're not trained to use this!") return + if(!console) + to_chat(user, "The device is not linked to console!") + return + if(mode == GIZMO_SCAN) mode = GIZMO_MARK icon_state = "gizmo_mark" @@ -146,11 +171,12 @@ to_chat(user, "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE") /obj/item/abductor/gizmo/attack(mob/living/M, mob/user) - if(!AbductorCheck(user)) - return if(!ScientistCheck(user)) - to_chat(user, "You're not trained to use this") return + if(!console) + to_chat(user, "The device is not linked to console!") + return + switch(mode) if(GIZMO_SCAN) scan(M, user) @@ -161,11 +187,12 @@ /obj/item/abductor/gizmo/afterattack(atom/target, mob/living/user, flag, params) if(flag) return - if(!AbductorCheck(user)) - return if(!ScientistCheck(user)) - to_chat(user, "You're not trained to use this") return + if(!console) + to_chat(user, "The device is not linked to console!") + return + switch(mode) if(GIZMO_SCAN) scan(target, user) @@ -174,9 +201,8 @@ /obj/item/abductor/gizmo/proc/scan(atom/target, mob/living/user) if(ishuman(target)) - if(console!=null) - console.AddSnapshot(target) - to_chat(user, "You scan [target] and add [target.p_them()] to the database.") + console.AddSnapshot(target) + to_chat(user, "You scan [target] and add [target.p_them()] to the database.") /obj/item/abductor/gizmo/proc/mark(atom/target, mob/living/user) if(marked == target) @@ -200,11 +226,15 @@ marked = target to_chat(user, "You finish preparing [target] for transport.") +/obj/item/abductor/gizmo/Destroy() + if(console) + console.gizmo = null + return ..() + /obj/item/abductor/silencer name = "abductor silencer" desc = "A compact device used to shut down communications equipment." - icon = 'icons/obj/abductor.dmi' icon_state = "silencer" item_state = "silencer" origin_tech = "materials=4;programming=7;abductor=3" @@ -222,7 +252,7 @@ radio_off(target, user) /obj/item/abductor/silencer/proc/radio_off(atom/target, mob/living/user) - if(!(user in (viewers(7,target)))) + if(!(user in (viewers(7, target)))) return var/turf/targloc = get_turf(target) @@ -238,12 +268,85 @@ var/list/all_items = M.GetAllContents() for(var/obj/I in all_items) - if(istype(I,/obj/item/radio/)) + if(istype(I, /obj/item/radio)) var/obj/item/radio/r = I r.listening = 0 - if(!istype(I,/obj/item/radio/headset)) + if(!istype(I, /obj/item/radio/headset)) r.broadcasting = 0 //goddamned headset hacks +/obj/item/abductor/mind_device + name = "mental interface device" + desc = "A dual-mode tool for directly communicating with sentient brains. It can be used to send a direct message to a target, or to send a command to a test subject with a charged gland." + icon_state = "mind_device_message" + item_state = "silencer" + var/mode = MIND_DEVICE_MESSAGE + +/obj/item/abductor/mind_device/attack_self(mob/user) + if(!ScientistCheck(user)) + return + + if(mode == MIND_DEVICE_MESSAGE) + mode = MIND_DEVICE_CONTROL + icon_state = "mind_device_control" + else + mode = MIND_DEVICE_MESSAGE + icon_state = "mind_device_message" + to_chat(user, "You switch the device to [mode == MIND_DEVICE_MESSAGE ? "TRANSMISSION" : "COMMAND"] MODE") + +/obj/item/abductor/mind_device/afterattack(atom/target, mob/living/user, flag, params) + if(!ScientistCheck(user)) + return + + switch(mode) + if(MIND_DEVICE_CONTROL) + mind_control(target, user) + if(MIND_DEVICE_MESSAGE) + mind_message(target, user) + +/obj/item/abductor/mind_device/proc/mind_control(atom/target, mob/living/user) + if(iscarbon(target)) + var/mob/living/carbon/C = target + var/obj/item/organ/internal/heart/gland/G = C.get_organ_slot("heart") + if(!istype(G)) + to_chat(user, "Your target does not have an experimental gland!") + return + if(!G.mind_control_uses) + to_chat(user, "Your target's gland is spent!") + return + if(G.active_mind_control) + to_chat(user, "Your target is already under a mind-controlling influence!") + return + + var/command = stripped_input(user, "Enter the command for your target to follow. Uses Left: [G.mind_control_uses], Duration: [DisplayTimeText(G.mind_control_duration)]", "Enter command") + + if(!command) + return + + if(QDELETED(user) || user.get_active_hand() != src || loc != user) + return + + if(QDELETED(G)) + return + + G.mind_control(command, user) + to_chat(user, "You send the command to your target.") + +/obj/item/abductor/mind_device/proc/mind_message(atom/target, mob/living/user) + if(isliving(target)) + var/mob/living/L = target + if(L.stat == DEAD) + to_chat(user, "Your target is dead!") + return + var/message = stripped_input(user, "Write a message to send to your target's brain.", "Enter message") + if(!message) + return + if(QDELETED(L) || L.stat == DEAD) + return + + to_chat(L, "You hear a voice in your head saying: [message]") + to_chat(user, "You send the message to your target.") + log_say("[key_name(user)] sent an abductor mind message to [key_name(L)]: '[message]'", user) + /obj/item/gun/energy/alien name = "alien pistol" desc = "A complicated gun that fires bursts of high-intensity radiation." @@ -302,7 +405,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} w_class = WEIGHT_CLASS_NORMAL actions_types = list(/datum/action/item_action/toggle_mode) -/obj/item/abductor_baton/proc/toggle(mob/living/user=usr) +/obj/item/abductor_baton/proc/toggle(mob/living/user = usr) mode = (mode+1)%BATON_MODES var/txt switch(mode) @@ -475,7 +578,6 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(BATON_PROBE) to_chat(user, "The baton is in probing mode.") - /obj/item/radio/headset/abductor name = "alien headset" desc = "An advanced alien headset designed to monitor communications of human space stations. Why does it have a microphone? No one knows." @@ -553,6 +655,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} name = "resting contraption" desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?" icon = 'icons/obj/abductor.dmi' + buildstacktype = /obj/item/stack/sheet/mineral/abductor icon_state = "bed" /obj/structure/table_frame/abductor diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index ebc14225cd7..4976fbc412b 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -14,28 +14,68 @@ var/active = 0 tough = TRUE //not easily broken by combat damage + var/mind_control_uses = 1 + var/mind_control_duration = 1800 + var/active_mind_control = FALSE + /obj/item/organ/internal/heart/gland/proc/ownerCheck() if(ishuman(owner)) - return 1 + return TRUE if(!human_only && iscarbon(owner)) - return 1 - return 0 + return TRUE + return FALSE /obj/item/organ/internal/heart/gland/proc/Start() active = 1 next_activation = world.time + rand(cooldown_low,cooldown_high) +/obj/item/organ/internal/heart/gland/proc/update_gland_hud() + if(!owner) + return + var/image/holder = owner.hud_list[GLAND_HUD] + var/icon/I = icon(owner.icon, owner.icon_state, owner.dir) + holder.pixel_y = I.Height() - world.icon_size + if(active_mind_control) + holder.icon_state = "hudgland_active" + else if(mind_control_uses) + holder.icon_state = "hudgland_ready" + else + holder.icon_state = "hudgland_spent" + +/obj/item/organ/internal/heart/gland/proc/mind_control(command, mob/living/user) + if(!ownerCheck() || !mind_control_uses || active_mind_control) + return + mind_control_uses-- + to_chat(owner, "You suddenly feel an irresistible compulsion to follow an order...") + to_chat(owner, "[command]") + active_mind_control = TRUE + log_admin("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]") + update_gland_hud() + + addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration) + +/obj/item/organ/internal/heart/gland/proc/clear_mind_control() + if(!ownerCheck() || !active_mind_control) + return + to_chat(owner, "You feel the compulsion fade, and you completely forget about your previous orders.") + active_mind_control = FALSE /obj/item/organ/internal/heart/gland/remove(var/mob/living/carbon/M, special = 0) active = 0 if(initial(uses) == 1) uses = initial(uses) + var/datum/atom_hud/abductor/hud = huds[DATA_HUD_ABDUCTOR] + hud.remove_from_hud(owner) + clear_mind_control() . = ..() /obj/item/organ/internal/heart/gland/insert(var/mob/living/carbon/M, special = 0) ..() if(special != 2 && uses) // Special 2 means abductor surgery Start() + var/datum/atom_hud/abductor/hud = huds[DATA_HUD_ABDUCTOR] + hud.add_to_hud(owner) + update_gland_hud() /obj/item/organ/internal/heart/gland/on_life() if(!beating) @@ -61,9 +101,12 @@ cooldown_high = 400 uses = -1 icon_state = "health" + mind_control_uses = 3 + mind_control_duration = 3000 /obj/item/organ/internal/heart/gland/heals/activate() to_chat(owner, "You feel curiously revitalized.") + owner.adjustToxLoss(-20) owner.adjustBruteLoss(-20) owner.adjustOxyLoss(-20) owner.adjustFireLoss(-20) @@ -73,6 +116,13 @@ cooldown_high = 1200 uses = -1 icon_state = "slime" + mind_control_uses = 1 + mind_control_duration = 2400 + +/obj/item/organ/internal/heart/gland/slime/insert(mob/living/carbon/M, special = 0) + ..() + owner.faction |= "slime" + owner.add_language("Bubblish") /obj/item/organ/internal/heart/gland/slime/activate() to_chat(owner, "You feel nauseous!") @@ -84,10 +134,12 @@ /obj/item/organ/internal/heart/gland/mindshock origin_tech = "materials=4;biotech=4;magnets=6;abductor=3" - cooldown_low = 300 - cooldown_high = 300 + cooldown_low = 400 + cooldown_high = 700 uses = -1 icon_state = "mindshock" + mind_control_uses = 1 + mind_control_duration = 6000 /obj/item/organ/internal/heart/gland/mindshock/activate() to_chat(owner, "You get a headache.") @@ -96,15 +148,25 @@ for(var/mob/living/carbon/H in orange(4,T)) if(H == owner) continue - to_chat(H, "You hear a buzz in your head.") - H.AdjustConfused(20) + switch(pick(1,3)) + if(1) + to_chat(H, "You hear a loud buzz in your head, silencing your thoughts!") + H.Stun(3) + if(2) + to_chat(H, "You hear an annoying buzz in your head.") + H.AdjustConfused(15) + H.adjustBrainLoss(5, 15) + if(3) + H.hallucination += 60 /obj/item/organ/internal/heart/gland/pop cooldown_low = 900 cooldown_high = 1800 uses = -1 - human_only = 1 + human_only = TRUE icon_state = "species" + mind_control_uses = 5 + mind_control_duration = 300 /obj/item/organ/internal/heart/gland/pop/activate() to_chat(owner, "You feel unlike yourself.") @@ -117,6 +179,8 @@ cooldown_high = 2400 uses = 1 icon_state = "vent" + mind_control_uses = 4 + mind_control_duration = 1800 /obj/item/organ/internal/heart/gland/ventcrawling/activate() to_chat(owner, "You feel very stretchy.") @@ -128,6 +192,8 @@ cooldown_high = 2400 uses = 1 icon_state = "viral" + mind_control_uses = 1 + mind_control_duration = 1800 /obj/item/organ/internal/heart/gland/viral/activate() to_chat(owner, "You feel sick.") @@ -153,19 +219,24 @@ /obj/item/organ/internal/heart/gland/spiderman cooldown_low = 450 cooldown_high = 900 - uses = 10 + uses = -1 icon_state = "spider" + mind_control_uses = 2 + mind_control_duration = 2400 /obj/item/organ/internal/heart/gland/spiderman/activate() to_chat(owner, "You feel something crawling in your skin.") owner.faction |= "spiders" - new /obj/structure/spider/spiderling(owner.loc) + var/obj/structure/spider/spiderling/S = new(owner.loc) + S.master_commander = owner /obj/item/organ/internal/heart/gland/egg cooldown_low = 300 cooldown_high = 400 uses = -1 icon_state = "egg" + mind_control_uses = 2 + mind_control_duration = 1800 /obj/item/organ/internal/heart/gland/egg/activate() to_chat(owner, "You lay an egg!") @@ -173,6 +244,50 @@ egg.reagents.add_reagent("sacid",20) egg.desc += " It smells bad." +/obj/item/organ/internal/heart/gland/electric + cooldown_low = 800 + cooldown_high = 1200 + uses = -1 + mind_control_uses = 2 + mind_control_duration = 900 + +/obj/item/organ/internal/heart/gland/electric/insert(mob/living/carbon/M, special = 0) + ..() + if(ishuman(owner)) + owner.gene_stability += GENE_INSTABILITY_MODERATE // give them this gene for free + owner.dna.SetSEState(SHOCKIMMUNITYBLOCK, TRUE) + genemutcheck(owner, SHOCKIMMUNITYBLOCK, null, MUTCHK_FORCED) + +/obj/item/organ/internal/heart/gland/electric/remove(mob/living/carbon/M, special = 0) + if(ishuman(owner)) + owner.gene_stability -= GENE_INSTABILITY_MODERATE // but return it to normal once it's removed + owner.dna.SetSEState(SHOCKIMMUNITYBLOCK, FALSE) + genemutcheck(owner, SHOCKIMMUNITYBLOCK, null, MUTCHK_FORCED) + return ..() + +/obj/item/organ/internal/heart/gland/electric/activate() + owner.visible_message("[owner]'s skin starts emitting electric arcs!",\ + "You feel electric energy building up inside you!") + playsound(get_turf(owner), "sparks", 100, 1, -1) + addtimer(CALLBACK(src, .proc/zap), rand(30, 100)) + +/obj/item/organ/internal/heart/gland/electric/proc/zap() + tesla_zap(owner, 4, 8000) + playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, 1) + +/obj/item/organ/internal/heart/gland/chem + cooldown_low = 50 + cooldown_high = 50 + uses = -1 + mind_control_uses = 3 + mind_control_duration = 1200 + +/obj/item/organ/internal/heart/gland/chem/activate() + var/chem_to_add = get_random_reagent_id() + owner.reagents.add_reagent(chem_to_add, 2) + owner.adjustToxLoss(-2, TRUE, TRUE) + ..() + /obj/item/organ/internal/heart/gland/bloody cooldown_low = 200 cooldown_high = 400 @@ -257,6 +372,8 @@ cooldown_high = 1800 origin_tech = "materials=4;biotech=4;plasmatech=6;abductor=3" uses = -1 + mind_control_uses = 1 + mind_control_duration = 800 /obj/item/organ/internal/heart/gland/plasma/activate() spawn(0) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index 10cd5473279..0e8c4d3c409 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -54,21 +54,22 @@ dat += "Agent Vest
" dat += "Radio Silencer
" dat += "Science Tool
" + dat += "Mental Interface Device
" else dat += "NO EXPERIMENT MACHINE DETECTED
" - if(pad!=null) + if(pad) dat += "Emergency Teleporter System." dat += "Consider using primary observation console first." dat += "Activate Teleporter
" - if(gizmo!=null && gizmo.marked!=null) + if(gizmo && gizmo.marked) dat += "Retrieve Mark
" else dat += "Retrieve Mark
" else dat += "NO TELEPAD DETECTED
" - if(vest!=null) + if(vest) dat += "

Agent Vest Mode


" var/mode = vest.mode if(mode == VEST_STEALTH) @@ -100,13 +101,14 @@ else if(href_list["flip_vest"]) FlipVest() else if(href_list["toggle_vest"]) - toggle_vest() + if(vest) + vest.toggle_nodrop() else if(href_list["select_disguise"]) SelectDisguise() else if(href_list["dispense"]) switch(href_list["dispense"]) if("baton") - Dispense(/obj/item/abductor_baton,cost=2) + Dispense(/obj/item/abductor_baton, cost = 2) if("helmet") Dispense(/obj/item/clothing/head/helmet/abductor) if("silencer") @@ -115,19 +117,21 @@ Dispense(/obj/item/abductor/gizmo) if("vest") Dispense(/obj/item/clothing/suit/armor/abductor/vest) + if("mind_device") + Dispense(/obj/item/abductor/mind_device, cost = 2) updateUsrDialog() /obj/machinery/abductor/console/proc/TeleporterRetrieve() - if(gizmo!=null && pad!=null && gizmo.marked) + if(pad && gizmo && gizmo.marked) pad.Retrieve(gizmo.marked) /obj/machinery/abductor/console/proc/TeleporterSend() - if(pad!=null) + if(pad) pad.Send() /obj/machinery/abductor/console/proc/FlipVest() - if(vest!=null) + if(vest) vest.flip_mode() /obj/machinery/abductor/console/proc/SelectDisguise(remote = 0) @@ -175,21 +179,36 @@ return disguises[entry.name] = entry +/obj/machinery/abductor/console/proc/AddGizmo(obj/item/abductor/gizmo/G) + if(G == gizmo && G.console == src) + return FALSE + + if(G.console) + G.console.gizmo = null + + gizmo = G + G.console = src + return TRUE + +/obj/machinery/abductor/console/proc/AddVest(obj/item/clothing/suit/armor/abductor/vest/V) + if(vest == V) + return FALSE + + for(var/obj/machinery/abductor/console/C in machines) + if(C.vest == V) + C.vest = null + break + + vest = V + return TRUE + /obj/machinery/abductor/console/attackby(obj/O, mob/user, params) - if(istype(O, /obj/item/abductor/gizmo)) - var/obj/item/abductor/gizmo/G = O + if(istype(O, /obj/item/abductor/gizmo) && AddGizmo(O)) to_chat(user, "You link the tool to the console.") - gizmo = G - G.console = src - else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest)) - var/obj/item/clothing/suit/armor/abductor/vest/V = O + else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest) && AddVest(O)) to_chat(user, "You link the vest to the console.") - if(istype(vest)) - if(vest.flags & NODROP) - toggle_vest() - vest = V else - ..() + return ..() /obj/machinery/abductor/console/proc/Dispense(item,cost=1) if(experiment && experiment.credits >= cost) @@ -201,10 +220,4 @@ else new item(src.loc) else - atom_say("Insufficent data!") - -/obj/machinery/abductor/console/proc/toggle_vest() - vest.flags ^= NODROP - var/mob/M = vest.loc - if(istype(M)) - to_chat(M, "[src] is now [vest.flags & NODROP ? "locked" : "unlocked"].") \ No newline at end of file + atom_say("Insufficent data!") \ No newline at end of file diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 9e07c9c04a9..1a377667650 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -3,8 +3,8 @@ desc = "A tank filled with replacement organs" icon = 'icons/obj/abductor.dmi' icon_state = "dispenser" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/list/gland_types var/list/gland_colors var/list/amounts @@ -49,7 +49,7 @@ var/g_color = gland_colors[i] var/amount = amounts[i] dat += "[amount]" - if(item_count == 3) // Three boxes per line + if(item_count == 4) // Three boxes per line dat +="

" item_count = 0 var/datum/browser/popup = new(user, "glands", "Gland Dispenser", 200, 200) @@ -68,7 +68,7 @@ if(gland_types[i] == W.type) amounts[i]++ else - ..() + return ..() /obj/machinery/abductor/gland_dispenser/Topic(href, href_list) if(..()) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 3b339ad7c40..53969aaf7d1 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -3,8 +3,8 @@ desc = "A large man-sized tube sporting a complex array of surgical apparatus." icon = 'icons/obj/abductor.dmi' icon_state = "experiment-open" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE var/points = 0 var/credits = 0 var/list/history = list() @@ -137,6 +137,7 @@ to_chat(H, "You feel intensely watched.") sleep(5) to_chat(H, "Your mind snaps!") + to_chat(H, "You can't remember how you got here...") var/objtype = pick(subtypesof(/datum/objective/abductee/)) var/datum/objective/abductee/O = new objtype() ticker.mode.abductees += H.mind diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index a7fcc6874a2..96693a0d086 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -1,7 +1,7 @@ var/global/default_martial_art = new/datum/martial_art /mob/living/carbon/human - hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPMINDSHIELD_HUD,IMPCHEM_HUD,IMPTRACK_HUD,SPECIALROLE_HUD,NATIONS_HUD) + hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPMINDSHIELD_HUD,IMPCHEM_HUD,IMPTRACK_HUD,SPECIALROLE_HUD,NATIONS_HUD,GLAND_HUD) //Marking colour and style var/list/m_colours = DEFAULT_MARKING_COLOURS //All colours set to #000000. diff --git a/code/modules/mob/living/carbon/human/species/abductor.dm b/code/modules/mob/living/carbon/human/species/abductor.dm index d50be2e73e8..c205cb6d033 100644 --- a/code/modules/mob/living/carbon/human/species/abductor.dm +++ b/code/modules/mob/living/carbon/human/species/abductor.dm @@ -36,4 +36,11 @@ H.gender = NEUTER H.languages.Cut() //Under no condition should you be able to speak any language H.add_language("Abductor Mindlink") //other than over the abductor's own mindlink - return ..() \ No newline at end of file + var/datum/atom_hud/abductor_hud = huds[DATA_HUD_ABDUCTOR] + abductor_hud.add_hud_to(H) + return ..() + +/datum/species/abductor/remove_abilities(mob/living/carbon/human/H) + ..() + var/datum/atom_hud/abductor_hud = huds[DATA_HUD_ABDUCTOR] + abductor_hud.remove_hud_from(H) \ No newline at end of file diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index f3fe28315f6..234c5ac2274 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -342,7 +342,8 @@ h1.alert, h2.alert {color: #000000;} .clown {color: #ff0000;} .shadowling {color: #3b2769;} .vulpkanin {color: #B97A57;} -.abductor {color: #800080;} +.abductor {color: #800080; font-style: italic;} +.mind_control {color: #A00D6F; font-size: 3; font-weight: bold; font-style: italic;} .rough {font-family: 'Trebuchet MS', cursive, sans-serif;} .say_quote {font-family: Georgia, Verdana, sans-serif;} .cult {color: #800080; font-weight: bold; font-style: italic;} diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 760e82458d8f47194475afd7cc7a9a4715b9c613..b4dea0cfa36482c56dac07680a4d185bab5034ab 100644 GIT binary patch literal 14695 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 E076+;R{#J2 literal 14509 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 ZQ0Z&TPjdS7Qy}0UOkL-0nW|Or{{d5ny{Z5J diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi index 2adfdba567084bd918068fdb5515190fe7b6d6b1..f20b190ce76189c881954183e307e57edade92b6 100644 GIT binary patch delta 8730 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 T@ Date: Tue, 24 Jul 2018 23:14:05 -0400 Subject: [PATCH 2/4] new tools --- _maps/map_files/cyberiad/z2.dmm | 5 +-- .../miniantags/abduction/abduction_gear.dm | 21 ++++++++++++ .../research/designs/medical_designs.dm | 30 ++++++++++++++++++ icons/obj/abductor.dmi | Bin 57606 -> 58701 bytes 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm index 4c9573b8e7e..e7bd86f366e 100644 --- a/_maps/map_files/cyberiad/z2.dmm +++ b/_maps/map_files/cyberiad/z2.dmm @@ -919,6 +919,7 @@ "rI" = (/obj/machinery/computer/security/telescreen{name = "Special Ops. Monitor"; desc = "Used for watching the Special Ops."; network = list("ERT")},/obj/structure/table/wood,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/specops) "rJ" = (/obj/machinery/door_control{desc = "A remote control switch to block view of the singularity."; icon_state = "doorctrl0"; id = "SPECOPS"; name = "Ready Room"; pixel_x = -6; pixel_y = 6; req_access_txt = "114"},/obj/machinery/door_control{desc = "A remote control switch to block view of the singularity."; icon_state = "doorctrl0"; id = "specopsoffice"; name = "Privacy Shutters"; pixel_x = 6; pixel_y = -6; req_access_txt = "114"},/obj/machinery/door_control{desc = "A remote control switch to block view of the singularity."; icon_state = "doorctrl0"; id = "CCGAMMA"; name = "Gamma Lockdown"; pixel_x = -6; pixel_y = -6; req_access_txt = "114"},/obj/structure/table/wood,/turf/unsimulated/floor{dir = 8; icon_state = "carpetside"},/area/centcom/specops) "rK" = (/turf/unsimulated/wall/splashscreen,/area/start) +"rL" = (/obj/structure/table/abductor,/obj/item/bonegel/alien,/obj/item/bonesetter/alien,/obj/item/FixOVein/alien,/obj/item/surgicaldrill/alien,/obj/item/circular_saw/alien,/turf/unsimulated/floor/abductor,/area/abductor_ship) "sq" = (/turf/unsimulated/wall,/area/centcom/control) "sr" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) "ss" = (/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) @@ -1731,7 +1732,7 @@ aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkwkykxkxkxkAkzaNkwkDkxkxkxkAkzaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNDtDAHlHmHnDAHoFvFvHpDAHqHrHsHpDwGaDKDKDAaNaNaNHtHuHvHwHtaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkEkGkFkIkHkNkMaNkEkGkOkIkPkNkMaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNHAFvFvFvHBFvFvFvFvHCFvFvFvFvHCDKDKDKDAaNaNEMDwDwHDDwDwEnaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkQkRkxkxkxkAkSaNkQkRkxkxkxkAkSaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEMDAHLdacZDAGVFvFvGWDAHOHPHQGWDwEIDKDKDAaNaNaNEMaNaNaNEnaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN -aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkUlikVlkljlmllaNkUlikVlkljlmllaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEMDwDwDwDwGZHVHWDADwDwDwDwEnaNDIDKDKDAaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN +aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkUlikVrLljlmllaNkUlikVlkljlmllaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEMDwDwDwDwGZHVHWDADwDwDwDwEnaNDIDKDKDAaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNlylnlAlzlFaNaNaNlylnlAlzlFaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEMaNaNEMDAGXIbDAEnaNaNaNaNaNEfDKDKDAaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEMDwDwEnaNDtDxDyDyDzGaDKDKDAaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNjQjPjSjRjTaNaNaNjQjPjSjRjTaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNDIDKDKDKDKDKDKDKDAaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN @@ -1739,7 +1740,7 @@ aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkwlRkxkxkxkAkzaNkwlSkxkxkxkAkzaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEMDwDwDMIqDMDwDwEnaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkEkGlTkIlUkNkMaNkEkGlVkIlYkNkMaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNDAItDKDKDKIuDAaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkQkRkxkxkxkAkSaNkQkRkxkxkxkAkSaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNDIDKDKDKDKlKDIaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN -aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkUlikVlkljlmllaNkUlikVlkljlmllaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNDNIADKDKDKIBDNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN +aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNkUlikVrLljlmllaNkUlikVrLljlmllaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNDNIADKDKDKIBDNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNlylnlAlzlFaNaNaNlylnlAlzlFaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEfICDKDKDKIDEfaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFZFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEMDwIFIGIHmsIJDwEnaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN aNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLFLaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNEMDwDxDyDzDwEnaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index f16028c35ba..97e0d8b8860 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -639,6 +639,27 @@ Congratulations! You are now trained for invasive xenobiology research!"} origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 +/obj/item/bonegel/alien + name = "alien bone gel" + desc = "It smells like duct tape." + icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" + toolspeed = 0.25 + +/obj/item/FixOVein/alien + name = "alien FixOVein" + desc = "Bloodless aliens would totally know how to stop internal bleeding...right?" + icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" + toolspeed = 0.25 + +/obj/item/bonesetter/alien + name = "alien bone setter" + desc = "You're not sure you want to know whether or not aliens have bones." + icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" + toolspeed = 0.25 + /obj/item/clothing/head/helmet/abductor name = "agent headgear" desc = "Abduct with style - spiky style. Prevents digital tracking." diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 638a614fc85..a7fe42063ff 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -245,6 +245,36 @@ materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500) category = list("Medical") +/datum/design/alienbonegel + name = "Alien Bone Gel" + desc = "Advanced bone gel obtained through Abductor technology." + id = "alien_bonegel" + req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3) + build_path = /obj/item/bonegel/alien + build_type = PROTOLATHE + materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500) + category = list("Medical") + +/datum/design/alienbonesetter + name = "Alien Bone Setter" + desc = "An advanced bone setter obtained through Abductor technology." + id = "alien_bonesetter" + req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3) + build_path = /obj/item/bonesetter/alien + build_type = PROTOLATHE + materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500) + category = list("Medical") + +/datum/design/alienfixovein + name = "Alien FixOVein" + desc = "An advanced FixOVein obtained through Abductor technology." + id = "alien_fixovein" + req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3) + build_path = /obj/item/FixOVein/alien + build_type = PROTOLATHE + materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500) + category = list("Medical") + ///////////////////////////////////////// //////////Cybernetic Implants//////////// ///////////////////////////////////////// diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi index f20b190ce76189c881954183e307e57edade92b6..f556369cf69ab9f3a4360801e6baf58f87578e7b 100644 GIT binary patch delta 9817 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 F{s$qz(*pni delta 8714 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 b_1?d1y`jvb+Z^x^fIiAkHRMZV&4d0QqN3sC From fc89432b3654f81c35eae8851759c694d95ccec7 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Wed, 25 Jul 2018 00:31:57 -0400 Subject: [PATCH 3/4] update --- code/__DEFINES/misc.dm | 2 + code/datums/diseases/_disease.dm | 2 + .../gamemodes/miniantags/abduction/gland.dm | 47 +++++++++++++------ .../food_and_drinks/food/foods/meat.dm | 10 ++++ 4 files changed, 46 insertions(+), 15 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 21bcd079d8b..c730d883e28 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -371,3 +371,5 @@ #define GET_RANDOM_JOB 0 #define BE_ASSISTANT 1 #define RETURN_TO_LOBBY 2 + +#define EGG_LAYING_MESSAGES list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.") \ No newline at end of file diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 571a0d7aa7b..9414a079e80 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -1,4 +1,6 @@ +#define VIRUS_SYMPTOM_LIMIT 6 + //Visibility Flags #define HIDDEN_SCANNER 1 #define HIDDEN_PANDEMIC 2 diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 4976fbc412b..3ff2f678fcf 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -59,6 +59,7 @@ return to_chat(owner, "You feel the compulsion fade, and you completely forget about your previous orders.") active_mind_control = FALSE + update_gland_hud() /obj/item/organ/internal/heart/gland/remove(var/mob/living/carbon/M, special = 0) active = 0 @@ -197,20 +198,39 @@ /obj/item/organ/internal/heart/gland/viral/activate() to_chat(owner, "You feel sick.") - var/virus_type = pick(/datum/disease/beesease, /datum/disease/brainrot, /datum/disease/magnitis) - var/datum/disease/D = new virus_type() - D.carrier = TRUE - owner.viruses += D - D.affected_mob = owner - owner.med_hud_set_status() + var/datum/disease/advance/A = random_virus(pick(2, 6), 6) + A.carrier = TRUE + owner.ForceContractDisease(A) + +/obj/item/organ/internal/heart/gland/viral/proc/random_virus(max_symptoms, max_level) + if(max_symptoms > VIRUS_SYMPTOM_LIMIT) + max_symptoms = VIRUS_SYMPTOM_LIMIT + var/datum/disease/advance/A = new /datum/disease/advance() + var/list/datum/symptom/possible_symptoms = list() + for(var/symptom in subtypesof(/datum/symptom)) + var/datum/symptom/S = symptom + if(initial(S.level) > max_level) + continue + if(initial(S.level) <= 0) //unobtainable symptoms + continue + possible_symptoms += S + for(var/i in 1 to max_symptoms) + var/datum/symptom/chosen_symptom = pick_n_take(possible_symptoms) + if(chosen_symptom) + var/datum/symptom/S = new chosen_symptom + A.symptoms += S + A.Refresh() //just in case someone already made and named the same disease + return A /obj/item/organ/internal/heart/gland/emp //TODO : Replace with something more interesting origin_tech = "materials=4;biotech=4;magnets=6;abductor=3" - cooldown_low = 900 - cooldown_high = 1600 + cooldown_low = 800 + cooldown_high = 1200 uses = 10 icon_state = "emp" + mind_control_uses = 3 + mind_control_duration = 1800 /obj/item/organ/internal/heart/gland/emp/activate() to_chat(owner, "You feel a spike of pain in your head.") @@ -239,10 +259,8 @@ mind_control_duration = 1800 /obj/item/organ/internal/heart/gland/egg/activate() - to_chat(owner, "You lay an egg!") - var/obj/item/reagent_containers/food/snacks/egg/egg = new(owner.loc) - egg.reagents.add_reagent("sacid",20) - egg.desc += " It smells bad." + owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]") + new /obj/item/reagent_containers/food/snacks/egg/gland(get_turf(owner)) /obj/item/organ/internal/heart/gland/electric cooldown_low = 800 @@ -283,9 +301,8 @@ mind_control_duration = 1200 /obj/item/organ/internal/heart/gland/chem/activate() - var/chem_to_add = get_random_reagent_id() - owner.reagents.add_reagent(chem_to_add, 2) - owner.adjustToxLoss(-2, TRUE, TRUE) + owner.reagents.add_reagent(get_random_reagent_id(), 2) + owner.adjustToxLoss(-2) ..() /obj/item/organ/internal/heart/gland/bloody diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index c59b6b9b1ee..a7f4acb4405 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -324,6 +324,16 @@ icon_state = "egg-yellow" item_color = "yellow" +/obj/item/reagent_containers/food/snacks/egg/gland + desc = "An egg! It looks weird..." + +/obj/item/reagent_containers/food/snacks/egg/gland/New() + ..() + reagents.add_reagent(get_random_reagent_id(), 15) + + var/reagent_color = mix_color_from_reagents(reagents.reagent_list) + color = reagent_color + /obj/item/reagent_containers/food/snacks/friedegg name = "Fried egg" desc = "A fried egg, with a touch of salt and pepper." From 4f10f52c7e223257e76a75ce542d6feeead07f03 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 27 Jul 2018 14:51:04 -0400 Subject: [PATCH 4/4] tweaks --- code/__DEFINES/misc.dm | 4 +--- code/_globalvars/lists/misc.dm | 4 +++- code/game/gamemodes/miniantags/abduction/abduction_gear.dm | 2 +- code/game/gamemodes/miniantags/abduction/gland.dm | 2 +- .../modules/mob/living/simple_animal/friendly/farm_animals.dm | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index c730d883e28..67a187c45db 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -370,6 +370,4 @@ // used for alternate_option #define GET_RANDOM_JOB 0 #define BE_ASSISTANT 1 -#define RETURN_TO_LOBBY 2 - -#define EGG_LAYING_MESSAGES list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.") \ No newline at end of file +#define RETURN_TO_LOBBY 2 \ No newline at end of file diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm index 148488a6ddf..65bffa7515a 100644 --- a/code/_globalvars/lists/misc.dm +++ b/code/_globalvars/lists/misc.dm @@ -31,4 +31,6 @@ var/list/round_end_sounds = list( // Maps available round end sounds to their du 'sound/goonstation/misc/newround2.ogg' = 14.8 SECONDS ) -GLOBAL_LIST(station_level_space_turfs) \ No newline at end of file +GLOBAL_LIST(station_level_space_turfs) + +#define EGG_LAYING_MESSAGES list("lays an egg.", "squats down and croons.", "begins making a huge racket.", "begins clucking raucously.") \ No newline at end of file diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 97e0d8b8860..c8539b568db 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -159,7 +159,7 @@ if(!ScientistCheck(user)) return if(!console) - to_chat(user, "The device is not linked to console!") + to_chat(user, "The device is not linked to a console!") return if(mode == GIZMO_SCAN) diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 3ff2f678fcf..8f058a872e6 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -167,7 +167,7 @@ human_only = TRUE icon_state = "species" mind_control_uses = 5 - mind_control_duration = 300 + mind_control_duration = 3000 /obj/item/organ/internal/heart/gland/pop/activate() to_chat(owner, "You feel unlike yourself.") 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 a8784a6d150..370418134c3 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -234,7 +234,7 @@ var/global/chicken_count = 0 can_hide = 1 can_collar = 1 var/list/feedMessages = list("It clucks happily.","It clucks happily.") - var/list/layMessage = list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.") + var/list/layMessage = EGG_LAYING_MESSAGES var/list/validColors = list("brown","black","white") gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY