\ -
- You can also click on the word to preview it. \ -
- You can only say 30 words for every announcement. \ -
- Do not use punctuation as you would normally, if you want a pause you can use the full stop and comma characters by separating them with spaces, like so: 'Alpha . Test , Bravo'.
Misuse of the announcement system will get you job banned.
" - var/index = 0 - var/list/vox_words = flist(VOX_PATH) // flist will return a list of strings with all the files in the path - for(var/word in vox_words) - index++ - var/stripped_word = copytext(word, 1, length(word) - 3) // Remove the .wav - dat += "[capitalize(stripped_word)]" - if(index != vox_words.len) - dat += " / " + var/dat = "Here is a list of words you can type into the 'Announcement' button to create sentences to vocally announce to everyone on the same level at you.
\ +
- You can also click on the word to preview it. \ +
- You can only say 30 words for every announcement. \ +
- Do not use punctuation as you would normally, if you want a pause you can use the full stop and comma characters by separating them with spaces, like so: 'Alpha . Test , Bravo'.
Misuse of the announcement system will get you job banned.
" - src << browse(dat, "window=announce_help;size=500x400") + var/index = 0 + for(var/word in vox_sounds) + index++ + dat += "[capitalize(word)]" + if(index != vox_sounds.len) + dat += " / " + + var/datum/browser/popup = new(src, "announce_help", "Announcement Help", 500, 400) + popup.set_content(dat) + popup.open() /mob/living/silicon/ai/verb/announcement() - set name = "Announcement" - set desc = "Create a vocal announcement by typing in the available words to create a sentence." - set category = "AI Commands" + set name = "Announcement" + set desc = "Create a vocal announcement by typing in the available words to create a sentence." + set category = "AI Commands" - if(announcing_vox > world.time) - src << "Please wait [round((announcing_vox - world.time) / 10)] seconds." - return + if(announcing_vox > world.time) + src << "Please wait [round((announcing_vox - world.time) / 10)] seconds." + return - var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", src.last_announcement) as text + var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", src.last_announcement) as text - last_announcement = message + last_announcement = message - if(!message || announcing_vox > world.time) - return + if(!message || announcing_vox > world.time) + return - var/list/words = stringsplit(trim(message), " ") - var/list/incorrect_words = list() + var/list/words = stringsplit(trim(message), " ") + var/list/incorrect_words = list() - if(words.len > 30) - words.len = 30 + if(words.len > 30) + words.len = 30 - // Detect incorrect words which aren't .wav files. + for(var/word in words) + word = trim(word) + if(!word) + words -= word + continue + if(!vox_sounds[word]) + incorrect_words += word - for(var/word in words) - word = trim(word) - if(!word) - words -= word - continue - if(!vox_word_exists(word)) - incorrect_words += word + if(incorrect_words.len) + src << "These words are not available on the announcement system: [english_list(incorrect_words)]." + return - if(incorrect_words.len) - src << "These words are not available on the announcement system: [english_list(incorrect_words)]." - return + announcing_vox = world.time + VOX_DELAY - announcing_vox = world.time + VOX_DELAY + log_game("[key_name_admin(src)] made a vocal announcement with the following message: [message].") - log_game("[key_name_admin(src)] made a vocal announcement with the following message: [message].") + for(var/word in words) + play_vox_word(word, src.z, null) - for(var/word in words) - play_vox_word(word, src.z, null) /proc/play_vox_word(var/word, var/z_level, var/mob/only_listener) - word = lowertext(word) + word = lowertext(word) - if(vox_word_exists(word)) + if(vox_sounds[word]) - var/sound_file = get_vox_file(word) - var/sound/voice = sound(sound_file, wait = 1, channel = VOX_CHANNEL) - voice.status = SOUND_STREAM + var/sound_file = vox_sounds[word] + var/sound/voice = sound(sound_file, wait = 1, channel = VOX_CHANNEL) + voice.status = SOUND_STREAM -// If there is no single listener, broadcast to everyone in the same z level - if(!only_listener) - // Play voice for all mobs in the z level - for(var/mob/M in player_list) - if(M.client) - var/turf/T = get_turf(M) - if(T.z == z_level) - M << voice - else - only_listener << voice - return 1 - return 0 + // If there is no single listener, broadcast to everyone in the same z level + if(!only_listener) + // Play voice for all mobs in the z level + for(var/mob/M in player_list) + if(M.client) + var/turf/T = get_turf(M) + if(T.z == z_level) + M << voice + else + only_listener << voice + return 1 + return 0 -/proc/vox_word_exists(var/word) - return fexists("[VOX_PATH][word].wav") - -/proc/get_vox_file(var/word) - if(vox_word_exists(word)) - return file("[VOX_PATH][word].wav") - -// Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable. -// We send the file to the user when they login. - -/client/proc/preload_vox() - var/list/vox_files = flist(VOX_PATH) - for(var/file in vox_files) - // src << "Downloading [file]" - var/sound/S = sound("[VOX_PATH][file]") - src << browse_rsc(S) \ No newline at end of file +// VOX sounds moved to /code/defines/vox_sounds.dm \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index f6bef71393b..9041d7e3480 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -7,6 +7,9 @@ return var/msg = "*---------*\nThis is \icon[src] \a [src][custom_name ? ", [modtype] [braintype]" : ""]!\n" + var/obj/act_module = get_active_hand() + if(act_module) + msg += "It is holding \icon[act_module] \a [act_module].\n" msg += "" if (src.getBruteLoss()) if (src.getBruteLoss() < 75) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f2a47b56f98..c9f72e0e019 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1035,38 +1035,41 @@ if(!module) pick_module() return - var/dat = "
Activated Modules
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
-
- Installed Modules
"} - +
| Module 1: | [module_state_1 ? "[module_state_1]" : "No Module"] |
| Module 2: | [module_state_2 ? "[module_state_2]" : "No Module"] |
| Module 3: | [module_state_3 ? "[module_state_3]" : "No Module"] |
+ Installed Modules
+
| Resource depleted | |
| [obj] | Activated |
| [obj] | Activate |
| [module.emag] | Activated |
| [module.emag] | Activate |
") else dat += text("[obj]: \[Activate | Deactivated\]
") */ - src << browse(dat, "window=robotmod&can_close=0") + var/datum/browser/popup = new(src, "robotmod", "Modules") + popup.set_content(dat) + popup.open() /mob/living/silicon/robot/Topic(href, href_list) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index ab4080ed501..4066a45a82a 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -172,7 +172,7 @@ src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src) src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src) src.modules += new /obj/item/weapon/pen/robopen(src) - + src.modules += new /obj/item/device/violin(src) var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src) M.matter = 30 src.modules += M diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 29f4223a8e6..bee64e60c36 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -170,7 +170,7 @@ src << "You are too small to pull anything." return -/mob/living/simple_animal/mouse/HasEntered(AM as mob|obj) +/mob/living/simple_animal/mouse/Crossed(AM as mob|obj) if( ishuman(AM) ) if(!stat) var/mob/M = AM diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm index 6e8b9b84904..c31082cdc59 100644 --- a/code/modules/mob/living/simple_animal/hostile/russian.dm +++ b/code/modules/mob/living/simple_animal/hostile/russian.dm @@ -38,7 +38,7 @@ icon_state = "russianranged" icon_living = "russianranged" corpse = /obj/effect/landmark/mobcorpse/russian/ranged - weapon1 = /obj/item/weapon/gun/projectile/mateba + weapon1 = /obj/item/weapon/gun/projectile/revolver/mateba ranged = 1 projectiletype = /obj/item/projectile/bullet projectilesound = 'sound/weapons/Gunshot.ogg' diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 0ef8269f138..60a7b107081 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -369,10 +369,10 @@ new_character = new /mob/living/carbon/human/vox(loc) if("Kidan") new_character = new /mob/living/carbon/human/kidan(loc) - if("Skellington") - new_character = new /mob/living/carbon/human/skellington(loc) + if("Grey") + new_character = new /mob/living/carbon/human/grey(loc) if("Human") - new_character = new /mob/living/carbon/human(loc) + new_character = new /mob/living/carbon/human/human(loc) // new_character.set_species(client.prefs.species) if(chosen_species.language) new_character.add_language(chosen_species.language) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 316541ddb23..73a75b9545b 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -51,7 +51,7 @@ name = "Bald" icon_state = "bald" gender = MALE - species_allowed = list("Human","Unathi","Vox","Diona","Skellington","Kidan") + species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Greys") short name = "Short Hair" // try to capatilize the names please~ @@ -305,7 +305,7 @@ name = "Shaved" icon_state = "bald" gender = NEUTER - species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Diona","Skellington","Kidan") + species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Diona","Kidan","Greys") watson name = "Watson Mustache" diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 02467ae4e14..f6c57b8989f 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -172,8 +172,15 @@ O.loc = loc O.job = "Cyborg" - O.mmi = new /obj/item/device/mmi(O) - O.mmi.transfer_identity(src)//Does not transfer key/client. + if(O.mind.assigned_role == "Cyborg") + if(O.mind.role_alt_title == "Android") + O.mmi = new /obj/item/device/mmi/posibrain(O) + if(O.mind.role_alt_title == "Robot") + O.mmi = new /obj/item/device/mmi/posibrain(O) //Ravensdale wants a circuit based brain for another robot class, this is a placeholder. + else + O.mmi = new /obj/item/device/mmi(O) + O.mmi.transfer_identity(src)//Does not transfer key/client. + O.Namepick() @@ -373,48 +380,3 @@ return 1 // ZOMG PONIES WHEEE //Not in here? Must be untested! return 0 - - -/* - -//////////////////////Grutor: -/////////////////////Zombie tranformation into NPC type zombie////////////// -////////////////////I'm very certain we can just remove player key////////// -////////////////move it to AI control instead and change body icon////////// -////////////////////////to zombie. But o'well lol////////////////////////// -/mob/living/carbon/human/proc/Turnundead() - if (monkeyizing) - return - for(var/obj/item/W in src) - drop_from_inventory(W) //should be replace with look for something that can transfer items - regenerate_icons() - monkeyizing = 1 - canmove = 0 - icon = null - invisibility = 101 - for(var/t in organs) //this really should not be necessary - del(t) - - var/mob/living/simple_animal/hostile/new_zombie = new /mob/living/simple_animal/hostile/zombie (src.loc) - - new_zombie.name = "Zombie \red[name]" - new_zombie.desc = "A person that has fallen victim to cannibles." - new_zombie.loc = loc - //If you wish everything from here to there can be edited out... - new_zombie.dna = dna //Don't know why I did this, you can't prick em with a needle - if(src.viruses) //Checks and see if the source has any viruses - for(var/datum/disease/tempvirus in new_zombie.viruses) //retrieves anything of disease type - tempvirus.cure(0) //For each virus found cure it - //One day we will need this... - for(var/datum/disease/cv in src.viruses) - new_zombie.viruses += cv //Add/assign the list to the zombie - cv.affected_mob = new_zombie //Change the copy's var to zombie - cv.strain_data = cv.strain_data.Copy() //what? line 520 does this already.... - cv.holder = new_zombie //new_zombie is holder of the virus - cv.carrier = 1 - //Edit from there to hear if you wish. - spawn(0)//To prevent the proc from returning null. - del(src) - return - -*/ \ No newline at end of file diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b599c9fe7e0..cce7953c544 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -270,7 +270,7 @@ return //Bone fracurtes - if(config.bones_can_break && brute_dam > min_broken_damage * config.organ_health_multiplier && !(status & (ORGAN_ROBOT|ORGAN_PEG))) + if(config.bones_can_break && brute_dam > min_broken_damage * config.organ_health_multiplier && !(status & (ORGAN_ROBOT|ORGAN_PEG)) && !(istype(owner, /mob/living/carbon/human/slime))) src.fracture() if(!(status & ORGAN_BROKEN)) perma_injury = 0 diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 9b0a931a838..79df43cfdcc 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -13,6 +13,8 @@ var/copies = 1 //how many copies to print! var/toner = 30 //how much toner is left! woooooo~ var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier! + var/mob/living/ass = null + attack_ai(mob/user as mob) return attack_hand(user) @@ -24,7 +26,7 @@ user.set_machine(src) var/dat = "Photocopier
" - if(copy || photocopy) + if(copy || photocopy || (ass && (ass.loc == src.loc))) dat += "Remove Paper
" if(toner) dat += "Copy
" @@ -85,6 +87,36 @@ else break updateUsrDialog() + else if(ass) //ASS COPY. By Miauw + for(var/i = 0, i < copies, i++) + var/icon/temp_img + if(ishuman(ass) && (ass.get_item_by_slot(slot_w_uniform) || ass.get_item_by_slot(slot_wear_suit))) + usr << "You feel kind of silly copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on." + else if(toner >= 5 && check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on. + if(isalien(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro. + temp_img = icon('icons/ass/assalien.png') + else if(ishuman(ass)) //Suit checks are in check_ass + if(ass.gender == MALE) + temp_img = icon('icons/ass/assmale.png') + else if(ass.gender == FEMALE) + temp_img = icon('icons/ass/assfemale.png') + else //In case anyone ever makes the generic ass. For now I'll be using male asses. + temp_img = icon('icons/ass/assmale.png') + else + break + var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (loc) + p.desc = "You see [ass]'s ass on the photo." + p.pixel_x = rand(-10, 10) + p.pixel_y = rand(-10, 10) + p.img = temp_img + var/icon/small_img = icon(temp_img) //Icon() is needed or else temp_img will be rescaled too >.> + var/icon/ic = icon('icons/obj/items.dmi',"photo") + small_img.Scale(8, 8) + ic.Blend(small_img,ICON_OVERLAY, 10, 13) + p.icon = ic + toner -= 5 + sleep(15) + updateUsrDialog() else if(href_list["remove"]) if(copy) copy.loc = usr.loc @@ -98,6 +130,8 @@ usr << "You take the photo out of \the [src]." photocopy = null updateUsrDialog() + else if(check_ass()) + ass << "You feel a slight pressure on your ass." else if(href_list["min"]) if(copies > 1) copies-- @@ -119,7 +153,7 @@ else user << "There is already something in \the [src]." else if(istype(O, /obj/item/weapon/photo)) - if(!copy && !photocopy) + if(copier_empty()) user.drop_item() photocopy = O O.loc = src @@ -129,7 +163,7 @@ else user << "There is already something in \the [src]." else if(istype(O, /obj/item/device/toner)) - if(toner == 0) + if(toner <= 0) user.drop_item() del(O) toner = 30 @@ -141,6 +175,20 @@ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored user << "You [anchored ? "wrench" : "unwrench"] \the [src]." + else if(istype(O, /obj/item/weapon/grab)) //For ass-copying. + var/obj/item/weapon/grab/G = O + if(ismob(G.affecting) && G.affecting != ass) + var/mob/GM = G.affecting + visible_message("[usr] drags [GM.name] onto the photocopier!") + GM.loc = get_turf(src) + ass = GM + if(photocopy) + photocopy.loc = src.loc + photocopy = null + else if(copy) + copy.loc = src.loc + copy = null + updateUsrDialog() return ex_act(severity) @@ -170,6 +218,50 @@ toner = 0 return +/obj/machinery/photocopier/MouseDrop_T(mob/target, mob/user) + check_ass() //Just to make sure that you can re-drag somebody onto it after they moved off. + if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass) + return + src.add_fingerprint(user) + if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis) + visible_message("[usr] jumps onto the photocopier!") + else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) + if(target.anchored) return + if(!ishuman(user) && !ismonkey(user)) return + visible_message("[usr] drags [target.name] onto the photocopier!") + target.loc = get_turf(src) + ass = target + if(photocopy) + photocopy.loc = src.loc + visible_message("[photocopy] is shoved out of the way by [ass]!") + photocopy = null + else if(copy) + copy.loc = src.loc + visible_message("[copy] is shoved out of the way by [ass]!") + copy = null + updateUsrDialog() + +/obj/machinery/photocopier/proc/check_ass() //I'm not sure wether I made this proc because it's good form or because of the name. + if(!ass) + return 0 + if(ass.loc != src.loc) + ass = null + updateUsrDialog() + return 0 + else if(istype(ass,/mob/living/carbon/human)) + if(!ass.get_item_by_slot(slot_w_uniform) && !ass.get_item_by_slot(slot_wear_suit)) + return 1 + else + return 0 + else + return 1 + +/obj/machinery/photocopier/proc/copier_empty() + if(copy || photocopy || check_ass()) + return 0 + else + return 1 + /obj/item/device/toner name = "toner cartridge" icon_state = "tonercartridge" diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index f331df770c1..149bd745a70 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -691,10 +691,10 @@ t += "
Override Programming
" else t += "
APC Hacked
" - /*if(!src.occupant) + if(!src.occupant) t += "Shunt Core Processes
" else - t += "Core Processes Uploaded
"*/ + t += "Core Processes Uploaded
" t += "
Close" diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 4e4e4d85304..8d08a7abab1 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -11,19 +11,25 @@ var/projectile_type = ""//The bullet type to create when New() is called var/obj/item/projectile/BB = null //The loaded bullet +/obj/item/ammo_casing/New() + ..() + if(projectile_type) + BB = new projectile_type(src) + pixel_x = rand(-10.0, 10) + pixel_y = rand(-10.0, 10) + dir = pick(alldirs) + update_icon() + +/obj/item/ammo_casing/update_icon() + ..() + icon_state = "[initial(icon_state)][BB ? "-live" : ""]" + desc = "[initial(desc)][BB ? "" : " This one is spent"]" - New() - ..() - if(projectile_type) - BB = new projectile_type(src) - pixel_x = rand(-10.0, 10) - pixel_y = rand(-10.0, 10) - dir = pick(cardinal) //Boxes of ammo -/obj/item/ammo_magazine +/obj/item/ammo_box name = "ammo box (.357)" desc = "A box of ammo" icon_state = "357" @@ -40,15 +46,61 @@ var/ammo_type = "/obj/item/ammo_casing" var/max_ammo = 7 var/multiple_sprites = 0 + var/caliber = "" +/obj/item/ammo_box/New() + for(var/i = 1, i <= max_ammo, i++) + stored_ammo += new ammo_type(src) + update_icon() - New() - for(var/i = 1, i <= max_ammo, i++) - stored_ammo += new ammo_type(src) +/obj/item/ammo_box/proc/get_round(var/keep = 0) + if (!stored_ammo.len) + return null + else + var/b = stored_ammo[stored_ammo.len] + stored_ammo -= b + if (keep) + stored_ammo.Insert(1,b) + return b + +/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/r) + var/obj/item/ammo_casing/rb = r + if (rb) + if (stored_ammo.len < max_ammo && rb.caliber == caliber) + stored_ammo += rb + rb.loc = src + return 1 + return 0 + +/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob) + var/num_loaded = 0 + if(istype(A, /obj/item/ammo_box)) + var/obj/item/ammo_box/AM = A + for(var/obj/item/ammo_casing/AC in AM.stored_ammo) + if(give_round(AC)) + AM.stored_ammo -= AC + num_loaded++ + else + break + if(istype(A, /obj/item/ammo_casing)) + var/obj/item/ammo_casing/AC = A + if(give_round(AC)) + user.drop_item() + AC.loc = src + num_loaded++ + if(num_loaded) + user << "You load [num_loaded] shell\s into \the [src]!" + A.update_icon() update_icon() - - update_icon() - if(multiple_sprites) +/obj/item/ammo_box/update_icon() + switch(multiple_sprites) + if(1) icon_state = "[initial(icon_state)]-[stored_ammo.len]" - desc = "There are [stored_ammo.len] shell\s left!" + if(2) + icon_state = "[initial(icon_state)]-[stored_ammo.len ? "[max_ammo]" : "0"]" + desc = "There are [stored_ammo.len] shell\s left!" + +//Behavior for magazines +/obj/item/ammo_box/magazine/proc/ammo_count() + return stored_ammo.len \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index cd696e1ca00..89ac19ed71b 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -1,4 +1,4 @@ -/obj/item/ammo_magazine/a357 +/obj/item/ammo_box/a357 name = "ammo box (.357)" desc = "A box of .357 ammo" icon_state = "357" @@ -6,7 +6,7 @@ max_ammo = 7 multiple_sprites = 1 -/obj/item/ammo_magazine/c38 +/obj/item/ammo_box/c38 name = "speed loader (.38)" icon_state = "38" ammo_type = "/obj/item/ammo_casing/c38" @@ -15,7 +15,7 @@ -/obj/item/ammo_magazine/a418 +/obj/item/ammo_box/a418 name = "ammo box (.418)" icon_state = "418" ammo_type = "/obj/item/ammo_casing/a418" @@ -24,7 +24,7 @@ -/obj/item/ammo_magazine/a666 +/obj/item/ammo_box/a666 name = "ammo box (.666)" icon_state = "666" ammo_type = "/obj/item/ammo_casing/a666" @@ -32,18 +32,7 @@ multiple_sprites = 1 -/obj/item/ammo_magazine/mc9mm - name = "magazine (9mm)" - icon_state = "9x19p" - origin_tech = "combat=2" - ammo_type = "/obj/item/ammo_casing/c9mm" - max_ammo = 8 - multiple_sprites = 1 - -/obj/item/ammo_magazine/mc9mm/empty - max_ammo = 0 - -/obj/item/ammo_magazine/c9mm +/obj/item/ammo_box/c9mm name = "Ammunition Box (9mm)" icon_state = "9mm" origin_tech = "combat=2" @@ -52,7 +41,7 @@ -/obj/item/ammo_magazine/c45 +/obj/item/ammo_box/c45 name = "Ammunition Box (.45)" icon_state = "9mm" origin_tech = "combat=2" @@ -61,61 +50,9 @@ -/obj/item/ammo_magazine/a12mm - name = "magazine (12mm)" - icon_state = "12mm" +/obj/item/ammo_box/a12mm + name = "Ammunition Box (12mm)" + icon_state = "9mm" origin_tech = "combat=2" ammo_type = "/obj/item/ammo_casing/a12mm" - max_ammo = 20 - multiple_sprites = 1 - - -/obj/item/ammo_magazine/a12mm/empty - name = "magazine (12mm)" - icon_state = "12mm" - ammo_type = "/obj/item/ammo_casing/12mm" - max_ammo = 0 - -/obj/item/ammo_magazine/a50 - name = "magazine (.50)" - icon_state = "50ae" - origin_tech = "combat=2" - ammo_type = "/obj/item/ammo_casing/a50" - max_ammo = 7 - multiple_sprites = 1 - -/obj/item/ammo_magazine/a50/empty - name = "magazine (.50)" - icon_state = "50ae" - ammo_type = "/obj/item/ammo_casing/a50" - max_ammo = 0 - -/obj/item/ammo_magazine/a75 - name = "ammo magazine (.75)" - icon_state = "75" - ammo_type = "/obj/item/ammo_casing/a75" - multiple_sprites = 1 - max_ammo = 8 - -/obj/item/ammo_magazine/a75/empty - name = "ammo magazine (.75)" - icon_state = "75" - ammo_type = "/obj/item/ammo_casing/a75" - max_ammo = 0 - -/obj/item/ammo_magazine/a762 - name = "magazine (a762)" - icon_state = "a762" - origin_tech = "combat=2" - ammo_type = "/obj/item/ammo_casing/a762" - max_ammo = 50 - multiple_sprites = 1 - -/obj/item/ammo_magazine/a762/empty - name = "magazine (a762)" - icon_state = "a762" - ammo_type = "/obj/item/ammo_casing/a762" - max_ammo = 0 - multiple_sprites = 1 - -/obj/item/ammo_magazine \ No newline at end of file + max_ammo = 30 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index e4b90d2b98f..87083bf1920 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -43,6 +43,10 @@ caliber = ".45" projectile_type = "/obj/item/projectile/bullet/midbullet" +/obj/item/ammo_casing/c10mm + desc = "A 10mm bullet casing." + caliber = "10mm" + projectile_type = "obj/item/projectile/bullet/midbullet2" /obj/item/ammo_casing/a12mm desc = "A 12mm bullet casing." @@ -96,6 +100,15 @@ projectile_type = "/obj/item/projectile/energy/dart" m_amt = 12500 +obj/item/ammo_casing/shotgun/dart/New() + ..() + flags |= NOREACT + create_reagents(30) + +/obj/item/ammo_casing/shotgun/dart/attackby() + return + + /obj/item/ammo_casing/a762 desc = "A 7.62 bullet casing." caliber = "a762" diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm new file mode 100644 index 00000000000..919c48b0bda --- /dev/null +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -0,0 +1,149 @@ +////////////////INTERNAL MAGAZINES////////////////////// +/obj/item/ammo_box/magazine/internal/cylinder + name = "revolver cylinder" + desc = "Oh god, this shouldn't be here" + ammo_type = "/obj/item/ammo_casing/a357" + caliber = "357" + max_ammo = 7 + +/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(var/countempties = 1) + if (!countempties) + var/boolets = 0 + for (var/i = 1, i <= stored_ammo.len, i++) + var/obj/item/ammo_casing/bullet = stored_ammo[i] + if (bullet.BB) + boolets++ + return boolets + else + return stored_ammo.len + +/obj/item/ammo_box/magazine/internal/cylinder/rus357 + name = "russian revolver cylinder" + desc = "Oh god, this shouldn't be here" + ammo_type = "/obj/item/ammo_casing/a357" + caliber = "357" + max_ammo = 6 + +/obj/item/ammo_box/magazine/internal/cylinder/rus357/New() + stored_ammo += new ammo_type(src) + +/obj/item/ammo_box/magazine/internal/cylinder/rev38 + name = "d-tiv revolver cylinder" + desc = "Oh god, this shouldn't be here" + ammo_type = "/obj/item/ammo_casing/c38" + caliber = "38" + max_ammo = 6 + +/obj/item/ammo_box/magazine/internal/shot + name = "shotgun internal magazine" + desc = "Oh god, this shouldn't be here" + ammo_type = "/obj/item/ammo_casing/shotgun/beanbag" + caliber = "shotgun" + max_ammo = 4 + +/obj/item/ammo_box/magazine/internal/shotcom + name = "combat shotgun internal magazine" + desc = "Oh god, this shouldn't be here" + ammo_type = "/obj/item/ammo_casing/shotgun" + caliber = "shotgun" + max_ammo = 8 + +/obj/item/ammo_box/magazine/internal/cylinder/dualshot + name = "double-barrel shotgun internal magazine" + desc = "This doesn't even exist" + ammo_type = "/obj/item/ammo_casing/shotgun/beanbag" + caliber = "shotgun" + max_ammo = 2 + +///////////EXTERNAL MAGAZINES//////////////// +/obj/item/ammo_box/magazine/m9mm + name = "magazine (9mm)" + icon_state = "9x19p" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/c9mm" + caliber = "9mm" + max_ammo = 8 + multiple_sprites = 2 + +/obj/item/ammo_box/magazine/msmg9mm + name = "SMG magazine (9mm)" + icon_state = "smg9mm" + ammo_type = "/obj/item/ammo_casing/c9mm" + caliber = "9mm" + max_ammo = 18 + +/obj/item/ammo_box/magazine/msmg9mm/update_icon() + ..() + icon_state = "[initial(icon_state)]-[round(ammo_count(),3)]" + +/obj/item/ammo_box/magazine/m10mm + name = "magazine (10mm)" + icon_state = "9x19p" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/c10mm" + caliber = "10mm" + max_ammo = 8 + multiple_sprites = 2 + +/obj/item/ammo_box/magazine/m12mm + name = "magazine (12mm)" + icon_state = "12mm" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/a12mm" + caliber = "12mm" + max_ammo = 20 + +/obj/item/ammo_box/magazine/m12mm/update_icon() + ..() + icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]" + +/obj/item/ammo_box/magazine/sm45 + name = "magazine (.45)" + icon_state = "9x19p" + ammo_type = "/obj/item/ammo_casing/c45" + caliber = ".45" + max_ammo = 12 + +/obj/item/ammo_box/magazine/sm45/update_icon() + ..() + icon_state = "[initial(icon_state)]-[ammo_count() ? "8" : "0"]" + +/obj/item/ammo_box/magazine/uzim45 + name = "Uzi magazine (.45)" + icon_state = "uzi45" + ammo_type = "/obj/item/ammo_casing/c45" + caliber = ".45" + max_ammo = 16 + +/obj/item/ammo_box/magazine/uzim45/update_icon() + ..() + icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]" + +/obj/item/ammo_box/magazine/m50 + name = "magazine (.50ae)" + icon_state = "50ae" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/a50" + caliber = ".50" + max_ammo = 7 + multiple_sprites = 1 + +/obj/item/ammo_box/magazine/m75 + name = "magazine (.75)" + icon_state = "75" + ammo_type = "/obj/item/ammo_casing/a75" + caliber = "75" + multiple_sprites = 2 + max_ammo = 8 + +/obj/item/ammo_box/magazine/m762 + name = "magazine (7.62mm)" + icon_state = "a762" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/a762" + caliber = "a762" + max_ammo = 50 + +/obj/item/ammo_box/magazine/m762/update_icon() + ..() + icon_state = "[initial(icon_state)]-[round(ammo_count(),10)]" \ No newline at end of file diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 62f4a9884f9..2afec0d1f9d 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -17,10 +17,8 @@ var/fire_sound = 'sound/weapons/Gunshot.ogg' var/obj/item/projectile/in_chamber = null - var/caliber = "" var/silenced = 0 var/recoil = 0 - var/ejectshell = 1 var/clumsy_check = 1 var/tmp/list/mob/living/target //List of who yer targeting. var/tmp/lock_time = -100 @@ -40,7 +38,7 @@ else return 0 - proc/load_into_chamber() + proc/process_chambered() return 0 proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver. @@ -101,7 +99,7 @@ user << "[src] is not ready to fire again!" return - if(!load_into_chamber()) //CHECK + if(!process_chambered()) //CHECK return click_empty(user) if(!in_chamber) @@ -136,6 +134,15 @@ in_chamber.current = curloc in_chamber.yo = targloc.y - curloc.y in_chamber.xo = targloc.x - curloc.x + if(istype(user, /mob/living/carbon)) + var/mob/living/carbon/mob = user + if(mob.shock_stage > 120) + in_chamber.yo += rand(-2,2) + in_chamber.xo += rand(-2,2) + else if(mob.shock_stage > 70) + in_chamber.yo += rand(-1,1) + in_chamber.xo += rand(-1,1) + if(params) var/list/mouse_control = params2list(params) @@ -158,7 +165,7 @@ user.update_inv_r_hand() /obj/item/weapon/gun/proc/can_fire() - return load_into_chamber() + return process_chambered() /obj/item/weapon/gun/proc/can_hit(var/mob/living/target as mob, var/mob/living/user as mob) return in_chamber.check_fire(target,user) @@ -180,7 +187,7 @@ M.visible_message("\blue [user] decided life was worth living") mouthshoot = 0 return - if (load_into_chamber()) + if (process_chambered()) user.visible_message("[user] pulls the trigger.") if(silenced) playsound(user, fire_sound, 10, 1) @@ -201,7 +208,7 @@ mouthshoot = 0 return - if (src.load_into_chamber()) + if (src.process_chambered()) //Point blank shooting if on harm intent or target we were targeting. if(user.a_intent == "hurt") user.visible_message("\red \The [user] fires \the [src] point blank at [M]!") diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index fb506def213..dfc41f945c8 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -26,7 +26,7 @@ return - load_into_chamber() + process_chambered() if(in_chamber) return 1 if(!power_supply) return 0 if(!power_supply.use(charge_cost)) return 0 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index c7026905b62..ae23d39cdb0 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -50,7 +50,7 @@ obj/item/weapon/gun/energy/laser/retro -/obj/item/weapon/gun/energy/laser/cyborg/load_into_chamber() +/obj/item/weapon/gun/energy/laser/cyborg/process_chambered() if(in_chamber) return 1 if(isrobot(src.loc)) @@ -76,7 +76,7 @@ obj/item/weapon/gun/energy/laser/retro isHandgun() return 0 -/obj/item/weapon/gun/energy/lasercannon/cyborg/load_into_chamber() +/obj/item/weapon/gun/energy/lasercannon/cyborg/process_chambered() if(in_chamber) return 1 if(isrobot(src.loc)) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index cd990a66a72..3e04e755ec0 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -36,7 +36,7 @@ isHandgun() return 0 -/obj/item/weapon/gun/energy/pulse_rifle/cyborg/load_into_chamber() +/obj/item/weapon/gun/energy/pulse_rifle/cyborg/process_chambered() if(in_chamber) return 1 if(isrobot(src.loc)) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 685122e05c5..bf0f08676c6 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -3,115 +3,92 @@ #define MAGAZINE 2 /obj/item/weapon/gun/projectile - desc = "A classic revolver. Uses 357 ammo" - name = "revolver" - icon_state = "revolver" - caliber = "357" + desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason" + name = "projectile gun" + icon_state = "pistol" origin_tech = "combat=2;materials=2" w_class = 3.0 m_amt = 1000 recoil = 1 - var/ammo_type = "/obj/item/ammo_casing/a357" - var/list/loaded = list() - var/max_shells = 7 - var/load_method = SPEEDLOADER //0 = Single shells or quick loader, 1 = box, 2 = magazine - var/obj/item/ammo_magazine/empty_mag = null + var/ammo_type = "/obj/item/ammo_casing/c10mm" + var/mag_type = "/obj/item/ammo_box/magazine/m10mm" //Removes the need for max_ammo and caliber info + var/obj/item/ammo_box/magazine/magazine + var/obj/item/ammo_casing/chambered = null // The round (not bullet) that is in the chamber. + /obj/item/weapon/gun/projectile/New() ..() - for(var/i = 1, i <= max_shells, i++) - loaded += new ammo_type(src) + magazine = new mag_type(src) + chamber_round() update_icon() return -/obj/item/weapon/gun/projectile/load_into_chamber() - if(in_chamber) - return 1 //{R} +/obj/item/weapon/gun/projectile/process_chambered() +// if(in_chamber) +// return 1 - if(!loaded.len) - return 0 - var/obj/item/ammo_casing/AC = loaded[1] //load next casing. - loaded -= AC //Remove casing from loaded list. + var/obj/item/ammo_casing/AC = chambered //Find chambered round if(isnull(AC) || !istype(AC)) return 0 AC.loc = get_turf(src) //Eject casing onto ground. + chambered = null + chamber_round() if(AC.BB) - AC.desc += " This one is spent." //descriptions are magic - only when there's a projectile in the casing in_chamber = AC.BB //Load projectile into chamber. AC.BB.loc = src //Set projectile loc to gun. + AC.update_icon() return 1 return 0 -/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/weapon/gun/projectile/proc/chamber_round() + if (chambered || !magazine) + return + else if (magazine.ammo_count()) + chambered = magazine.get_round() + chambered.loc = src + return - var/num_loaded = 0 - if(istype(A, /obj/item/ammo_magazine)) - if((load_method == MAGAZINE) && loaded.len) return - var/obj/item/ammo_magazine/AM = A - for(var/obj/item/ammo_casing/AC in AM.stored_ammo) - if(loaded.len >= max_shells) - break - if(AC.caliber == caliber && loaded.len < max_shells) - AC.loc = src - AM.stored_ammo -= AC - loaded += AC - num_loaded++ - if(load_method == MAGAZINE) + +/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob) + if (istype(A, /obj/item/ammo_box/magazine)) + var/obj/item/ammo_box/magazine/AM = A + if (!magazine && istype(AM, text2path(mag_type))) user.remove_from_mob(AM) - empty_mag = AM - empty_mag.loc = src - if(istype(A, /obj/item/ammo_casing) && load_method == SPEEDLOADER) - var/obj/item/ammo_casing/AC = A - if(AC.caliber == caliber && loaded.len < max_shells) - user.drop_item() - AC.loc = src - loaded += AC - num_loaded++ - if(num_loaded) - user << "\blue You load [num_loaded] shell\s into the gun!" - A.update_icon() + magazine = AM + magazine.loc = src + user << "You load a new magazine into \the [src]!" + chamber_round() + A.update_icon() + update_icon() + return 1 + else if (magazine) + user << "There's already a magazine in \the [src]." + return 0 + +/obj/item/weapon/gun/projectile/attack_self(mob/living/user as mob) + if (magazine) + magazine.loc = get_turf(src.loc) + user.put_in_hands(magazine) + magazine.update_icon() + magazine = null + user << "You pull the magazine out of \the [src]!" + else + user << "There's no magazine in \the [src]." update_icon() return -/obj/item/weapon/gun/projectile/attack_self(mob/user as mob) - if (target) - return ..() - if (loaded.len) - if (load_method == SPEEDLOADER) - var/obj/item/ammo_casing/AC = loaded[1] - loaded -= AC - AC.loc = get_turf(src) //Eject casing onto ground. - user << "\blue You unload shell from \the [src]!" - if (load_method == MAGAZINE) - var/obj/item/ammo_magazine/AM = empty_mag - for (var/obj/item/ammo_casing/AC in loaded) - AM.stored_ammo += AC - loaded -= AC - AM.loc = get_turf(src) - empty_mag = null - update_icon() - user << "\blue You unload magazine from \the [src]!" - else - user << "\red Nothing loaded in \the [src]!" - - - /obj/item/weapon/gun/projectile/examine() ..() - usr << "Has [getAmmo()] round\s remaining." -// if(in_chamber && !loaded.len) -// usr << "However, it has a chambered round." -// if(in_chamber && loaded.len) -// usr << "It also has a chambered round." {R} + usr << "Has [get_ammo()] round\s remaining." return -/obj/item/weapon/gun/projectile/proc/getAmmo() - var/bullets = 0 - for(var/obj/item/ammo_casing/AC in loaded) - if(istype(AC)) - bullets += 1 - return bullets - +/obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1) + var/boolets = 0 //mature var names for mature people + if (chambered && countchambered) + boolets++ + if (magazine) + boolets += magazine.ammo_count() + return boolets diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 93a7010d7d1..1d3e576584e 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -3,27 +3,35 @@ desc = "A lightweight, fast firing gun. Uses 9mm rounds." icon_state = "saber" //ugly w_class = 3.0 - max_shells = 18 - caliber = "9mm" origin_tech = "combat=4;materials=2" ammo_type = "/obj/item/ammo_casing/c9mm" automatic = 1 - + mag_type = "/obj/item/ammo_box/magazine/msmg9mm" + var/alarmed = 0 fire_delay = 0 - isHandgun() return 0 +/obj/item/weapon/gun/projectile/automatic/update_icon() + ..() + icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"]" + return + +/obj/item/weapon/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob) + if(..() && chambered) + alarmed = 0 + + /obj/item/weapon/gun/projectile/automatic/mini_uzi name = "Uzi" desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds." icon_state = "mini-uzi" w_class = 3.0 - max_shells = 16 - caliber = ".45" + origin_tech = "combat=5;materials=2;syndicate=8" ammo_type = "/obj/item/ammo_casing/c45" + mag_type = "/obj/item/ammo_box/magazine/uzim45" isHandgun() return 1 @@ -35,38 +43,29 @@ icon_state = "c20r" item_state = "c20r" w_class = 3.0 - max_shells = 20 - caliber = "12mm" origin_tech = "combat=5;materials=2;syndicate=8" ammo_type = "/obj/item/ammo_casing/a12mm" + mag_type = "/obj/item/ammo_box/magazine/m12mm" fire_sound = 'sound/weapons/Gunshot_smg.ogg' - load_method = 2 - - - New() - ..() - empty_mag = new /obj/item/ammo_magazine/a12mm/empty(src) - update_icon() - return - - - afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) - ..() - if(!loaded.len && empty_mag) - empty_mag.loc = get_turf(src.loc) - empty_mag = null - playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1) - update_icon() - return - +/obj/item/weapon/gun/projectile/automatic/c20r/New() + ..() update_icon() - ..() - if(empty_mag) - icon_state = "c20r-[round(loaded.len,4)]" - else - icon_state = "c20r" - return + return + +/obj/item/weapon/gun/projectile/automatic/c20r/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) + ..() + if(!chambered && !get_ammo() && !alarmed) + playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1) + update_icon() + alarmed = 1 + return + +/obj/item/weapon/gun/projectile/automatic/c20r/update_icon() + ..() + icon_state = "c20r[magazine ? "-[round(get_ammo(0),4)]" : ""][chambered ? "" : "-e"]" + return + /obj/item/weapon/gun/projectile/automatic/l6_saw name = "\improper L6 SAW" @@ -75,14 +74,13 @@ item_state = "l6closedmag" w_class = 4 slot_flags = 0 - max_shells = 50 - caliber = "a762" origin_tech = "combat=5;materials=1;syndicate=2" ammo_type = "/obj/item/ammo_casing/a762" + mag_type = "/obj/item/ammo_box/magazine/m762" fire_sound = 'sound/weapons/Gunshot_smg.ogg' - load_method = 2 + var/cover_open = 0 - var/mag_inserted = 1 + /obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob) @@ -92,7 +90,7 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon() - icon_state = "l6[cover_open ? "open" : "closed"][mag_inserted ? round(loaded.len, 25) : "-empty"]" + icon_state = "l6[cover_open ? "open" : "closed"][magazine ? round(magazine.ammo_count() * 2, 25) : "-empty"]" /obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays @@ -107,19 +105,14 @@ if(loc != user) ..() return //let them pick it up - if(!cover_open || (cover_open && !mag_inserted)) + if(!cover_open || (cover_open && !magazine)) ..() - else if(cover_open && mag_inserted) + else if(cover_open && magazine) //drop the mag - empty_mag = new /obj/item/ammo_magazine/a762(src) - empty_mag.stored_ammo = loaded - empty_mag.icon_state = "a762-[round(loaded.len, 10)]" - empty_mag.desc = "There are [loaded.len] shells left!" - empty_mag.loc = get_turf(src.loc) - user.put_in_hands(empty_mag) - empty_mag = null - mag_inserted = 0 - loaded = list() + magazine.update_icon() + magazine.loc = get_turf(src.loc) + user.put_in_hands(magazine) + magazine = null update_icon() user << "You remove the magazine from [src]." @@ -128,13 +121,6 @@ if(!cover_open) user << "[src]'s cover is closed! You can't insert a new mag!" return - else if(cover_open && mag_inserted) - user << "[src] already has a magazine inserted!" - return - else if(cover_open && !mag_inserted) - mag_inserted = 1 - user << "You insert the magazine!" - update_icon() ..() diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index c7748091e9f..b6100ebe84c 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -1,114 +1,101 @@ -/obj/item/weapon/gun/projectile/silenced +/obj/item/weapon/gun/projectile/automatic/silenced name = "silenced pistol" desc = "A small, quiet, easily concealable gun. Uses .45 rounds." icon_state = "silenced_pistol" w_class = 3.0 - max_shells = 12 - caliber = ".45" silenced = 1 origin_tech = "combat=2;materials=2;syndicate=8" ammo_type = "/obj/item/ammo_casing/c45" + mag_type = "/obj/item/ammo_box/magazine/sm45" + +/obj/item/weapon/gun/projectile/automatic/silenced/update_icon() + ..() + icon_state = "[initial(icon_state)]" + return -/obj/item/weapon/gun/projectile/deagle +/obj/item/weapon/gun/projectile/automatic/deagle name = "desert eagle" desc = "A robust handgun that uses .50 AE ammo" icon_state = "deagle" force = 14.0 - max_shells = 7 - caliber = ".50" - ammo_type ="/obj/item/ammo_casing/a50" - load_method = 2 - New() - ..() - empty_mag = new /obj/item/ammo_magazine/a50/empty(src) + ammo_type = "/obj/item/ammo_casing/a50" + mag_type = "/obj/item/ammo_box/magazine/m50" + +/obj/item/weapon/gun/projectile/automatic/deagle/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) + ..() + if(!chambered && !get_ammo() && !alarmed) + playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1) update_icon() - return + alarmed = 1 + return +/obj/item/weapon/gun/projectile/automatic/deagle/update_icon() + ..() + icon_state = "[initial(icon_state)][magazine ? "" : "-e"]" - afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) - ..() - if(!loaded.len && empty_mag) - empty_mag.loc = get_turf(src.loc) - empty_mag = null - playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1) - update_icon() - return - -/obj/item/weapon/gun/projectile/deagle/gold +/obj/item/weapon/gun/projectile/automatic/deagle/gold desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .50 AE ammo." icon_state = "deagleg" item_state = "deagleg" -/obj/item/weapon/gun/projectile/deagle/camo +/obj/item/weapon/gun/projectile/automatic/deagle/camo desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo." icon_state = "deaglecamo" item_state = "deagleg" -/obj/item/weapon/gun/projectile/gyropistol +/obj/item/weapon/gun/projectile/automatic/gyropistol name = "gyrojet pistol" desc = "A bulky pistol designed to fire self propelled rounds" icon_state = "gyropistol" - max_shells = 8 - caliber = "75" fire_sound = 'sound/effects/Explosion1.ogg' origin_tech = "combat=3" ammo_type = "/obj/item/ammo_casing/a75" - load_method = 2 - New() - ..() - empty_mag = new /obj/item/ammo_magazine/a75/empty(src) - update_icon() - return - - - afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) - ..() - if(!loaded.len && empty_mag) - empty_mag.loc = get_turf(src.loc) - empty_mag = null - playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1) - update_icon() - return + mag_type = "/obj/item/ammo_box/magazine/m75" +/obj/item/weapon/gun/projectile/automatic/gyropistol/New() + ..() update_icon() - ..() - if(empty_mag) - icon_state = "gyropistolloaded" - else - icon_state = "gyropistol" - return + return -/obj/item/weapon/gun/projectile/pistol +/obj/item/weapon/gun/projectile/automatic/gyropistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) + ..() + if(!chambered && !get_ammo() && !alarmed) + playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1) + update_icon() + alarmed = 1 + return + +/obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon() + ..() + icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]" + return + +/obj/item/weapon/gun/projectile/automatic/pistol name = "\improper Stechtkin pistol" desc = "A small, easily concealable gun. Uses 9mm rounds." icon_state = "pistol" w_class = 2 - max_shells = 8 - caliber = "9mm" silenced = 0 origin_tech = "combat=2;materials=2;syndicate=2" ammo_type = "/obj/item/ammo_casing/c9mm" - load_method = 2 + mag_type = "/obj/item/ammo_box/magazine/m10mm" -/obj/item/weapon/gun/projectile/pistol/New() +/obj/item/weapon/gun/projectile/automatic/pistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) ..() - empty_mag = new /obj/item/ammo_magazine/mc9mm/empty(src) + if(magazine) + if(!chambered && !magazine.ammo_count()) + magazine.update_icon() + magazine.loc = get_turf(src.loc) + magazine = null return -/obj/item/weapon/gun/projectile/pistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) - ..() - if(!loaded.len && empty_mag) - empty_mag.loc = get_turf(src.loc) - empty_mag = null - return - -/obj/item/weapon/gun/projectile/pistol/attack_hand(mob/user as mob) +/obj/item/weapon/gun/projectile/automatic/pistol/attack_hand(mob/user as mob) if(loc == user) if(silenced) if(user.l_hand != src && user.r_hand != src) @@ -123,7 +110,7 @@ ..() -/obj/item/weapon/gun/projectile/pistol/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/weapon/gun/projectile/automatic/pistol/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/silencer)) if(user.l_hand != src && user.r_hand != src) //if we're not in his hands user << "You'll need [src] in your hands to do that." @@ -137,12 +124,11 @@ return ..() -/obj/item/weapon/gun/projectile/pistol/update_icon() +/obj/item/weapon/gun/projectile/automatic/pistol/update_icon() ..() - if(silenced) - icon_state = "pistol-silencer" - else - icon_state = "pistol" + icon_state = "[initial(icon_state)][silenced ? "-silencer" : ""][chambered ? "" : "-e"]" + return + /obj/item/weapon/silencer name = "silencer" diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index e153281c724..5a9d9d8f7b8 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -1,103 +1,165 @@ -/obj/item/weapon/gun/projectile/detective +/obj/item/weapon/gun/projectile/revolver + desc = "A classic revolver. Uses 357 ammo" + name = "revolver" + icon_state = "revolver" + ammo_type = "/obj/item/ammo_casing/a357" + mag_type = "/obj/item/ammo_box/magazine/internal/cylinder" + +/obj/item/weapon/gun/projectile/revolver/chamber_round() + if (chambered || !magazine) + return + else if (magazine.ammo_count()) + chambered = magazine.get_round(1) + return + +/obj/item/weapon/gun/projectile/revolver/process_chambered() + var/obj/item/ammo_casing/AC = chambered //Find chambered round + if(isnull(AC) || !istype(AC)) + return 0 + chambered = null + chamber_round() + if(AC.BB) + in_chamber = AC.BB //Load projectile into chamber. + AC.BB.loc = src //Set projectile loc to gun. + AC.BB = null + AC.update_icon() + return 1 + return 0 + +/obj/item/weapon/gun/projectile/revolver/attackby(var/obj/item/A as obj, mob/user as mob) + var/num_loaded = 0 + if(istype(A, /obj/item/ammo_box)) + var/obj/item/ammo_box/AM = A + for(var/obj/item/ammo_casing/AC in AM.stored_ammo) + if(magazine.give_round(AC)) + AM.stored_ammo -= AC + num_loaded++ + else + break + if(istype(A, /obj/item/ammo_casing)) + var/obj/item/ammo_casing/AC = A + if(magazine.give_round(AC)) + user.drop_item() + AC.loc = src + num_loaded++ + if(num_loaded) + user << "You load [num_loaded] shell\s into \the [src]!" + A.update_icon() + update_icon() + chamber_round() + +/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user as mob) + var/num_unloaded = 0 + while (get_ammo() > 0) + var/obj/item/ammo_casing/CB + CB = magazine.get_round(0) + chambered = null + CB.loc = get_turf(src.loc) + CB.update_icon() + num_unloaded++ + if (num_unloaded) + user << "You unload [num_unloaded] shell\s from [src]!" + else + user << "[src] is empty." + +/obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1) + var/boolets = 0 //mature var names for mature people + if (chambered && countchambered) + boolets++ + if (magazine) + boolets += magazine.ammo_count(countempties) + return boolets + +/obj/item/weapon/gun/projectile/revolver/examine() + ..() + usr << "[get_ammo(0,0)] of those are live rounds." + +/obj/item/weapon/gun/projectile/revolver/detective desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds." name = "revolver" icon_state = "detective" - max_shells = 6 - caliber = "38" origin_tech = "combat=2;materials=2" ammo_type = "/obj/item/ammo_casing/c38" - - var/perfect = 0 + mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/rev38" - special_check(var/mob/living/carbon/human/M) - if(caliber == initial(caliber)) - return 1 - if(!perfect && prob(70 - (loaded.len * 10))) //minimum probability of 10, maximum of 60 - M << "[src] blows up in your face." - M.take_organ_damage(0,20) - M.drop_item() - del(src) - return 0 +/obj/item/weapon/gun/projectile/revolver/detective/special_check(var/mob/living/carbon/human/M) + if(magazine.caliber == initial(magazine.caliber)) + return 1 + if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 + M << "[src] blows up in your face." + M.take_organ_damage(0,20) + M.drop_item() + del(src) + return 0 + return 1 + +/obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun() + set name = "Name Gun" + set category = "Object" + set desc = "Click to rename your gun." + + var/mob/M = usr + var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN) + + if(src && input && !M.stat && in_range(M,src)) + name = input + M << "You name the gun [input]. Say hello to your new friend." return 1 - verb/rename_gun() - set name = "Name Gun" - set category = "Object" - set desc = "Click to rename your gun. If you're the detective." +/obj/item/weapon/gun/projectile/revolver/detective/verb/reskin_gun() + set name = "Reskin gun" + set category = "Object" + set desc = "Click to reskin your gun." - var/mob/M = usr - var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN) + var/mob/M = usr + var/list/options = list() + options["The Original"] = "detective" + options["Leopard Spots"] = "detective_leopard" + options["Black Panther"] = "detective_panther" + options["Gold Trim"] = "detective_gold" + options["The Peacemaker"] = "detective_peacemaker" + var/choice = input(M,"What do you want to skin the gun to?","Reskin Gun") in options - if(src && input && !M.stat && in_range(M,src)) - name = input - M << "You name the gun [input]. Say hello to your new friend." - return 1 + if(src && choice && !M.stat && in_range(M,src)) + icon_state = options[choice] + M << "Your gun is now skinned as [choice]. Say hello to your new friend." + return 1 - verb/reskin_gun() - set name = "Reskin gun" - set category = "Object" - set desc = "Click to reskin your gun. If you're the detective." - - var/mob/M = usr - var/list/options = list() - options["The Original"] = "detective" - options["Leopard Spots"] = "detective_leopard" - options["Black Panther"] = "detective_panther" - options["Gold Trim"] = "detective_gold" - options["The Peacemaker"] = "detective_peacemaker" - var/choice = input(M,"What do you want to skin the gun to?","Reskin Gun") in options - - if(src && choice && !M.stat && in_range(M,src)) - icon_state = options[choice] - M << "Your gun is now skinned as [choice]. Say hello to your new friend." - return 1 - - attackby(var/obj/item/A as obj, mob/user as mob) - var/obj/item/weapon/conversion_kit/CK - ..() - if(isscrewdriver(A) || istype(A, /obj/item/weapon/conversion_kit)) - if(istype(A, /obj/item/weapon/conversion_kit)) - CK = A - if(!CK.open) - user << "This [CK.name] is useless unless you open it first. " +/obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob) + ..() + if(istype(A, /obj/item/weapon/screwdriver)) + if(magazine.caliber == "38") + user << "You begin to reinforce the barrel of [src]." + if(magazine.ammo_count()) + afterattack(user, user) //you know the drill + user.visible_message("[src] goes off!", "[src] goes off in your face!") + return + if(do_after(user, 30)) + if(magazine.ammo_count()) + user << "You can't modify it!" return - if(caliber == "38") - user << "You begin to reinforce the barrel of [src]." - if(loaded.len) - afterattack(user, user) //you know the drill - playsound(user, fire_sound, 50, 1) - user.visible_message("[src] goes off!", "[src] goes off in your face!") + magazine.caliber = "357" + desc = "The barrel and chamber assembly seems to have been modified." + user << "You reinforce the barrel of [src]! Now it will fire .357 rounds." + else + user << "You begin to revert the modifications to [src]." + if(magazine.ammo_count()) + afterattack(user, user) //and again + user.visible_message("[src] goes off!", "[src] goes off in your face!") + return + if(do_after(user, 30)) + if(magazine.ammo_count()) + user << "You can't modify it!" return - if(do_after(user, 30)) - if(loaded.len) - user << "You can't modify it!" - return - caliber = "357" - desc = "The barrel and chamber assembly seems to have been modified." - user << "You reinforce the barrel of [src]! Now it will fire .357 rounds." - if(CK && istype(CK)) - perfect = 1 - else - user << "You begin to revert the modifications to [src]." - if(loaded.len) - afterattack(user, user) //and again - playsound(user, fire_sound, 50, 1) - user.visible_message("[src] goes off!", "[src] goes off in your face!") - return - if(do_after(user, 30)) - if(loaded.len) - user << "You can't modify it!" - return - caliber = "38" - desc = initial(desc) - user << "You remove the modifications on [src]! Now it will fire .38 rounds." - perfect = 0 + magazine.caliber = "38" + desc = initial(desc) + user << "You remove the modifications on [src]! Now it will fire .38 rounds." -/obj/item/weapon/gun/projectile/mateba +/obj/item/weapon/gun/projectile/revolver/mateba name = "mateba" desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo." //>10mm hole >.357 icon_state = "mateba" @@ -106,80 +168,87 @@ // A gun to play Russian Roulette! // You can spin the chamber to randomize the position of the bullet. -/obj/item/weapon/gun/projectile/russian +/obj/item/weapon/gun/projectile/revolver/russian name = "Russian Revolver" desc = "A Russian made revolver. Uses .357 ammo. It has a single slot in it's chamber for a bullet." - max_shells = 6 origin_tech = "combat=2;materials=2" + mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/rus357" + var/spun = 0 -/obj/item/weapon/gun/projectile/russian/New() +/obj/item/weapon/gun/projectile/revolver/russian/New() + ..() Spin() update_icon() -/obj/item/weapon/gun/projectile/russian/proc/Spin() - - for(var/obj/item/ammo_casing/AC in loaded) - del(AC) - loaded = list() - var/random = rand(1, max_shells) - for(var/i = 1; i <= max_shells; i++) - if(i != random) - loaded += i // Basically null - else - loaded += new ammo_type(src) - - -/obj/item/weapon/gun/projectile/russian/attackby(var/obj/item/A as obj, mob/user as mob) - - if(!A) return +/obj/item/weapon/gun/projectile/revolver/russian/proc/Spin() + chambered = null + var/random = rand(1, magazine.max_ammo) + if(random <= get_ammo(0,0)) + chamber_round() + spun = 1 +/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob) var/num_loaded = 0 - if(istype(A, /obj/item/ammo_magazine)) - - if((load_method == 2) && loaded.len) return - var/obj/item/ammo_magazine/AM = A + if(istype(A, /obj/item/ammo_box)) + var/obj/item/ammo_box/AM = A for(var/obj/item/ammo_casing/AC in AM.stored_ammo) - if(getAmmo() > 0 || loaded.len >= max_shells) - break - if(AC.caliber == caliber && loaded.len < max_shells) - AC.loc = src - AM.stored_ammo -= AC - loaded += AC - num_loaded++ + if(get_ammo() <= 1) + if(magazine.give_round(AC)) + AM.stored_ammo -= AC + num_loaded++ break - A.update_icon() - + if(istype(A, /obj/item/ammo_casing)) + var/obj/item/ammo_casing/AC = A + if(get_ammo() <= 1) + magazine.give_round(AC) + user.drop_item() + AC.loc = src + num_loaded++ if(num_loaded) user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.") else user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") - if(getAmmo() > 0) + if(get_ammo() > 0) Spin() update_icon() + A.update_icon() return -/obj/item/weapon/gun/projectile/russian/attack_self(mob/user as mob) - - user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") - if(getAmmo() > 0) +/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob) + if(!spun && get_ammo(0,0)) + user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") Spin() + else + var/num_unloaded = 0 + while (get_ammo() > 0) + var/obj/item/ammo_casing/CB + CB = magazine.get_round() + chambered = null + CB.loc = get_turf(src.loc) + CB.update_icon() + num_unloaded++ + if (num_unloaded) + user << "You unload [num_unloaded] shell\s from [src]!" + else + user << "[src] is empty." -/obj/item/weapon/gun/projectile/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj) +/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) + ..() + spun = 0 - if(!loaded.len) +/obj/item/weapon/gun/projectile/revolver/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj) + + if(!chambered) user.visible_message("\red *click*", "\red *click*") - playsound(user, 'sound/weapons/empty.ogg', 100, 1) return if(isliving(target) && isliving(user)) if(target == user) var/datum/organ/external/affecting = user.zone_sel.selecting if(affecting == "head") - - var/obj/item/ammo_casing/AC = loaded[1] - if(!load_into_chamber()) + var/obj/item/ammo_casing/AC = chambered + if(!process_chambered()) user.visible_message("\red *click*", "\red *click*") - playsound(user, 'sound/weapons/empty.ogg', 100, 1) return if(!in_chamber) return @@ -189,5 +258,7 @@ if(!P.nodamage) user.apply_damage(300, BRUTE, affecting) // You are dead, dead, dead. return + + spun = 0 ..() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 2d20b7bb9b1..74844a979dc 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -1,137 +1,145 @@ +/obj/item/weapon/gun/projectile/shotgun + name = "shotgun" + desc = "This almost certainly shouldn't be here." + icon_state = "shotgun" + item_state = "shotgun" + ammo_type = "/obj/item/ammo_casing/shotgun" + mag_type = "/obj/item/ammo_box/magazine/internal/shot" + +/obj/item/weapon/gun/projectile/shotgun/attackby(var/obj/item/A as obj, mob/user as mob) + var/num_loaded = 0 + if(istype(A, /obj/item/ammo_box)) + var/obj/item/ammo_box/AM = A + for(var/obj/item/ammo_casing/AC in AM.stored_ammo) + if(magazine && magazine.give_round(AC)) + AM.stored_ammo -= AC + num_loaded++ + else + break + if(istype(A, /obj/item/ammo_casing)) + var/obj/item/ammo_casing/AC = A + if(magazine && magazine.give_round(AC)) + user.drop_item() + AC.loc = src + num_loaded++ + if(num_loaded) + user << "You load [num_loaded] shell\s into \the [src]!" + A.update_icon() + update_icon() + /obj/item/weapon/gun/projectile/shotgun/pump name = "shotgun" desc = "Useful for sweeping alleys." icon_state = "shotgun" item_state = "shotgun" - max_shells = 4 w_class = 4.0 force = 10 flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BACK - caliber = "shotgun" origin_tech = "combat=4;materials=2" ammo_type = "/obj/item/ammo_casing/shotgun/beanbag" var/recentpump = 0 // to prevent spammage var/pumped = 0 - var/obj/item/ammo_casing/current_shell = null - isHandgun() + +/obj/item/weapon/gun/projectile/shotgun/pump/process_chambered() + var/obj/item/ammo_casing/AC = chambered //Find chambered round + if(isnull(AC) || !istype(AC)) return 0 - - load_into_chamber() - if(in_chamber) - return 1 - return 0 - - - attack_self(mob/living/user as mob) - if(recentpump) return - pump() - recentpump = 1 - spawn(10) - recentpump = 0 - return - - - proc/pump(mob/M as mob) - playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1) - pumped = 0 - if(current_shell)//We have a shell in the chamber - current_shell.loc = get_turf(src)//Eject casing - current_shell = null - if(in_chamber) - in_chamber = null - if(!loaded.len) return 0 - var/obj/item/ammo_casing/AC = loaded[1] //load next casing. - loaded -= AC //Remove casing from loaded list. - current_shell = AC - if(AC.BB) - in_chamber = AC.BB //Load projectile into chamber. - update_icon() //I.E. fix the desc + if(AC.BB) + if(AC.reagents && AC.BB.reagents) + var/datum/reagents/casting_reagents = AC.reagents + casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts + casting_reagents.delete() + in_chamber = AC.BB //Load projectile into chamber. + AC.BB.loc = src //Set projectile loc to gun. + AC.BB = null + AC.update_icon() return 1 + return 0 + + +/obj/item/weapon/gun/projectile/shotgun/pump/attack_self(mob/living/user as mob) + if(recentpump) return + pump() + recentpump = 1 + spawn(10) + recentpump = 0 + return + + +/obj/item/weapon/gun/projectile/shotgun/pump/proc/pump(mob/M as mob) + playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1) + pumped = 0 + if(chambered)//We have a shell in the chamber + chambered.loc = get_turf(src)//Eject casing + chambered = null + if(in_chamber) + in_chamber = null + if(!magazine.ammo_count()) return 0 + var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing. + chambered = AC + update_icon() //I.E. fix the desc + return 1 + +/obj/item/weapon/gun/projectile/shotgun/pump/examine() + ..() + if (chambered) + usr << "A [chambered.BB ? "live" : "spent"] one is in the chamber." /obj/item/weapon/gun/projectile/shotgun/pump/combat name = "combat shotgun" icon_state = "cshotgun" - max_shells = 8 origin_tech = "combat=5;materials=2" ammo_type = "/obj/item/ammo_casing/shotgun" + mag_type = "/obj/item/ammo_box/magazine/internal/shotcom" + w_class = 5 -//this is largely hacky and bad :( -Pete -/obj/item/weapon/gun/projectile/shotgun/doublebarrel +/obj/item/weapon/gun/projectile/revolver/doublebarrel name = "double-barreled shotgun" desc = "A true classic." icon_state = "dshotgun" item_state = "shotgun" - max_shells = 2 w_class = 4.0 force = 10 flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BACK - caliber = "shotgun" origin_tech = "combat=3;materials=1" ammo_type = "/obj/item/ammo_casing/shotgun/beanbag" + mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/dualshot" - New() - for(var/i = 1, i <= max_shells, i++) - loaded += new ammo_type(src) - - update_icon() - return - - load_into_chamber() - if(in_chamber) - return 1 - if(!loaded.len) - return 0 - - var/obj/item/ammo_casing/AC = loaded[1] //load next casing. - loaded -= AC //Remove casing from loaded list. - AC.desc = "[initial(AC.desc)] This one is spent." - - if(AC.BB) - in_chamber = AC.BB //Load projectile into chamber. - AC.BB.loc = src //Set projectile loc to gun. - return 1 - return 0 - - attack_self(mob/living/user as mob) - if(!(locate(/obj/item/ammo_casing/shotgun) in src) && !loaded.len) - user << "\The [src] is empty." +/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob) + ..() + if (istype(A,/obj/item/ammo_box) || istype(A,/obj/item/ammo_casing)) + chamber_round() + if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) + user << "You begin to shorten the barrel of \the [src]." + if(get_ammo()) + afterattack(user, user) //will this work? + afterattack(user, user) //it will. we call it twice, for twice the FUN + playsound(user, fire_sound, 50, 1) + user.visible_message("The shotgun goes off!", "The shotgun goes off in your face!") return + if(do_after(user, 30)) //SHIT IS STEALTHY EYYYYY + icon_state = "sawnshotgun" + w_class = 3.0 + item_state = "gun" + slot_flags &= ~SLOT_BACK //you can't sling it on your back + slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + user << "You shorten the barrel of \the [src]!" + name = "sawn-off shotgun" + desc = "Omar's coming!" - for(var/obj/item/ammo_casing/shotgun/shell in src) //This feels like a hack. //don't code at 3:30am kids!! - if(shell in loaded) - loaded -= shell - shell.loc = get_turf(src.loc) - - user << "You break \the [src]." - update_icon() - - attackby(var/obj/item/A as obj, mob/user as mob) - if(istype(A, /obj/item/ammo_casing) && !load_method) - var/obj/item/ammo_casing/AC = A - if(AC.caliber == caliber && (loaded.len < max_shells) && (contents.len < max_shells)) //forgive me father, for i have sinned - user.drop_item() - AC.loc = src - loaded += AC - user << "You load a shell into \the [src]!" - A.update_icon() - update_icon() - if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) - user << "You begin to shorten the barrel of \the [src]." - if(loaded.len) - afterattack(user, user) //will this work? - afterattack(user, user) //it will. we call it twice, for twice the FUN - playsound(user, fire_sound, 50, 1) - user.visible_message("The shotgun goes off!", "The shotgun goes off in your face!") - return - if(do_after(user, 30)) //SHIT IS STEALTHY EYYYYY - icon_state = "sawnshotgun" - w_class = 3.0 - item_state = "gun" - slot_flags &= ~SLOT_BACK //you can't sling it on your back - slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - name = "sawn-off shotgun" - desc = "Omar's coming!" - user << "You shorten the barrel of \the [src]!" \ No newline at end of file +/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob) + var/num_unloaded = 0 + while (get_ammo() > 0) + var/obj/item/ammo_casing/CB + CB = magazine.get_round(0) + chambered = null + CB.loc = get_turf(src.loc) + CB.update_icon() + num_unloaded++ + if (num_unloaded) + user << "You break open \the [src] and unload [num_unloaded] shell\s." + else + user << "[src] is empty." \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 5471e17bb43..6a9bd1ca04d 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -15,9 +15,13 @@ var/amount = 30 var/beaker = null var/recharged = 0 + var/hackedcheck = 0 var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine", "sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron", "copper","mercury","radium","water","ethanol","sugar","sacid","tungsten") + var/list/broken_requirements = list() + var/broken_on_spawn = 0 + /obj/machinery/chem_dispenser/proc/recharge() if(stat & (BROKEN|NOPOWER)) return @@ -49,6 +53,29 @@ recharge() dispensable_reagents = sortList(dispensable_reagents) + if(broken_on_spawn) + var/amount = pick(1,2,2,3,4) + var/list/options = list() + options[/obj/item/weapon/stock_parts/capacitor/adv] = "Add an advanced capacitor to fix it." + options[/obj/item/weapon/stock_parts/console_screen] = "Replace the console screen to fix it." + options[/obj/item/weapon/stock_parts/manipulator/pico] = "Upgrade to a pico manipulator to fix it." + options[/obj/item/weapon/stock_parts/matter_bin/adv] = "Give it an advanced matter bin to fix it." + options[/obj/item/stack/sheet/mineral/diamond] = "Line up a cut diamond with the nozzle to fix it." + options[/obj/item/stack/sheet/mineral/uranium] = "Position a uranium sheet inside to fix it." + options[/obj/item/stack/sheet/mineral/plasma] = "Enter a block of plasma to fix it." + options[/obj/item/stack/sheet/mineral/silver] = "Cover the internals with a silver lining to fix it." + options[/obj/item/stack/sheet/mineral/gold] = "Wire a golden filament to fix it." + options[/obj/item/stack/sheet/plasteel] = "Surround the outside with a plasteel cover to fix it." + options[/obj/item/stack/sheet/rglass] = "Insert a pane of reinforced glass to fix it." + + while(amount > 0) + amount -= 1 + + var/index = pick(options) + broken_requirements[index] = options[index] + options -= index + + /obj/machinery/chem_dispenser/ex_act(severity) switch(severity) if(1.0) @@ -74,14 +101,18 @@ * * @param user /mob The mob who is interacting with this ui * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") - * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui * * @return nothing */ -/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main") if(stat & (BROKEN|NOPOWER)) return if(user.stat || user.restrained()) return + if(broken_requirements.len) + user << "[src] is broken. [broken_requirements[broken_requirements[1]]]" + return + + // this is the data which will be sent to the ui var/data[0] data["amount"] = amount @@ -111,10 +142,7 @@ chemicals.Add(list(list("title" = temp.name, "id" = temp.id, "commands" = list("dispense" = temp.id)))) // list in a list because Byond merges the first list... data["chemicals"] = chemicals - if (!ui) // no ui has been passed, so we'll search for one - { - ui = nanomanager.get_open_ui(user, src, ui_key) - } + var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, ui_key) if (!ui) // the ui does not exist, so we'll create a new one ui = new(user, src, ui_key, "chem_dispenser.tmpl", "Chem Dispenser 5000", 374, 640) @@ -139,7 +167,7 @@ if(href_list["dispense"]) if (dispensable_reagents.Find(href_list["dispense"]) && beaker != null) - var/obj/item/weapon/reagent_containers/B = src.beaker + var/obj/item/weapon/reagent_containers/glass/B = src.beaker var/datum/reagents/R = B.reagents var/space = R.maximum_volume - R.total_volume @@ -155,22 +183,35 @@ add_fingerprint(usr) return 1 // update UIs attached to this object -/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/B as obj, var/mob/user as mob) +/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob) if(isrobot(user)) return - if(!istype(B, /obj/item/weapon/reagent_containers/glass || /obj/item/weapon/reagent_containers/food)) + if(broken_requirements.len && B.type == broken_requirements[1]) + broken_requirements -= broken_requirements[1] + user << "You fix [src]." + if(istype(B,/obj/item/stack)) + var/obj/item/stack/S = B + S.use(1) + else + user.drop_item() + del(B) return + if(!istype(B, /obj/item/weapon/reagent_containers/glass)) + return + + if(src.beaker) user << "Something is already loaded into the machine." return - - src.beaker = B - user.drop_item() - B.loc = src - user << "You set [B] on the machine." - nanomanager.update_uis(src) // update all UIs attached to src + if(istype(B, /obj/item/weapon/reagent_containers/glass||/obj/item/weapon/reagent_containers/food)) + src.beaker = B + user.drop_item() + B.loc = src + user << "You set [B] on the machine." + nanomanager.update_uis(src) // update all UIs attached to src + return /obj/machinery/chem_dispenser/attack_ai(mob/user as mob) return src.attack_hand(user) @@ -184,24 +225,52 @@ ui_interact(user) -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - /obj/machinery/chem_dispenser/soda icon_state = "soda_dispenser" name = "soda fountain" desc = "A drink fabricating machine, capable of producing many sugary drinks with just one touch." energy = 100 max_energy = 100 - dispensable_reagents = list("water","ice","coffee","tea","milk","cream","icetea","space_cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_line","sugar","orangejuice","limejuice","lemonjuice","tomatojuice","banana","berryjuice","potato_juice","watermelonjuice","carrotjuice") + dispensable_reagents = list("water","ice","coffee","tea","icetea","space_cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_lime","sugar","orangejuice","limejuice") + /obj/machinery/chem_dispenser/soda/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob) + ..() + if(istype(B, /obj/item/device/multitool)) + if(hackedcheck == 0) + user << "You change the mode from 'McNano' to 'Pizza King'." + dispensable_reagents += list("thirteenloko") + hackedcheck = 1 + return + + else + user << "You change the mode from 'Pizza King' to 'McNano'." + dispensable_reagents -= list("thirteenloko") + hackedcheck = 0 + return /obj/machinery/chem_dispenser/beer icon_state = "booze_dispenser" - name = "booze-o-mat" + name = "booze dispenser" energy = 100 max_energy = 100 desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." - dispensable_reagents = list("beer","kahlua","whiskey","wine","vodka","gin","rum","tequila","vermouth","cognac","ale","goldschlager","patron","mead") + dispensable_reagents = list("water","ice","coffee","tea","cream","lemon_lime","sugar","orangejuice","limejuice","cola","sodawater","tonic","beer","kahlua","whisky","wine","vodka","gin","rum","tequila","vermouth","cognac","ale","mead") + + /obj/machinery/chem_dispenser/beer/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob) + ..() + if(istype(B, /obj/item/device/multitool)) + if(hackedcheck == 0) + user << "You disable the 'nanotrasen-are-cheap-bastards' lock, enabling hidden and very expensive boozes." + dispensable_reagents += list("goldschlager","patron","watermelonjuice","berryjuice") + hackedcheck = 1 + return + + else + user << "You re-enable the 'nanotrasen-are-cheap-bastards' lock, disabling hidden and very expensive boozes." + dispensable_reagents -= list("goldschlager","patron","watermelonjuice","berryjuice") + hackedcheck = 0 + return +////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /obj/machinery/chem_master name = "ChemMaster 3000" @@ -371,7 +440,7 @@ var/name = reject_bad_text(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)")) while (count--) var/obj/item/weapon/reagent_containers/pill/P = new/obj/item/weapon/reagent_containers/pill(src.loc) - if(!name) name = "[reagents.get_master_reagent_name()] ([amount_per_pill] units)" + if(!name) name = reagents.get_master_reagent_name() P.name = "[name] pill" P.pixel_x = rand(-7, 7) //random position P.pixel_y = rand(-7, 7) @@ -383,9 +452,9 @@ src.updateUsrDialog() else if (href_list["createbottle"]) if(!condi) - var/name = reject_bad_text(input(usr,"Name:","Name your bottle!","[reagents.get_master_reagent_name()] ([reagents.total_volume] units)")) + var/name = reject_bad_text(input(usr,"Name:","Name your bottle!",reagents.get_master_reagent_name())) var/obj/item/weapon/reagent_containers/glass/bottle/P = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc) - if(!name) name = "[reagents.get_master_reagent_name()] ([reagents.total_volume] units)" + if(!name) name = reagents.get_master_reagent_name() P.name = "[name] bottle" P.pixel_x = rand(-7, 7) //random position P.pixel_y = rand(-7, 7) @@ -478,7 +547,7 @@ if(!condi) dat += "
Create pill (50 units max)
![](\"pill[pillsprite].png\"){kind=icon}
" dat += "Create multiple pills
" - dat += "Create bottle (30 units max)
![](\"bottle[bottlesprite].png\"){kind=icon}
"
+ dat += "Create bottle (30 units max)"
else
dat += "Create bottle (50 units max)"
if(!condi)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index cf0761eba3f..7c6c9f23319 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -213,6 +213,44 @@ datum
color = "#0064C8" // rgb: 0, 100, 200
custom_metabolism = 0.01
+ on_mob_life(var/mob/living/M as mob)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.species.name=="Grey")
+ if(!M) M = holder.my_atom
+ M.adjustToxLoss(1*REM)
+ M.take_organ_damage(0, 1*REM)
+ ..()
+ reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ if(!istype(M, /mob/living))
+ return
+
+ // Grays treat water like acid.
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.species.name=="Grey")
+ if(method == TOUCH)
+ if(H.wear_mask)
+ H << "\red Your mask protects you from the water!"
+ return
+ if(H.head)
+ H << "\red Your helmet protects you from the water!"
+ return
+ if(!M.unacidable)
+ if(prob(15) && volume >= 30)
+ var/datum/organ/external/affecting = H.get_organ("head")
+ if(affecting)
+ if(affecting.take_damage(25, 0))
+ H.UpdateDamageIcon()
+ H.status_flags |= DISFIGURED
+ H.emote("scream")
+ else
+ M.take_organ_damage(min(15, volume * 2)) // uses min() and volume to make sure they aren't being sprayed in trace amounts (1 unit != insta rape) -- Doohl
+ else
+ if(!M.unacidable)
+ M.take_organ_damage(min(15, volume * 2))
+
+
reaction_turf(var/turf/simulated/T, var/volume)
if (!istype(T)) return
src = null
@@ -294,7 +332,7 @@ datum
id = "anti_toxin"
description = "Dylovene is a broad-spectrum antitoxin."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#006400" // rgb: 0, 100, 0
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -522,7 +560,7 @@ datum
id = "inaprovaline"
description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#0000FF" // rgb: 0, 0, 255
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -826,8 +864,12 @@ datum
return
if(!M.unacidable)
- if(prob(15) && istype(M, /mob/living/carbon/human) && volume >= 30)
+ if(prob(15) && istype(M, /mob/living/carbon/human/grey) && volume >= 30)
var/mob/living/carbon/human/H = M
+ if(H.species.name=="Grey")
+ ..()
+ return // Greys lurve dem some sacid
+
var/datum/organ/external/affecting = H.get_organ("head")
if(affecting)
if(affecting.take_damage(25, 0))
@@ -838,6 +880,11 @@ datum
M.take_organ_damage(min(15, volume * 2)) // uses min() and volume to make sure they aren't being sprayed in trace amounts (1 unit != insta rape) -- Doohl
else
if(!M.unacidable)
+ if(ishuman(M))
+ var/mob/living/carbon/human/grey/H = M
+ if(H.species.name=="Grey")
+ ..()
+ return // Greys lurve dem some sacid
M.take_organ_damage(min(15, volume * 2))
reaction_obj(var/obj/O, var/volume)
@@ -1057,14 +1104,14 @@ datum
id = "tramadol"
description = "A simple, yet effective painkiller."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#FAEBD7" //rgb 250, 235, 215
oxycodone
name = "Oxycodone"
id = "oxycodone"
description = "An effective and very addictive painkiller."
reagent_state = LIQUID
- color = "#C805DC"
+ color = "#8A2BE2" // rgb 138, 43, 226
virus_food
name = "Virus Food"
@@ -1085,7 +1132,7 @@ datum
id = "sterilizine"
description = "Sterilizes wounds in preparation for surgery."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#F0FFF0" // rgb: 240, 255, 240
/* reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
src = null
if (method==TOUCH)
@@ -1342,7 +1389,7 @@ datum
id = "leporazine"
description = "Leporazine can be use to stabilize an individuals body temperature."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#E9D66B" // rgb: 233, 214, 107
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1358,7 +1405,7 @@ datum
id = "cryptobiolin"
description = "Cryptobiolin causes confusion and dizzyness."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#FFD1DC" // rgb: 255, 209, 220
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1374,7 +1421,7 @@ datum
id = "lexorin"
description = "Lexorin temporarily stops respiration. Causes tissue damage."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#32127A" // rgb: 50, 18, 122
on_mob_life(var/mob/living/M as mob)
if(M.stat == 2.0)
@@ -1392,7 +1439,7 @@ datum
id = "kelotane"
description = "Kelotane is a drug used to treat burns."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#ECD540" // rgb: 236, 213, 64
on_mob_life(var/mob/living/M as mob)
if(M.stat == 2.0)
@@ -1407,7 +1454,7 @@ datum
id = "dermaline"
description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#F4A460" // rgb: 244, 164, 96
on_mob_life(var/mob/living/M as mob)
if(M.stat == 2.0) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN
@@ -1422,7 +1469,7 @@ datum
id = "dexalin"
description = "Dexalin is used in the treatment of oxygen deprivation."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#00CED1" // rgb: 0, 206, 209
on_mob_life(var/mob/living/M as mob)
if(M.stat == 2.0)
@@ -1439,7 +1486,7 @@ datum
id = "dexalinp"
description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#00FFFF" // rgb: 0, 255, 255
on_mob_life(var/mob/living/M as mob)
if(M.stat == 2.0)
@@ -1456,7 +1503,7 @@ datum
id = "tricordrazine"
description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#DB7093" // rgb: 219, 112, 147
on_mob_life(var/mob/living/M as mob)
if(M.stat == 2.0)
@@ -1538,7 +1585,7 @@ datum
id = "synaptizine"
description = "Synaptizine is used to treat various diseases."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#FF4040" // rgb: 255, 64, 64
custom_metabolism = 0.01
on_mob_life(var/mob/living/M as mob)
@@ -1560,7 +1607,7 @@ datum
id = "impedrezene"
description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#2C1608" // rgb: 44, 22, 8
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1576,7 +1623,7 @@ datum
id = "hyronalin"
description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#74C365" // rgb: 116, 195, 101
custom_metabolism = 0.05
on_mob_life(var/mob/living/M as mob)
@@ -1590,7 +1637,7 @@ datum
id = "arithrazine"
description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#BFFF00" // rgb: 191, 255, 0
custom_metabolism = 0.05
on_mob_life(var/mob/living/M as mob)
@@ -1609,7 +1656,7 @@ datum
id = "alkysine"
description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#F77FBE" // rgb: 247, 127, 190
custom_metabolism = 0.05
on_mob_life(var/mob/living/M as mob)
@@ -1623,7 +1670,7 @@ datum
id = "imidazoline"
description = "Heals eye damage"
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#FFA500" // rgb: 255, 165, 0
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1640,7 +1687,7 @@ datum
id = "bicaridine"
description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#FF003F" // rgb: 255, 0, 63
on_mob_life(var/mob/living/M as mob)
if(M.stat == 2.0)
@@ -1655,7 +1702,7 @@ datum
id = "hyperzine"
description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#CCFF00" // rgb: 204, 255, 0
custom_metabolism = 0.03
on_mob_life(var/mob/living/M as mob)
@@ -1669,7 +1716,7 @@ datum
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."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#BF00FF" // rgb: 191, 0, 255
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1686,7 +1733,7 @@ datum
id = "clonexadone"
description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' clones that get ejected early when used in conjunction with a cryo tube."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#FF77FF" // rgb: 255, 119, 255
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1703,7 +1750,7 @@ datum
id = "rezadone"
description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
reagent_state = SOLID
- color = "#669900" // rgb: 102, 153, 0
+ color = "#E25822" // rgb: 226, 88, 34
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1730,7 +1777,7 @@ datum
id = "spaceacillin"
description = "An all-purpose antiviral agent."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#228B22" // rgb: 34, 139, 34
custom_metabolism = 0.01
on_mob_life(var/mob/living/M as mob)
@@ -3547,64 +3594,28 @@ datum
else if(data >= 115 && prob(33))
M.confused = max(M.confused+15,15)
..()
+
return
+
+
+//Fox
+/////////////////Requires Further Balance Testing//////////////////
/*
-
-//Grutor
-/////////////////Zombie Stuff//////////////////
-
- //This isn't implemented yet, future updates might change this
- necroblood
- name = "Zombie blood"
- id = "necroblood"
- description = "It's blood, but it looks like jello."
+ lectrazine
+ name = "Lectrazine"
+ id = "lectrazine"
+ description = "An extremly powerful cardiostimulant and analgesic which is used in revival of deceased."
reagent_state = LIQUID
+ color = "#080000"
+ custom_metabolism = 0.1
- //So you don't need to be a virologist
- necrocure
- name = "Zombie Cure"
- id = "necrocure"
- description = "The thing only stopping you from turning."
- reagent_state = LIQUID
- nutriment_factor = 0
- color = "#54C754" // rgb: 84, 199, 84
-
- z_meat
- name = "Zombie Juice"
- id = "zmeat"
- description = "Definitely smells funny."
- reagent_state = LIQUID
- color = "#E23351"
- var/said_it_before = 0
- var/fate_is_sealed = 0
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- if(said_it_before == 0)
- M << "You are starting to have regrets..."
- said_it_before = 1
- if(prob(8) && istype(M, /mob/living/carbon) && fate_is_sealed == 0) //Per reagent tick there is a chance this person will explode
- fate_is_sealed = 1
- sleep(rand(80, 250))
- for(var/obj/item/W in M) //Some items will not be recovered..
- if(prob(70))
- M.drop_from_inventory(W)
- M.gib()
- return
-
- necrovirus
- name = "Zombie Virus"
- id = "necrodisease"
- description = "It's said it can bring the dead back to life."
- reagent_state = SOLID
-
- on_mob_life(var/mob/living/carbon/M as mob)
+ reaction_mob(var/mob/living/carbon/M as mob, var/methode=INGEST)
if(!M) M = holder.my_atom
- var/datum/disease/D = new /datum/disease/zombie_transformation
- D.holder = M
- D.affected_mob = M
- M.viruses += D
- ..()
+ M.stat = CONSCIOUS
+ M.setOxyLoss(0)
+ M.heal_organ_damage(15,0)
+ M.SetParalysis(15)
+ M.adjustBrainLoss(10*REM)
return
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 85a4d8f2658..ea85ddadb15 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -315,8 +315,8 @@ datum
name = "Glycerol"
id = "glycerol"
result = "glycerol"
- required_reagents = list("cornoil" = 3, "sacid" = 1)
- result_amount = 1
+ required_reagents = list("cornoil" = 3, "sacid" = 2)
+ result_amount = 5
nitroglycerin
name = "Nitroglycerin"
@@ -455,8 +455,8 @@ datum
name = "Zombie Powder"
id = "zombiepowder"
result = "zombiepowder"
- required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5)
- result_amount = 2
+ required_reagents = list("carpotoxin" = 1, "stoxin" = 1, "copper" = 1)
+ result_amount = 3
rezadone
name = "Rezadone"
@@ -1961,21 +1961,18 @@ datum
required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
result_amount = 2
-//Grutor
-///////////////////////Zombie recipes////////////////////////////
-
- necrocure
- name = "Zombie Cure"
- id = "necrocure"
- result = "necrocure"
- required_reagents = list("sterilizine" = 2, "zmeat" = 2)
- result_amount = 5
-
- necrodisease
- name = "Zombie Virus"
- id = "necrodisease"
- result = "necrodisease"
- required_reagents = list("zombiepowder" = 2, "cryptobiolin" = 2, "mutagen" = 2)
- result_amount = 5
+//Fox
+///////////////////////Requires Balance Testing///////////////////
+/*
+ lectrazine
+ name = "Lectrazine"
+ id = "lectrazine"
+ result = "lectrazine"
+ required_reagents = list("inaprovaline" = 1, "phosphorus" = 1)
+ required_catalysts = list("silver" = 5)
+ result_amount = 2
+
+*/
+
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 6ea87725d1b..f2a57d1c212 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -118,7 +118,7 @@
if(istype(W,/obj/item/weapon/storage))
..() // -> item/attackby()
if((slices_num <= 0 || !slices_num) || !slice_path)
- return 1
+ return 0
var/inaccurate = 0
if( \
istype(W, /obj/item/weapon/kitchenknife) || \
diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm
index c47103e2821..cada51cf361 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm
@@ -635,7 +635,7 @@
del(src)
return
-/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato/HasEntered(AM as mob|obj)
+/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato/Crossed(AM as mob|obj)
if (istype(AM, /mob/living/carbon))
var/mob/M = AM
if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))
diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
index a64af273833..3acaaffe9d1 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
@@ -25,20 +25,3 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
name = "Corgi meat"
desc = "Tastes like... well you know..."
-
-//Grutor
-//zombies yum...
-/obj/item/weapon/reagent_containers/food/snacks/meat/undead
- name = "Rotten flesh"
- desc = "You really shouldn't..."
- icon = 'icons/obj/food.dmi'
- icon_state = "rottenmeat"
-
- attack(mob/M as mob, mob/user as mob, def_zone)
- if(..())
- M << "You are starting to have regrets..." //If you seeing this message twice, remove this one.
-
- New()
- ..()
- reagents.add_reagent("carpotoxin", 6)
- reagents.add_reagent("zmeat", 20)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 831c3df795f..7e87f589664 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -123,7 +123,7 @@
else if(istype(target, /obj/machinery/bunsen_burner))
return
- else if(istype(target, /obj/machinery/anomaly))
+ else if(istype(target, /obj/machinery/radiocarbon_spectrometer))
return
else if(reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index c4beb0a8f91..a1240ebec56 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -17,9 +17,40 @@
if(!icon_state)
icon_state = "bottle[rand(1,20)]"
+
+ //Copypasta from /obj/item/weapon/reagent_containers/glass/beaker
+ on_reagent_change()
+ update_icon()
+
+ pickup(mob/user)
+ ..()
+ update_icon()
+
+ dropped(mob/user)
+ ..()
+ update_icon()
+
+ attack_hand()
+ ..()
+ update_icon()
+
update_icon()
overlays.Cut()
+ if(reagents.total_volume)
+ var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+
+ var/percent = round((reagents.total_volume / volume) * 100)
+ switch(percent)
+ if(0 to 24) filling.icon_state = "[icon_state]10"
+ if(25 to 49) filling.icon_state = "[icon_state]25"
+ if(50 to 74) filling.icon_state = "[icon_state]50"
+ if(75 to 90) filling.icon_state = "[icon_state]75"
+ if(91 to INFINITY) filling.icon_state = "[icon_state]100"
+
+ filling.icon += mix_color_from_reagents(reagents.reagent_list)
+ overlays += filling
+
if (!is_open_container())
var/image/lid = image(icon, src, "lid_bottle")
overlays += lid
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 9d3aa3b4608..652d16a0f19 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -165,10 +165,23 @@
for(var/datum/reagent/blood/d in src.reagents.reagent_list)
B = d
break
+ var/datum/reagent/water/W
+ for(var/datum/reagent/water/r in src.reagents.reagent_list)
+ W = r
+ break
var/trans
+ if(W && istype(target,/mob/living/carbon/human/slime))
+ var/mob/living/carbon/human/slime/S = target
+ S.vessel.add_reagent("water", 5)
+ S.vessel.update_total()
if(B && istype(target,/mob/living/carbon))
- var/mob/living/carbon/C = target
- C.inject_blood(src,5)
+ if(istype(target,/mob/living/carbon/human/slime))
+ var/mob/living/carbon/human/slime/S = target
+ S.reagents.add_reagent("blood", 5)
+ S.reagents.update_total()
+ else
+ var/mob/living/carbon/C = target
+ C.inject_blood(src,5)
else
trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index b328d5d495a..ae820ebf219 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -229,6 +229,11 @@
// attack with hand, switch position
/obj/machinery/conveyor_switch/attack_hand(mob/user)
+ if(!allowed(user))
+ user << "Access denied."
+ return
+
+
if(position == 0)
if(last_pos < 0)
position = 1
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index bea829b1944..ae3dd52b4cc 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -157,7 +157,7 @@
/obj/item/device/destTagger
name = "destination tagger"
desc = "Used to set the destination of properly wrapped packages."
- icon_state = "forensic0-old"
+ icon_state = "dest_tagger"
var/currTag = 0
//The whole system for the sorttype var is determined based on the order of this list,
//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index effc3e18844..6fa91b4aaf3 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -101,7 +101,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
user << "\The [name] must be linked to an R&D console first!"
return 1
if (O.is_open_container())
- return
+ return 0
if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond) && !istype(O, /obj/item/stack/sheet/mineral/uranium))
user << "\red You cannot insert this item into the [name]!"
return 1
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 9deb8a8ab40..1f5abd38aa8 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1490,7 +1490,16 @@ datum/design/ammo_9mm
req_tech = list("combat" = 4, "materials" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 3750, "$silver" = 100)
- build_path = "/obj/item/ammo_magazine/c9mm"
+ build_path = "/obj/item/ammo_box/c9mm"
+
+datum/design/mag_smg
+ name = "Submachine Gun Magazine (9mm)"
+ desc = "A prototype magazine for the submachine gun."
+ id = "mag_smg"
+ req_tech = list("combat" = 4, "materials" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 3750, "$silver" = 100)
+ build_path = "/obj/item/ammo_box/magazine/msmg9mm"
datum/design/stunshell
name = "Stun Shell"
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm
index 3517cd96064..6300a6d71a4 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm
@@ -13,8 +13,10 @@
artifact_id = "[pick("kappa","sigma","antaeres","beta","omicron","iota","epsilon","omega","gamma","delta","tau","alpha")]-[rand(100,999)]"
artifact_find_type = pick(\
+ 5;/obj/machinery/power/supermatter,\
5;/obj/structure/constructshell,\
5;/obj/machinery/syndicate_beacon,\
+ 25;/obj/machinery/power/supermatter/shard,\
50;/obj/structure/cult/pylon,\
100;/obj/machinery/auto_cloner,\
100;/obj/machinery/giga_drill,\
@@ -33,6 +35,7 @@
icon_state = "boulder1"
density = 1
opacity = 1
+ anchored = 1
var/excavation_level = 0
var/datum/geosample/geological_data
var/datum/artifact_find/artifact_find
@@ -73,17 +76,14 @@
user << "\blue You finish [P.drill_verb] [src]."
excavation_level += P.excavation_amount
- var/reveal_prob = 1
- if(excavation_level >= 95)
- reveal_prob = 50 + (excavation_level - 90) * (excavation_level - 90)
- else if(excavation_level >= 90)
- reveal_prob = 5
- if(excavation_level >= 100)
+ if(excavation_level > 100)
//failure
user.visible_message("[src] suddenly crumbles away.",\
- "\red [src] has disintegrated under your onslaught, any secrets it was holding long gone.")
+ "\red [src] has disintegrated under your onslaught, any secrets it was holding are long gone.")
del(src)
- else if(prob(reveal_prob))
+ return
+
+ if(prob(excavation_level))
//success
if(artifact_find)
var/spawn_type = artifact_find.artifact_find_type
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm
deleted file mode 100644
index 3c779caa967..00000000000
--- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm
+++ /dev/null
@@ -1,242 +0,0 @@
-//Part of ISaidNo's public release around July 2011(ish), multiple changes
-//many thanks
-
-#define PLASMA_SPAWN 1
-#define N2_SPAWN 2
-#define CO2_SPAWN 3
-#define RADIATE 4
-#define VIRUS 5
-#define HEAT 6
-#define COLD 7
-
-/obj/machinery/artifact
- name = "alien artifact"
- desc = "A large alien device."
- icon = 'icons/obj/xenoarchaeology.dmi'
- icon_state = "ano00"
- var/icon_num = 0
- anchored = 0
- density = 1
- var/origin = null // Used in the randomisation/research of the artifact.
- var/activated = 0 // Whether or not the artifact has been unlocked.
- var/charged = 1 // Whether the artifact is ready to have it's effect.
- var/chargetime = 0 // How much time until the artifact is charged.
- var/recharge = 5 // How long does it take this artifact to recharge?
- var/display_id = "" // Artifact ID to display once successfully scanned
- var/datum/artifact_effect/my_effect = null
- var/being_used = 0
-
-/obj/machinery/artifact/New()
- ..()
- // Origin and appearance randomisation
-
- my_effect = new()
-
-
- icon_num = rand(0,5)
- icon_state = "ano[icon_num]0"
-
- // Power randomisation
- my_effect.trigger = pick("force","energy","chemical","heat","touch","presence")
- if (my_effect.trigger == "chemical")
- my_effect.triggerX = pick("hydrogen","corrosive","volatile","toxic")
-
- my_effect.effecttype = pick("healing","injure","stun","roboheal","robohurt","cellcharge","celldrain","planthelper","forcefield","teleport","dnaswitch","emp","sleepy")
-
- // Select range based on the power
- var/canworldpulse = 1
- switch(my_effect.effecttype)
- if("healing")
- my_effect.effectmode = pick("aura","pulse","contact")
- if("injure")
- my_effect.effectmode = pick("aura","pulse","contact")
- if("stun")
- my_effect.effectmode = pick("aura","pulse","contact")
- if("roboheal")
- my_effect.effectmode = pick("aura","pulse","contact")
- if("robohurt")
- my_effect.effectmode = pick("aura","pulse","contact")
- if("sleepy")
- my_effect.effectmode = pick("aura","pulse","contact")
- if("cellcharge")
- my_effect.effectmode = pick("aura","pulse")
- if("celldrain")
- my_effect.effectmode = pick("aura","pulse")
- if("planthelper")
- my_effect.effectmode = pick("aura","pulse")
- canworldpulse = 0
- if("forcefield")
- my_effect.effectmode = "contact"
- canworldpulse = 0
- if("teleport")
- my_effect.effectmode = pick("pulse","contact")
- if("genderswitch")
- my_effect.effectmode = pick("pulse","contact")
- if("emp")
- my_effect.effectmode = pick("pulse","contact")
-
- // Recharge timer & range setup
- if (my_effect.effectmode == "aura")
- my_effect.aurarange = rand(1,4)
- if (my_effect.effectmode == "contact")
- src.recharge = rand(5,15)
- if (my_effect.effectmode == "pulse")
- my_effect.aurarange = rand(2,14)
- src.recharge = rand(5,20)
- if (canworldpulse == 1 && prob(1))
- my_effect.effectmode = "worldpulse"
- src.recharge = rand(40,120)
-
- /*
- display_id += pick("kappa","sigma","antaeres","beta","lorard","omicron","iota","upsilon","omega","gamma","delta")
- display_id += "-"
- display_id += num2text(rand(100,999))
- */
-
-/obj/machinery/artifact/Del()
- ..()
- my_effect.HaltEffect()
-
-/obj/machinery/artifact/attack_hand(var/mob/user as mob)
- if (istype(user, /mob/living/silicon/ai) || istype(user, /mob/dead/)) return
- if (istype(user, /mob/living/silicon/robot))
- if (get_dist(user, src) > 1)
- user << "\red You can't reach [src] from here."
- return
- if(ishuman(user) && istype(user:gloves,/obj/item/clothing/gloves))
- return ..()
- for(var/mob/O in viewers(src, null))
- O.show_message(text("[] touches [].", user, src), 1)
- src.add_fingerprint(user)
- src.Artifact_Contact(user)
-
-/obj/machinery/artifact/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
- /*if (istype(W, /obj/item/weapon/cargotele))
- W:cargoteleport(src, user)
- return*/
- if (my_effect.trigger == "chemical" && istype(W, /obj/item/weapon/reagent_containers/))
- switch(my_effect.triggerX)
- if("hydrogen")
- if (W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1))
- src.Artifact_Activate()
- return
- if("corrosive")
- if (W.reagents.has_reagent("acid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1))
- src.Artifact_Activate()
- return
- if("volatile")
- if (W.reagents.has_reagent("plasma", 1) || W.reagents.has_reagent("thermite", 1))
- src.Artifact_Activate()
- return
- if("toxic")
- if (W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amanitin", 1) || W.reagents.has_reagent("neurotoxin", 1))
- src.Artifact_Activate()
- return
- ..()
- if (my_effect.trigger == "force" && W.force >= 10 && !src.activated) src.Artifact_Activate()
- if (my_effect.trigger == "energy")
- if (istype(W,/obj/item/weapon/melee/baton) && W:status) src.Artifact_Activate()
- if (istype(W,/obj/item/weapon/melee/energy)) src.Artifact_Activate()
- if (istype(W,/obj/item/weapon/melee/cultblade)) src.Artifact_Activate()
- if (istype(W,/obj/item/weapon/gun/energy/)) src.Artifact_Activate()
- if (istype(W,/obj/item/device/multitool)) src.Artifact_Activate()
- if (istype(W,/obj/item/weapon/card/emag)) src.Artifact_Activate()
- if (my_effect.trigger == "heat")
- if (istype(W,/obj/item/weapon/match) && W:lit) src.Artifact_Activate()
- if (istype(W, /obj/item/weapon/weldingtool) && W:welding) src.Artifact_Activate()
- if (istype(W, /obj/item/weapon/lighter) && W:lit) src.Artifact_Activate()
-
- //Bump(atom/A)
-
-/obj/machinery/artifact/Bumped(M as mob|obj)
- if (istype(M,/obj/item/weapon/) && my_effect.trigger == "force" && M:throwforce >= 10) src.Artifact_Activate()
-
-/obj/machinery/artifact/bullet_act(var/obj/item/projectile/P)
- if (my_effect.trigger == "force")
- if(istype(P,/obj/item/projectile/bullet)) src.Artifact_Activate()
- else if(istype(P,/obj/item/projectile/hivebotbullet)) src.Artifact_Activate()
- if (my_effect.trigger == "energy")
- if(istype(P,/obj/item/projectile/beam)) src.Artifact_Activate()
- else if(istype(P,/obj/item/projectile/ion)) src.Artifact_Activate()
- else if(istype(P,/obj/item/projectile/energy)) src.Artifact_Activate()
- if (my_effect.trigger == "heat")
- if(istype(P,/obj/item/projectile/temp)) src.Artifact_Activate()
-
-/obj/machinery/artifact/ex_act(severity)
- switch(severity)
- if(1.0) del src
- if(2.0)
- if (prob(50)) del src
- if (my_effect.trigger == "force") src.Artifact_Activate()
- if (my_effect.trigger == "heat") src.Artifact_Activate()
- if(3.0)
- if (my_effect.trigger == "force") src.Artifact_Activate()
- if (my_effect.trigger == "heat") src.Artifact_Activate()
- return
-
-/obj/machinery/artifact/temperature_expose(null, temp, volume)
- if (my_effect.trigger == "heat") src.Artifact_Activate()
-
-/obj/machinery/artifact/process()
- if (!src.activated)
- return
- if (chargetime > 0)
- chargetime -= 1
- else
- src.charged = 1
-
- my_effect.UpdateEffect(src.loc)
-
- //activate
- if( (my_effect.effectmode == "pulse" || my_effect.effecttype == "worldpulse") && activated)
- if(src.charged && my_effect.DoEffect(src))
- src.charged = 0
- src.chargetime = src.recharge
-
-/obj/machinery/artifact/proc/Artifact_Activate()
- src.activated = !src.activated
- var/display_msg = ""
- if(activated)
- if(prob(30))
- switch(rand(4))
- if(0)
- display_msg = "momentarily glows brightly!"
- if(1)
- display_msg = "distorts slightly for a moment!"
- if(2)
- display_msg = "makes a slightly clicking noise!"
- if(3)
- display_msg = "flickers slightly!"
- if(4)
- display_msg = "vibrates!"
- else
- my_effect.HaltEffect()
- if(prob(30))
- switch(rand(2))
- if(0)
- display_msg = "grows dull!"
- if(1)
- display_msg = "fades in intensity!"
- if(2)
- display_msg = "suddenly becomes very quiet!"
-
- icon_state = "ano[icon_num][activated]"
- for(var/mob/O in viewers(src, null))
- O.show_message(text("[] [display_msg]", src), 1)
-
-/obj/machinery/artifact/proc/Artifact_Contact(var/mob/user as mob)
- // Trigger Code
- if (istype (user,/mob/living/carbon/) && my_effect.trigger == "touch" && !src.activated) src.Artifact_Activate()
- else if (my_effect.trigger != "touch" && !src.activated) user << "Nothing happens."
-
- if (my_effect.effectmode == "contact" && src.activated && src.charged)
- my_effect.DoEffect(user)
- src.charged = 0
- src.chargetime = src.recharge
-
-// this was used in QM for a time but it fell into disuse and wasn't removed, the purpose being to check if an artifact
-// was benevolent or malicious, to determine whether QMs would be paid or punished for shipping it
-
-/obj/machinery/artifact/Move()
- ..()
- my_effect.update_move(src, src.loc)
diff --git a/code/modules/research/xenoarchaeology/artifact/effect_old.dm b/code/modules/research/xenoarchaeology/artifact/effect_old.dm
deleted file mode 100644
index 092cb0d0f58..00000000000
--- a/code/modules/research/xenoarchaeology/artifact/effect_old.dm
+++ /dev/null
@@ -1,542 +0,0 @@
-//
-
-/datum/artifact_effect
- var/artifact_id = "" // Display ID of the spawning artifact
- var/trigger = "touch" // What activates it?
- var/triggerX = "none" // Used for more varied triggers
- var/effecttype = "healing" // What does it do?
- var/effectmode = "aura" // How does it carry out the effect?
- var/aurarange = 4 // How far the artifact will extend an aura effect.
- var/list/created_field
- var/archived_loc
-
-/datum/artifact_effect/New()
- //
- created_field = new()
-
-/datum/artifact_effect/proc/GetOriginString(var/origin)
-
-/datum/artifact_effect/proc/GetEffectString(var/effect)
-
-/datum/artifact_effect/proc/GetTriggerString(var/trigger)
-
-/datum/artifact_effect/proc/GetRangeString(var/range)
- switch(effectmode)
- if("aura") return "Constant Short-Range Energy Field"
- if("pulse")
- if(aurarange > 7) return "Long Range Energy Pulses"
- else return "Medium Range Energy Pulses"
- if("worldpulse") return "Extreme Range Energy Pulses"
- if("contact") return "Requires contact with subject"
- else return "Unknown Range"
-
-/datum/artifact_effect/proc/HaltEffect()
- for(var/obj/effect/energy_field/F in created_field)
- created_field.Remove(F)
- del F
-
-/datum/artifact_effect/proc/UpdateEffect(var/atom/originator)
- /*for(var/obj/effect/energy_field/F in created_field)
- created_field.Remove(F)
- del F*/
- if(originator.loc != archived_loc)
- archived_loc = originator.loc
- update_move(originator)
-
- for(var/obj/effect/energy_field/E in created_field)
- if(E.strength < 5)
- E.Strengthen(0.2)
-
-/datum/artifact_effect/proc/DoEffect(var/atom/originator)
- archived_loc = originator.loc
- if (src.effectmode == "contact")
- var/mob/living/user = originator
- if(!user)
- return
- switch(src.effecttype)
- if("healing")
- //caeltodo
- if (istype(user, /mob/living/carbon/human/))
- user << "\blue You feel a soothing energy invigorate you."
-
- var/mob/living/carbon/human/H = user
- for(var/datum/organ/external/affecting in H.organs)
- if(!affecting) continue
- if(!istype(affecting, /datum/organ/external)) continue
- affecting.heal_damage(25, 25) //fixes getting hit after ingestion, killing you when game updates organ health
- //user:heal_organ_damage(25, 25)
- //
- user.adjustOxyLoss(-25)
- user.adjustToxLoss(-25)
- user.adjustBruteLoss(-25)
- user.adjustFireLoss(-25)
- user.adjustBrainLoss(-25)
- user.radiation -= min(user.radiation, 25)
- user.nutrition += 50
- H.bodytemperature = initial(H.bodytemperature)
- //
- H.vessel.add_reagent("blood",50)
- spawn(1)
- H.fixblood()
- H.regenerate_icons()
- return 1
- //
- if (istype(user, /mob/living/carbon/monkey/))
- user << "\blue You feel a soothing energy invigorate you."
- user.adjustOxyLoss(-25)
- user.adjustToxLoss(-25)
- user.adjustBruteLoss(-25)
- user.adjustFireLoss(-25)
- user.adjustBrainLoss(-25)
- return 1
- else user << "Nothing happens."
- if("injure")
- if (istype(user, /mob/living/carbon/))
- user << "\red A painful discharge of energy strikes you!"
- user.adjustOxyLoss(rand(5,25))
- user.adjustToxLoss(rand(5,25))
- user.adjustBruteLoss(rand(5,25))
- user.adjustFireLoss(rand(5,25))
- user.adjustBrainLoss(rand(5,25))
- user.radiation += 25
- user.nutrition -= min(50, user.nutrition)
- user.make_dizzy(6)
- user.weakened += 6
- return 1
- else user << "Nothing happens."
- if("stun")
- if (istype(user, /mob/living/carbon/))
- user << "\red A powerful force overwhelms your consciousness."
- user.weakened += 45
- user.stuttering += 45
- if(prob(50))
- user.stunned += rand(1,10)
- return 1
- else user << "Nothing happens."
- if("roboheal")
- if (istype(user, /mob/living/silicon/robot))
- user << "\blue Your systems report damaged components mending by themselves!"
- user.adjustBruteLoss(rand(-10,-30))
- user.adjustFireLoss(rand(-10,-30))
- return 1
- else user << "Nothing happens."
- if("robohurt")
- if (istype(user, /mob/living/silicon/robot))
- user << "\red Your systems report severe damage has been inflicted!"
- user.adjustBruteLoss(rand(10,50))
- user.adjustFireLoss(rand(10,50))
- return 1
- else user << "Nothing happens."
- if("forcefield")
- while(created_field.len < 16)
- var/obj/effect/energy_field/E = new (locate(user.x,user.y,user.z))
- created_field.Add(E)
- E.strength = 1
- E.density = 1
- E.anchored = 1
- E.invisibility = 0
- return 1
- if("teleport")
- var/list/randomturfs = new/list()
- for(var/turf/T in orange(user, 50))
- if(!istype(T, /turf/simulated/floor) || T.density)
- continue
- randomturfs.Add(T)
- if(randomturfs.len > 0)
- user << "\red You are suddenly zapped away elsewhere!"
- if (user.buckled)
- user.buckled.unbuckle()
- user.loc = pick(randomturfs)
- var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
- sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is
- sparks.start()
- return 1
- if("sleepy")
- user << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")
- user.drowsyness = min(user.drowsyness + rand(5,25), 50)
- user.eye_blurry = min(user.eye_blurry + rand(1,3), 50)
- return 1
- else if (src.effectmode == "aura")
- switch(src.effecttype)
- //caeltodo
- if("healing")
- for (var/mob/living/carbon/M in range(src.aurarange,originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- if(prob(10)) M << "\blue You feel a soothing energy radiating from something nearby."
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- M.adjustToxLoss(-1)
- M.adjustOxyLoss(-1)
- M.adjustBrainLoss(-1)
- M.updatehealth()
- return 1
- if("injure")
- for (var/mob/living/carbon/M in range(src.aurarange,originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- if(prob(10)) M << "\red You feel a painful force radiating from something nearby."
- M.adjustBruteLoss(1)
- M.adjustFireLoss(1)
- M.adjustToxLoss(1)
- M.adjustOxyLoss(1)
- M.adjustBrainLoss(1)
- M.updatehealth()
- return 1
- if("stun")
- for (var/mob/living/carbon/M in range(src.aurarange,originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- if(prob(10)) M << "\red Energy radiating from the [originator] is making you feel numb."
- if(prob(20))
- M << "\red Your body goes numb for a moment."
- M.stunned += 2
- M.weakened += 2
- M.stuttering += 2
- return 1
- if("roboheal")
- for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
- if(prob(10)) M << "\blue SYSTEM ALERT: Beneficial energy field detected!"
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- M.updatehealth()
- return 1
- if("robohurt")
- for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
- if(prob(10)) M << "\red SYSTEM ALERT: Harmful energy field detected!"
- M.adjustBruteLoss(1)
- M.adjustFireLoss(1)
- M.updatehealth()
- return 1
- if("cellcharge")
- for (var/obj/machinery/power/apc/C in range(src.aurarange,originator))
- for (var/obj/item/weapon/cell/B in C.contents)
- B.charge += 10
- for (var/obj/machinery/power/smes/S in range (src.aurarange,originator)) S.charge += 20
- for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
- for (var/obj/item/weapon/cell/D in M.contents)
- D.charge += 10
- if(prob(10)) M << "\blue SYSTEM ALERT: Energy boosting field detected!"
- return 1
- if("celldrain")
- for (var/obj/machinery/power/apc/C in range(src.aurarange,originator))
- for (var/obj/item/weapon/cell/B in C.contents)
- B.charge = max(B.charge-10,0)
- for (var/obj/machinery/power/smes/S in range (src.aurarange,originator))
- S.charge = max(S.charge-20,0)
- for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
- for (var/obj/item/weapon/cell/D in M.contents)
- D.charge = max(D.charge-10,0)
- if(prob(10)) M << "\red SYSTEM ALERT: Energy draining field detected!"
- return 1
- if("planthelper")
- for (var/obj/machinery/hydroponics/H in range(src.aurarange,originator))
- //makes weeds and shrooms and stuff more potent too
- if(H.planted)
- H.waterlevel += 2
- H.nutrilevel += 2
- if(H.toxic > 0)
- H.toxic -= 1
- H.health += 1
- if(H.pestlevel > 0)
- H.pestlevel -= 1
- if(H.weedlevel > 0)
- H.weedlevel -= 1
- H.lastcycle += 5
- return 1
- if("sleepy")
- for (var/mob/living/carbon/M in range(src.aurarange,originator))
- if(prob(10))
- M << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")
- M.drowsyness = min(M.drowsyness + 1, 25)
- M.eye_blurry = min(M.eye_blurry + 1, 25)
- return 1
- else if (src.effectmode == "pulse")
- for(var/mob/O in viewers(originator, null))
- O.show_message(text("[] emits a pulse of energy!", originator), 1)
- switch(src.effecttype)
- //caeltodo
- if("healing")
- for (var/mob/living/carbon/M in range(src.aurarange,originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- M << "\blue A wave of energy invigorates you."
- M.adjustBruteLoss(-5)
- M.adjustFireLoss(-5)
- M.adjustToxLoss(-5)
- M.adjustOxyLoss(-5)
- M.adjustBrainLoss(-5)
- M.updatehealth()
- return 1
- if("injure")
- for (var/mob/living/carbon/M in range(src.aurarange,originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- M << "\red A wave of energy causes you great pain!"
- M.adjustBruteLoss(5)
- M.adjustFireLoss(5)
- M.adjustToxLoss(5)
- M.adjustOxyLoss(5)
- M.adjustBrainLoss(5)
- M.make_dizzy(6)
- M.weakened += 3
- M.updatehealth()
- return 1
- if("stun")
- for (var/mob/living/carbon/M in range(src.aurarange,originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- M << "\red A wave of energy overwhelms your senses!"
- M.paralysis += 3
- M.weakened += 4
- M.stuttering += 4
- return 1
- if("roboheal")
- for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
- M << "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!"
- M.adjustBruteLoss(-10)
- M.adjustFireLoss(-10)
- M.updatehealth()
- return 1
- if("robohurt")
- for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
- M << "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!"
- M.adjustBruteLoss(10)
- M.adjustFireLoss(10)
- M.updatehealth()
- return 1
- if("cellcharge")
- for (var/obj/machinery/power/apc/C in range(src.aurarange,originator))
- for (var/obj/item/weapon/cell/B in C.contents)
- B.charge += 250
- for (var/obj/machinery/power/smes/S in range (src.aurarange,originator)) S.charge += 400
- for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
- for (var/obj/item/weapon/cell/D in M.contents)
- D.charge += 250
- M << "\blue SYSTEM ALERT: Large energy boost detected!"
- return 1
- if("celldrain")
- for (var/obj/machinery/power/apc/C in range(src.aurarange,originator))
- for (var/obj/item/weapon/cell/B in C.contents)
- B.charge = max(B.charge-500,0)
- for (var/obj/machinery/power/smes/S in range (src.aurarange,originator))
- S.charge = max(S.charge-400,0)
- for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
- for (var/obj/item/weapon/cell/D in M.contents)
- D.charge = max(D.charge-500,0)
- M << "\red SYSTEM ALERT: Severe energy drain detected!"
- return 1
- if("planthelper")
- //makes weeds and shrooms and stuff more potent too
- for (var/obj/machinery/hydroponics/H in range(src.aurarange,originator))
- if(H.planted)
- H.dead = 0
- H.waterlevel = 200
- H.nutrilevel = 200
- H.toxic = 0
- H.health = 100
- H.pestlevel = 0
- H.weedlevel = 0
- H.lastcycle = H.cycledelay
- return 1
- if("teleport")
- for (var/mob/living/M in range(src.aurarange,originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- var/list/randomturfs = new/list()
- for(var/turf/T in orange(M, 30))
- if(!istype(T, /turf/simulated/floor) || T.density)
- continue
- randomturfs.Add(T)
- if(randomturfs.len > 0)
- M << "\red You are displaced by a strange force!"
- if(M.buckled)
- M.buckled.unbuckle()
- M.loc = pick(randomturfs)
- var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
- sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is
- sparks.start()
- return 1
- if("dnaswitch")
- for(var/mob/living/H in range(src.aurarange,originator))
- if(ishuman(H) && istype(H:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(H:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
-
- if(prob(30))
- H << pick("\green You feel a little different.","\green You feel strange.","\green You feel different.")
- //todo
- if (H.gender == FEMALE)
- H.gender = MALE
- else
- H.gender = FEMALE
- /*H.dna.ready_dna(H)
- H.update_body()
- H.update_face()*/
- return 1
- if("emp")
- empulse(get_turf(originator), aurarange/2, aurarange)
- return 1
- if("sleepy")
- for (var/mob/living/carbon/M in range(src.aurarange,originator))
- if(prob(30))
- M << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")
- if(prob(50))
- M.drowsyness = min(M.drowsyness + rand(1,5), 25)
- if(prob(50))
- M.eye_blurry = min(M.eye_blurry + rand(1,5), 25)
- return 1
- else if (src.effectmode == "worldpulse")
- for(var/mob/O in viewers(originator, null))
- O.show_message(text("[] emits a powerful burst of energy!", originator), 1)
- switch(src.effecttype)
- if("healing")
- for (var/mob/living/carbon/M in range(200, originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- M << "\blue Waves of soothing energy wash over you."
- M.adjustBruteLoss(-3)
- M.adjustFireLoss(-3)
- M.adjustToxLoss(-3)
- M.adjustOxyLoss(-3)
- M.adjustBrainLoss(-3)
- M.updatehealth()
- return 1
- if("injure")
- for (var/mob/living/carbon/human/M in range(200, originator))
- M << "\red A wave of painful energy strikes you!"
- M.adjustBruteLoss(3)
- M.adjustFireLoss(3)
- M.adjustToxLoss(3)
- M.adjustOxyLoss(3)
- M.adjustBrainLoss(3)
- M.updatehealth()
- return 1
- if("stun")
- for (var/mob/living/carbon/M in range(200, originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- M << "\red A powerful force causes you to black out momentarily."
- M.paralysis += 5
- M.weakened += 8
- M.stuttering += 8
- return 1
- if("roboheal")
- for (var/mob/living/silicon/robot/M in range(200, originator))
- M << "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!"
- M.adjustBruteLoss(-5)
- M.adjustFireLoss(-5)
- M.updatehealth()
- return 1
- if("robohurt")
- for (var/mob/living/silicon/robot/M in range(200, originator))
- M << "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!"
- M.adjustBruteLoss(5)
- M.adjustFireLoss(5)
- M.updatehealth()
- return 1
- if("cellcharge")
- for (var/obj/machinery/power/apc/C in range(200, originator))
- for (var/obj/item/weapon/cell/B in C.contents)
- B.charge += 100
- for (var/obj/machinery/power/smes/S in range (src.aurarange,src)) S.charge += 250
- for (var/mob/living/silicon/robot/M in world)
- for (var/obj/item/weapon/cell/D in M.contents)
- D.charge += 100
- M << "\blue SYSTEM ALERT: Energy boost detected!"
- return 1
- if("celldrain")
- for (var/obj/machinery/power/apc/C in range(200, originator))
- for (var/obj/item/weapon/cell/B in C.contents)
- B.charge = max(B.charge-250,0)
- for (var/obj/machinery/power/smes/S in range (src.aurarange,src))
- S.charge = max(S.charge-250,0)
- for (var/mob/living/silicon/robot/M in world)
- for (var/obj/item/weapon/cell/D in M.contents)
- D.charge = max(D.charge-250,0)
- M << "\red SYSTEM ALERT: Energy drain detected!"
- return 1
- if("teleport")
- for (var/mob/living/M in range(200, originator))
- if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
- var/list/randomturfs = new/list()
- for(var/turf/T in orange(M, 15))
- if(!istype(T, /turf/simulated/floor) || T.density)
- continue
- randomturfs.Add(T)
- if(randomturfs.len > 0)
- M << "\red You are displaced by a strange force!"
- if(M.buckled)
- M.buckled.unbuckle()
- M.loc = pick(randomturfs)
- var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
- sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is
- sparks.start()
- return 1
- if("dnaswitch")
- for(var/mob/living/H in range(200, originator))
- if(ishuman(H) && istype(H:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(H:head,/obj/item/clothing/head/bio_hood/anomaly))
- continue
-
- if(prob(30))
- H << pick("\green You feel a little different.","\green You feel strange.","\green You feel different.")
- //todo
- if (H.gender == FEMALE)
- H.gender = MALE
- else
- H.gender = FEMALE
- /*H.dna.ready_dna(H)
- H.update_body()
- H.update_face()*/
- return 1
- if("sleepy")
- for(var/mob/living/H in range(200, originator))
- H.drowsyness = min(H.drowsyness + rand(5,15), 50)
- H.eye_blurry = min(H.eye_blurry + rand(5,15), 50)
- return 1
-
-//initially for the force field artifact
-/datum/artifact_effect/proc/update_move(var/atom/originator)
- switch(effecttype)
- if("forcefield")
- while(created_field.len < 16)
- //for now, just instantly respawn the fields when they get destroyed
- var/obj/effect/energy_field/E = new (locate(originator.x,originator.y,originator))
- created_field.Add(E)
- E.strength = 1
- E.density = 1
- E.anchored = 1
- E.invisibility = 0
-
- var/obj/effect/energy_field/E = created_field[1]
- E.loc = locate(originator.x + 2,originator.y + 2,originator.z)
- E = created_field[2]
- E.loc = locate(originator.x + 2,originator.y + 1,originator.z)
- E = created_field[3]
- E.loc = locate(originator.x + 2,originator.y,originator.z)
- E = created_field[4]
- E.loc = locate(originator.x + 2,originator.y - 1,originator.z)
- E = created_field[5]
- E.loc = locate(originator.x + 2,originator.y - 2,originator.z)
- E = created_field[6]
- E.loc = locate(originator.x + 1,originator.y + 2,originator.z)
- E = created_field[7]
- E.loc = locate(originator.x + 1,originator.y - 2,originator.z)
- E = created_field[8]
- E.loc = locate(originator.x,originator.y + 2,originator.z)
- E = created_field[9]
- E.loc = locate(originator.x,originator.y - 2,originator.z)
- E = created_field[10]
- E.loc = locate(originator.x - 1,originator.y + 2,originator.z)
- E = created_field[11]
- E.loc = locate(originator.x - 1,originator.y - 2,originator.z)
- E = created_field[12]
- E.loc = locate(originator.x - 2,originator.y + 2,originator.z)
- E = created_field[13]
- E.loc = locate(originator.x - 2,originator.y + 1,originator.z)
- E = created_field[14]
- E.loc = locate(originator.x - 2,originator.y,originator.z)
- E = created_field[15]
- E.loc = locate(originator.x - 2,originator.y - 1,originator.z)
- E = created_field[16]
- E.loc = locate(originator.x - 2,originator.y - 2,originator.z)
diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm
index 4e5c733abd3..43c3d1ec70c 100644
--- a/code/modules/research/xenoarchaeology/finds/finds.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds.dm
@@ -88,7 +88,7 @@
if(new_item_type)
find_type = new_item_type
else
- find_type = rand(1,34) //update this when you add new find types
+ find_type = rand(1,33) //update this when you add new find types
var/item_type = "object"
icon_state = "unknown[rand(1,4)]"
@@ -323,34 +323,33 @@
item_type = new_item.name
if(26)
//energy gun
- var/spawn_type = pick(
- /obj/item/weapon/gun/energy/laser/practice;100,\
- /obj/item/weapon/gun/energy/laser;75,\
- /obj/item/weapon/gun/energy/xray;50,\
- /obj/item/weapon/gun/energy/laser/captain;25,\
- )
- if(isnull(spawn_type))
- spawn_type = /obj/item/weapon/gun/energy/laser
- var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc)
- new_item = new_gun
- new_item.icon_state = "egun[rand(1,6)]"
+ var/spawn_type = pick(\
+ /obj/item/weapon/gun/energy/laser/practice,\
+ /obj/item/weapon/gun/energy/laser,\
+ /obj/item/weapon/gun/energy/xray,\
+ /obj/item/weapon/gun/energy/laser/captain)
+ if(spawn_type)
+ var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc)
+ new_item = new_gun
+ new_item.icon_state = "egun[rand(1,6)]"
+ new_gun.desc = "This is an antique energy weapon, you're not sure if it will fire or not."
- //5% chance to explode when first fired
- //10% chance to have an unchargeable cell
- //15% chance to gain a random amount of starting energy, otherwise start with an empty cell
- if(prob(5))
- new_gun.power_supply.rigged = 1
- if(prob(10))
- new_gun.power_supply.maxcharge = 0
- if(prob(15))
- new_gun.power_supply.charge = rand(0, new_gun.power_supply.maxcharge)
- else
- new_gun.power_supply.charge = 0
+ //5% chance to explode when first fired
+ //10% chance to have an unchargeable cell
+ //15% chance to gain a random amount of starting energy, otherwise start with an empty cell
+ if(prob(5))
+ new_gun.power_supply.rigged = 1
+ if(prob(10))
+ new_gun.power_supply.maxcharge = 0
+ if(prob(15))
+ new_gun.power_supply.charge = rand(0, new_gun.power_supply.maxcharge)
+ else
+ new_gun.power_supply.charge = 0
item_type = "gun"
- if(27)
+/* if(27)
//revolver
- var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc)
+ var/obj/item/weapon/gun/projectile/revolver/new_gun = new /obj/item/weapon/gun/projectile/revolver(src.loc)
new_item = new_gun
new_item.icon_state = "gun[rand(1,4)]"
new_item.icon = 'icons/obj/xenoarchaeology.dmi'
@@ -382,7 +381,7 @@
new_gun.loaded.Remove(I)
I.loc = null
- item_type = "gun"
+ item_type = "gun"*/
if(28)
//completely unknown alien device
if(prob(50))
@@ -448,7 +447,7 @@
"A pile of wires and crap metal that looks vaguely robotic.")
apply_image_decorations = 0
apply_material_decorations = 0
- if(34)
+ if(27)
//xenos remains
apply_prefix = 0
item_type = "alien [pick("remains","skeleton")]"
diff --git a/code/modules/research/xenoarchaeology/finds/finds_defines.dm b/code/modules/research/xenoarchaeology/finds/finds_defines.dm
index b9649d074b3..6de9b4c8061 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_defines.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_defines.dm
@@ -206,6 +206,28 @@
)
return find_type
+var/list/responsive_carriers = list( \
+ "carbon", \
+ "potassium", \
+ "hydrogen", \
+ "nitrogen", \
+ "mercury", \
+ "iron", \
+ "chlorine", \
+ "phosphorus", \
+ "plasma")
+
+var/list/finds_as_strings = list( \
+ "Trace organic cells", \
+ "Long exposure particles", \
+ "Trace water particles", \
+ "Crystalline structures", \
+ "Metallic derivative", \
+ "Metallic composite", \
+ "Metamorphic/igneous rock composite", \
+ "Metamorphic/sedimentary rock composite", \
+ "Anomalous material" )
+
#undef ARCHAEO_BOWL
#undef ARCHAEO_URN
#undef ARCHAEO_CUTLERY
diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm
index 91d5f1bd62c..47a5bd3da1a 100644
--- a/code/modules/research/xenoarchaeology/geosample.dm
+++ b/code/modules/research/xenoarchaeology/geosample.dm
@@ -29,30 +29,6 @@
pixel_x = rand(0,16)-8
pixel_y = rand(0,8)-8
-var/list/responsive_carriers = list( \
- "carbon", \
- "potassium", \
- "hydrogen", \
- "nitrogen", \
- "mercury", \
- "iron", \
- "chlorine", \
- "phosphorus", \
- "plasma")
-
-var/list/finds_as_strings = list( \
- "Trace organic cells", \
- "Long exposure particles", \
- "Trace water particles", \
- "Crystalline structures", \
- "Metallic derivative", \
- "Metallic composite", \
- "Metamorphic/igneous rock composite", \
- "Metamorphic/sedimentary rock composite", \
- "Anomalous material" )
-
-var/list/artifact_spawning_turfs = list()
-
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Geosample datum
@@ -64,7 +40,6 @@ var/list/artifact_spawning_turfs = list()
var/artifact_id = "" //id of a nearby artifact, if there is one
var/artifact_distance = -1 //proportional to distance
var/source_mineral = "chlorine" //machines will pop up a warning telling players that the sample may be confused
- var/total_spread = 0
//
//var/source_mineral
//all potential finds are initialised to null, so nullcheck before you access them
@@ -76,11 +51,11 @@ var/list/artifact_spawning_turfs = list()
//this should only need to be called once
/datum/geosample/proc/UpdateTurf(var/turf/simulated/mineral/container)
+ set background = 1
if(!container || !istype(container))
return
age = rand(1,999)
- total_spread = 0
switch(container.mineralName)
if("Uranium")
@@ -132,8 +107,15 @@ var/list/artifact_spawning_turfs = list()
var/responsive_reagent = get_responsive_reagent(F.find_type)
find_presence[responsive_reagent] = F.dissonance_spread
- for(var/entry in find_presence)
- total_spread += find_presence[entry]
+ //loop over again to reset values to percentages
+ var/total_presence = 0
+ for(var/carrier in find_presence)
+ total_presence += find_presence[carrier]
+ for(var/carrier in find_presence)
+ find_presence[carrier] = find_presence[carrier] / total_presence
+
+ /*for(var/entry in find_presence)
+ total_spread += find_presence[entry]*/
//have this separate from UpdateTurf() so that we dont have a billion turfs being updated (redundantly) every time an artifact spawns
/datum/geosample/proc/UpdateNearbyArtifactInfo(var/turf/simulated/mineral/container)
@@ -144,14 +126,14 @@ var/list/artifact_spawning_turfs = list()
artifact_distance = rand()
artifact_id = container.artifact_find.artifact_id
else
- for(var/turf/simulated/mineral/holder in artifact_spawning_turfs)
- if(holder.artifact_find)
- var/dist = get_dist(container, holder)
- if(dist < holder.artifact_find.artifact_detect_range && dist < src.artifact_distance)
- src.artifact_distance = dist
- src.artifact_id = holder.artifact_find.artifact_id
+ for(var/turf/simulated/mineral/T in master_controller.artifact_spawning_turfs)
+ if(T.artifact_find)
+ var/cur_dist = get_dist(container, T) * 2
+ if( (artifact_distance < 0 || cur_dist < artifact_distance) && cur_dist <= T.artifact_find.artifact_detect_range )
+ artifact_distance = cur_dist + rand() * 2 - 1
+ artifact_id = T.artifact_find.artifact_id
else
- artifact_spawning_turfs.Remove(holder)
+ master_controller.artifact_spawning_turfs.Remove(T)
/*
#undef FIND_PLANT
diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm b/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm
deleted file mode 100644
index 74ac904dc9b..00000000000
--- a/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// This machine shows the age for extremely old finds
-
-obj/machinery/anomaly/accelerator
- name = "Accelerator spectrometer"
-
-obj/machinery/anomaly/accelerator/ScanResults()
- var/results = "The scan was inconclusive. Check sample integrity and carrier consistency."
-
- var/datum/geosample/scanned_sample
- var/carrier_name
- var/num_reagents = 0
-
- for(var/datum/reagent/A in held_container.reagents.reagent_list)
- var/datum/reagent/R = A
- if(istype(R, /datum/reagent/analysis_sample))
- scanned_sample = R.data
- else
- carrier_name = R.id
- num_reagents++
-
- if(num_reagents == 2 && scanned_sample && carrier_name)
- var/specifity = GetResultSpecifity(scanned_sample, carrier_name)
- results = "Kinetic acceleration of carrier ([carrier_name]) indicates age ([100 * specifity]% accuracy): " - - if(scanned_sample.age_billion) - var/displayed_age_millions = scanned_sample.age_million + max(scanned_sample.age_million * ((1 - specifity) * (2 * rand() - 1)), 0) - var/displayed_age_billions = scanned_sample.age_billion + max(scanned_sample.age_billion * ((1 - specifity) * (2 * rand() - 1)), 0) - results += "[displayed_age_billions + displayed_age_millions / 1000] billion years.
" - else if(scanned_sample.age_million) - var/displayed_age_thousands = scanned_sample.age_thousand + max(scanned_sample.age_thousand * ((1 - specifity) * (4 * rand() - 2)), 0) - var/displayed_age_millions = scanned_sample.age_million + max(scanned_sample.age_million * ((1 - specifity) * (2 * rand() - 1)), 0) - results += "[displayed_age_millions + displayed_age_thousands / 1000] million years.
" - else if(scanned_sample.age_thousand) - var/displayed_age = scanned_sample.age + max(scanned_sample.age * ((1 - specifity) * (8 * rand() - 4)), 0) - var/displayed_age_thousands = scanned_sample.age_thousand + max(scanned_sample.age * ((1 - specifity) * (4 * rand() - 2)), 0) - results += "[displayed_age_thousands + displayed_age / 1000] thousand years.
" - else - var/displayed_age = scanned_sample.age + max(scanned_sample.age * ((1 - specifity) * (8 * rand() - 4)), 0) - results += "[displayed_age] years.
" - - results += "
Warning, results only valid for ages on the scale of billions of years." - - return results diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm deleted file mode 100644 index a462bd98fa0..00000000000 --- a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm +++ /dev/null @@ -1,203 +0,0 @@ -//Handles how much the temperature changes on power use. (Joules/Kelvin) -//Equates to as much heat energy per kelvin as a quarter tile of air. -#define XENOARCH_HEAT_CAPACITY 5000 - -//Handles heat transfer to the air. (In watts) -//Can heat a single tile 2 degrees per tick. -#define XENOARCH_MAX_ENERGY_TRANSFER 4000 - -//How many joules of electrical energy produce how many joules of heat energy? -#define XENOARCH_HEAT_COEFFICIENT 3 - - -/obj/machinery/anomaly - name = "Analysis machine" - desc = "A specialised, complex analysis machine." - anchored = 1 - density = 1 - icon = 'icons/obj/virology.dmi' - icon_state = "analyser" - - idle_power_usage = 20 //watts - active_power_usage = 300 //Because I need to make up numbers~ - - var/obj/item/weapon/reagent_containers/glass/held_container - var/obj/item/weapon/tank/fuel_container - var/target_scan_ticks = 30 - var/report_num = 0 - var/scan_process = 0 - var/temperature = 273 //measured in kelvin, if this exceeds 1200, the machine is damaged and requires repairs - //if this exceeds 600 and safety is enabled it will shutdown - //temp greater than 600 also requires a safety prompt to initiate scanning - var/max_temp = 450 - -/obj/machinery/anomaly/New() - ..() - - //for analysis debugging - /*var/obj/item/weapon/reagent_containers/glass/solution_tray/S = new(src.loc) - var/turf/simulated/mineral/diamond/D - for(var/turf/simulated/mineral/diamond/M in world) - D = M - break - S.reagents.add_reagent("analysis_sample", 1, D.geological_data) - S.reagents.add_reagent("chlorine", 1, null)*/ - -/obj/machinery/anomaly/process() - //not sure if everything needs to heat up, or just the GLPC - var/datum/gas_mixture/env = loc.return_air() - var/environmental_temp = env.temperature - if(scan_process) - if(scan_process++ > target_scan_ticks) - FinishScan() - else if(temperature > 400) - src.visible_message("\blue \icon[src] shuts down from the heat!", 2) - scan_process = 0 - else if(temperature > 350 && prob(10)) - src.visible_message("\blue \icon[src] bleets plaintively.", 2) - if(temperature > 400) - scan_process = 0 - - //show we're busy - if(prob(5)) - src.visible_message("\blue \icon[src] [pick("whirrs","chuffs","clicks")][pick(" quietly"," softly"," sadly"," excitedly"," energetically"," angrily"," plaintively")].", 2) - - use_power = 2 - - else - use_power = 1 - - auto_use_power() - - //Add 3000 joules when active. This is about 0.6 degrees per tick. - //May need adjustment - if(use_power == 1) - var/heat_added = active_power_usage *XENOARCH_HEAT_COEFFICIENT - - if(temperature < max_temp) - temperature += heat_added/XENOARCH_HEAT_CAPACITY - - var/temperature_difference = abs(environmental_temp-temperature) - var/datum/gas_mixture/removed = loc.remove_air(env.total_moles*0.25) - var/heat_capacity = removed.heat_capacity() - - heat_added = max(temperature_difference*heat_capacity, XENOARCH_MAX_ENERGY_TRANSFER) - - if(temperature > environmental_temp) - //cool down to match the air - temperature = max(TCMB, temperature - heat_added/XENOARCH_HEAT_CAPACITY) - removed.temperature = max(TCMB, removed.temperature + heat_added/heat_capacity) - - if(temperature_difference > 10 && prob(5)) - src.visible_message("\blue \icon[src] hisses softly.", 2) - - else - //heat up to match the air - temperature = max(TCMB, temperature + heat_added/XENOARCH_HEAT_CAPACITY) - removed.temperature = max(TCMB, removed.temperature - heat_added/heat_capacity) - - if(temperature_difference > 10 && prob(5)) - src.visible_message("\blue \icon[src] plinks quietly.", 2) - - env.merge(removed) - - -//this proc should be overriden by each individual machine -/obj/machinery/anomaly/attack_hand(var/mob/user as mob) - if(stat & (NOPOWER|BROKEN)) - return - user.machine = src - var/dat = "[src.name]
" - dat += "Module heat level: [temperature] kelvin
" - dat += "Safeties set at 350k, shielding failure at 400k. Failure to maintain safe heat levels may result in equipment damage.
" - dat += "
" - if(scan_process) - dat += "Scan in progress
" - else - dat += "[held_container ? "Eject beaker" : "No beaker inserted."]
" - //dat += "[fuel_container ? "Eject fuel tank" : "No fuel tank inserted."]
" - dat += "[held_container ? "Begin scanning" : ""]" - dat += "
" - dat += "Refresh
" - dat += "Close
" - user << browse(dat, "window=anomaly;size=450x500") - onclose(user, "anomaly") - -obj/machinery/anomaly/attackby(obj/item/weapon/W as obj, mob/living/user as mob) - if(istype(W, /obj/item/weapon/reagent_containers/glass)) - //var/obj/item/weapon/reagent_containers/glass/G = W - if(held_container) - user << "\red You must remove the [held_container] first." - else - user << "\blue You put the [W] into the [src]." - user.drop_item(W) - held_container = W - held_container.loc = src - updateDialog() - - /*else if(istype(W, /obj/item/weapon/tank)) - //var/obj/item/weapon/reagent_containers/glass/G = W - if(fuel_container) - user << "\red You must remove the [fuel_container] first." - else - user << "\blue You put the [fuel_container] into the [src]." - user.drop_item(W) - fuel_container.loc = src - fuel_container = W - updateDialog()*/ - else - return ..() - -obj/machinery/anomaly/proc/ScanResults() - //instantiate in children to produce unique scan behaviour - return "\red Error initialising scanning components." - -obj/machinery/anomaly/proc/FinishScan() - scan_process = 0 - updateDialog() - - //determine the results and print a report - if(held_container) - src.visible_message("\blue \icon[src] makes an insistent chime.", 2) - var/obj/item/weapon/paper/P = new(src.loc) - P.name = "[src] report #[++report_num]" - P.info = "[src] analysis report #[report_num]
" + ScanResults() - P.stamped = list(/obj/item/weapon/stamp) - P.overlays = list("paper_stamped") - else - src.visible_message("\blue \icon[src] makes a low buzzing noise.", 2) - -obj/machinery/anomaly/Topic(href, href_list) - ..() - usr.set_machine(src) - if(href_list["close"]) - usr << browse(null, "window=anomaly") - usr.machine = null - if(href_list["eject_beaker"]) - held_container.loc = src.loc - held_container = null - if(href_list["eject_fuel"]) - fuel_container.loc = src.loc - fuel_container = null - if(href_list["begin"]) - if(temperature >= 350) - var/proceed = input("Unsafe internal temperature detected, enter YES below to continue.","Warning") - if(proceed == "YES" && get_dist(src, usr) <= 1) - scan_process = 1 - else - scan_process = 1 - - updateUsrDialog() - -//whether the carrier sample matches the possible finds -//results greater than a threshold of 0.6 means a positive result -obj/machinery/anomaly/proc/GetResultSpecifity(var/datum/geosample/scanned_sample, var/carrier_name) - var/specifity = 0 - if(scanned_sample && carrier_name) - - if(scanned_sample.find_presence.Find(carrier_name)) - specifity = 0.75 * (scanned_sample.find_presence[carrier_name] / scanned_sample.total_spread) + 0.25 - else - specifity = rand(0, 0.5) - - return specifity diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm b/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm deleted file mode 100644 index 98c49b2372a..00000000000 --- a/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm +++ /dev/null @@ -1,34 +0,0 @@ - -// This machine tells the distance to a nearby artifact, if there is one - -obj/machinery/anomaly/fourier_transform - name = "Fourier Transform spectroscope" - -obj/machinery/anomaly/fourier_transform/ScanResults() - var/results = "The scan was inconclusive. Check sample integrity and carrier consistency." - - var/datum/geosample/scanned_sample - var/carrier - var/num_reagents = 0 - - for(var/datum/reagent/A in held_container.reagents.reagent_list) - var/datum/reagent/R = A - if(istype(R, /datum/reagent/analysis_sample)) - scanned_sample = R.data - else - carrier = R.id - num_reagents++ - - if(num_reagents == 2 && scanned_sample && carrier) - //all necessary components are present - var/specifity = GetResultSpecifity(scanned_sample, carrier) - var/distance = scanned_sample.artifact_distance - if(distance > 0) - distance += (2 * rand() - 1) * distance * 0.05 - results = "Fourier transform analysis on anomalous energy absorption through carrier ([carrier]) indicates source located inside emission radius ([95 * specifity]% accuracy): [distance]." - else - results = "Energy dispersion detected throughout sample consistent with background readings.
" - if(carrier == scanned_sample.source_mineral) - results += "Warning, analysis may be contaminated by high quantities of molecular carrier present throughout sample." - - return results diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm b/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm deleted file mode 100644 index bd6dbeb9b36..00000000000 --- a/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm +++ /dev/null @@ -1,39 +0,0 @@ - -// This machine shows the materials that are present - -obj/machinery/anomaly/gas_chromatography - name = "Gas Chromatography spectrometer" - -obj/machinery/anomaly/gas_chromatography/ScanResults() - var/results = "The scan was inconclusive. Check sample integrity and carrier consistency." - - var/datum/geosample/scanned_sample - var/carrier - var/num_reagents = 0 - - for(var/datum/reagent/A in held_container.reagents.reagent_list) - var/datum/reagent/R = A - if(istype(R, /datum/reagent/analysis_sample)) - scanned_sample = R.data - else - carrier = R.id - num_reagents++ - - if(num_reagents == 2 && scanned_sample) - var/specifity = GetResultSpecifity(scanned_sample, carrier) - results = "Chromatography partitioning analysis over carrier ([carrier]) indicates the following elements present ([100 * specifity]% accuracy):
" - - var/num_found = 0 - for(var/index=1,index <= scanned_sample.find_presence.len, index++) - var/find = scanned_sample.find_presence[index] - if(find && prob(100 * specifity)) - results += " - " + finds_as_strings[index] + "
" - num_found++ - - if(!num_found) - results = "Chromatography partitioning results over carrier ([carrier]) to determine elemental makeup were inconclusive.
" - - if(!carrier) - results += "
No carrier detected, scan accuracy affected.
" - - return results diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm b/code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm deleted file mode 100644 index a070a61a5d3..00000000000 --- a/code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm +++ /dev/null @@ -1,55 +0,0 @@ - -obj/machinery/anomaly/hyperspectral - name = "Hyperspectral Imager" - icon = 'icons/obj/xenoarchaeology.dmi' - icon_state = "scanner" - -obj/machinery/anomaly/hyperspectral/process() - ..() - if(scan_process) - icon_state = "scanner_active" - else if(prob(10)) - icon_state = "scanner" - flick(src, "scanner_active") - -obj/machinery/anomaly/hyperspectral/ScanResults() - var/results = "The scan was inconclusive. Check sample integrity and carrier consistency." - - var/datum/geosample/scanned_sample - var/carrier - var/num_reagents = 0 - - for(var/datum/reagent/A in held_container.reagents.reagent_list) - var/datum/reagent/R = A - if(istype(R, /datum/reagent/analysis_sample)) - scanned_sample = R.data - else - carrier = R.id - num_reagents++ - - if(num_reagents == 2 && scanned_sample && carrier) - //all necessary components are present - var/specifity = GetResultSpecifity(scanned_sample, carrier) - results = "Spectral signature over carrier ([carrier]):
" - if(specifity <= 0.25) - //results += "
![](\"http://i.imgur.com/TAQHn.jpg\")
" - results += "
"
- else if(specifity <= 0.5)
- //results += "![](\"http://i.imgur.com/EwOZ7.jpg\")
" - results += "
"
- else if(specifity <= 0.75)
- //results += "![](\"http://i.imgur.com/1qCae.jpg\")
" - results += "
"
- else
- //results += "![](\"http://i.imgur.com/9T9nc.jpg\")
" - results += "
"
-
- results += "" - if(scanned_sample.artifact_id) - results += "Detected energy signatures [100 * (1 - specifity)]% consistent with standard background readings.
" - if(prob( (specifity + 0.5 * (1 - specifity)) * 100)) - results += "Anomalous exotic energy signature isolated: [scanned_sample.artifact_id]." - else - results += "Detected energy signatures [95 + 5 * (2 * rand() - 1) * (1 - specifity)]% consistent with standard background readings." - - return results diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm b/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm deleted file mode 100644 index 9b37d20df91..00000000000 --- a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm +++ /dev/null @@ -1,47 +0,0 @@ - -// This machine shows the amount of a certain material that is present - -obj/machinery/anomaly/ion_mobility - name = "Ion Mobility Spectrometer" - desc = "A specialised, complex analysis machine." - icon = 'icons/obj/virology.dmi' - icon_state = "analyser" - -obj/machinery/anomaly/ion_mobility/ScanResults() - var/results = "The scan was inconclusive. Check sample integrity and carrier consistency." - - var/datum/geosample/scanned_sample - var/carrier - var/num_reagents = 0 - - for(var/datum/reagent/A in held_container.reagents.reagent_list) - var/datum/reagent/R = A - if(istype(R, /datum/reagent/analysis_sample)) - scanned_sample = R.data - else - carrier = R.id - num_reagents++ - - if(num_reagents == 2 && scanned_sample && carrier) - //all necessary components are present - results = "Kinetic analysis on sample's ionic residue in carrier ([carrier]) indicates the dissonance spread:
" - var/found = 0 - if(scanned_sample.find_presence.Find(carrier)) - var/dis_ratio = scanned_sample.find_presence[carrier] - var/desc_index = responsive_carriers.Find(carrier) - results += " - [finds_as_strings[desc_index]]: [dis_ratio]
" - found++ - /* - for(var/index=1,index <= scanned_sample.find_presence.len, index++) - var/find = scanned_sample.find_presence[index] - //world << "index: [index], find: [find], response: [responsive_carriers[index]], carrier: [carrier]" - if(find && responsive_carriers[index] == carrier) - results += " - [finds_as_strings[index]] [find * 100]%
" - found++ - */ - if(!found) - results = "Kinetic analysis on sample's ionic residue in carrier ([carrier]) to determine composition were inconclusive.
" - if(carrier == scanned_sample.source_mineral) - results += "Warning, analysis may be contaminated by high quantities of molecular carrier present throughout sample." - - return results diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm b/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm deleted file mode 100644 index 04efb278ad9..00000000000 --- a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm +++ /dev/null @@ -1,51 +0,0 @@ - -// This machine shows the age for newer finds - -obj/machinery/anomaly/isotope_ratio - name = "Isotope ratio spectrometer" - desc = "A specialised, complex analysis machine." - icon = 'icons/obj/virology.dmi' - icon_state = "analyser" - -obj/machinery/anomaly/isotope_ratio/ScanResults() - var/results = "The scan was inconclusive. Check sample integrity and carrier consistency." - - var/datum/geosample/scanned_sample - var/carrier_name - var/num_reagents = 0 - - for(var/datum/reagent/A in held_container.reagents.reagent_list) - var/datum/reagent/R = A - if(istype(R, /datum/reagent/analysis_sample)) - scanned_sample = R.data - else - carrier_name = R.id - num_reagents++ - - if(num_reagents == 2 && scanned_sample && carrier_name) - var/accuracy = GetResultSpecifity(scanned_sample, carrier_name) - accuracy += 0.5 * (1 - accuracy) / scanned_sample.total_spread - if(!accuracy) - accuracy = rand(0.01, 0.5) - results = "Isotope decay analysis in carrier ([carrier_name]) indicates age ([100 * accuracy]% accuracy):
" - - if(scanned_sample.age_billion) - //scramble the results - var/displayed_age_thousands = rand(0, 999) - var/displayed_age_millions = rand(0, 999) - results += "[displayed_age_millions + displayed_age_thousands / 1000] million years.
" - else if(scanned_sample.age_million) - var/displayed_age_thousands = scanned_sample.age_thousand + max(scanned_sample.age_thousand * ((1 - accuracy) * (2 * rand() - 1)), 0) - var/displayed_age_millions = scanned_sample.age_million + max(scanned_sample.age_million * ((1 - accuracy) * (4 * rand() - 2)), 0) - results += "[displayed_age_millions + displayed_age_thousands / 1000] million years.
" - else if(scanned_sample.age_thousand) - var/displayed_age = scanned_sample.age + scanned_sample.age * ((1 - accuracy) * (2 * rand() - 1)) - var/displayed_age_thousands = scanned_sample.age_thousand + max(scanned_sample.age_thousand * ((1 - accuracy) * (2 * rand() - 1)), 0) - results += "[displayed_age_thousands + displayed_age / 1000] thousand years.
" - else - var/displayed_age = scanned_sample.age + max(scanned_sample.age * ((1 - accuracy) * (2 * rand() - 1)), 0) - results += "[displayed_age] years.
" - - results += "
Warning, results only valid up to ages of one billion years." - - return results diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm index c489bfc10e1..7daa0a665aa 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm @@ -134,11 +134,11 @@ ecosystem involving self cannibalism and a symbiotic relationship with the contained liquid.
\ Structure is composed of a carbo-titanium alloy with interlaced reinforcing energy fields, and the contained liquid \ resembles proto-plasmic residue supportive of single cellular developmental conditions." -// if(/obj/machinery/power/supermatter) -// return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\ + if(/obj/machinery/power/supermatter) + return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\ Potential application as unrefined plasma source." -// if(/obj/machinery/power/supermatter) -// return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\ + if(/obj/machinery/power/supermatter) + return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\ Potential application as unrefined plasma source." if(/obj/structure/constructshell) return "Tribal idol - Item resembles statues/emblems built by superstitious pre-warp civilisations to honour their gods. Material appears to be a \ diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm deleted file mode 100644 index ff1415997b1..00000000000 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser_old.dm +++ /dev/null @@ -1,318 +0,0 @@ - -//cael - some changes here. the analysis pad is entirely new - -/obj/machinery/artifact_analyser - name = "Artifact Analyser" - desc = "Studies the structure of artifacts to discover their uses." - icon = 'icons/obj/virology.dmi' - icon_state = "analyser" - anchored = 1 - density = 1 - var/working = 0 - var/accuO = 0 - var/accuT = 0 - var/accuE1 = 0 - var/accuE2 = 0 - var/aorigin = "None" - var/atrigger = "None" - var/aeffect1 = "None" - var/aeffect2 = "None" - var/list/origin_bonuses - var/list/trigger_bonuses - var/list/function_bonuses - var/list/range_bonuses - var/cur_id = "" - var/scan_num = 0 - var/obj/machinery/artifact/cur_artifact = null - var/obj/machinery/analyser_pad/owned_pad = null - var/list/allorigins = list("Ancient Robots","Martian","Wizard Federation","Extradimensional","Precursor") - var/list/alltriggers = list("Contact with Living Organism","Heavy Impact","Contact with Energy Source","Contact with Hydrogen","Contact with Corrosive Substance","Contact with Volatile Substance","Contact with Toxins","Exposure to Heat") - var/list/alleffects = list("Healing Device","Anti-biological Weapon","Non-lethal Stunning Trap","Mechanoid Repair Module","Mechanoid Deconstruction Device","Power Generator","Power Drain","Stellar Mineral Attractor","Agriculture Regulator","Shield Generator","Space-Time Displacer") - var/list/allranges = list("Constant Short-Range Energy Field","Medium Range Energy Pulses","Long Range Energy Pulses","Extreme Range Energy Pulses","Requires contact with subject") - -/obj/machinery/artifact_analyser/New() - ..() - origin_bonuses = new/list() - origin_bonuses["ancient"] = 0 - origin_bonuses["martian"] = 0 - origin_bonuses["wizard"] = 0 - origin_bonuses["eldritch"] = 0 - origin_bonuses["precursor"] = 0 - trigger_bonuses = new/list() - trigger_bonuses["ancient"] = 0 - trigger_bonuses["martian"] = 0 - trigger_bonuses["wizard"] = 0 - trigger_bonuses["eldritch"] = 0 - trigger_bonuses["precursor"] = 0 - function_bonuses = new/list() - function_bonuses["ancient"] = 0 - function_bonuses["martian"] = 0 - function_bonuses["wizard"] = 0 - function_bonuses["eldritch"] = 0 - function_bonuses["precursor"] = 0 - range_bonuses = new/list() - range_bonuses["ancient"] = 0 - range_bonuses["martian"] = 0 - range_bonuses["wizard"] = 0 - range_bonuses["eldritch"] = 0 - range_bonuses["precursor"] = 0 - // - spawn(10) - owned_pad = locate() in orange(1, src) - -/obj/machinery/artifact_analyser/attack_hand(var/mob/user as mob) - if(stat & (NOPOWER|BROKEN)) - return - user.machine = src - var/dat = "Artifact Analyser
" - dat += "
" - if(!owned_pad) - dat += "Unable to locate analysis pad.
" - dat += "
" - else if (!src.working) - dat += "Artifact ID: [cur_id]
" - dat += "Artifact Origin: [aorigin] ([accuO]%)
" - dat += "Activation Trigger: [atrigger] ([accuT]%)
" - dat += "Artifact Function: [aeffect1] ([accuE1]%)
" - dat += "Artifact Range: [aeffect2] ([accuE2]%)
" - dat += "
" - dat += "Artifact ID is determined from unique energy emission signatures.
" - dat += "Analyse Artifact (Scan number #[scan_num+1])
" - dat += "Upload/update artifact scan
" - dat += "Print Page
" - else - dat += "Please wait. Analysis in progress.
" - dat += "
" - // - dat += "Close
" - user << browse(dat, "window=artanalyser;size=450x500") - onclose(user, "artanalyser") - -/obj/machinery/artifact_analyser/process() - if(stat & (NOPOWER|BROKEN)) - return - use_power(350) - // - if(!owned_pad) - for(var/obj/machinery/analyser_pad/pad in range(1)) - owned_pad = pad - break - -/obj/machinery/artifact_analyser/proc/AA_FailedAnalysis(var/failtype) - switch(failtype) - if(1) - src.aorigin = "Failed to Identify" - if (prob(20)) src.aorigin = pick(src.allorigins) - if(2) - src.atrigger = "Failed to Identify" - if (prob(20)) src.atrigger = pick(src.alltriggers) - if(3) - src.aeffect1 = "Failed to Identify" - if (prob(20)) src.aeffect1 = pick(src.alleffects) - if(4) - src.aeffect2 = "Failed to Identify" - if (prob(20)) src.aeffect2 = pick(src.allranges) - -/obj/machinery/artifact_analyser/proc/AA_Analyse() - if(!cur_artifact) - return - src.accuO = 5 + rand(0,10) + origin_bonuses[cur_artifact.origin] + cur_artifact.activated * 50 - src.accuT = 5 + rand(0,10) + trigger_bonuses[cur_artifact.origin] + cur_artifact.activated * 50 - src.accuE1 = 5 + rand(0,10) + function_bonuses[cur_artifact.origin] + cur_artifact.activated * 50 - src.accuE2 = 5 + rand(0,10) + range_bonuses[cur_artifact.origin] + cur_artifact.activated * 50 - - //keep any correctly determined properties the same - var/origin_correct = 0 - var/trigger_correct = 0 - var/function_correct = 0 - var/range_correct = 0 - if(cur_id == cur_artifact.display_id) - if(src.aorigin == cur_artifact.origin) - origin_correct = 1 - - if(src.atrigger == cur_artifact.my_effect.trigger) - trigger_correct = 1 - else if(src.atrigger == cur_artifact.my_effect.triggerX) - trigger_correct = 1 - - if(src.aeffect1 == cur_artifact.my_effect.effecttype) - function_correct = 1 - - if(src.aeffect2 == cur_artifact.my_effect.effectmode) - range_correct = 1 - - if (src.accuO > 100) src.accuO = 100 - if (src.accuT > 100) src.accuT = 100 - if (src.accuE1 > 100) src.accuE1 = 100 - if (src.accuE2 > 100) src.accuE2 = 100 - // Roll to generate report - if (prob(accuO) || origin_correct) - switch(cur_artifact.origin) - if("ancient") src.aorigin = "Ancient Robots" - if("martian") src.aorigin = "Martian" - if("wizard") src.aorigin = "Wizard Federation" - if("eldritch") src.aorigin = "Extradimensional" - if("precursor") src.aorigin = "Precursor" - else src.aorigin = "Unknown Origin" - origin_bonuses[cur_artifact.origin] += 10 - else - AA_FailedAnalysis(1) - origin_bonuses[cur_artifact.origin] += 5 - if (prob(accuT) || trigger_correct) - switch(cur_artifact.my_effect.trigger) - if("touch") src.atrigger = "Contact with Living Organism" - if("force") src.atrigger = "Heavy Impact" - if("energy") src.atrigger = "Contact with Energy Source" - if("chemical") - switch(cur_artifact.my_effect.triggerX) - if("hydrogen") src.atrigger = "Contact with Hydrogen" - if("corrosive") src.atrigger = "Contact with Corrosive Substance" - if("volatile") src.atrigger = "Contact with Volatile Substance" - if("toxin") src.atrigger = "Contact with Toxins" - if("heat") src.atrigger = "Exposure to Heat" - else src.atrigger = "Unknown Trigger" - trigger_bonuses[cur_artifact.origin] += 5 - else - AA_FailedAnalysis(2) - trigger_bonuses[cur_artifact.origin] += 1 - if (prob(accuE1) || function_correct) - switch(cur_artifact.my_effect.effecttype) - if("healing") src.aeffect1 = "Healing Device" - if("injure") src.aeffect1 = "Anti-biological Weapon" - // if("stun") src.aeffect1 = "Non-lethal Stunning Trap" - if("roboheal") src.aeffect1 = "Mechanoid Repair Module" - if("robohurt") src.aeffect1 = "Mechanoid Deconstruction Device" - if("cellcharge") src.aeffect1 = "Power Generator" - if("celldrain") src.aeffect1 = "Power Drain" - if("planthelper") src.aeffect1 = "Agriculture Regulator" - if("forcefield") src.aeffect1 = "Shield Generator" - if("teleport") src.aeffect1 = "Space-Time Displacer" - else src.aeffect1 = "Unknown Effect" - function_bonuses[cur_artifact.origin] += 5 - else - AA_FailedAnalysis(3) - function_bonuses[cur_artifact.origin] += 1 - if (prob(accuE2) || range_correct) - switch(cur_artifact.my_effect.effectmode) - if("aura") src.aeffect2 = "Constant Short-Range Energy Field" - if("pulse") - if(cur_artifact.my_effect.aurarange > 7) src.aeffect2 = "Long Range Energy Pulses" - else src.aeffect2 = "Medium Range Energy Pulses" - if("worldpulse") src.aeffect2 = "Extreme Range Energy Pulses" - if("contact") src.aeffect2 = "Requires contact with subject" - else src.aeffect2 = "Unknown Range" - range_bonuses[cur_artifact.origin] += 5 - else - AA_FailedAnalysis(4) - range_bonuses[cur_artifact.origin] += 1 - - cur_artifact.name = "alien artifact ([cur_artifact.display_id])" - cur_artifact.desc = "A large alien device. It has a small tag near the bottom that reads \"[cur_artifact.display_id]\"." - cur_id = cur_artifact.display_id - cur_artifact.my_effect.artifact_id = cur_artifact.display_id - -/obj/machinery/artifact_analyser/Topic(href, href_list) - - if(href_list["analyse"]) - if(owned_pad) - var/turf/pad_turf = get_turf(owned_pad) - var/findarti = 0 - for(var/obj/machinery/artifact/A in pad_turf.contents) - findarti++ - cur_artifact = A - if (findarti == 1) - if(cur_artifact && cur_artifact.being_used) - var/message = "[src] states, \"Cannot analyse. Excess energy drain is disrupting signal.\"" - src.visible_message(message, message) - else - cur_artifact.anchored = 1 - cur_artifact.being_used = 1 - src.working = 1 - src.icon_state = "analyser_processing" - var/time = rand(30,50) + max(0, 300 - scan_num * 10) - /*for(var/i = artifact_research.starting_tier, i <= artifact_research.max_tiers, i++) - for(var/datum/artiresearch/R in artifact_research.researched_items[i]) - if (R.bonustype == "analyser") time -= R.bonusTime*/ - time *= 10 - var/message = "[src] states, \"Commencing analysis.\"" - src.visible_message(message, message) - use_power(500) - spawn(time) - src.working = 0 - icon_state = "analyser" - cur_artifact.anchored = 0 - cur_artifact.being_used = 0 - if(cur_artifact.loc == pad_turf) - AA_Analyse() - scan_num++ - message = "[src] states, \"Analysis complete.\"" - src.visible_message(message, message) - use_power(500) - else if (findarti > 1) - var/message = "[src] states, \"Cannot analyse. Error isolating energy signature.\"" - src.visible_message(message, message) - else - var/message = "[src] states, \"Cannot analyse. No noteworthy energy signature isolated.\"" - src.visible_message(message, message) - - if(href_list["upload"] && cur_id != "") - //add new datum to every DB in the world - for(var/obj/machinery/computer/artifact_database/DB in world) - var/update = 0 - for(var/datum/catalogued_artifact/CA in DB.catalogued_artifacts) - if(CA.display_id == cur_id) - //already there, so update it - update = 1 - CA.origin = aorigin + " ([accuO]%)" - CA.trigger = atrigger + " ([accuT]%)" - CA.effecttype = aeffect1 + " ([accuE1]%)" - CA.effectmode = aeffect2 + " ([accuE2]%)" - if(!update) - //not there, so add it - var/datum/catalogued_artifact/CA = new() - CA.display_id = cur_id - CA.origin = aorigin + " ([accuO]%)" - CA.trigger = atrigger + " ([accuT]%)" - CA.effecttype = aeffect1 + " ([accuE1]%)" - CA.effectmode = aeffect2 + " ([accuE2]%)" - DB.catalogued_artifacts.Add(CA) - use_power(100) - - if(href_list["print"]) - var/r = "Artifact Analysis Report (Scan #[scan_num])
" - r += "Artifact ID: [cur_id] (determined from unique energy emission signatures)
" - r += "Artifact Origin: [aorigin] ([accuO]%)
" - r += "Activation Trigger: [atrigger] ([accuT]%)
" - r += "Artifact Function: [aeffect1] ([accuE1]%)
" - r += "Artifact Range: [aeffect2] ([accuE2]%)
" - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src.loc) - P.name = "Artifact Analysis Report #[scan_num]" - P.info = r - for(var/mob/O in hearers(src, null)) - O.show_message("\icon[src] \blue The [src.name] prints a sheet of paper", 3) - use_power(10) - - if(href_list["close"]) - usr << browse(null, "window=artanalyser") - usr.machine = null - - src.updateDialog() - -//stick artifacts onto this then switch the analyser on -/obj/machinery/analyser_pad - name = "artifact analysis pad" - desc = "Studies the structure of artifacts to discover their uses." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "tele0" - anchored = 1 - density = 0 - -/obj/machinery/analyser_pad/New() - ..() - /*spawn(10) - for(var/obj/machinery/artifact_analyser/analyser in orange(1)) - world << "pad found analyser" - if(!analyser.owned_pad) - analyser.owned_pad = src - world << "pad set analyser to self" - break*/ diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_db_old.dm b/code/modules/research/xenoarchaeology/machinery/artifact_db_old.dm deleted file mode 100644 index c6e0d1fb3fa..00000000000 --- a/code/modules/research/xenoarchaeology/machinery/artifact_db_old.dm +++ /dev/null @@ -1,58 +0,0 @@ - -/datum/catalogued_artifact - var/trigger = "touch" // What activates it? - var/effecttype = "healing" // What does it do? - var/effectmode = "aura" // How does it carry out the effect? - var/display_id = "" // Artifact ID to display once successfully scanned - var/origin = "" - -/obj/machinery/computer/artifact_database - name = "Artifact Database" - icon_state = "rdcomp" - var/list/catalogued_artifacts - -/obj/machinery/computer/artifact_database/New() - ..() - catalogued_artifacts = new/list - -/obj/machinery/computer/artifact_database/Topic(href, href_list) - ..() - if( href_list["close"] ) - usr << browse(null, "window=artifact_db") - usr.machine = null - updateDialog() - -/obj/machinery/computer/artifact_database/process() - ..() - updateDialog() - -/obj/machinery/computer/artifact_database/interact(mob/user) - if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) ) - if (!istype(user, /mob/living/silicon)) - user.machine = null - user << browse(null, "window=artifact_db") - return - var/t = "Artifact Database
" - t += "
" - for(var/datum/catalogued_artifact/CA in catalogued_artifacts) - t += "Artifact ID: [CA.display_id] (determined from unique energy emission signatures)
" - t += "Artifact Origin: [CA.origin]
" - t += "Activation Trigger: [CA.trigger]
" - t += "Artifact Function: [CA.effecttype]
" - t += "Artifact Range: [CA.effectmode]
" - t += "
" - t += "Refresh Close
" - user << browse(t, "window=artifact_db;size=500x800") - user.machine = src - -/* -/datum/artifact_effect - var/origin = null // Used in the randomisation/research of the artifact. - var/trigger = "touch" // What activates it? - var/triggerX = "none" // Used for more varied triggers - var/effecttype = "healing" // What does it do? - var/effectmode = "aura" // How does it carry out the effect? - var/aurarange = 4 // How far the artifact will extend an aura effect. - var/display_id = "" // Artifact ID to display once successfully scanned - var/list/created_field -*/ \ No newline at end of file diff --git a/code/modules/research/xenoarchaeology/machinery/coolant.dm b/code/modules/research/xenoarchaeology/machinery/coolant.dm new file mode 100644 index 00000000000..bc03553bee0 --- /dev/null +++ b/code/modules/research/xenoarchaeology/machinery/coolant.dm @@ -0,0 +1,59 @@ + +datum/reagent/coolant + name = "Coolant" + id = "coolant" + description = "Industrial cooling substance." + reagent_state = LIQUID + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/chemical_reaction/coolant + name = "Coolant" + id = "coolant" + result = "coolant" + required_reagents = list("tungsten" = 1, "oxygen" = 1, "water" = 1) + result_amount = 3 + + + +/obj/structure/reagent_dispensers/coolanttank + name = "coolant tank" + desc = "A tank of industrial coolant" + icon = 'icons/obj/objects.dmi' + icon_state = "coolanttank" + amount_per_transfer_from_this = 10 + New() + ..() + reagents.add_reagent("coolant",1000) + +/obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/item/projectile/Proj) + if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) + if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) ) + explode() + +/obj/structure/reagent_dispensers/coolanttank/blob_act() + explode() + +/obj/structure/reagent_dispensers/coolanttank/ex_act() + explode() + +/obj/structure/reagent_dispensers/coolanttank/proc/explode() + var/datum/effect/effect/system/harmless_smoke_spread/S = new /datum/effect/effect/system/harmless_smoke_spread + //S.attach(src) + S.set_up(5, 0, src.loc) + + playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) + spawn(0) + S.start() + + var/datum/gas_mixture/env = src.loc.return_air() + if(env) + if (reagents.total_volume > 750) + env.temperature = 0 + else if (reagents.total_volume > 500) + env.temperature -= 100 + else + env.temperature -= 50 + + sleep(10) + if(src) + del(src) diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm new file mode 100644 index 00000000000..6dcd45c8255 --- /dev/null +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -0,0 +1,363 @@ + +/obj/machinery/radiocarbon_spectrometer + name = "Radiocarbon spectrometer" + desc = "A specialised, complex scanner for gleaning information on all manner of small things." + anchored = 1 + density = 1 + icon = 'icons/obj/virology.dmi' + icon_state = "analyser" + + use_power = 1 //1 = idle, 2 = active + idle_power_usage = 20 + active_power_usage = 300 + + //var/obj/item/weapon/reagent_containers/glass/coolant_container + var/scanning = 0 + var/report_num = 0 + // + var/obj/item/scanned_item + var/last_scan_data = "No scans on record." + // + var/last_process_worldtime = 0 + // + var/scanner_progress = 0 + var/scanner_rate = 1.25 //80 seconds per scan + var/scanner_rpm = 0 + var/scanner_rpm_dir = 1 + var/scanner_temperature = 0 + var/scanner_seal_integrity = 100 + // + var/coolant_usage_rate = 0 //measured in u/microsec + var/fresh_coolant = 0 + var/coolant_purity = 0 + var/datum/reagents/coolant_reagents + var/used_coolant = 0 + var/list/coolant_reagents_purity = list() + // + var/maser_wavelength = 0 + var/optimal_wavelength = 0 + var/optimal_wavelength_target = 0 + var/tleft_retarget_optimal_wavelength = 0 + var/maser_efficiency = 0 + // + var/radiation = 0 //0-100 mSv + var/t_left_radspike = 0 + var/rad_shield = 0 + +/obj/machinery/radiocarbon_spectrometer/New() + ..() + create_reagents(500) + coolant_reagents_purity["water"] = 0.5 + coolant_reagents_purity["icecoffee"] = 0.6 + coolant_reagents_purity["icetea"] = 0.6 + coolant_reagents_purity["milkshake"] = 0.6 + coolant_reagents_purity["leporazine"] = 0.7 + coolant_reagents_purity["kelotane"] = 0.7 + coolant_reagents_purity["sterilizine"] = 0.7 + coolant_reagents_purity["dermaline"] = 0.7 + coolant_reagents_purity["hyperzine"] = 0.8 + coolant_reagents_purity["cryoxadone"] = 0.9 + coolant_reagents_purity["coolant"] = 1 + coolant_reagents_purity["adminordrazine"] = 2 + +/obj/machinery/radiocarbon_spectrometer/attack_hand(var/mob/user as mob) + ui_interact(user) + +/obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob) + if(scanning) + user << "You can't do that while [src] is scanning!" + else + if(istype(I, /obj/item/stack/nanopaste)) + var/choice = alert("What do you want to do with the nanopaste?","Radiometric Scanner","Scan nanopaste","Fix seal integrity") + if(choice == "Fix seal integrity") + var/obj/item/stack/nanopaste/N = I + var/amount_used = min(N.amount, 10 - scanner_seal_integrity / 10) + N.use(amount_used) + scanner_seal_integrity = round(scanner_seal_integrity + amount_used * 10) + return + if(istype(I, /obj/item/weapon/reagent_containers/glass)) + var/choice = alert("What do you want to do with the container?","Radiometric Scanner","Add coolant","Empty coolant","Scan container") + if(choice == "Add coolant") + var/obj/item/weapon/reagent_containers/glass/G = I + var/amount_transferred = min(src.reagents.maximum_volume - src.reagents.total_volume, G.reagents.total_volume) + G.reagents.trans_to(src, amount_transferred) + user << "You empty [amount_transferred]u of coolant into [src]." + update_coolant() + return + else if(choice == "Empty coolant") + var/obj/item/weapon/reagent_containers/glass/G = I + var/amount_transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, src.reagents.total_volume) + src.reagents.trans_to(G, amount_transferred) + user << "You remove [amount_transferred]u of coolant from [src]." + update_coolant() + return + user.drop_item() + I.loc = src + scanned_item = I + +/obj/machinery/radiocarbon_spectrometer/proc/update_coolant() + var/total_purity = 0 + fresh_coolant = 0 + coolant_purity = 0 + var/num_reagent_types = 0 + for (var/datum/reagent/current_reagent in src.reagents.reagent_list) + if (!current_reagent) + continue + var/cur_purity = coolant_reagents_purity[current_reagent.id] + if(!cur_purity) + cur_purity = 0.1 + else if(cur_purity > 1) + cur_purity = 1 + total_purity += cur_purity * current_reagent.volume + fresh_coolant += current_reagent.volume + num_reagent_types += 1 + if(total_purity && fresh_coolant) + coolant_purity = total_purity / fresh_coolant + +/obj/machinery/radiocarbon_spectrometer/ui_interact(mob/user, ui_key = "radio_spectro") + + if(user.stat) + return + + // this is the data which will be sent to the ui + var/data[0] + data["scanned_item"] = (scanned_item ? scanned_item.name : "") + data["scanned_item_desc"] = (scanned_item ? (scanned_item.desc ? scanned_item.desc : "No information on record.") : "") + data["last_scan_data"] = last_scan_data + // + data["scan_progress"] = round(scanner_progress) + data["scanning"] = scanning + // + data["scanner_seal_integrity"] = round(scanner_seal_integrity) + data["scanner_rpm"] = round(scanner_rpm) + data["scanner_temperature"] = round(scanner_temperature) + // + data["coolant_usage_rate"] = "[coolant_usage_rate]" + data["unused_coolant_abs"] = round(fresh_coolant) + data["unused_coolant_per"] = round(fresh_coolant / reagents.maximum_volume * 100) + data["coolant_purity"] = "[coolant_purity * 100]" + // + data["optimal_wavelength"] = round(optimal_wavelength) + data["maser_wavelength"] = round(maser_wavelength) + data["maser_efficiency"] = round(maser_efficiency * 100) + // + data["radiation"] = round(radiation) + data["t_left_radspike"] = round(t_left_radspike) + data["rad_shield_on"] = rad_shield + + var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, ui_key) + if (!ui) + // the ui does not exist, so we'll create a new one + ui = new(user, src, ui_key, "geoscanner.tmpl", "High Res Radiocarbon Spectrometer", 900, 825) + // When the UI is first opened this is the data it will use + ui.set_initial_data(data) + ui.open() + // Auto update every Master Controller tick + ui.set_auto_update(1) + else + // The UI is already open so push the new data to it + ui.push_data(data) + return + +/obj/machinery/radiocarbon_spectrometer/process() + if(scanning) + if(!scanned_item || scanned_item.loc != src) + scanned_item = null + stop_scanning() + else if(scanner_progress >= 100) + complete_scan() + else + //calculate time difference + var/deltaT = (world.time - last_process_worldtime) * 0.1 + + //modify the RPM over time + //i want 1u to last for 10 sec at 500 RPM, scaling linearly + scanner_rpm += scanner_rpm_dir * 50 * deltaT + if(scanner_rpm > 1000) + scanner_rpm = 1000 + scanner_rpm_dir = -1 * pick(0.5, 2.5, 5.5) + else if(scanner_rpm < 1) + scanner_rpm = 1 + scanner_rpm_dir = 1 * pick(0.5, 2.5, 5.5) + + //heat up according to RPM + //each unit of coolant + scanner_temperature += scanner_rpm * deltaT * 0.05 + + //radiation + t_left_radspike -= deltaT + if(t_left_radspike > 0) + //ordinary radiation + radiation = rand() * 15 + else + //radspike + if(t_left_radspike > -5) + radiation = rand() * 15 + 85 + if(!rad_shield) + //irradiate nearby mobs + for(var/mob/living/M in view(7,src)) + M.apply_effect(radiation / 25, IRRADIATE, 0) + else + t_left_radspike = pick(10,15,25) + + //use some coolant to cool down + if(coolant_usage_rate > 0) + var/coolant_used = min(fresh_coolant, coolant_usage_rate * deltaT) + if(coolant_used > 0) + fresh_coolant -= coolant_used + used_coolant += coolant_used + scanner_temperature = max(scanner_temperature - coolant_used * coolant_purity * 20, 0) + + //modify the optimal wavelength + tleft_retarget_optimal_wavelength -= deltaT + if(tleft_retarget_optimal_wavelength <= 0) + tleft_retarget_optimal_wavelength = pick(4,8,15) + optimal_wavelength_target = rand() * 9900 + 100 + // + if(optimal_wavelength < optimal_wavelength_target) + optimal_wavelength = min(optimal_wavelength + 700 * deltaT, optimal_wavelength_target) + else if(optimal_wavelength > optimal_wavelength_target) + optimal_wavelength = max(optimal_wavelength - 700 * deltaT, optimal_wavelength_target) + // + maser_efficiency = 1 - max(min(10000, abs(optimal_wavelength - maser_wavelength) * 3), 1) / 10000 + + //make some scan progress + if(!rad_shield) + scanner_progress = min(100, scanner_progress + scanner_rate * maser_efficiency * deltaT) + + //degrade the seal over time according to temperature + //i want temperature of 50K to degrade at 1%/sec + scanner_seal_integrity -= (max(scanner_temperature, 1) / 1000) * deltaT + + //emergency stop if seal integrity reaches 0 + if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield)) + stop_scanning() + src.visible_message("\blue \icon[src] buzzes unhappily. It has failed mid-scan!", 2) + + if(prob(5)) + src.visible_message("\blue \icon[src] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", 2) + else + //gradually cool down over time + if(scanner_temperature > 0) + scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0) + if(prob(0.75)) + src.visible_message("\blue \icon[src] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2) + last_process_worldtime = world.time + +/obj/machinery/radiocarbon_spectrometer/proc/stop_scanning() + scanning = 0 + scanner_rpm_dir = 1 + scanner_rpm = 0 + optimal_wavelength = 0 + maser_efficiency = 0 + maser_wavelength = 0 + coolant_usage_rate = 0 + radiation = 0 + t_left_radspike = 0 + if(used_coolant) + src.reagents.remove_any(used_coolant) + used_coolant = 0 + +/obj/machinery/radiocarbon_spectrometer/proc/complete_scan() + src.visible_message("\blue \icon[src] makes an insistent chime.", 2) + + if(scanned_item) + //create report + var/obj/item/weapon/paper/P = new(src) + P.name = "[src] report #[++report_num]: [scanned_item.name]" + P.stamped = list(/obj/item/weapon/stamp) + P.overlays = list("paper_stamped") + + //work out data + var/data = " - Mundane object: [scanned_item.desc ? scanned_item.desc : "No information on record."]
" + var/datum/geosample/G + switch(scanned_item.type) + if(/obj/item/weapon/ore) + var/obj/item/weapon/ore/O = scanned_item + if(O.geological_data) + G = O.geological_data + + if(/obj/item/weapon/rocksliver) + var/obj/item/weapon/rocksliver/O = scanned_item + if(O.geological_data) + G = O.geological_data + + if(/obj/item/weapon/archaeological_find) + data = " - Mundane object (archaic xenos origins)
" + + var/obj/item/weapon/archaeological_find/A = scanned_item + if(A.speaking_to_players) + data = " - Exhibits properties consistent with sonic reproduction.
" + if(A.listening_to_players) + data = " - Exhibits properties similar to audio capture technology.
" + + var/anom_found = 0 + if(G) + data = " - Spectometric analysis on mineral sample has determined type [finds_as_strings[responsive_carriers.Find(G.source_mineral)]]
" + if(G.age_billion > 0) + data += " - Radiometric dating shows age of [G.age_billion].[G.age_million] billion years
" + else if(G.age_million > 0) + data += " - Radiometric dating shows age of [G.age_million].[G.age_thousand] million years
" + else + data += " - Radiometric dating shows age of [G.age_thousand * 1000 + G.age] years
" + data += " - Chromatographic analysis shows the following materials present:
" + for(var/carrier in G.find_presence) + if(G.find_presence[carrier]) + var/index = responsive_carriers.Find(carrier) + if(index > 0 && index <= finds_as_strings.len) + data += " > [100 * G.find_presence[carrier]]% [finds_as_strings[index]]
" + + if(G.artifact_id && G.artifact_distance >= 0) + anom_found = 1 + data += " - Hyperspectral imaging reveals exotic energy wavelength detected with ID: [G.artifact_id]
" + data += " - Fourier transform analysis on anomalous energy absorption indicates energy source located inside emission radius of [G.artifact_distance]m
" + + if(!anom_found) + data += " - No anomalous data
" + + P.info = "[src] analysis report #[report_num]
" + P.info += "Scanned item: [scanned_item.name]
" + data + last_scan_data = P.info + P.loc = src.loc + + scanned_item.loc = src.loc + scanned_item = null + +/obj/machinery/radiocarbon_spectrometer/Topic(href, href_list) + if(stat & (NOPOWER|BROKEN)) + return 0 // don't update UIs attached to this object + + if(href_list["scanItem"]) + if(scanning) + stop_scanning() + else + if(scanned_item) + if(scanner_seal_integrity > 0) + scanner_progress = 0 + scanning = 1 + t_left_radspike = pick(5,10,15) + usr << "Scan initiated." + else + usr << "Could not initiate scan, seal requires replacing." + else + usr << "Insert an item to scan." + + if(href_list["maserWavelength"]) + maser_wavelength = max(min(maser_wavelength + 1000 * text2num(href_list["maserWavelength"]), 10000), 1) + + if(href_list["coolantRate"]) + coolant_usage_rate = max(min(coolant_usage_rate + text2num(href_list["coolantRate"]), 10000), 0) + + if(href_list["toggle_rad_shield"]) + if(rad_shield) + rad_shield = 0 + else + rad_shield = 1 + + if(href_list["ejectItem"]) + if(scanned_item) + scanned_item.loc = src.loc + scanned_item = null + + add_fingerprint(usr) + return 1 // update UIs attached to this object diff --git a/code/modules/research/xenoarchaeology/manuals.dm b/code/modules/research/xenoarchaeology/manuals.dm index ceaa3d036ea..99be3a6849c 100644 --- a/code/modules/research/xenoarchaeology/manuals.dm +++ b/code/modules/research/xenoarchaeology/manuals.dm @@ -49,6 +49,8 @@
Contents
- A note on terms -
- Isotope ratio spectrometer -
- Accelerator spectrometer -
- Gas chromatography spectrometer -
- Ion mobility spectrometer +
- Analysis progression +
- Heat management +
- Ambient radiation
A note on terms
-
-
Contents -
Isotope ratio spectrometer
- Isotope ratio mass spectrometers work by coating a small surface with a semiliquid stationary phase consisting of the sample to be - analysed, and recording it's interactions with a gaseous mobile phase comprised of an inert or nonreactive gas such as helium or nitrogen.+
Analysis progression
+ Modern mass spectrometry requires constant attention from the diligant researcher in order to be successul. There are many different elements to juggle, + and later chapters will delve into them. For the spectrometry assistant, the first thing you need to know is that the scanner wavelength is automatically + calculated for you. Just tweak the settings and try to match it with the actual wavelength as closely as possible.- IRMS are employed as radiometric daters, extremely accurate but only so up to ages of one billion years.
Contents -
Accelerator spectrometer
- The accelerator mass spectrometer works by accelerating ions to extraordinarily high kinetic energies before mass analysis. The special strength of AMS is - isolate rare or low-strength isotopes, making it able to determine much greater ages with reasonable accuracy.+
Seal integrity
+ In order to maintain sterile and environmentally static procedures, a special chamber is setup inside the spectrometer. It's protected by a proprietary vacuum seal + produced by top tier industrial science. It will only last for a certain number of scans before failing outright, but it can be resealed through use of nanite paste. + Unfortunately, it's susceptible to malforming under heat stress so exposing it to higher temperatures will cause it's operation life to drop significantly.- AMS are employed as extreme age radiometric daters, able to determine the age of the sample on a scale of billions of years. - They are commonly located in geology and archaeology laboratories.
Contents -
Gas chromatography spectrometer
- Gas-liquid chromatography mass spectrometers work by coating a small surface with a semiliquid stationary phase consisting of the sample to be - analysed, and recording it's interactions with a gaseous mobile phase comprised of an inert or nonreactive gas such as helium or nitrogen.+
Heat management
+ The scanner relies on a gyro-rotational system that varies in speed and intensity. Over the course of an ordinary scan, the RPMs can change dramatically. Higher RPMs + means greater heat generation, but is necessary for the ongoing continuation of the scan. To offset heat production, spectrometers have an inbuilt cooling system. + Researchers can modify the flow rate of coolant to aid in dropping temperature as necessary, but are advised that frequent coolant replacements may be necessary + depending on coolant purity. Water and substances such as cryoxadone are viable substitutes, but nowhere near as effective as pure coolant itself.- GLCS are employed in forensic and geological analysis to determine what elements are present in a sample.
Contents -
Ion mobility spectrometer
- Ion mobility mass spectrometers work by examining the mobility of ionized molecules in an inert carrier gas+
Ambient radiation
+ Researchers are warned that while operational, mass spectrometers emit period bursts of radiation and are thus advised to wear protective gear. In the event of + radiation spikes, there is also a special shield that can be lowered to block emissions. Lowering this, however, will have the effect of blocking the scanner + so use it sparingly.- IMS returns a dissonance ratio over the scanned sample and carrier reagent, indicating the average total presence of the sample.
Contents @@ -197,67 +198,17 @@ -
Contents
--
-
- Some useful phrases for you -
- Sample preparation and analysis -
- Fourier transform spectroscope -
- Hyperspectral Imager -
-
Some useful phrases for you
--
-
- Contents - -
Sample preparation and analysis
- When you are readying your spectrometry lab for analysis, you'll need to make sure the sample is in a form the machines can glean data from. --
-
- Contents - -
Fourier transform spectroscope
- The FTS measures temporal coherence of radiating energy, then applies time-and-space domain measurements on the collected emission data. The collective - procedure is known as the Fourier Transform Procedure, with the mathematical algorithms dating back to the 19th century on Earth.-
- As well as providing background energy readings, an FTS calculates the approximate distance and direction towards any anomalous energy signatures from - the location the scanned sample was taken from.
- Contents - -
Hyperspectral Imager
- The imager scans and collates spectral energy signatures from across the electromagnetic spectrum. The collected data is then presented to the viewer in - graph form, with any anomalous (uncatalogued or unidentified) energy signatures highlighted.-
- As well as visualising background energy readings, a hyperspectral imager will isolate and identify any anomalous energy signatures in the sample.
- Contents - - -