The master controller reports: [MC_report]
" - if(!diseases_ready) - if(last_disease_processed) - MC_admin_report += "DISEASE PROCESSING stuck on [last_disease_processed]
" - else - MC_admin_report += "DISEASE PROCESSING stuck on unknown
" - if(!machines_ready) - if(last_machine_processed) - MC_admin_report += "MACHINE PROCESSING stuck on [last_machine_processed]
" - else - MC_admin_report += "MACHINE PROCESSING stuck on unknown
" - if(!objects_ready) - if(last_obj_processed) - MC_admin_report += "OBJ PROCESSING stuck on [last_obj_processed]
" - else - MC_admin_report += "OBJ PROCESSING stuck on unknown
" - MC_admin_report += "Master controller breaking out of delaying loop. Restarting the round is advised if problem persists. DO NOT manually restart the master controller.
" - message_admins(MC_admin_report) - log_admin("PROC BREAKAGE WARNING: infinite_loop_check = [IL_check]; [MC_report];") - break - sleep(3) - else - sleep(10) - - - -/datum/failsafe // This thing pretty much just keeps poking the master controller - var/spinning = 1 - var/current_iteration = 0 - var/ticks_per_spin = 200 //poke the MC every 20 seconds - var/defcon = 0 //alert level. For every poke that fails this is raised by 1. When it reaches 5 the MC is replaced with a new one. (effectively killing any master_controller.process() and starting a new one) - -/datum/failsafe/New() - //There can be only one failsafe. Out with the old in with the new (that way we can restart the Failsafe by spawning a new one) - if(Failsafe && (Failsafe != src)) - del(Failsafe) - Failsafe = src - - current_iteration = controller_iteration - spawn(0) - Failsafe.spin() - - -/datum/failsafe/proc/spin() - set background = 1 - while(1) //more efficient than recursivly calling ourself over and over. background = 1 ensures we do not trigger an infinite loop - if(master_controller) - if(spinning && master_controller.processing) //only poke if these overrides aren't in effect - if(current_iteration == controller_iteration) //master_controller hasn't finished processing in the defined interval - switch(defcon) - if(0 to 3) - defcon++ - if(4) - defcon = 5 - for(var/client/C) - if(C.holder) - C << "Warning. The Master Controller has not fired in the last [4*ticks_per_spin] ticks. Automatic restart in [ticks_per_spin] ticks." - if(5) - for(var/client/C) - if(C.holder) - C << "Warning. The Master Controller has still not fired within the last [5*ticks_per_spin] ticks. Killing and restarting..." - spawn(0) - new /datum/controller/game_controller() //replace the old master_controller (hence killing the old one's process) - master_controller.process() //Start it rolling again - defcon = 0 - else - defcon = 0 - current_iteration = controller_iteration - else - defcon = 0 - else - new /datum/controller/game_controller() //replace the missing master_controller! This should never happen. - sleep(ticks_per_spin) - diff --git a/code/WorkInProgress/mapload/dmm_suite.dm b/code/WorkInProgress/mapload/dmm_suite.dm deleted file mode 100644 index f096d555642..00000000000 --- a/code/WorkInProgress/mapload/dmm_suite.dm +++ /dev/null @@ -1,246 +0,0 @@ -dmm_suite - /* - - dmm_suite version 1.0 - Released January 30th, 2011. - - defines the object /dmm_suite - - Provides the proc load_map() - - Loads the specified map file onto the specified z-level. - - provides the proc write_map() - - Returns a text string of the map in dmm format - ready for output to a file. - - provides the proc save_map() - - Returns a .dmm file if map is saved - - Returns FALSE if map fails to save - - The dmm_suite provides saving and loading of map files in BYOND's native DMM map - format. It approximates the map saving and loading processes of the Dream Maker - and Dream Seeker programs so as to allow editing, saving, and loading of maps at - runtime. - - ------------------------ - - To save a map at runtime, create an instance of /dmm_suite, and then call - write_map(), which accepts three arguments: - - A turf representing one corner of a three dimensional grid (Required). - - Another turf representing the other corner of the same grid (Required). - - Any, or a combination, of several bit flags (Optional, see documentation). - - The order in which the turfs are supplied does not matter, the /dmm_writer will - determine the grid containing both, in much the same way as DM's block() function. - write_map() will then return a string representing the saved map in dmm format; - this string can then be saved to a file, or used for any other purose. - - ------------------------ - - To load a map at runtime, create an instance of /dmm_suite, and then call load_map(), - which accepts two arguments: - - A .dmm file to load (Required). - - A number representing the z-level on which to start loading the map (Optional). - - The /dmm_suite will load the map file starting on the specified z-level. If no - z-level was specified, world.maxz will be increased so as to fit the map. Note - that if you wish to load a map onto a z-level that already has objects on it, - you will have to handle the removal of those objects. Otherwise the new map will - simply load the new objects on top of the old ones. - - Also note that all type paths specified in the .dmm file must exist in the world's - code, and that the /dmm_reader trusts that files to be loaded are in fact valid - .dmm files. Errors in the .dmm format will cause runtime errors. - - */ - - - verb/load_map(var/dmm_file as file, var/z_offset as num) - // dmm_file: A .dmm file to load (Required). - // z_offset: A number representing the z-level on which to start loading the map (Optional). - - - verb/write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num) - // t1: A turf representing one corner of a three dimensional grid (Required). - // t2: Another turf representing the other corner of the same grid (Required). - // flags: Any, or a combination, of several bit flags (Optional, see documentation). - - // save_map is included as a legacy proc. Use write_map instead. - verb/save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num) - // t1: A turf representing one corner of a three dimensional grid (Required). - // t2: Another turf representing the other corner of the same grid (Required). - // map_name: A valid name for the map to be saved, such as "castle" (Required). - // flags: Any, or a combination, of several bit flags (Optional, see documentation). - - -#define DMM_IGNORE_AREAS 1 -#define DMM_IGNORE_TURFS 2 -#define DMM_IGNORE_OBJS 4 -#define DMM_IGNORE_NPCS 8 -#define DMM_IGNORE_PLAYERS 16 -#define DMM_IGNORE_MOBS 24 -dmm_suite{ - var{ - quote = "\"" - list/letter_digits = list( - "a","b","c","d","e", - "f","g","h","i","j", - "k","l","m","n","o", - "p","q","r","s","t", - "u","v","w","x","y", - "z", - "A","B","C","D","E", - "F","G","H","I","J", - "K","L","M","N","O", - "P","Q","R","S","T", - "U","V","W","X","Y", - "Z" - ) - } - save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num){ - //Check for illegal characters in file name... in a cheap way. - if(!((ckeyEx(map_name)==map_name) && ckeyEx(map_name))){ - CRASH("Invalid text supplied to proc save_map, invalid characters or empty string.") - } - //Check for valid turfs. - if(!isturf(t1) || !isturf(t2)){ - CRASH("Invalid arguments supplied to proc save_map, arguments were not turfs.") - } - var/file_text = write_map(t1,t2,flags) - if(fexists("[map_name].dmm")){ - fdel("[map_name].dmm") - } - var/saved_map = file("[map_name].dmm") - saved_map << file_text - return saved_map - } - write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){ - //Check for valid turfs. - if(!isturf(t1) || !isturf(t2)){ - CRASH("Invalid arguments supplied to proc write_map, arguments were not turfs.") - } - var/turf/nw = locate(min(t1.x,t2.x),max(t1.y,t2.y),min(t1.z,t2.z)) - var/turf/se = locate(max(t1.x,t2.x),min(t1.y,t2.y),max(t1.z,t2.z)) - var/list/templates[0] - var/template_buffer = {""} - var/dmm_text = {""} - for(var/pos_z=nw.z;pos_z<=se.z;pos_z++){ - for(var/pos_y=nw.y;pos_y>=se.y;pos_y--){ - for(var/pos_x=nw.x;pos_x<=se.x;pos_x++){ - var/turf/test_turf = locate(pos_x,pos_y,pos_z) - var/test_template = make_template(test_turf, flags) - var/template_number = templates.Find(test_template) - if(!template_number){ - templates.Add(test_template) - template_number = templates.len - } - template_buffer += "[template_number]," - } - template_buffer += ";" - } - template_buffer += "." - } - var/key_length = round/*floor*/(log(letter_digits.len,templates.len-1)+1) - var/list/keys[templates.len] - for(var/key_pos=1;key_pos<=templates.len;key_pos++){ - keys[key_pos] = get_model_key(key_pos,key_length) - dmm_text += {""[keys[key_pos]]" = ([templates[key_pos]])\n"} - } - var/z_level = 0 - for(var/z_pos=1;TRUE;z_pos=findtext(template_buffer,".",z_pos)+1){ - if(z_pos>=length(template_buffer)){break} - if(z_level){dmm_text+={"\n"}} - dmm_text += {"\n(1,1,[++z_level]) = {"\n"} - var/z_block = copytext(template_buffer,z_pos,findtext(template_buffer,".",z_pos)) - for(var/y_pos=1;TRUE;y_pos=findtext(z_block,";",y_pos)+1){ - if(y_pos>=length(z_block)){break} - var/y_block = copytext(z_block,y_pos,findtext(z_block,";",y_pos)) - for(var/x_pos=1;TRUE;x_pos=findtext(y_block,",",x_pos)+1){ - if(x_pos>=length(y_block)){break} - var/x_block = copytext(y_block,x_pos,findtext(y_block,",",x_pos)) - var/key_number = text2num(x_block) - var/temp_key = keys[key_number] - dmm_text += temp_key - sleep(-1) - } - dmm_text += {"\n"} - sleep(-1) - } - dmm_text += {"\"}"} - sleep(-1) - } - return dmm_text - } - proc{ - make_template(var/turf/model as turf, var/flags as num){ - var/template = "" - var/obj_template = "" - var/mob_template = "" - var/turf_template = "" - if(!(flags & DMM_IGNORE_TURFS)){ - turf_template = "[model.type][check_attributes(model)]," - } else{ turf_template = "[world.turf],"} - var/area_template = "" - if(!(flags & DMM_IGNORE_OBJS)){ - for(var/obj/O in model.contents){ - obj_template += "[O.type][check_attributes(O)]," - } - } - for(var/mob/M in model.contents){ - if(M.client){ - if(!(flags & DMM_IGNORE_PLAYERS)){ - mob_template += "[M.type][check_attributes(M)]," - } - } - else{ - if(!(flags & DMM_IGNORE_NPCS)){ - mob_template += "[M.type][check_attributes(M)]," - } - } - } - if(!(flags & DMM_IGNORE_AREAS)){ - var/area/m_area = model.loc - area_template = "[m_area.type][check_attributes(m_area)]" - } else{ area_template = "[world.area]"} - template = "[obj_template][mob_template][turf_template][area_template]" - return template - } - check_attributes(var/atom/A){ - var/attributes_text = {"{"} - for(var/V in A.vars){ - sleep(-1) - if((!issaved(A.vars[V])) || (A.vars[V]==initial(A.vars[V]))){continue} - if(istext(A.vars[V])){ - attributes_text += {"[V] = "[A.vars[V]]""} - } - else if(isnum(A.vars[V])||ispath(A.vars[V])){ - attributes_text += {"[V] = [A.vars[V]]"} - } - else if(isicon(A.vars[V])||isfile(A.vars[V])){ - attributes_text += {"[V] = '[A.vars[V]]'"} - } - else{ - continue - } - if(attributes_text != {"{"}){ - attributes_text+={"; "} - } - } - if(attributes_text=={"{"}){ - return - } - if(copytext(attributes_text, length(attributes_text)-1, 0) == {"; "}){ - attributes_text = copytext(attributes_text, 1, length(attributes_text)-1) - } - attributes_text += {"}"} - return attributes_text - } - get_model_key(var/which as num, var/key_length as num){ - var/key = "" - var/working_digit = which-1 - for(var/digit_pos=key_length;digit_pos>=1;digit_pos--){ - var/place_value = round/*floor*/(working_digit/(letter_digits.len**(digit_pos-1))) - working_digit-=place_value*(letter_digits.len**(digit_pos-1)) - key = "[key][letter_digits[place_value+1]]" - } - return key - } - } - } diff --git a/code/WorkInProgress/mapload/reader.dm b/code/WorkInProgress/mapload/reader.dm deleted file mode 100644 index 755b96fc2da..00000000000 --- a/code/WorkInProgress/mapload/reader.dm +++ /dev/null @@ -1,181 +0,0 @@ -dmm_suite/load_map(var/dmm_file as file, var/z_offset as num) - if(!z_offset) - z_offset = world.maxz+1 - var/quote = ascii2text(34) - var/tfile = file2text(dmm_file) - var/tfile_len = length(tfile) - var/list/grid_models[0] - var/key_len = length(copytext(tfile,2,findtext(tfile,quote,2,0))) - for(var/lpos=1;lpos
Infection rate : [dish.virus2.infectionchance * 10]" - r += "
Spread form : [dish.virus2.spreadtype]" - r += "
Progress Speed : [dish.virus2.stageprob * 10]" - for(var/datum/disease2/effectholder/E in dish.virus2.effects) - r += "
Effect:[E.effect.name]. Strength : [E.multiplier * 8]. Verosity : [E.chance * 15]. Type : [5-E.stage]." - // display the antigens - var/code = "" - for(var/V in ANTIGENS) if(text2num(V) & dish.virus2.antigen) code += ANTIGENS[V] - r += "
Antigen pattern: [code]" - - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src.loc) - P.info = r - dish.info = r - dish.analysed = 1 - dish.loc = src.loc - dish = null - icon_state = "analyser" - - for(var/mob/O in hearers(src, null)) - O.show_message("\icon[src] \blue The [src.name] prints a sheet of paper", 3) - else if(dish && !scanning && !pause) - if(dish.virus2 && dish.growth > 50) - dish.growth -= 10 - scanning = 5 - icon_state = "analyser_processing" - else - pause = 1 - spawn(25) - dish.loc = src.loc - dish = null - for(var/mob/M in viewers(src)) - M.show_message("\icon[src] \blue The [src.name] buzzes", 2) - pause = 0 - - return \ No newline at end of file diff --git a/code/WorkInProgress/virus2/antibodies.dm b/code/WorkInProgress/virus2/antibodies.dm deleted file mode 100644 index 6277e1a6176..00000000000 --- a/code/WorkInProgress/virus2/antibodies.dm +++ /dev/null @@ -1,55 +0,0 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 - -// pure concentrated antibodies -datum/reagent/antibodies - data = new/list("antibodies"=0) - name = "Antibodies" - id = "antibodies" - reagent_state = LIQUID - color = "#0050F0" - - reaction_mob(var/mob/M, var/method=TOUCH, var/volume) - if(istype(M,/mob/living/carbon/human)) - if(src.data && method == INGEST) - if(src.data["antibodies"] & M:virus2.antigen) - M:virus2.dead = 1 - return - -// reserving some numbers for later special antigens -var/global/const/ANTIGEN_A = 1 -var/global/const/ANTIGEN_B = 2 -var/global/const/ANTIGEN_RH = 4 -var/global/const/ANTIGEN_Q = 8 -var/global/const/ANTIGEN_U = 16 -var/global/const/ANTIGEN_V = 32 -var/global/const/ANTIGEN_X = 64 -var/global/const/ANTIGEN_Y = 128 -var/global/const/ANTIGEN_Z = 256 -var/global/const/ANTIGEN_M = 512 -var/global/const/ANTIGEN_N = 1024 -var/global/const/ANTIGEN_P = 2048 -var/global/const/ANTIGEN_O = 4096 - -var/global/list/ANTIGENS = list("[ANTIGEN_A]" = "A", "[ANTIGEN_B]" = "B", "[ANTIGEN_RH]" = "RH", "[ANTIGEN_Q]" = "Q", - "[ANTIGEN_U]" = "U", "[ANTIGEN_V]" = "V", "[ANTIGEN_Z]" = "Z", "[ANTIGEN_M]" = "M", - "[ANTIGEN_N]" = "N", "[ANTIGEN_P]" = "P", "[ANTIGEN_O]" = "O") - - - -/obj/item/device/antibody_scanner - name = "Antibody Scanner" - desc = "Used to scan living beings for antibodies in their blood." - icon_state = "health" - w_class = 2.0 - item_state = "electronic" - flags = FPRINT | TABLEPASS | ONBELT | CONDUCT | USEDELAY - - -/obj/item/device/antibody_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob) - if(! istype(M, /mob/living/carbon) || !M:antibodies) - user << "Unable to detect antibodies.." - else - // iterate over the list of antigens and see what matches - var/code = "" - for(var/V in ANTIGENS) if(text2num(V) & M.antibodies) code += ANTIGENS[V] - user << text("\blue [src] The antibody scanner displays a cryptic set of data: [code]") diff --git a/code/WorkInProgress/virus2/base.dm b/code/WorkInProgress/virus2/base.dm deleted file mode 100644 index bebc719b88f..00000000000 --- a/code/WorkInProgress/virus2/base.dm +++ /dev/null @@ -1,591 +0,0 @@ -/obj/virus - // a virus instance that is placed on the map, moves, and infects - invisibility = INVISIBILITY_MAXIMUM - - var/datum/disease2/disease - - New() - ..() - step_rand(src) - step_rand(src) - anchored = 1 - spawn(300) del(src) - -/mob/living/carbon/proc/get_infection_chance() - var/score = 0 - var/mob/living/carbon/M = src - if(istype(M, /mob/living/carbon/human)) - if(M:gloves) - score += 5 - if(istype(M:wear_suit, /obj/item/clothing/suit/space)) score += 10 - if(istype(M:wear_suit, /obj/item/clothing/suit/bio_suit)) score += 10 - if(istype(M:head, /obj/item/clothing/head/helmet/space)) score += 5 - if(istype(M:head, /obj/item/clothing/head/bio_hood)) score += 5 - if(M.wear_mask) - score += 5 - if(istype(M:wear_mask, /obj/item/clothing/mask/surgical) && !M.internal) - score += 10 - if(M.internal) - score += 10 - - if(score >= 30) - return 0 - else if(score == 25 && prob(99)) - return 0 - else if(score == 20 && prob(95)) - return 0 - else if(score == 15 && prob(75)) - return 0 - else if(score == 10 && prob(55)) - return 0 - else if(score == 5 && prob(35)) - return 0 - - return 1 - - -/proc/infect_virus2(var/mob/living/carbon/M,var/datum/disease2/disease/disease,var/forced = 0) - if(M.virus2) - return - if(!disease) - return - //immunity - /*for(var/iii = 1, iii <= M.immunevirus2.len, iii++) - if(disease.issame(M.immunevirus2[iii])) - return*/ - - // if one of the antibodies in the mob's body matches one of the disease's antigens, don't infect - if(M.antibodies & disease.antigen != 0) return - - for(var/datum/disease2/resistance/res in M.resistances) - if(res.resistsdisease(disease)) - return - if(prob(disease.infectionchance) || forced) - if(M.virus2) - return - else - // certain clothes can prevent an infection - if(!forced && !M.get_infection_chance()) - return - - M.virus2 = disease.getcopy() - M.virus2.minormutate() - - for(var/datum/disease2/resistance/res in M.resistances) - if(res.resistsdisease(M.virus2)) - M.virus2 = null - - - -/datum/disease2/resistance - var/list/datum/disease2/effect/resistances = list() - - proc/resistsdisease(var/datum/disease2/disease/virus2) - var/list/res2 = list() - for(var/datum/disease2/effect/e in resistances) - res2 += e.type - for(var/datum/disease2/effectholder/holder in virus2) - if(!(holder.effect.type in res2)) - return 0 - else - res2 -= holder.effect.type - if(res2.len > 0) - return 0 - else - return 1 - - New(var/datum/disease2/disease/virus2) - for(var/datum/disease2/effectholder/h in virus2.effects) - resistances += h.effect.type - - -/proc/infect_mob_random_lesser(var/mob/living/carbon/M) - if(!M.virus2) - M.virus2 = new /datum/disease2/disease - M.virus2.makerandom() - M.virus2.infectionchance = 1 - -/proc/infect_mob_random_greater(var/mob/living/carbon/M) - if(!M.virus2) - M.virus2 = new /datum/disease2/disease - M.virus2.makerandom(1) - -/datum/disease2/var/antigen = 0 // 16 bits describing the antigens, when one bit is set, a cure with that bit can dock here - -/datum/disease2/disease - var/infectionchance = 10 - var/speed = 1 - var/spreadtype = "Blood" // Can also be "Airborne" - var/stage = 1 - var/stageprob = 10 - var/dead = 0 - var/clicks = 0 - - var/uniqueID = 0 - var/list/datum/disease2/effectholder/effects = list() - proc/makerandom(var/greater=0) - var/datum/disease2/effectholder/holder = new /datum/disease2/effectholder - holder.stage = 1 - if(greater) - holder.getrandomeffect_greater() - else - holder.getrandomeffect_lesser() - effects += holder - holder = new /datum/disease2/effectholder - holder.stage = 2 - if(greater) - holder.getrandomeffect_greater() - else - holder.getrandomeffect_lesser() - effects += holder - holder = new /datum/disease2/effectholder - holder.stage = 3 - if(greater) - holder.getrandomeffect_greater() - else - holder.getrandomeffect_lesser() - effects += holder - holder = new /datum/disease2/effectholder - holder.stage = 4 - if(greater) - holder.getrandomeffect_greater() - else - holder.getrandomeffect_lesser() - effects += holder - uniqueID = rand(0,10000) - infectionchance = rand(1,10) - // pick 2 antigens - antigen |= text2num(pick(ANTIGENS)) - antigen |= text2num(pick(ANTIGENS)) - spreadtype = "Airborne" - - proc/makealien() - var/datum/disease2/effectholder/holder = new /datum/disease2/effectholder - holder.stage = 1 - holder.chance = 10 - holder.effect = new/datum/disease2/effect/lesser/gunck() - effects += holder - - holder = new /datum/disease2/effectholder - holder.stage = 2 - holder.chance = 10 - holder.effect = new/datum/disease2/effect/lesser/cough() - effects += holder - - holder = new /datum/disease2/effectholder - holder.stage = 3 - holder.chance = 10 - holder.effect = new/datum/disease2/effect/greater/toxins() - effects += holder - - holder = new /datum/disease2/effectholder - holder.stage = 4 - holder.chance = 10 - holder.effect = new/datum/disease2/effect/alien() - effects += holder - - uniqueID = 896 // all alien diseases have the same ID - infectionchance = 0 - spreadtype = "Airborne" - - proc/minormutate() - var/datum/disease2/effectholder/holder = pick(effects) - holder.minormutate() - infectionchance = min(10,infectionchance + rand(0,1)) - - proc/issame(var/datum/disease2/disease/disease) - var/list/types = list() - var/list/types2 = list() - for(var/datum/disease2/effectholder/d in effects) - types += d.effect.type - var/equal = 1 - - for(var/datum/disease2/effectholder/d in disease.effects) - types2 += d.effect.type - - for(var/type in types) - if(!(type in types2)) - equal = 0 - return equal - - proc/activate(var/mob/living/carbon/mob) - if(dead) - cure(mob) - mob.virus2 = null - return - if(mob.stat == 2) - return - // with a certain chance, the mob may become immune to the disease before it starts properly - if(stage <= 1 && clicks == 0) - if(prob(20)) - mob.antibodies |= antigen // 20% immunity is a good chance IMO, because it allows finding an immune person easily - else - if(mob.radiation > 50) - if(prob(1)) - majormutate() - if(mob.reagents.has_reagent("spaceacillin")) - mob.reagents.remove_reagent("spaceacillin",0.3) - return - if(mob.reagents.has_reagent("virusfood")) - mob.reagents.remove_reagent("virusfood",0.1) - clicks += 10 - if(clicks > stage*100 && prob(10)) - if(stage == 4) - var/datum/disease2/resistance/res = new /datum/disease2/resistance(src) - src.cure(mob) - mob.resistances2 += res - mob.antibodies |= src.antigen - mob.virus2 = null - del src - stage++ - clicks = 0 - for(var/datum/disease2/effectholder/e in effects) - e.runeffect(mob,stage) - clicks+=speed - - proc/cure(var/mob/living/carbon/mob) - var/datum/disease2/effectholder/E - if(stage>1) - E = effects[1] - E.effect.deactivate(mob) - if(stage>2) - E = effects[2] - E.effect.deactivate(mob) - if(stage>3) - E = effects[3] - E.effect.deactivate(mob) - if(stage>4) - E = effects[4] - E.effect.deactivate(mob) - - proc/cure_added(var/datum/disease2/resistance/res) - if(res.resistsdisease(src)) - dead = 1 - - proc/majormutate() - var/datum/disease2/effectholder/holder = pick(effects) - holder.majormutate() - - - proc/getcopy() -// world << "getting copy" - var/datum/disease2/disease/disease = new /datum/disease2/disease - disease.infectionchance = infectionchance - disease.spreadtype = spreadtype - disease.stageprob = stageprob - disease.antigen = antigen - for(var/datum/disease2/effectholder/holder in effects) - // world << "adding effects" - var/datum/disease2/effectholder/newholder = new /datum/disease2/effectholder - newholder.effect = new holder.effect.type - newholder.chance = holder.chance - newholder.cure = holder.cure - newholder.multiplier = holder.multiplier - newholder.happensonce = holder.happensonce - newholder.stage = holder.stage - disease.effects += newholder - // world << "[newholder.effect.name]" - // world << "[disease]" - return disease - -/datum/disease2/effect - var/chance_maxm = 100 - var/name = "Blanking effect" - var/stage = 4 - var/maxm = 1 - proc/activate(var/mob/living/carbon/mob,var/multiplier) - proc/deactivate(var/mob/living/carbon/mob) - -/datum/disease2/effect/alien - name = "Unidentified Foreign Body" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - mob << "\red You feel something tearing its way out of your stomach..." - mob.adjustToxLoss(10) - mob.updatehealth() - if(prob(40)) - if(mob.client) - mob.client.mob = new/mob/living/carbon/alien/larva(mob.loc) - else - new/mob/living/carbon/alien/larva(mob.loc) - var/datum/disease2/disease/D = mob:virus2 - mob:gib() - del D - -/datum/disease2/effect/greater/gibbingtons - name = "Gibbingtons Syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.gib() - -/datum/disease2/effect/greater/radian - name = "Radian's syndrome" - stage = 4 - maxm = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.radiation += (2*multiplier) - -/datum/disease2/effect/greater/toxins - name = "Hyperacid Syndrome" - stage = 3 - maxm = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.adjustToxLoss((2*multiplier)) - -/datum/disease2/effect/greater/scream - name = "Random screaming syndrome" - stage = 2 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*scream") - -/datum/disease2/effect/greater/drowsness - name = "Automated sleeping syndrome" - stage = 2 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.drowsyness += 10 - -/datum/disease2/effect/greater/shakey - name = "World Shaking syndrome" - stage = 3 - maxm = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - shake_camera(mob,5*multiplier) - -/datum/disease2/effect/greater/deaf - name = "Hard of hearing syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.ear_deaf += 20 - -/datum/disease2/effect/invisible - name = "Waiting Syndrome" - stage = 1 - activate(var/mob/living/carbon/mob,var/multiplier) - return - -/datum/disease2/effect/greater/telepathic - name = "Telepathy Syndrome" - stage = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.mutations |= 512 - -/*/datum/disease2/effect/greater/noface - name = "Identity Loss syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.face_dmg++ - deactivate(var/mob/living/carbon/mob) - mob.face_dmg--*/ - -/datum/disease2/effect/greater/monkey - name = "Monkism syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - if(istype(mob,/mob/living/carbon/human)) - var/mob/living/carbon/human/h = mob - h.monkeyize() - -/datum/disease2/effect/greater/sneeze - name = "Coldingtons Effect" - stage = 1 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*sneeze") - -/datum/disease2/effect/greater/gunck - name = "Flemmingtons" - stage = 1 - activate(var/mob/living/carbon/mob,var/multiplier) - mob << "\red Mucous runs down the back of your throat." - -/datum/disease2/effect/greater/killertoxins - name = "Toxification syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.adjustToxLoss(15) - -/*/datum/disease2/effect/greater/hallucinations - name = "Hallucinational Syndrome" - stage = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.hallucination += 25*/ - -/datum/disease2/effect/greater/sleepy - name = "Resting syndrome" - stage = 2 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*collapse") - -/datum/disease2/effect/greater/mind - name = "Lazy mind syndrome" - stage = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.setBrainLoss(50) - -/datum/disease2/effect/greater/suicide - name = "Suicidal syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.suiciding = 1 - //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while - viewers(mob) << "\red [mob.name] is holding \his breath. It looks like \he's trying to commit suicide." - mob.adjustOxyLoss(175 - mob.getToxLoss() - mob.getFireLoss() - mob.getBruteLoss() - mob.getOxyLoss()) - mob.updatehealth() - spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds - mob.suiciding = 0 - -// lesser syndromes, partly just copypastes -/datum/disease2/effect/lesser/mind - name = "Lazy mind syndrome" - stage = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.setBrainLoss(20) - -/datum/disease2/effect/lesser/drowsy - name = "Bedroom Syndrome" - stage = 2 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.drowsyness = 5 - -/datum/disease2/effect/lesser/deaf - name = "Hard of hearing syndrome" - stage = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.ear_deaf = 5 - -/datum/disease2/effect/lesser/gunck - name = "Flemmingtons" - stage = 1 - activate(var/mob/living/carbon/mob,var/multiplier) - mob << "\red Mucous runs down the back of your throat." - -/datum/disease2/effect/lesser/radian - name = "Radian's syndrome" - stage = 4 - maxm = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.radiation += 1 - -/datum/disease2/effect/lesser/sneeze - name = "Coldingtons Effect" - stage = 1 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*sneeze") - -/datum/disease2/effect/lesser/cough - name = "Anima Syndrome" - stage = 2 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*cough") - -/*/datum/disease2/effect/lesser/hallucinations - name = "Hallucinational Syndrome" - stage = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.hallucination += 5*/ - -/*/datum/disease2/effect/lesser/arm - name = "Disarming Syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - var/obj/item/organ/limb/org = mob.organs["r_arm"] - org.take_damage(3,0,0,0) - mob << "\red You feel a sting in your right arm."*/ - -/datum/disease2/effect/lesser/hungry - name = "Appetiser Effect" - stage = 2 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.nutrition = max(0, mob.nutrition - 200) - -/datum/disease2/effect/lesser/groan - name = "Groaning Syndrome" - stage = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*groan") - -/datum/disease2/effect/lesser/scream - name = "Loudness Syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*scream") - -/datum/disease2/effect/lesser/drool - name = "Saliva Effect" - stage = 1 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*drool") - -/datum/disease2/effect/lesser/fridge - name = "Refridgerator Syndrome" - stage = 2 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*shiver") - -/datum/disease2/effect/lesser/twitch - name = "Twitcher" - stage = 1 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*twitch") - -/*Removed on request by Spaceman, due to it being detrimental to RP. -CN -/datum/disease2/effect/lesser/deathgasp - name = "Zombie Syndrome" - stage = 4 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*deathgasp")*/ - -/datum/disease2/effect/lesser/giggle - name = "Uncontrolled Laughter Effect" - stage = 3 - activate(var/mob/living/carbon/mob,var/multiplier) - mob.say("*giggle") - - -/datum/disease2/effect/lesser - chance_maxm = 10 - -/datum/disease2/effectholder - var/name = "Holder" - var/datum/disease2/effect/effect - var/chance = 0 //Chance in percentage each tick - var/cure = "" //Type of cure it requires - var/happensonce = 0 - var/multiplier = 1 //The chance the effects are WORSE - var/stage = 0 - - proc/runeffect(var/mob/living/carbon/human/mob,var/stage) - if(happensonce > -1 && effect.stage <= stage && prob(chance)) - effect.activate(mob) - if(happensonce == 1) - happensonce = -1 - - proc/getrandomeffect_greater() - var/list/datum/disease2/effect/list = list() - for(var/e in (typesof(/datum/disease2/effect/greater) - /datum/disease2/effect/greater)) - // world << "Making [e]" - var/datum/disease2/effect/f = new e - if(f.stage == src.stage) - list += f - effect = pick(list) - chance = rand(1,6) - - proc/getrandomeffect_lesser() - var/list/datum/disease2/effect/list = list() - for(var/e in (typesof(/datum/disease2/effect/lesser) - /datum/disease2/effect/lesser)) - var/datum/disease2/effect/f = new e - if(f.stage == src.stage) - list += f - effect = pick(list) - chance = rand(1,6) - - proc/minormutate() - switch(pick(1,2,3,4,5)) - if(1) - chance = rand(0,effect.chance_maxm) - if(2) - multiplier = rand(1,effect.maxm) - proc/majormutate() - getrandomeffect_greater() - -/proc/dprob(var/p) - return(prob(sqrt(p)) && prob(sqrt(p))) \ No newline at end of file diff --git a/code/WorkInProgress/virus2/biohazard destroyer.dm b/code/WorkInProgress/virus2/biohazard destroyer.dm deleted file mode 100644 index abd1803de86..00000000000 --- a/code/WorkInProgress/virus2/biohazard destroyer.dm +++ /dev/null @@ -1,20 +0,0 @@ -/obj/machinery/disease2/biodestroyer - name = "Biohazard destroyer" - icon = 'icons/obj/pipes/disposal.dmi' - icon_state = "disposalbio" - var/list/accepts = list(/obj/item/clothing,/obj/item/weapon/virusdish/,/obj/item/weapon/cureimplanter,/obj/item/weapon/diseasedisk,/obj/item/weapon/reagent_containers) - density = 1 - anchored = 1 - -/obj/machinery/disease2/biodestroyer/attackby(var/obj/I as obj, var/mob/user as mob) - for(var/path in accepts) - if(I.type in typesof(path)) - user.drop_item() - del(I) - overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle") - return - user.drop_item() - I.loc = src.loc - - for(var/mob/O in hearers(src, null)) - O.show_message("\icon[src] \blue The [src.name] beeps", 2) \ No newline at end of file diff --git a/code/WorkInProgress/virus2/cureimplanter.dm b/code/WorkInProgress/virus2/cureimplanter.dm deleted file mode 100644 index 30d952b4851..00000000000 --- a/code/WorkInProgress/virus2/cureimplanter.dm +++ /dev/null @@ -1,43 +0,0 @@ -/obj/item/weapon/cureimplanter - name = "Hypospray injector" - icon = 'icons/obj/items.dmi' - icon_state = "implanter1" - var/datum/disease2/resistance/resistance = null - var/works = 0 - var/datum/disease2/disease/virus2 = null - item_state = "syringe_0" - throw_speed = 3 - throw_range = 5 - w_class = 2.0 - - -/obj/item/weapon/cureimplanter/attack(mob/target as mob, mob/user as mob) - if(ismob(target)) - for(var/mob/O in viewers(world.view, user)) - if (target != user) - O.show_message(text("\red [] is trying to inject [] with [src.name]!", user, target), 1) - else - O.show_message("\red [user] is trying to inject themselves with [src.name]!", 1) - if(!do_mob(user, target,60)) return - - - for(var/mob/O in viewers(world.view, user)) - if (target != user) - O.show_message(text("\red [] injects [] with [src.name]!", user, target), 1) - else - O.show_message("\red [user] injects themself with [src.name]!", 1) - - - var/mob/living/carbon/M = target - - if(works == 0) - M.resistances2 += resistance - //M.immunevirus2 += M.virus2.getcopy() - if(M.virus2) - M.virus2.cure_added(resistance) - else if(works == 1) - M.adjustToxLoss(60) - else if(works == 2) - M.gib() - else if(works == 3) - infect_virus2(M,virus2,1) \ No newline at end of file diff --git a/code/WorkInProgress/virus2/curer.dm b/code/WorkInProgress/virus2/curer.dm deleted file mode 100644 index cbd155711cc..00000000000 --- a/code/WorkInProgress/virus2/curer.dm +++ /dev/null @@ -1,129 +0,0 @@ -/obj/machinery/computer/curer - name = "Cure Research Machine" - icon = 'icons/obj/computer.dmi' - icon_state = "dna" - var/curing - var/virusing - - var/obj/item/weapon/reagent_containers/container = null - -/obj/machinery/computer/curer/attackby(var/obj/I as obj, var/mob/user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - new /obj/item/weapon/shard( src.loc ) - //var/obj/item/weapon/circuitboard/curer/M = new /obj/item/weapon/circuitboard/curer( A ) - for (var/obj/C in src) - C.loc = src.loc - //A.circuit = M - A.state = 3 - A.icon_state = "3" - A.anchored = 1 - del(src) - else - user << "\blue You disconnect the monitor." - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - //var/obj/item/weapon/circuitboard/curer/M = new /obj/item/weapon/circuitboard/curer( A ) - for (var/obj/C in src) - C.loc = src.loc - //A.circuit = M - A.state = 4 - A.icon_state = "4" - A.anchored = 1 - del(src) - if(istype(I,/obj/item/weapon/reagent_containers)) - var/mob/living/carbon/C = user - if(!container) - container = I - C.drop_item() - I.loc = src - - //else - src.attack_hand(user) - return - -/obj/machinery/computer/curer/attack_ai(var/mob/user as mob) - return src.attack_hand(user) - -/obj/machinery/computer/curer/attack_paw(var/mob/user as mob) - - return src.attack_hand(user) - return - -/obj/machinery/computer/curer/attack_hand(var/mob/user as mob) - if(..()) - return - user.machine = src - var/dat - if(curing) - dat = "Antibody production in progress" - else if(virusing) - dat = "Virus production in progress" - else if(container) - // see if there's any blood in the container - var/datum/reagent/blood/B = locate(/datum/reagent/blood) in container.reagents.reagent_list - - if(B) - dat = "Blood sample inserted." - dat += "
Begin antibody production" - else - dat += "
Please check container contents." - dat += "
Eject container" - else - dat = "Please insert a container." - - user << browse(dat, "window=computer;size=400x500") - onclose(user, "computer") - return - -/obj/machinery/computer/curer/process() - ..() - - if(stat & (NOPOWER|BROKEN)) - return - use_power(500) - //src.updateDialog() - - if(curing) - curing -= 1 - if(curing == 0) - if(container) - createcure(container) - return - -/obj/machinery/computer/curer/Topic(href, href_list) - if(..()) - return - if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.machine = src - - if (href_list["antibody"]) - curing = 10 - else if(href_list["eject"]) - container.loc = src.loc - container = null - - src.add_fingerprint(usr) - src.updateUsrDialog() - return - - -/obj/machinery/computer/curer/proc/createcure(var/obj/item/weapon/reagent_containers/container) - var/obj/item/weapon/reagent_containers/glass/beaker/product = new(src.loc) - - var/datum/reagent/blood/B = locate() in container.reagents.reagent_list - - var/list/data = list() - data["antibodies"] = B.data["antibodies"] - product.reagents.add_reagent("antibodies",30,data) - - state("The [src.name] Buzzes", "blue") - -/obj/machinery/computer/curer/proc/createvirus(var/datum/disease2/disease/virus2) - var/obj/item/weapon/cureimplanter/implanter = new /obj/item/weapon/cureimplanter(src.loc) - implanter.name = "Viral implanter (MAJOR BIOHAZARD)" - implanter.works = 3 - state("The [src.name] Buzzes", "blue") \ No newline at end of file diff --git a/code/WorkInProgress/virus2/diseasesplicer.dm b/code/WorkInProgress/virus2/diseasesplicer.dm deleted file mode 100644 index e238af93c86..00000000000 --- a/code/WorkInProgress/virus2/diseasesplicer.dm +++ /dev/null @@ -1,185 +0,0 @@ -/obj/machinery/computer/diseasesplicer - name = "Disease Splicer" - icon = 'icons/obj/computer.dmi' - icon_state = "crew" - - var/datum/disease2/effectholder/memorybank = null - var/analysed = 0 - var/obj/item/weapon/virusdish/dish = null - var/burning = 0 - - var/splicing = 0 - var/scanning = 0 - -/obj/machinery/computer/diseasesplicer/attackby(var/obj/I as obj, var/mob/user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - new /obj/item/weapon/shard( src.loc ) - //var/obj/item/weapon/circuitboard/diseasesplicer/M = new /obj/item/weapon/circuitboard/diseasesplicer( A ) - for (var/obj/C in src) - C.loc = src.loc - //A.circuit = M - A.state = 3 - A.icon_state = "3" - A.anchored = 1 - del(src) - else - user << "\blue You disconnect the monitor." - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - //var/obj/item/weapon/circuitboard/diseasesplicer/M = new /obj/item/weapon/circuitboard/diseasesplicer( A ) - for (var/obj/C in src) - C.loc = src.loc - //A.circuit = M - A.state = 4 - A.icon_state = "4" - A.anchored = 1 - del(src) - if(istype(I,/obj/item/weapon/virusdish)) - var/mob/living/carbon/c = user - if(!dish) - - dish = I - c.drop_item() - I.loc = src - if(istype(I,/obj/item/weapon/diseasedisk)) - user << "You upload the contents of the disk into the buffer" - memorybank = I:effect - - - //else - src.attack_hand(user) - return - -/obj/machinery/computer/diseasesplicer/attack_ai(var/mob/user as mob) - return src.attack_hand(user) - -/obj/machinery/computer/diseasesplicer/attack_paw(var/mob/user as mob) - - return src.attack_hand(user) - return - -/obj/machinery/computer/diseasesplicer/attack_hand(var/mob/user as mob) - if(..()) - return - user.machine = src - var/dat - if(splicing) - dat = "Splicing in progress" - else if(scanning) - dat = "Splicing in progress" - else if(burning) - dat = "Data disk burning in progress" - else - if(dish) - dat = "Virus dish inserted" - - dat += "
Current DNA strand : " - if(memorybank) - dat += "" - if(analysed) - dat += "[memorybank.effect.name] ([5-memorybank.effect.stage])" - else - dat += "Unknown DNA strand ([5-memorybank.effect.stage])" - dat += "" - - dat += "
Burn DNA Sequence to data storage disk" - else - dat += "Empty" - - dat += "
" - - if(dish) - if(dish.virus2) - if(dish.growth >= 50) - for(var/datum/disease2/effectholder/e in dish.virus2.effects) - dat += "
DNA strand" - if(dish.analysed) - dat += ": [e.effect.name]" - dat += " (5-[e.effect.stage])" - else - dat += "
Insufficent cells to attempt gene splicing" - else - dat += "
No virus found in dish" - - dat += "
Eject disk" - else - dat += "
Please insert dish" - - user << browse(dat, "window=computer;size=400x500") - onclose(user, "computer") - return - -/obj/machinery/computer/diseasesplicer/process() - if(stat & (NOPOWER|BROKEN)) - return - use_power(500) - //src.updateDialog() - - if(scanning) - scanning -= 1 - if(!scanning) - state("The [src.name] beeps", "blue") - if(splicing) - splicing -= 1 - if(!splicing) - state("The [src.name] pings", "blue") - if(burning) - burning -= 1 - if(!burning) - var/obj/item/weapon/diseasedisk/d = new /obj/item/weapon/diseasedisk(src.loc) - if(analysed) - d.name = "[memorybank.effect.name] GNA disk (Stage: [5-memorybank.effect.stage])" - else - d.name = "Unknown GNA disk (Stage: [5-memorybank.effect.stage])" - d.effect = memorybank - state("The [src.name] zings", "blue") - - return - -/obj/machinery/computer/diseasesplicer/Topic(href, href_list) - if(..()) - return - if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.machine = src - - if (href_list["grab"]) - memorybank = locate(href_list["grab"]) - analysed = dish.analysed - del(dish) - dish = null - scanning = 10 - - else if(href_list["eject"]) - dish.loc = src.loc - dish = null - - else if(href_list["splice"]) - for(var/datum/disease2/effectholder/e in dish.virus2.effects) - if(e.stage == memorybank.stage) - e.effect = memorybank.effect - splicing = 10 - dish.virus2.spreadtype = "Blood" - - else if(href_list["disk"]) - burning = 10 - - src.add_fingerprint(usr) - src.updateUsrDialog() - return - -/obj/item/weapon/diseasedisk - name = "Blank GNA disk" - icon = 'icons/obj/items.dmi' - icon_state = "datadisk0" - var/datum/disease2/effectholder/effect = null - var/stage = 1 - -/obj/item/weapon/diseasedisk/premade/New() - name = "Blank GNA disk (stage: [5-stage])" - effect = new /datum/disease2/effectholder - effect.effect = new /datum/disease2/effect/invisible - effect.stage = stage diff --git a/code/WorkInProgress/virus2/dishincubator.dm b/code/WorkInProgress/virus2/dishincubator.dm deleted file mode 100644 index 06833ab5505..00000000000 --- a/code/WorkInProgress/virus2/dishincubator.dm +++ /dev/null @@ -1,169 +0,0 @@ -/obj/machinery/disease2/incubator/ - name = "Pathogenic incubator" - density = 1 - anchored = 1 - icon = 'icons/obj/virology.dmi' - icon_state = "incubator" - var/obj/item/weapon/virusdish/dish - var/obj/item/weapon/reagent_containers/glass/beaker = null - var/radiation = 0 - - var/on = 0 - var/power = 0 - - var/foodsupply = 0 - var/toxins = 0 - - ex_act(severity) - switch(severity) - if(1.0) - del(src) - return - if(2.0) - if (prob(50)) - del(src) - return - - blob_act() - if (prob(25)) - del(src) - - meteorhit() - del(src) - return - - attackby(var/obj/B as obj, var/mob/user as mob) - if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B,/obj/item/weapon/reagent_containers/syringe)) - - if(src.beaker) - if(istype(beaker,/obj/item/weapon/reagent_containers/syringe)) - user << "A syringe is already loaded into the machine." - else - user << "A beaker is already loaded into the machine." - return - - src.beaker = B - user.drop_item() - B.loc = src - if(istype(B,/obj/item/weapon/reagent_containers/syringe)) - user << "You add the syringe to the machine!" - src.updateUsrDialog() - else - user << "You add the beaker to the machine!" - src.updateUsrDialog() - else - if(istype(B,/obj/item/weapon/virusdish)) - if(src.dish) - user << "A dish is already loaded into the machine." - return - - src.dish = B - user.drop_item() - B.loc = src - if(istype(B,/obj/item/weapon/virusdish)) - user << "You add the dish to the machine!" - src.updateUsrDialog() - - Topic(href, href_list) - if(stat & BROKEN) return - if(usr.stat || usr.restrained()) return - if(!in_range(src, usr)) return - if (href_list["ejectchem"]) - if(beaker) - beaker.loc = src.loc - beaker = null - if(!dish) - return - usr.machine = src - if (href_list["power"]) - on = !on - if(on) - icon_state = "incubator_on" - else - icon_state = "incubator" - if (href_list["ejectdish"]) - if(dish) - dish.loc = src.loc - dish = null - if (href_list["rad"]) - radiation += 10 - if (href_list["flush"]) - radiation = 0 - toxins = 0 - foodsupply = 0 - - - src.add_fingerprint(usr) - src.updateUsrDialog() - - attack_hand(mob/user as mob) - if(stat & BROKEN) - return - user.machine = src - var/dat = "" - if(!dish) - dat = "Please insert dish into the incubator.
" - var/string = "Off" - if(on) - string = "On" - dat += "Power status : [string]" - dat += "
" - dat += "Food supply : [foodsupply]" - dat += "
" - dat += "Radiation Levels : [radiation] RADS : Radiate" - dat += "
" - dat += "Toxins : [toxins]" - dat += "
" - if(beaker) - dat += "Eject chemicals : Eject" - dat += "
" - if(dish) - dat += "Eject Virus dish : Eject" - dat += "
" - dat += "
" - dat += "Flush system
" - dat += "Close
" - user << browse("
[dat]", "window=incubator;size=575x400") - onclose(user, "incubator") - return - - - - - process() - - if(dish && on && dish.virus2) - use_power(50,EQUIP) - if(!powered(EQUIP)) - on = 0 - icon_state = "incubator" - if(foodsupply) - foodsupply -= 1 - dish.growth += 3 - if(dish.growth >= 100) - state("The [src.name] pings", "blue") - if(radiation) - if(radiation > 50 & prob(5)) - dish.virus2.majormutate() - if(dish.info) - dish.info = "OUTDATED : [dish.info]" - dish.analysed = 0 - state("The [src.name] beeps", "blue") - - else if(prob(5)) - dish.virus2.minormutate() - radiation -= 1 - if(toxins && prob(5)) - dish.virus2.infectionchance -= 1 - if(toxins > 50) - dish.virus2 = null - else if(!dish) - on = 0 - icon_state = "incubator" - - - if(beaker) - if(!beaker.reagents.remove_reagent("virusfood",5)) - foodsupply += 10 - if(!beaker.reagents.remove_reagent("toxins",1)) - toxins += 1 \ No newline at end of file diff --git a/code/WorkInProgress/virus2/isolator.dm b/code/WorkInProgress/virus2/isolator.dm deleted file mode 100644 index d23ef0bbd55..00000000000 --- a/code/WorkInProgress/virus2/isolator.dm +++ /dev/null @@ -1,159 +0,0 @@ -/obj/machinery/disease2/isolator/ - name = "Pathogenic Isolator" - density = 1 - anchored = 1 - icon = 'icons/obj/virology.dmi' - icon_state = "isolator" - var/datum/disease2/disease/virus2 = null - var/isolating = 0 - var/beaker = null - - ex_act(severity) - switch(severity) - if(1.0) - del(src) - return - if(2.0) - if (prob(50)) - del(src) - return - - blob_act() - if (prob(25)) - del(src) - - meteorhit() - del(src) - return - - attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob) - if(!istype(B,/obj/item/weapon/reagent_containers/syringe)) - return - - if(src.beaker) - user << "A syringe is already loaded into the machine." - return - - src.beaker = B - user.drop_item() - B.loc = src - if(istype(B,/obj/item/weapon/reagent_containers/syringe)) - user << "You add the syringe to the machine!" - src.updateUsrDialog() - icon_state = "isolator_in" - - Topic(href, href_list) - if(stat & BROKEN) return - if(usr.stat || usr.restrained()) return - if(!in_range(src, usr)) return - - usr.machine = src - if(!beaker) return - var/datum/reagents/R = beaker:reagents - - if (href_list["isolate"]) - var/datum/reagent/blood/Blood - for(var/datum/reagent/blood/B in R.reagent_list) - if(B) - Blood = B - break - - if(Blood.data["virus2"]) - virus2 = Blood.data["virus2"] - isolating = 40 - icon_state = "isolator_processing" - src.updateUsrDialog() - return - - else if (href_list["main"]) - attack_hand(usr) - return - else if (href_list["eject"]) - beaker:loc = src.loc - beaker = null - icon_state = "isolator" - src.updateUsrDialog() - return - - attack_hand(mob/user as mob) - if(stat & BROKEN) - return - user.machine = src - var/dat = "" - if(!beaker) - dat = "Please insert sample into the isolator.
" - dat += "Close" - else if(isolating) - dat = "Isolating" - else - var/datum/reagents/R = beaker:reagents - dat += "Eject
" - if(!R.total_volume) - dat += "[beaker] is empty." - else - dat += "Contained reagents:
" - for(var/datum/reagent/blood/G in R.reagent_list) - dat += " [G.name]: Isolate" - user << browse("
[dat]", "window=isolator;size=575x400") - onclose(user, "isolator") - return - - - - - process() - if(isolating > 0) - isolating -= 1 - if(isolating == 0) - var/obj/item/weapon/virusdish/d = new /obj/item/weapon/virusdish(src.loc) - d.virus2 = virus2.getcopy() - virus2 = null - icon_state = "isolator_in" - - - - -/obj/item/weapon/virusdish - name = "Virus containment/growth dish" - desc = "This is a virus containment dish" - icon = 'icons/obj/items.dmi' - icon_state = "implantcase-b" - var/datum/disease2/disease/virus2 = null - var/growth = 0 - var/info = 0 - var/analysed = 0 - - reagents = list() - -/obj/item/weapon/virusdish/random - name = "Virus Sample" - -/obj/item/weapon/virusdish/random/New() - ..() - // add a random virus to this dish - src.virus2 = new /datum/disease2/disease - src.virus2.makerandom() - growth = rand(5, 50) - -/obj/item/weapon/virusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob) - if(istype(W,/obj/item/weapon/hand_labeler) || istype(W,/obj/item/weapon/reagent_containers/syringe)) - return - ..() - if(prob(50)) - user << "The dish shatters" - if(virus2.infectionchance > 0) - // spread around some pathogens - for(var/i = 0, i<= (growth / 3), i++) - var/obj/virus/V = new(src.loc) - V.disease = virus2.getcopy() - del src - -/obj/item/weapon/virusdish/examine() - ..() - if(src.info) - usr << "It has the following information about its contents" - usr << src.info - -/obj/machinery/proc/state(var/msg) - for(var/mob/O in hearers(src, null)) - O.show_message("\icon[src] \blue [msg]", 2) diff --git a/code/WorkInProgress/virus2/monkeydispensor.dm b/code/WorkInProgress/virus2/monkeydispensor.dm deleted file mode 100644 index d4da072c645..00000000000 --- a/code/WorkInProgress/virus2/monkeydispensor.dm +++ /dev/null @@ -1,30 +0,0 @@ -/obj/machinery/disease2/monkeycloner - name = "Monkey dispensor" - icon = 'icons/obj/cloning.dmi' - icon_state = "pod_0" - density = 1 - anchored = 1 - - var/cloning = 0 - -/obj/machinery/disease2/monkeycloner/attack_hand() - if(!cloning) - cloning = 150 - - icon_state = "pod_g" - -/obj/machinery/disease2/monkeycloner/process() - if(stat & (NOPOWER|BROKEN)) - return - use_power(500) - //src.updateDialog() - - if(cloning) - cloning -= 1 - if(!cloning) - new /mob/living/carbon/monkey(src.loc) - icon_state = "pod_0" - - - - return \ No newline at end of file diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 818f0ccc1a9..0c121617b81 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -89,6 +89,9 @@ #define FIRE_HELM_MIN_TEMP_PROTECT 60 //Cold protection for fire helmets #define FIRE_HELM_MAX_TEMP_PROTECT 30000 //for fire helmet quality items (red and white hardhats) +#define FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT 35000 //what max_heat_protection_temperature is set to for firesuit quality suits. MUST NOT BE 0. +#define FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT 35000 //for fire helmet quality items (red and white hardhats) + #define HELMET_MIN_TEMP_PROTECT 160 //For normal helmets #define HELMET_MAX_TEMP_PROTECT 600 //For normal helmets #define ARMOR_MIN_TEMP_PROTECT 160 //For armor diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 805a1627251..e650f0ef17a 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -25,6 +25,9 @@ #define MASKCOVERSMOUTH 2048 // on other items, these are just for mask/head #define HEADCOVERSMOUTH 2048 +#define HEADBANGPROTECT 1024 +#define EARBANGPROTECT 1024 + #define NOSLIP 1024 //prevents from slipping on wet floors, in space etc (NOTE: flag shared with THICKMATERIAL for external suits and helmet) #define OPENCONTAINER 4096 // is an open container for chemistry purposes diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm new file mode 100644 index 00000000000..8842b23e433 --- /dev/null +++ b/code/__DEFINES/hud.dm @@ -0,0 +1,26 @@ +// for secHUDs and medHUDs and variants. The number is the location of the image on the list hud_list +// note: if you add more HUDs, even for non-human atoms, make sure to use unique numbers for the defines! +// /datum/atom_hud expects these to be unique +// these need to be strings in order to make them associative lists +#define HEALTH_HUD "1" // dead, alive, sick, health status +#define STATUS_HUD "2" // a simple line rounding the mob's number health +#define ID_HUD "3" // the job asigned to your ID +#define WANTED_HUD "4" // wanted, released, parroled, security status +#define IMPLOYAL_HUD "5" // loyality implant +#define IMPCHEM_HUD "6" // chemical implant +#define IMPTRACK_HUD "7" // tracking implant +//for antag huds. these are used at the /mob level +#define ANTAG_HUD "8" + +//data HUD (medhud, sechud) defines +//Don't forget to update human/New() if you change these! +#define DATA_HUD_SECURITY_BASIC 1 +#define DATA_HUD_SECURITY_ADVANCED 2 +#define DATA_HUD_MEDICAL_BASIC 3 +#define DATA_HUD_MEDICAL_ADVANCED 4 +//antag HUD defines +#define ANTAG_HUD_CULT 5 +#define ANTAG_HUD_REV 6 +#define ANTAG_HUD_OPS 7 +#define ANTAG_HUD_GANG_A 8 +#define ANTAG_HUD_GANG_B 9 diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 512768419be..4af1675b4e7 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -44,3 +44,10 @@ #define BE_CLOSE 1 //in the case of a silicon, to select if they need to be next to the atom #define NO_DEXTERY 1 //if other mobs (monkeys, aliens, etc) can use this //used by canUseTopic() + +//singularity defines +#define STAGE_ONE 1 +#define STAGE_TWO 3 +#define STAGE_THREE 5 +#define STAGE_FOUR 7 +#define STAGE_FIVE 9 diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm index 6d8865816df..40c56793bac 100644 --- a/code/__DEFINES/sight.dm +++ b/code/__DEFINES/sight.dm @@ -21,12 +21,3 @@ #define BORGMESON 1 #define BORGTHERM 2 #define BORGXRAY 4 - -// for secHUDs and medHUDs and variants. The number is the location of the image on the list hud_list of humans. -#define HEALTH_HUD 1 // dead, alive, sick, health status -#define STATUS_HUD 2 // a simple line rounding the mob's number health -#define ID_HUD 3 // the job asigned to your ID -#define WANTED_HUD 4 // wanted, released, parroled, security status -#define IMPLOYAL_HUD 5 // loyality implant -#define IMPCHEM_HUD 6 // chemical implant -#define IMPTRACK_HUD 7 // tracking implant diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 03265398796..c253e1e02e6 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -70,4 +70,14 @@ /proc/log_pda(text) if (config.log_pda) - diary << "\[[time_stamp()]]PDA: [text]" \ No newline at end of file + diary << "\[[time_stamp()]]PDA: [text]" + +/proc/log_chat(text) + if (config.log_pda) //reusing this for now, can change if needed + diary << "\[[time_stamp()]]CHAT: [text]" + +/proc/log_comment(text) + if (config.log_pda) + //reusing the PDA option because I really don't think news comments are worth a config option + diary << "\[[time_stamp()]]COMMENT: [text]" + diff --git a/code/__HELPERS/_string_lists.dm b/code/__HELPERS/_string_lists.dm new file mode 100644 index 00000000000..b2b31ab36e4 --- /dev/null +++ b/code/__HELPERS/_string_lists.dm @@ -0,0 +1,27 @@ +#define pick_list(FILE, KEY) (pick(strings(FILE, KEY))) + +var/global/list/string_cache + +/proc/strings(filename as text, key as text) + var/list/fileList + if(!string_cache) + string_cache = new + if(!(filename in string_cache)) + if(fexists("strings/[filename]")) + string_cache[filename] = list() + var/list/stringsList = list() + fileList = file2list("strings/[filename]") + for(var/s in fileList) + stringsList = text2list(s, "@=") + if(stringsList.len != 2) + CRASH("Invalid string list in strings/[filename]") + if(findtext(stringsList[2], "@,")) + string_cache[filename][stringsList[1]] = text2list(stringsList[2], "@,") + else + string_cache[filename][stringsList[1]] = stringsList[2] // Its a single string! + else + CRASH("file not found: strings/[filename]") + if((filename in string_cache) && (key in string_cache[filename])) + return string_cache[filename][key] + else + CRASH("strings list not found: strings/[filename], index=[key]") diff --git a/code/__HELPERS/bygex/bygex.dm b/code/__HELPERS/bygex/bygex.dm new file mode 100644 index 00000000000..b06ac322e6a --- /dev/null +++ b/code/__HELPERS/bygex/bygex.dm @@ -0,0 +1,144 @@ +/* + This file is part of bygex. + + bygex is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of + the License, or (at your option) any later version. + + bygex is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with bygex. If not, see
" points += S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later qdel(MA) + sold_atoms += "." if(plasma_count) centcom_message += "+[round(plasma_count/plasma_per_point)]: Received [plasma_count] unit(s) of exotic material.
" @@ -420,8 +426,8 @@ var/global/datum/controller/supply_shuttle/supply_shuttle if(temp) dat = temp else - dat += {"Shuttle Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]
-
Supply Points: [supply_shuttle.points]
+ dat += {"
Shuttle Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]
+
Supply Points: [supply_shuttle.points]
+
Supply Points: [supply_shuttle.points]
\nRequest items
View approved orders
@@ -451,22 +457,21 @@ var/global/datum/controller/supply_shuttle/supply_shuttle //all_supply_groups //Request what? last_viewed_group = "categories" - temp = "Supply points: [supply_shuttle.points]
" - temp += "Main Menu
" + temp = "
" temp += "Select a category
" for(var/cat in all_supply_groups ) temp += "[get_supply_group_name(cat)]
" else last_viewed_group = href_list["order"] var/cat = text2num(last_viewed_group) - temp = "Supply points: [supply_shuttle.points]
" - temp += "Back to all categories
" + temp = "
" temp += "Request from: [get_supply_group_name(cat)]
" for(var/supply_name in supply_shuttle.supply_packs ) var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] if(N.hidden || N.contraband || N.group != cat) continue //Have to send the type instead of a reference to temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - else if (href_list["doorder"]) if(world.time < reqtime) say("[world.time - reqtime] seconds remaining until another requisition form may be printed.") @@ -474,10 +479,11 @@ var/global/datum/controller/supply_shuttle/supply_shuttle //Find the correct supply_pack datum var/datum/supply_packs/P = supply_shuttle.supply_packs[href_list["doorder"]] - if(!istype(P)) return + if(!istype(P) || P.hidden || P.contraband) //href protection + return var/timeout = world.time + 600 - var/reason = copytext(sanitize(input(usr,"Reason:","Why do you require this item?","") as null|text),1,MAX_MESSAGE_LEN) + var/reason = stripped_input(usr,"Reason:","Why do you require this item?","") if(world.time > timeout) return if(!reason) return @@ -545,7 +551,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle /obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << " Access Denied." + user << "Access Denied." return if(..()) @@ -556,24 +562,25 @@ var/global/datum/controller/supply_shuttle/supply_shuttle if (temp) dat = temp else - dat += {"
Supply shuttle
+ dat += {"
Supply shuttle
\nLocation: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Away"]
-
\nSupply Points: [supply_shuttle.points]
\n
+
\nSupply Points: [supply_shuttle.points]
\n
\nLocation: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Away"]
-
\nSupply Points: [supply_shuttle.points]
\n
+
\nSupply Points: [supply_shuttle.points]
\n
[supply_shuttle.moving ? "\n*Must be away to order items*
\n
":supply_shuttle.at_station ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"] [supply_shuttle.moving ? "\n*Shuttle already called*
\n
":supply_shuttle.at_station ? "\nSend away
\n
":"\nSend to station
\n
"] [supply_shuttle.shuttle_loan ? (supply_shuttle.shuttle_loan.dispatched ? "\n*Shuttle loaned to Centcom*
\n
" : "\nLoan shuttle to Centcom (5 mins duration)
\n
") : "\n*No pending external shuttle requests*
\n
"] \nView requests
\n
\nView orders
\n
\nClose
-
\nCentral Command messages
[supply_shuttle.centcom_message ? supply_shuttle.centcom_message : "Remember to stamp and send back the supply manifests."]"} +
\nCentral Command messages:
[supply_shuttle.centcom_message ? supply_shuttle.centcom_message : "Remember to stamp and send back the supply manifests."]"} - user << browse(dat, "window=computer;size=700x450") - onclose(user, "computer") + var/datum/browser/popup = new(user, "computer", "Supply Shuttle Console", 700, 455) + popup.set_content(dat) + popup.open() return /obj/machinery/computer/supplycomp/attackby(I as obj, user as mob) if(istype(I,/obj/item/weapon/card/emag) && !hacked) - user << " Special supplies unlocked." + user << "Special supplies unlocked." hacked = 1 return else @@ -613,7 +620,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.moving = -1 supply_shuttle.sell() supply_shuttle.send() - + investigate_log("[usr.key] has sent the supply shuttle away. Remaining points: [supply_shuttle.points]. Shuttle contents:[supply_shuttle.sold_atoms].", "cargo") else if(href_list["loan"] && supply_shuttle.shuttle_loan) if(!supply_shuttle.shuttle_loan.dispatched) @@ -635,21 +642,22 @@ var/global/datum/controller/supply_shuttle/supply_shuttle //all_supply_groups //Request what? last_viewed_group = "categories" - temp = "Supply points: [supply_shuttle.points]
" - temp += "Main Menu
" + temp = "
" temp += "Select a category
" for(var/cat in all_supply_groups ) temp += "[get_supply_group_name(cat)]
" else last_viewed_group = href_list["order"] var/cat = text2num(last_viewed_group) - temp = "Supply points: [supply_shuttle.points]
" - temp += "Back to all categories
" + temp = "
" temp += "Request from: [get_supply_group_name(cat)]
" for(var/supply_name in supply_shuttle.supply_packs ) var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] - if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) continue //Have to send the type instead of a reference to - temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage + if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) //Have to send the type instead of a reference to + continue //the obj because it would get caught by the garbage + temp += "[supply_name] Cost: [N.cost]
" /*temp = "Supply points: [supply_shuttle.points]
Request what?
" @@ -667,10 +675,11 @@ var/global/datum/controller/supply_shuttle/supply_shuttle //Find the correct supply_pack datum var/datum/supply_packs/P = supply_shuttle.supply_packs[href_list["doorder"]] - if(!istype(P)) return + if(!istype(P) || (P.hidden && !hacked) || (P.contraband && !can_order_contraband)) //href exploit protection + return var/timeout = world.time + 600 - var/reason = copytext(sanitize(input(usr,"Reason:","Why do you require this item?","") as null|text),1,MAX_MESSAGE_LEN) + var/reason = stripped_input(usr,"Reason:","Why do you require this item?","") if(world.time > timeout) return // if(!reason) return @@ -727,6 +736,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.points -= P.cost supply_shuttle.shoppinglist += O temp = "Thanks for your order." + investigate_log("[usr.key] has authorized an order for [P.name]. Remaining points: [supply_shuttle.points].", "cargo") else temp = "Not enough supply points." break diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 2b1fbfe8cce..0285f2be06c 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -78,7 +78,7 @@ [title ? "
[title]
"}
-
+//" This is here because else the rest of the file looks like a string in notepad++.
/datum/browser/proc/get_footer()
return {"
diff --git a/code/datums/disease.dm b/code/datums/disease.dm
deleted file mode 100644
index d7d98405710..00000000000
--- a/code/datums/disease.dm
+++ /dev/null
@@ -1,212 +0,0 @@
-#define SPECIAL -1
-#define NON_CONTAGIOUS 0
-#define BLOOD 1
-#define CONTACT_FEET 2
-#define CONTACT_HANDS 3
-#define CONTACT_GENERAL 4
-#define AIRBORNE 5
-
-#define SCANNER 1
-#define PANDEMIC 2
-
-/*
-
-IMPORTANT NOTE: Please delete the diseases by using cure() proc or del() instruction.
-Diseases are referenced in a global list, so simply setting mob or obj vars
-to null does not delete the object itself. Thank you.
-
-*/
-
-var/list/diseases = typesof(/datum/disease) - /datum/disease
-
-
-/datum/disease
- var/form = "Virus" //During medscans, what the disease is referred to as
- var/name = "No disease"
- var/stage = 1 //all diseases start at stage 1
- var/max_stages = 0.0
- var/cure = null
- var/cure_id = null// reagent.id or list containing them
- var/cure_list = null // allows for multiple possible cure combinations
- var/cure_chance = 8//chance for the cure to do its job
- var/spread = null //spread type description
- var/initial_spread = null
- var/spread_type = AIRBORNE
- var/contagious_period = 0//the disease stage when it can be spread
- var/list/affected_species = list()
- var/mob/living/carbon/affected_mob = null //the mob which is affected by disease.
- var/holder = null //the atom containing the disease (mob or obj)
- var/carrier = 0.0 //there will be a small chance that the person will be a carrier
- var/curable = 0 //can this disease be cured? (By itself...)
- var/list/strain_data = list() //This is passed on to infectees
- var/stage_prob = 4 // probability of advancing to next stage, default 4% per check
- var/agent = "some microbes"//name of the disease agent
- var/permeability_mod = 1//permeability modifier coefficient.
- var/desc = null//description. Leave it null and this disease won't show in med records.
- var/severity = null//severity descr
- var/longevity = 150//time in "ticks" the virus stays in inanimate object (blood stains, corpses, etc). In syringes, bottles and beakers it stays infinitely.
- var/list/hidden = list(0, 0)
- var/can_carry = 1 // If the disease allows "carriers".
- // if hidden[1] is true, then virus is hidden from medical scanners
- // if hidden[2] is true, then virus is hidden from PANDEMIC machine
- var/requires = 0
- var/list/required_limb = list()
-
- var/const/non_threat = "Non-Threat"
-
-
-/datum/disease/proc/stage_act()
- var/cure_present = has_cure()
- //world << "[cure_present]"
-
- if(carrier&&!cure_present)
- //world << "[affected_mob] is carrier"
- return
-
- spread = (cure_present?"Remissive":initial_spread)
-
- if(stage > max_stages)
- stage = max_stages
-
- if(!cure_present && prob(stage_prob)) //now the disease shouldn't get back up to stage 4 in no time
- stage = min(stage + 1, max_stages)
-
- else if(cure_present && prob(cure_chance))
- stage = max(stage - 1, 1)
-
- if(stage <= 1 && ((prob(1) && curable) || (cure_present && prob(cure_chance))))
- cure()
- return
- return
-
-/datum/disease/proc/has_cure()//check if affected_mob has required reagents.
- if(!cure_id) return 0
- var/result = 1
- if(cure_list == list(cure_id))
- if(istype(cure_id, /list))
- for(var/C_id in cure_id)
- if(!affected_mob.reagents.has_reagent(C_id))
- result = 0
- else if(!affected_mob.reagents.has_reagent(cure_id))
- result = 0
- else
- for(var/C_list in cure_list)
- if(istype(C_list, /list))
- for(var/C_id in cure_id)
- if(!affected_mob.reagents.has_reagent(C_id))
- result = 0
- else if(!affected_mob.reagents.has_reagent(C_list))
- result = 0
-
- return result
-
-/datum/disease/proc/spread_by_touch()
- switch(spread_type)
- if(CONTACT_FEET, CONTACT_HANDS, CONTACT_GENERAL)
- return 1
- return 0
-
-/datum/disease/proc/spread(var/atom/source=null, var/airborne_range = 2, var/force_spread)
- //world << "Disease [src] proc spread was called from holder [source]"
-
- // If we're overriding how we spread, say so here
- var/how_spread = spread_type
- if(force_spread)
- how_spread = force_spread
-
- if(how_spread == SPECIAL || how_spread == NON_CONTAGIOUS || how_spread == BLOOD)//does not spread
- return
-
- if(stage < contagious_period) //the disease is not contagious at this stage
- return
-
- if(!source)//no holder specified
- if(affected_mob)//no mob affected holder
- source = affected_mob
- else //no source and no mob affected. Rogue disease. Break
- return
-
- if(affected_mob)
- if(affected_mob.reagents.has_reagent("spaceacillin"))
- return // Don't spread if we have spaceacillin in our system.
-
- var/check_range = airborne_range//defaults to airborne - range 2
-
- if(how_spread != AIRBORNE && how_spread != SPECIAL)
- check_range = 1 // everything else, like infect-on-contact things, only infect things on top of it
-
- if(isturf(source.loc))
- for(var/mob/living/carbon/M in oview(check_range, source))
- if(isturf(M.loc))
- if(AStar(source.loc, M.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, check_range))
- M.contract_disease(src, 0, 1, force_spread)
-
- return
-
-
-/datum/disease/proc/process()
-
- if(!holder)
- active_diseases -= src
- return
- if(prob(65))
- spread(holder)
-
- if(affected_mob)
- for(var/datum/disease/D in affected_mob.viruses)
- if(D != src)
- if(IsSame(D))
- //ERROR("Deleting [D.name] because it's the same as [src.name].")
- del(D) // if there are somehow two viruses of the same kind in the system, delete the other one
-
- if(holder == affected_mob)
- if(affected_mob.stat != DEAD) //he's alive
- stage_act()
- else //he's dead.
- if(spread_type!=SPECIAL)
- spread_type = CONTACT_GENERAL
- affected_mob = null
- if(!affected_mob) //the virus is in inanimate obj
-// world << "[src] longevity = [longevity]"
-
- if(prob(70))
- if(--longevity<=0)
- cure(0)
- return
-
-/datum/disease/proc/cure(var/resistance=1)//if resistance = 0, the mob won't develop resistance to disease
- if(affected_mob)
- if(resistance && !(type in affected_mob.resistances))
- affected_mob.resistances += type
- affected_mob.viruses -= src //remove the datum from the list
- del(src) //delete the datum to stop it processing
- return
-
-
-/datum/disease/New(var/process=1, var/datum/disease/D)//process = 1 - adding the object to global list. List is processed by master controller.
- if(requires == 1)
- if(ishuman(affected_mob))
- var/mob/living/carbon/human/H = affected_mob
- if(!H.getlimb(required_limb))
- cure(1)
- return
-
- cure_list = list(cure_id) // to add more cures, add more vars to this list in the actual disease's New()
- if(process) // Viruses in list are considered active.
- active_diseases += src
- initial_spread = spread
-
-/datum/disease/proc/IsSame(var/datum/disease/D)
- if(istype(src, D.type))
- return 1
- return 0
-
-/datum/disease/proc/Copy(var/process = 0)
- return new type(process, src)
-
-/datum/disease/proc/GetDiseaseID()
- return src.type
-
-/datum/disease/Del()
- active_diseases.Remove(src)
- ..()
diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm
new file mode 100644
index 00000000000..9b172e7c175
--- /dev/null
+++ b/code/datums/diseases/_MobProcs.dm
@@ -0,0 +1,126 @@
+
+/mob/proc/HasDisease(var/datum/disease/D)
+ for(var/datum/disease/DD in viruses)
+ if(D.IsSame(DD))
+ return 1
+ return 0
+
+
+/mob/proc/CanContractDisease(var/datum/disease/D)
+ if(stat == DEAD)
+ return 0
+
+ if(D.GetDiseaseID() in resistances)
+ return 0
+
+ if(HasDisease(D))
+ return 0
+
+ if(!(type in D.viable_mobtypes))
+ return 0
+
+ if(count_by_type(viruses, /datum/disease/advance) >= 3)
+ return 0
+
+ return 1
+
+
+/mob/proc/ContractDisease(var/datum/disease/D)
+ if(!CanContractDisease(D))
+ return 0
+ AddDisease(D)
+
+
+/mob/proc/AddDisease(var/datum/disease/D)
+ var/datum/disease/DD = new D.type(1, D, 0)
+ viruses += DD
+ DD.affected_mob = src
+ DD.holder = src
+ if(DD.disease_flags & CAN_CARRY && prob(5))
+ DD.carrier = 1
+ DD.affected_mob.med_hud_set_status()
+
+
+/mob/living/carbon/ContractDisease(var/datum/disease/D)
+ if(!CanContractDisease(D))
+ return 0
+
+ var/obj/item/clothing/Cl = null
+ var/passed = 1
+
+ var/head_ch = 100
+ var/body_ch = 100
+ var/hands_ch = 25
+ var/feet_ch = 25
+
+ if(D.spread_flags & CONTACT_HANDS)
+ head_ch = 0
+ body_ch = 0
+ hands_ch = 100
+ feet_ch = 0
+ if(D.spread_flags & CONTACT_FEET)
+ head_ch = 0
+ body_ch = 0
+ hands_ch = 0
+ feet_ch = 100
+
+ if(prob(15/D.permeability_mod))
+ return
+
+ var/target_zone = pick(head_ch;1,body_ch;2,hands_ch;3,feet_ch;4)
+
+ if(istype(src, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = src
+
+ switch(target_zone)
+ if(1)
+ if(isobj(H.head) && !istype(H.head, /obj/item/weapon/paper))
+ Cl = H.head
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+ if(passed && isobj(H.wear_mask))
+ Cl = H.wear_mask
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+ if(2)
+ if(isobj(H.wear_suit))
+ Cl = H.wear_suit
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+ if(passed && isobj(slot_w_uniform))
+ Cl = slot_w_uniform
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+ if(3)
+ if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS)
+ Cl = H.wear_suit
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+
+ if(passed && isobj(H.gloves))
+ Cl = H.gloves
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+ if(4)
+ if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&FEET)
+ Cl = H.wear_suit
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+
+ if(passed && isobj(H.shoes))
+ Cl = H.shoes
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+
+ else if(istype(src, /mob/living/carbon/monkey))
+ var/mob/living/carbon/monkey/M = src
+ switch(target_zone)
+ if(1)
+ if(M.wear_mask && isobj(M.wear_mask))
+ Cl = M.wear_mask
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+
+ if(!passed && (D.spread_flags & AIRBORNE) && !internals)
+ passed = (prob((50*D.permeability_mod) - 1))
+
+ if(passed)
+ AddDisease(D)
+
+
+//Same as ContractDisease, except never overidden clothes checks
+/mob/proc/ForceContractDisease(var/datum/disease/D)
+ if(!CanContractDisease(D))
+ return 0
+ AddDisease(D)
diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
new file mode 100644
index 00000000000..f9b689c2e78
--- /dev/null
+++ b/code/datums/diseases/_disease.dm
@@ -0,0 +1,199 @@
+
+//Visibility Flags
+#define HIDDEN_SCANNER 1
+#define HIDDEN_PANDEMIC 2
+
+//Disease Flags
+#define CURABLE 1
+#define CAN_CARRY 2
+#define CAN_RESIST 3
+
+//Spread Flags
+#define SPECIAL 1
+#define NON_CONTAGIOUS 2
+#define BLOOD 4
+#define CONTACT_FEET 8
+#define CONTACT_HANDS 16
+#define CONTACT_GENERAL 32
+#define AIRBORNE 64
+
+
+//Severity Defines
+#define NONTHREAT "No threat"
+#define MINOR "Minor"
+#define MEDIUM "Medium"
+#define HARMFUL "Harmful"
+#define DANGEROUS "Dangerous!"
+#define BIOHAZARD "BIOHAZARD THREAT!"
+
+
+var/list/diseases = typesof(/datum/disease) - /datum/disease
+
+
+/datum/disease
+ //Flags
+ var/visibility_flags = 0
+ var/disease_flags = CURABLE|CAN_CARRY|CAN_RESIST
+ var/spread_flags = AIRBORNE
+
+ //Fluff
+ var/form = "Virus"
+ var/name = "No disease"
+ var/desc = ""
+ var/agent = "some microbes"
+ var/spread_text = ""
+ var/cure_text = ""
+
+ //Stages
+ var/stage = 1
+ var/max_stages = 0
+ var/stage_prob = 4
+
+ //Other
+ var/longevity = 150 //Time in ticks disease stays in objects, Syringes and such are infinite.
+ var/list/viable_mobtypes = list() //typepaths of viable mobs
+ var/mob/living/carbon/affected_mob = null
+ var/atom/movable/holder = null
+ var/list/cures = list() //list of cures if the disease has the CURABLE flag, these are reagent ids
+ var/infectivity = 65
+ var/cure_chance = 0
+ var/carrier = 0 //If our host is only a carrier
+ var/permeability_mod = 1
+ var/severity = NONTHREAT
+ var/list/required_organs = list()
+
+ var/list/strain_data = list() //dna_spread special bullshit
+
+
+
+/datum/disease/proc/stage_act()
+ var/cure = has_cure()
+
+ if(carrier && !cure)
+ return
+
+ stage = min(stage, max_stages)
+
+ if(!cure)
+ if(prob(stage_prob))
+ stage = min(stage + 1,max_stages)
+ else
+ if(prob(cure_chance))
+ stage = max(stage - 1, 1)
+
+ if(disease_flags & CURABLE)
+ if(cure && prob(cure_chance))
+ cure()
+
+
+/datum/disease/proc/has_cure()
+ if(!(disease_flags & CURABLE))
+ return 0
+
+ . = 1
+ for(var/C_id in cures)
+ if(!affected_mob.reagents.has_reagent(C_id))
+ .--
+ break //One missing cure is enough to fail
+
+
+/datum/disease/proc/spread(var/atom/source)
+ if(spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD)
+ return
+
+ if(affected_mob)
+ if(affected_mob.reagents.has_reagent("spaceacillin"))
+ return
+
+ var/spread_range = 1
+
+ if(spread_flags & AIRBORNE)
+ spread_range++
+
+ if(!source)
+ if(affected_mob)
+ source = affected_mob
+ else
+ return
+
+ if(isturf(source.loc))
+ for(var/mob/living/carbon/C in oview(spread_range, source))
+ if(isturf(C.loc))
+ if(AStar(source.loc, C.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, spread_range))
+ C.ContractDisease(src)
+
+
+/datum/disease/proc/process()
+ if(!holder)
+ active_diseases -= src
+ return
+
+ if(prob(infectivity))
+ spread(holder)
+
+ if(affected_mob)
+ for(var/datum/disease/D in affected_mob.viruses)
+ if(D != src)
+ if(IsSame(D))
+ del(D)
+
+ if(holder == affected_mob)
+ if(affected_mob.stat != DEAD)
+ stage_act()
+
+ if(!affected_mob)
+ if(prob(70))
+ if(--longevity<=0)
+ cure()
+
+
+/datum/disease/proc/cure()
+ if(affected_mob)
+ if(disease_flags & CAN_RESIST)
+ if(!(type in affected_mob.resistances))
+ affected_mob.resistances += type
+ remove_virus()
+ del(src)
+
+
+/datum/disease/New()
+ if(required_organs && required_organs.len)
+ if(ishuman(affected_mob))
+ var/mob/living/carbon/human/H = affected_mob
+ for(var/obj/item/organ/O in required_organs)
+ if(!locate(O) in H.organs)
+ if(!locate(O) in H.internal_organs)
+ cure()
+ return
+
+ active_diseases += src
+
+
+/datum/disease/proc/IsSame(var/datum/disease/D)
+ if(istype(src, D.type))
+ return 1
+ return 0
+
+
+/datum/disease/proc/Copy()
+ return new type()
+
+
+/datum/disease/proc/GetDiseaseID()
+ return type
+
+
+/datum/disease/Del()
+ active_diseases.Remove(src)
+ ..()
+
+
+/datum/disease/proc/IsSpreadByTouch()
+ if(spread_flags & CONTACT_FEET || spread_flags & CONTACT_HANDS || spread_flags & CONTACT_GENERAL)
+ return 1
+ return 0
+
+//don't use this proc directly. this should only ever be called by cure()
+/datum/disease/proc/remove_virus()
+ affected_mob.viruses -= src //remove the datum from the list
+ affected_mob.med_hud_set_status()
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index b356109b1b2..50da4ca82f2 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -30,8 +30,8 @@ var/list/advance_cures = list(
form = "Advance Disease" // Will let med-scanners know that this disease was engineered.
agent = "advance microbes"
max_stages = 5
- spread = "Unknown"
- affected_species = list("Human","Monkey")
+ spread_text = "Unknown"
+ viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
// NEW VARS
@@ -106,7 +106,7 @@ var/list/advance_cures = list(
var/id = "[GetDiseaseID()]"
if(resistance && !(id in affected_mob.resistances))
affected_mob.resistances[id] = id
- affected_mob.viruses -= src //remove the datum from the list
+ remove_virus()
del(src) //delete the datum to stop it processing
// Returns the advance disease with a different reference memory.
@@ -198,10 +198,14 @@ var/list/advance_cures = list(
/datum/disease/advance/proc/AssignProperties(var/list/properties = list())
if(properties && properties.len)
+ switch(properties["stealth"])
+ if(2 to 3)
+ visibility_flags = HIDDEN_SCANNER
+ if(3 to INFINITY)
+ visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
- hidden = list( (properties["stealth"] > 2), (properties["stealth"] > 3) )
// The more symptoms we have, the less transmittable it is but some symptoms can make up for it.
- SetSpread(Clamp(properties["transmittable"] - symptoms.len, BLOOD, AIRBORNE))
+ SetSpread(Clamp(2 ** (properties["transmittable"] - symptoms.len), BLOOD, AIRBORNE))
permeability_mod = max(Ceiling(0.4 * properties["transmittable"]), 1)
cure_chance = 15 - Clamp(properties["resistance"], -5, 5) // can be between 10 and 20
stage_prob = max(properties["stage_rate"], 2)
@@ -214,37 +218,35 @@ var/list/advance_cures = list(
// Assign the spread type and give it the correct description.
/datum/disease/advance/proc/SetSpread(var/spread_id)
switch(spread_id)
-
if(NON_CONTAGIOUS)
- spread = "None"
+ spread_text = "None"
if(SPECIAL)
- spread = "None"
+ spread_text = "None"
if(CONTACT_GENERAL, CONTACT_HANDS, CONTACT_FEET)
- spread = "On contact"
+ spread_text = "On contact"
if(AIRBORNE)
- spread = "Airborne"
+ spread_text = "Airborne"
if(BLOOD)
- spread = "Blood"
+ spread_text = "Blood"
- spread_type = spread_id
- //world << "Setting spread type to [spread_id]/[spread]"
+ spread_flags = spread_id
/datum/disease/advance/proc/SetSeverity(var/level_sev)
switch(level_sev)
if(-INFINITY to 0)
- severity = non_threat
+ severity = NONTHREAT
if(1)
- severity = "Minor"
+ severity = MINOR
if(2)
- severity = "Medium"
+ severity = MEDIUM
if(3)
- severity = "Harmful"
+ severity = HARMFUL
if(4)
- severity = "Dangerous!"
+ severity = DANGEROUS
if(5 to INFINITY)
- severity = "BIOHAZARD THREAT!"
+ severity = BIOHAZARD
else
severity = "Unknown"
@@ -254,11 +256,11 @@ var/list/advance_cures = list(
if(properties && properties.len)
var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len)
//world << "Res = [res]"
- cure_id = advance_cures[res]
+ cures = list(advance_cures[res])
// Get the cure name from the cure_id
- var/datum/reagent/D = chemical_reagents_list[cure_id]
- cure = D.name
+ var/datum/reagent/D = chemical_reagents_list[cures[1]]
+ cure_text = D.name
return
@@ -406,8 +408,8 @@ var/list/advance_cures = list(
for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
if(H.z != 1)
continue
- if(!H.has_disease(D))
- H.contract_disease(D, 1)
+ if(!H.HasDisease(D))
+ H.ForceContractDisease(D)
break
var/list/name_symptoms = list()
diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm
new file mode 100644
index 00000000000..3de7edf76cc
--- /dev/null
+++ b/code/datums/diseases/anxiety.dm
@@ -0,0 +1,41 @@
+/datum/disease/anxiety
+ name = "Severe Anxiety"
+ form = "Infection"
+ max_stages = 4
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Ethanol"
+ cures = list("ethanol")
+ agent = "Excess Lepidopticides"
+ viable_mobtypes = list(/mob/living/carbon/human,/mob/living/carbon/monkey)
+ desc = "If left untreated subject will regurgitate butterflies."
+ severity = MEDIUM
+
+/datum/disease/anxiety/stage_act()
+ ..()
+ switch(stage)
+ if(2) //also changes say, see say.dm
+ if(prob(5))
+ affected_mob << "Your feel anxious."
+ if(3)
+ if(prob(10))
+ affected_mob << "Your stomach flutters."
+ if(prob(5))
+ affected_mob << "You feel panicky."
+ if(prob(2))
+ affected_mob << "You're overtaken with panic!"
+ affected_mob.confused += (rand(2,3))
+ if(4)
+ if(prob(10))
+ affected_mob << "You feel butterflies in your stomach."
+ if(prob(5))
+ affected_mob.visible_message("[affected_mob] stumbles around in a panic.", \
+ "You have a panic attack!")
+ affected_mob.confused += (rand(6,8))
+ affected_mob.jitteriness += (rand(6,8))
+ if(prob(2))
+ affected_mob.visible_message("[affected_mob] coughs up butterflies!", \
+ "You cough up butterflies!")
+ new /mob/living/simple_animal/butterfly(affected_mob.loc)
+ new /mob/living/simple_animal/butterfly(affected_mob.loc)
+ return
\ No newline at end of file
diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm
index f3a2432ebe5..11a68034d8b 100644
--- a/code/datums/diseases/appendicitis.dm
+++ b/code/datums/diseases/appendicitis.dm
@@ -2,18 +2,18 @@
form = "Condition"
name = "Appendicitis"
max_stages = 3
- spread = "Acute"
- cure = "Surgery"
+ cure_text = "Surgery"
agent = "Shitty Appendix"
- affected_species = list("Human")
+ viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 1
- contagious_period = 9001 //slightly hacky, but hey! whatever works, right?
desc = "If left untreated the subject will become very weak, and may vomit often."
severity = "Dangerous!"
longevity = 1000
- hidden = list(0, 1)
- requires = 1
- required_limb = list(/obj/item/organ/limb/chest)
+ disease_flags = CAN_CARRY|CAN_RESIST
+ spread_flags = NON_CONTAGIOUS
+ visibility_flags = HIDDEN_PANDEMIC
+ required_organs = list(/obj/item/organ/limb/chest)
+
/datum/disease/appendicitis/stage_act()
..()
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
index ec863a441eb..7defa90d7bd 100644
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -1,31 +1,40 @@
-/*
/datum/disease/beesease
name = "Beesease"
- max_stages = 5
- spread = "Contact" //ie shot bees
- cure = "???"
- cure_id = "???"
- agent = "Bees"
- affected_species = list("Human","Monkey")
- curable = 0
+ form = "Infection"
+ max_stages = 4
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Sugar"
+ cures = list("sugar")
+ agent = "Apidae Infection"
+ viable_mobtypes = list(/mob/living/carbon/human,/mob/living/carbon/monkey)
+ desc = "If left untreated subject will regurgitate bees."
+ severity = DANGEROUS
/datum/disease/beesease/stage_act()
..()
switch(stage)
- if(1)
- if(prob(2))
- affected_mob << "\red You feel like something is moving inside of you"
if(2) //also changes say, see say.dm
if(prob(2))
- affected_mob << "\red You feel like something is moving inside of you"
- if(prob(2))
- affected_mob << "\red BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+ affected_mob << "You taste honey in your mouth."
if(3)
- //Should give the bee spit verb
+ if(prob(10))
+ affected_mob << "Your stomach rumbles."
+ if(prob(2))
+ affected_mob << "Your stomach stings painfully."
+ if(prob(20))
+ affected_mob.adjustToxLoss(2)
+ affected_mob.updatehealth()
if(4)
- //Plus bees now spit randomly
- if(5)
+ if(prob(10))
+ affected_mob.visible_message("[affected_mob] buzzes.", \
+ "Your stomach buzzes violently!")
+ if(prob(5))
+ affected_mob << "You feel something moving in your throat."
+ if(prob(1))
+ affected_mob.visible_message("[affected_mob] coughs up a swarm of bees!", \
+ "You cough up a swarm of bees!")
+ new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
+ //if(5)
//Plus if you die, you explode into bees
- return
-*/
-//Started working on it, but am too lazy to finish it today -- Urist
\ No newline at end of file
+ return
\ No newline at end of file
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index f457c533011..f5c0b4d5d33 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -1,18 +1,17 @@
/datum/disease/brainrot
name = "Brainrot"
max_stages = 4
- spread = "On contact"
- spread_type = CONTACT_GENERAL
- cure = "Alkysine"
- cure_id = list("alkysine")
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Alkysine"
+ cures = list("alkysine")
agent = "Cryptococcus Cosmosis"
- affected_species = list("Human")
- curable = 0
+ viable_mobtypes = list(/mob/living/carbon/human)
+ disease_flags = CAN_CARRY|CAN_RESIST
cure_chance = 15//higher chance to cure, since two reagents are required
desc = "This disease destroys the braincells, causing brain fever, brain necrosis and general intoxication."
- severity = "Dangerous!"
- requires = 1
- required_limb = list(/obj/item/organ/limb/head)
+ required_organs = list(/obj/item/organ/limb/head)
+ severity = DANGEROUS
/datum/disease/brainrot/stage_act() //Removed toxloss because damaging diseases are pretty horrible. Last round it killed the entire station because the cure didn't work -- Urist -ACTUALLY Removed rather than commented out, I don't see it returning - RR
..()
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index a62c4825422..5207fd009d1 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -1,14 +1,14 @@
/datum/disease/cold
name = "The Cold"
max_stages = 3
- spread = "Airborne"
- cure = "Rest & Spaceacillin"
- cure_id = "spaceacillin"
+ spread_flags = AIRBORNE
+ cure_text = "Rest & Spaceacillin"
+ cures = list("spaceacillin")
agent = "XY-rhinovirus"
- affected_species = list("Human", "Monkey")
+ viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
permeability_mod = 0.5
desc = "If left untreated the subject will contract the flu."
- severity = "Minor"
+ severity = MINOR
/datum/disease/cold/stage_act()
..()
@@ -62,5 +62,5 @@
if(prob(1) && prob(50))
if(!affected_mob.resistances.Find(/datum/disease/flu))
var/datum/disease/Flu = new /datum/disease/flu(0)
- affected_mob.contract_disease(Flu,1)
+ affected_mob.ContractDisease(Flu)
cure()
\ No newline at end of file
diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm
index 0e7847588fa..68c11d65850 100644
--- a/code/datums/diseases/cold9.dm
+++ b/code/datums/diseases/cold9.dm
@@ -1,14 +1,14 @@
/datum/disease/cold9
name = "The Cold"
max_stages = 3
- spread = "On contact"
- spread_type = CONTACT_GENERAL
- cure = "Common Cold Anti-bodies & Spaceacillin"
- cure_id = "spaceacillin"
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Common Cold Anti-bodies & Spaceacillin"
+ cures = list("spaceacillin")
agent = "ICE9-rhinovirus"
- affected_species = list("Human")
+ viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated the subject will slow, as if partly frozen."
- severity = "Medium"
+ severity = MEDIUM
/datum/disease/cold9/stage_act()
..()
diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm
index df96b3ca231..6df8582e325 100644
--- a/code/datums/diseases/dna_spread.dm
+++ b/code/datums/diseases/dna_spread.dm
@@ -1,17 +1,17 @@
/datum/disease/dnaspread
name = "Space Retrovirus"
max_stages = 4
- spread = "On contact"
- spread_type = CONTACT_GENERAL
- cure = "Ryetalyn"
- cure_id = "ryetalyn"
- curable = 0
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Ryetalyn"
+ cures = list("ryetalyn")
+ disease_flags = CAN_CARRY|CAN_RESIST
agent = "S4E1 retrovirus"
- affected_species = list("Human")
+ viable_mobtypes = list(/mob/living/carbon/human)
var/list/original_dna = list()
var/transformed = 0
desc = "This disease transplants the genetic code of the intial vector into new hosts."
- severity = "Medium"
+ severity = MEDIUM
/datum/disease/dnaspread/stage_act()
diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm
index 9700cd120a5..e4352483036 100644
--- a/code/datums/diseases/fake_gbs.dm
+++ b/code/datums/diseases/fake_gbs.dm
@@ -1,14 +1,14 @@
/datum/disease/fake_gbs
name = "GBS"
max_stages = 5
- spread = "On contact"
- spread_type = CONTACT_GENERAL
- cure = "Synaptizine & Sulfur"
- cure_id = list("synaptizine","sulfur")
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Synaptizine & Sulfur"
+ cures = list("synaptizine","sulfur")
agent = "Gravitokinetic Bipotential SADS-"
- affected_species = list("Human", "Monkey")
+ viable_mobtypes = list(/mob/living/carbon/human,/mob/living/carbon/monkey)
desc = "If left untreated death will occur."
- severity = "BIOHAZARD THREAT!"
+ severity = BIOHAZARD
/datum/disease/fake_gbs/stage_act()
..()
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 74dcdafaa93..1df55bbb9d7 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -1,27 +1,21 @@
/datum/disease/flu
name = "The Flu"
max_stages = 3
- spread = "Airborne"
- cure = "Spaceacillin"
- cure_id = "spaceacillin"
+ spread_text = "Airborne"
+ cure_text = "Spaceacillin"
+ cures = list("spaceacillin")
cure_chance = 10
agent = "H13N1 flu virion"
- affected_species = list("Human", "Monkey")
+ viable_mobtypes = list(/mob/living/carbon/human,/mob/living/carbon/monkey)
permeability_mod = 0.75
desc = "If left untreated the subject will feel quite unwell."
- severity = "Medium"
+ severity = MEDIUM
/datum/disease/flu/stage_act()
..()
switch(stage)
if(2)
-/*
- if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed --Blaank
- affected_mob << "\blue You feel better."
- stage--
- return
-*/
- if(affected_mob.lying && prob(20)) //added until sleeping is fixed --Blaank
+ if(affected_mob.lying && prob(20))
affected_mob << "You feel better."
stage--
return
@@ -40,13 +34,7 @@
affected_mob.updatehealth()
if(3)
-/*
- if(affected_mob.sleeping && prob(15)) //removed until sleeping is fixed
- affected_mob << "\blue You feel better."
- stage--
- return
-*/
- if(affected_mob.lying && prob(15)) //added until sleeping is fixed
+ if(affected_mob.lying && prob(15))
affected_mob << "You feel better."
stage--
return
diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm
index 6d8a9c9a290..caa098584f1 100644
--- a/code/datums/diseases/fluspanish.dm
+++ b/code/datums/diseases/fluspanish.dm
@@ -1,15 +1,15 @@
/datum/disease/fluspanish
name = "Spanish inquisition Flu"
max_stages = 3
- spread = "Airborne"
- cure = "Spaceacillin & Anti-bodies to the common flu"
- cure_id = "spaceacillin"
+ spread_text = "Airborne"
+ cure_text = "Spaceacillin & Anti-bodies to the common flu"
+ cures = list("spaceacillin")
cure_chance = 10
agent = "1nqu1s1t10n flu virion"
- affected_species = list("Human")
+ viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 0.75
desc = "If left untreated the subject will burn to death for being a heretic."
- severity = "Dangerous!"
+ severity = DANGEROUS
/datum/disease/inquisition/stage_act()
..()
diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm
index 9579d8f2036..925b9a4a9b8 100644
--- a/code/datums/diseases/gbs.dm
+++ b/code/datums/diseases/gbs.dm
@@ -1,16 +1,16 @@
/datum/disease/gbs
name = "GBS"
max_stages = 5
- spread = "On contact"
- spread_type = CONTACT_GENERAL
- cure = "Synaptizine & Sulfur"
- cure_id = list("synaptizine","sulfur")
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Synaptizine & Sulfur"
+ cures = list("synaptizine","sulfur")
cure_chance = 15//higher chance to cure, since two reagents are required
agent = "Gravitokinetic Bipotential SADS+"
- affected_species = list("Human")
- curable = 0
+ viable_mobtypes = list(/mob/living/carbon/human)
+ disease_flags = CAN_CARRY|CAN_RESIST
permeability_mod = 1
- severity = "BIOHAZARD THREAT!"
+ severity = BIOHAZARD
/datum/disease/gbs/stage_act()
..()
diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm
index b6f6aa91f1b..cd600e214cd 100644
--- a/code/datums/diseases/magnitis.dm
+++ b/code/datums/diseases/magnitis.dm
@@ -1,15 +1,15 @@
/datum/disease/magnitis
name = "Magnitis"
max_stages = 4
- spread = "Airborne"
- cure = "Iron"
- cure_id = "iron"
+ spread_text = "Airborne"
+ cure_text = "Iron"
+ cures = list("iron")
agent = "Fukkos Miracos"
- affected_species = list("Human")
- curable = 0
+ viable_mobtypes = list(/mob/living/carbon/human)
+ disease_flags = CAN_CARRY|CAN_RESIST
permeability_mod = 0.75
desc = "This disease disrupts the magnetic field of your body, making it act as if a powerful magnet. Injections of iron help stabilize the field."
- severity = "Medium"
+ severity = MEDIUM
/datum/disease/magnitis/stage_act()
..()
diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm
index 6f7f16301b8..34f0e14be85 100644
--- a/code/datums/diseases/pierrot_throat.dm
+++ b/code/datums/diseases/pierrot_throat.dm
@@ -1,15 +1,15 @@
/datum/disease/pierrot_throat
name = "Pierrot's Throat"
max_stages = 4
- spread = "Airborne"
- cure = "Banana products, especially banana bread."
- cure_id = "banana"
+ spread_text = "Airborne"
+ cure_text = "Banana products, especially banana bread."
+ cures = list("banana")
cure_chance = 75
agent = "H0NI<42 Virus"
- affected_species = list("Human")
+ viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 0.75
desc = "If left untreated the subject will probably drive others to insanity."
- severity = "Medium"
+ severity = MEDIUM
longevity = 400
/datum/disease/pierrot_throat/stage_act()
diff --git a/code/datums/diseases/plasmatoid.dm b/code/datums/diseases/plasmatoid.dm
deleted file mode 100644
index 499edcb5fa1..00000000000
--- a/code/datums/diseases/plasmatoid.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-/datum/disease/plasmatoid
- name = "Plasmatoid"
- max_stages = 4
- cure = "None"
- affected_species = list("Monkey", "Human")
- severity = "Unknown"
\ No newline at end of file
diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm
index 40b56b05bf6..bc22d9641bf 100644
--- a/code/datums/diseases/retrovirus.dm
+++ b/code/datums/diseases/retrovirus.dm
@@ -1,29 +1,28 @@
/datum/disease/dna_retrovirus
name = "Retrovirus"
max_stages = 4
- spread = "Contact"
- spread_type = CONTACT_GENERAL
- cure = "Rest or an injection of ryetalyn"
+ spread_text = "Contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Rest or an injection of ryetalyn"
cure_chance = 6
agent = ""
- affected_species = list("Human")
+ viable_mobtypes = list(/mob/living/carbon/human)
desc = "A DNA-altering retrovirus that scrambles the structural and unique enzymes of a host constantly."
- severity = "Dangerous!"
+ severity = DANGEROUS
permeability_mod = 0.4
stage_prob = 2
var/SE
var/UI
var/restcure = 0
- New()
- ..()
- agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
- if(prob(40))
- cure_id = list("ryetalyn")
- cure_list = list("ryetalyn")
- else
- restcure = 1
+/datum/disease/dna_retrovirus/New()
+ ..()
+ agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
+ if(prob(40))
+ cures = list("ryetalyn")
+ else
+ restcure = 1
/datum/disease/dna_retrovirus/stage_act()
@@ -31,13 +30,7 @@
switch(stage)
if(1)
if(restcure)
-/*
- if(affected_mob.sleeping && prob(30)) //removed until sleeping is fixed
- affected_mob << "\blue You feel better."
- cure()
- return
-*/
- if(affected_mob.lying && prob(30)) //changed FROM prob(20) until sleeping is fixed
+ if(affected_mob.lying && prob(30))
affected_mob << "You feel better."
cure()
return
@@ -49,13 +42,7 @@
affected_mob << "You feel angry."
if(2)
if(restcure)
-/*
- if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed
- affected_mob << "\blue You feel better."
- cure()
- return
-*/
- if(affected_mob.lying && prob(20)) //changed FROM prob(10) until sleeping is fixed
+ if(affected_mob.lying && prob(20))
affected_mob << "You feel better."
cure()
return
@@ -70,13 +57,7 @@
affected_mob << "Your stomach churns."
if(3)
if(restcure)
-/*
- if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed
- affected_mob << "\blue You feel better."
- cure()
- return
-*/
- if(affected_mob.lying && prob(20)) //changed FROM prob(10) until sleeping is fixed
+ if(affected_mob.lying && prob(20))
affected_mob << "You feel better."
cure()
return
@@ -89,13 +70,7 @@
if(4)
if(restcure)
-/*
- if(affected_mob.sleeping && prob(10)) //removed until sleeping is fixed
- affected_mob << "\blue You feel better."
- cure()
- return
-*/
- if(affected_mob.lying && prob(5)) //changed FROM prob(5) until sleeping is fixed
+ if(affected_mob.lying && prob(5))
affected_mob << "You feel better."
cure()
return
diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm
index 09225bf25b1..f0a5e2fd035 100644
--- a/code/datums/diseases/rhumba_beat.dm
+++ b/code/datums/diseases/rhumba_beat.dm
@@ -1,14 +1,14 @@
/datum/disease/rhumba_beat
name = "The Rhumba Beat"
max_stages = 5
- spread = "On contact"
- spread_type = CONTACT_GENERAL
- cure = "Chick Chicky Boom!"
- cure_id = list("plasma")
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Chick Chicky Boom!"
+ cures = list("plasma")
agent = "Unknown"
- affected_species = list("Human")
+ viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 1
- severity = "BIOHAZARD THREAT!"
+ severity = BIOHAZARD
/datum/disease/rhumba_beat/stage_act()
..()
diff --git a/code/datums/diseases/robotic_transformation.dm b/code/datums/diseases/robotic_transformation.dm
deleted file mode 100644
index ac63febb375..00000000000
--- a/code/datums/diseases/robotic_transformation.dm
+++ /dev/null
@@ -1,64 +0,0 @@
-//Nanomachines!
-
-/datum/disease/robotic_transformation
- name = "Robotic Transformation"
- max_stages = 5
- spread = "Syringe"
- spread_type = SPECIAL
- cure = "An injection of copper."
- cure_id = list("copper")
- cure_chance = 5
- agent = "R2D2 Nanomachines"
- affected_species = list("Human")
- desc = "This disease, actually acute nanomachine infection, converts the victim into a cyborg."
- severity = "Major"
- var/gibbed = 0
-
-/datum/disease/robotic_transformation/stage_act()
- ..()
- switch(stage)
- if(2)
- if (prob(8))
- affected_mob << "Your joints feel stiff."
- affected_mob.take_organ_damage(1)
- if (prob(9))
- affected_mob << "Beep...boop.."
- if (prob(9))
- affected_mob << "Bop...beeep..."
- if(3)
- if (prob(8))
- affected_mob << "Your joints feel very stiff."
- affected_mob.take_organ_damage(1)
- if (prob(8))
- affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
- if (prob(10))
- affected_mob << "Your skin feels loose."
- affected_mob.take_organ_damage(5)
- if (prob(4))
- affected_mob << "You feel a stabbing pain in your head."
- affected_mob.Paralyse(2)
- if (prob(4))
- affected_mob << "You can feel something move...inside."
- if(4)
- if (prob(10))
- affected_mob << "Your skin feels very loose."
- affected_mob.take_organ_damage(8)
- if (prob(20))
- affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee..."))
- if (prob(8))
- affected_mob << "You can feel... something...inside you."
- if(5)
- affected_mob <<"Your skin feels as if it's about to burst off..."
- affected_mob.adjustToxLoss(10)
- affected_mob.updatehealth()
- if(prob(40)) //So everyone can feel like robot Seth Brundle
- if(src.gibbed != 0) return 0
- var/turf/T = find_loc(affected_mob)
- gibs(T)
- gibbed = 1
- var/mob/living/carbon/human/H = affected_mob
- if(istype(H) && !jobban_isbanned(affected_mob, "Cyborg"))
- H.Robotize()
- else
- affected_mob.death(1)
-
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 71dbe67181e..6c8a80c85d7 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -1,15 +1,14 @@
/datum/disease/transformation
-
name = "Transformation"
max_stages = 5
- spread = "Acute"
- spread_type = SPECIAL
- cure = "A coder's love (theoretical)."
+ spread_text = "Acute"
+ spread_flags = SPECIAL
+ cure_text = "A coder's love (theoretical)."
agent = "Shenanigans"
- affected_species = list("Human", "Monkey", "Alien")
- severity = "Harmful"
+ viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/alien)
+ severity = HARMFUL
stage_prob = 10
- hidden = list(1, 1)
+ visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
var/list/stage1 = list("You feel unremarkable.")
var/list/stage2 = list("You feel boring.")
var/list/stage3 = list("You feel utterly plain.")
@@ -68,19 +67,19 @@
/datum/disease/transformation/jungle_fever
name = "Jungle Fever"
- cure = "Bananas"
- cure_id = "banana"
- spread = "Monkey Bites"
- spread_type = SPECIAL
- affected_species = list("Monkey", "Human")
+ cure_text = "Bananas"
+ cures = list("banana")
+ spread_text = "Monkey Bites"
+ spread_flags = SPECIAL
+ viable_mobtypes = list(/mob/living/carbon/monkey, /mob/living/carbon/human)
permeability_mod = 1
cure_chance = 1
- curable = 0
+ disease_flags = CAN_CARRY|CAN_RESIST
longevity = 30
desc = "Monkeys with this disease will bite humans, causing humans to mutate into a monkey."
- severity = "BIOHAZARD THREAT!"
- hidden = list(0, 0)//Not hidden, with the exception of the starting ape.
+ severity = BIOHAZARD
stage_prob = 4
+ visibility_flags = 0
agent = "Kongey Vibrion M-909"
new_form = /mob/living/carbon/monkey
@@ -118,13 +117,13 @@
/datum/disease/transformation/robot
name = "Robotic Transformation"
- cure = "An injection of copper."
- cure_id = list("copper")
+ cure_text = "An injection of copper."
+ cures = list("copper")
cure_chance = 5
agent = "R2D2 Nanomachines"
desc = "This disease, actually acute nanomachine infection, converts the victim into a cyborg."
- severity = "Dangerous!"
- hidden = list(0, 0)
+ severity = DANGEROUS
+ visibility_flags = 0
stage1 = null
stage2 = list("Your joints feel stiff.", "Beep...boop..")
stage3 = list("Your joints feel very stiff.", "Your skin feels loose.", "You can feel something move...inside.")
@@ -150,13 +149,13 @@
/datum/disease/transformation/xeno
name = "Xenomorph Transformation"
- cure = "Spaceacillin & Glycerol"
- cure_id = list("spaceacillin", "glycerol")
+ cure_text = "Spaceacillin & Glycerol"
+ cures = list("spaceacillin", "glycerol")
cure_chance = 5
agent = "Rip-LEY Alien Microbes"
desc = "This disease changes the victim into a xenomorph."
- severity = "BIOHAZARD THREAT!"
- hidden = list(0, 0)
+ severity = BIOHAZARD
+ visibility_flags = 0
stage1 = null
stage2 = list("Your throat feels scratchy.", "Kill...")
stage3 = list("Your throat feels very scratchy.", "Your skin feels tight.", "You can feel something move...inside.")
@@ -178,13 +177,13 @@
/datum/disease/transformation/slime
name = "Advanced Mutation Transformation"
- cure = "frost oil"
- cure_id = list("frostoil")
+ cure_text = "frost oil"
+ cures = list("frostoil")
cure_chance = 80
agent = "Advanced Mutation Toxin"
desc = "This highly concentrated extract converts anything into more of itself."
- severity = "BIOHAZARD THREAT!"
- hidden = list(0, 0)
+ severity = BIOHAZARD
+ visibility_flags = 0
stage1 = list("You don't feel very well.")
stage2 = list("You are turning a little green.")
stage3 = list("Your limbs are getting oozy.", "Your skin begins to peel away.")
@@ -207,10 +206,10 @@
/datum/disease/transformation/corgi
name = "The Barkening"
- cure = "Death"
+ cure_text = "Death"
agent = "Fell Doge Majicks"
desc = "This disease transforms the victim into a corgi."
- hidden = list(0, 0)
+ visibility_flags = 0
stage1 = list("BARK.")
stage2 = list("You feel the need to wear silly hats.")
stage3 = list("Must... eat... chocolate....", "YAP")
diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm
index c8cf37d77aa..86ff3f4e7f7 100644
--- a/code/datums/diseases/wizarditis.dm
+++ b/code/datums/diseases/wizarditis.dm
@@ -1,18 +1,17 @@
/datum/disease/wizarditis
name = "Wizarditis"
max_stages = 4
- spread = "Airborne"
- cure = "The Manly Dorf"
- cure_id = "manlydorf"
+ spread_text = "Airborne"
+ cure_text = "The Manly Dorf"
+ cures = list("manlydorf")
cure_chance = 100
agent = "Rincewindus Vulgaris"
- affected_species = list("Human")
- curable = 1
+ viable_mobtypes = list(/mob/living/carbon/human)
+ disease_flags = CAN_CARRY|CAN_RESIST
permeability_mod = 0.75
desc = "Some speculate, that this virus is the cause of Wizard Federation existance. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition."
- severity = "Harmful"
- requires = 1
- required_limb = list(/obj/item/organ/limb/head)
+ severity = HARMFUL
+ required_organs = list(/obj/item/organ/limb/head)
/*
BIRUZ BENNAR
diff --git a/code/datums/diseases/xeno_transformation.dm b/code/datums/diseases/xeno_transformation.dm
deleted file mode 100644
index e8d6fad3777..00000000000
--- a/code/datums/diseases/xeno_transformation.dm
+++ /dev/null
@@ -1,60 +0,0 @@
-//Xenomicrobes
-
-/datum/disease/xeno_transformation
- name = "Xenomorph Transformation"
- max_stages = 5
- spread = "Syringe"
- spread_type = SPECIAL
- cure = "Spaceacillin & Glycerol"
- cure_id = list("spaceacillin", "glycerol")
- cure_chance = 5
- agent = "Rip-LEY Alien Microbes"
- affected_species = list("Human")
- var/gibbed = 0
-
-/datum/disease/xeno_transformation/stage_act()
- ..()
- switch(stage)
- if(2)
- if (prob(8))
- affected_mob << "Your throat feels scratchy."
- affected_mob.take_organ_damage(1)
- if (prob(9))
- affected_mob << "Kill..."
- if (prob(9))
- affected_mob << "Kill..."
- if(3)
- if (prob(8))
- affected_mob << "Your throat feels very scratchy."
- affected_mob.take_organ_damage(1)
- /*
- if (prob(8))
- affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
- */
- if (prob(10))
- affected_mob << "Your skin feels tight."
- affected_mob.take_organ_damage(5)
- if (prob(4))
- affected_mob << "You feel a stabbing pain in your head."
- affected_mob.Paralyse(2)
- if (prob(4))
- affected_mob << "You can feel something move...inside."
- if(4)
- if (prob(10))
- affected_mob << pick("Your skin feels very tight.", "Your blood boils!")
- affected_mob.take_organ_damage(8)
- if (prob(20))
- affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"))
- if (prob(8))
- affected_mob << "You can feel... something...inside you."
- if(5)
- affected_mob <<"Your skin feels impossibly calloused..."
- affected_mob.adjustToxLoss(10)
- affected_mob.updatehealth()
- if(prob(40))
- if(gibbed != 0) return 0
- var/turf/T = find_loc(affected_mob)
- gibs(T)
- gibbed = 1
- affected_mob:Alienize()
-
diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm
index 32b5a313094..0b2d5377904 100644
--- a/code/datums/gas_mixture.dm
+++ b/code/datums/gas_mixture.dm
@@ -502,11 +502,11 @@ What are the archived variables for?
return 1
-/datum/gas_mixture/check_turf(turf/model)
- var/delta_oxygen = (oxygen_archived - model.oxygen)/5
- var/delta_carbon_dioxide = (carbon_dioxide_archived - model.carbon_dioxide)/5
- var/delta_nitrogen = (nitrogen_archived - model.nitrogen)/5
- var/delta_toxins = (toxins_archived - model.toxins)/5
+/datum/gas_mixture/check_turf(turf/model, atmos_adjacent_turfs = 4)
+ var/delta_oxygen = (oxygen_archived - model.oxygen)/(atmos_adjacent_turfs+1)
+ var/delta_carbon_dioxide = (carbon_dioxide_archived - model.carbon_dioxide)/(atmos_adjacent_turfs+1)
+ var/delta_nitrogen = (nitrogen_archived - model.nitrogen)/(atmos_adjacent_turfs+1)
+ var/delta_toxins = (toxins_archived - model.toxins)/(atmos_adjacent_turfs+1)
var/delta_temperature = (temperature_archived - model.temperature)
@@ -525,6 +525,29 @@ What are the archived variables for?
return 1
+/datum/gas_mixture/proc/check_turf_total(turf/model)
+ var/delta_oxygen = (oxygen - model.oxygen)
+ var/delta_carbon_dioxide = (carbon_dioxide - model.carbon_dioxide)
+ var/delta_nitrogen = (nitrogen - model.nitrogen)
+ var/delta_toxins = (toxins - model.toxins)
+
+ var/delta_temperature = (temperature - model.temperature)
+
+ if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= oxygen*MINIMUM_AIR_RATIO_TO_SUSPEND)) \
+ || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= carbon_dioxide*MINIMUM_AIR_RATIO_TO_SUSPEND)) \
+ || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= nitrogen*MINIMUM_AIR_RATIO_TO_SUSPEND)) \
+ || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= toxins*MINIMUM_AIR_RATIO_TO_SUSPEND)))
+ return 0
+ if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND)
+ return 0
+
+ if(trace_gases.len)
+ for(var/datum/gas/trace_gas in trace_gases)
+ if(trace_gas.moles > MINIMUM_AIR_TO_SUSPEND*4)
+ return 0
+
+ return 1
+
/datum/gas_mixture/share(datum/gas_mixture/sharer, var/atmos_adjacent_turfs = 4)
if(!sharer) return 0
var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/(atmos_adjacent_turfs+1)
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
new file mode 100644
index 00000000000..9eaeb1f03a2
--- /dev/null
+++ b/code/datums/hud.dm
@@ -0,0 +1,76 @@
+/* HUD DATUMS */
+
+//GLOBAL HUD LIST
+var/datum/atom_hud/huds = list( \
+ DATA_HUD_SECURITY_BASIC = new/datum/atom_hud/data/security/basic(), \
+ DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/security/advanced(), \
+ DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/medical/basic(), \
+ DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/medical/advanced(), \
+ ANTAG_HUD_CULT = new/datum/atom_hud/antag(), \
+ ANTAG_HUD_REV = new/datum/atom_hud/antag(), \
+ ANTAG_HUD_OPS = new/datum/atom_hud/antag(), \
+ ANTAG_HUD_GANG_A = new/datum/atom_hud/antag(), \
+ ANTAG_HUD_GANG_B = new/datum/atom_hud/antag(), \
+ )
+
+/mob/proc/refresh_huds(var/mob/inherited_from = null)
+ var/mob/seek_for = (inherited_from) ? inherited_from : src
+ var/image/oldantagicon = seek_for.hud_list[ANTAG_HUD]
+ var/image/newantagicon = hud_list[ANTAG_HUD]
+ if(oldantagicon && oldantagicon.icon_state)
+ newantagicon.icon_state = oldantagicon.icon_state
+ if(istype(inherited_from, /mob/dead/observer))
+ var/mob/dead/observer/G = inherited_from
+ for(var/datum/atom_hud/hud in G.oldhuds)
+ readd_hud(hud)
+ else
+ for(var/datum/atom_hud/hud in huds)
+ if(seek_for in hud.hudusers)
+ readd_hud(hud)
+
+/mob/proc/readd_hud(var/datum/atom_hud/hud)
+ hud.readd_hud(src)
+
+/mob/dead/observer/readd_hud(var/datum/atom_hud/hud)
+ oldhuds |= hud
+
+/datum/atom_hud
+ var/list/atom/hudatoms = list() //list of all atoms which display this hud
+ var/list/mob/hudusers = list() //list with all mobs who can see the hud
+ var/list/hud_icons = list() //these will be the indexes for the atom's hud_list
+
+/datum/atom_hud/proc/remove_hud_from(var/mob/M)
+ for(var/atom/A in hudatoms)
+ remove_from_single_hud(M, A)
+ hudusers -= M
+
+/datum/atom_hud/proc/remove_from_hud(var/atom/A)
+ for(var/mob/M in hudusers)
+ remove_from_single_hud(M, A)
+ hudatoms -= A
+
+/datum/atom_hud/proc/remove_from_single_hud(var/mob/M, var/atom/A) //unsafe, no sanity apart from client
+ if(!M.client)
+ return
+ for(var/i in hud_icons)
+ M.client.images -= A.hud_list[i]
+
+/datum/atom_hud/proc/add_hud_to(var/mob/M)
+ hudusers |= M
+ for(var/atom/A in hudatoms)
+ add_to_single_hud(M, A)
+
+/datum/atom_hud/proc/add_to_hud(var/atom/A)
+ hudatoms |= A
+ for(var/mob/M in hudusers)
+ add_to_single_hud(M, A)
+
+/datum/atom_hud/proc/add_to_single_hud(var/mob/M, var/atom/A) //unsafe, no sanity apart from client
+ if(!M.client)
+ return
+ for(var/i in hud_icons)
+ M.client.images |= A.hud_list[i]
+
+/datum/atom_hud/proc/readd_hud(var/mob/M)
+ add_hud_to(M)
+
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 581bb6bfe7f..51e2fa251f7 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -75,6 +75,7 @@
if(new_character.mind) //disassociate any mind currently in our new body's mind variable
new_character.mind.current = null
+ new_character.refresh_huds(current) //inherit the HUDs from the old body
current = new_character //associate ourself with our new body
new_character.mind = src //and associate our new body with ourself
@@ -966,7 +967,7 @@
log_admin("[key_name(usr)] has traitor'ed [current].")
if(isAI(current))
var/mob/living/silicon/ai/A = current
- call(/datum/game_mode/proc/add_law_zero)(A)
+ ticker.mode.add_law_zero(A)
A.show_laws()
if("autoobjectives")
@@ -1003,9 +1004,9 @@
src = null
M = H.monkeyize()
src = M.mind
- current.contract_disease(new /datum/disease/transformation/jungle_fever,1,0)
+ current.ForceContractDisease(new /datum/disease/transformation/jungle_fever)
else if (istype(M))
- current.contract_disease(new /datum/disease/transformation/jungle_fever,1,0)
+ current.ForceContractDisease(new /datum/disease/transformation/jungle_fever)
if("human")
if (check_rights(R_ADMIN, 0))
var/mob/living/carbon/human/H = current
diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm
index b2ced9fa0d5..7103eb17765 100644
--- a/code/datums/spells/area_teleport.dm
+++ b/code/datums/spells/area_teleport.dm
@@ -54,11 +54,12 @@
var/success = 0
while(tempL.len)
attempt = pick(tempL)
- success = target.Move(attempt)
- if(!success)
- tempL.Remove(attempt)
- else
+ target.Move(attempt)
+ if(get_turf(target) == attempt)
+ success = 1
break
+ else
+ tempL.Remove(attempt)
if(!success)
target.loc = pick(L)
@@ -79,4 +80,4 @@
if("whisper")
usr.whisper("[invocation] [uppertext(chosenarea.name)]")
- return
\ No newline at end of file
+ return
diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm
index 30567e3fe18..b17b5746801 100644
--- a/code/datums/spells/conjure.dm
+++ b/code/datums/spells/conjure.dm
@@ -12,7 +12,6 @@
var/list/newVars = list() //vars of the summoned objects will be replaced with those where they meet
//should have format of list("emagged" = 1,"name" = "Wizard's Justicebot"), for example
- var/delay = 1//Go Go Gadget Inheritance
var/cast_sound = 'sound/items/welder.ogg'
@@ -25,39 +24,31 @@
if(cast_sound)
playsound(src.loc, cast_sound, 50, 1)
- if(do_after(usr,delay))
- for(var/i=0,iSubject Status:
"
var/scanner_status
var/temp_html
- if(connected)
+ if(connected && connected.is_operational())
if(connected.occupant) //set occupant_status message
viable_occupant = connected.occupant
if(check_dna_integrity(viable_occupant) && (!(NOCLONE in viable_occupant.mutations) || (connected.scan_level == 3))) //occupent is viable for dna modification
diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm
new file mode 100644
index 00000000000..4e5666202c0
--- /dev/null
+++ b/code/game/gamemodes/antag_hud.dm
@@ -0,0 +1,17 @@
+/datum/atom_hud/antag
+ hud_icons = list(ANTAG_HUD)
+
+/datum/atom_hud/antag/proc/join_hud(var/mob/M)
+ add_to_hud(M)
+ add_hud_to(M)
+
+/datum/atom_hud/antag/proc/leave_hud(var/mob/M)
+ remove_from_hud(M)
+ remove_hud_from(M)
+
+/datum/atom_hud/antag/readd_hud(var/mob/M)
+ join_hud(M)
+
+/datum/game_mode/proc/set_antag_hud(var/mob/M, var/new_icon_state)
+ var/image/holder = M.hud_list[ANTAG_HUD]
+ holder.icon_state = new_icon_state
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index c1325118245..ce290d754f1 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -126,7 +126,8 @@
A.blob_act()
return 1
-/obj/effect/blob/ex_act(severity)
+/obj/effect/blob/ex_act(severity, specialty)
+ ..()
var/damage = 150
health -= ((damage/brute_resist) - (severity * 5))
update_icon()
@@ -149,8 +150,9 @@
L.blob_act()
-/obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/user)
+/obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
src.visible_message("The [src.name] has been attacked with \the [W][(user ? " by [user]" : "")]!")
var/damage = 0
@@ -168,6 +170,7 @@
/obj/effect/blob/attack_animal(mob/living/simple_animal/M as mob)
M.changeNext_move(CLICK_CD_MELEE)
+ M.do_attack_animation(src)
playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
src.visible_message("The [src.name] has been attacked by \the [M]!")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index d0a5ec0ba2c..eff9b4e843a 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -91,16 +91,28 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
..()
/datum/game_mode/proc/forge_changeling_objectives(var/datum/mind/changeling)
- //OBJECTIVES - Always absorb at least 5 genomes, plus random traitor objectives.
- //If they have two objectives as well as absorb, they must survive rather than escape
+ //OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft".
//No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting
//If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone
+
var/datum/objective/absorb/absorb_objective = new
absorb_objective.owner = changeling
absorb_objective.gen_amount_goal(6, 8)
changeling.objectives += absorb_objective
+ if(prob(60))
+ var/datum/objective/steal/steal_objective = new
+ steal_objective.owner = changeling
+ steal_objective.find_target()
+ changeling.objectives += steal_objective
+ else
+ var/datum/objective/debrain/debrain_objective = new
+ debrain_objective.owner = changeling
+ debrain_objective.find_target()
+ changeling.objectives += debrain_objective
+
+
var/list/active_ais = active_ais()
if(active_ais.len && prob(100/joined_player_list.len))
var/datum/objective/destroy/destroy_objective = new
@@ -119,22 +131,23 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
maroon_objective.find_target()
changeling.objectives += maroon_objective
- if(prob(60))
- var/datum/objective/steal/steal_objective = new
- steal_objective.owner = changeling
- steal_objective.find_target()
- changeling.objectives += steal_objective
- else
- var/datum/objective/debrain/debrain_objective = new
- debrain_objective.owner = changeling
- debrain_objective.find_target()
- changeling.objectives += debrain_objective
+ if (!(locate(/datum/objective/escape) in changeling.objectives))
+ var/datum/objective/escape/escape_with_identity/identity_theft = new
+ identity_theft.owner = changeling
+ identity_theft.target = maroon_objective.target
+ identity_theft.update_explanation_text()
+ changeling.objectives += identity_theft
if (!(locate(/datum/objective/escape) in changeling.objectives))
- var/datum/objective/escape/escape_objective = new
- escape_objective.owner = changeling
- changeling.objectives += escape_objective
-
+ if(prob(50))
+ var/datum/objective/escape/escape_objective = new
+ escape_objective.owner = changeling
+ changeling.objectives += escape_objective
+ else
+ var/datum/objective/escape/escape_with_identity/identity_theft = new
+ identity_theft.owner = changeling
+ identity_theft.find_target()
+ changeling.objectives += identity_theft
return
/datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1)
@@ -217,6 +230,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
/datum/changeling //stores changeling powers, changeling recharge thingie, changeling absorbed DNA and changeling ID (for changeling hivemind)
var/list/absorbed_dna = list()
+ var/list/protected_dna = list() //dna that is not lost when capacity is otherwise full
var/dna_max = 4 //How many extra DNA strands the changeling can store for transformation.
var/absorbedcount = 1 //We would require at least 1 sample of compatible DNA to have taken on the form of a human.
var/chem_charges = 20
@@ -255,27 +269,30 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
/datum/changeling/proc/get_dna(var/dna_owner)
- for(var/datum/dna/DNA in absorbed_dna)
+ for(var/datum/dna/DNA in (absorbed_dna+protected_dna))
if(dna_owner == DNA.real_name)
return DNA
+/datum/changeling/proc/has_dna(var/datum/dna/tDNA)
+ for(var/datum/dna/D in (absorbed_dna+protected_dna))
+ if(tDNA.is_same_as(D))
+ return 1
+ return 0
+
/datum/changeling/proc/can_absorb_dna(var/mob/living/carbon/user, var/mob/living/carbon/target)
if(absorbed_dna[1] == user.dna)//If our current DNA is the stalest, we gotta ditch it.
user << "We have reached our capacity to store genetic information! We must transform before absorbing more."
return
if(!target)
return
- if(NOCLONE in target.mutations || HUSK in target.mutations)
+ if((NOCLONE in target.mutations) || (HUSK in target.mutations))
user << "DNA of [target] is ruined beyond usability!"
return
if(!ishuman(target))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway!
user << "We could gain no benefit from absorbing a lesser creature."
return
- var/datum/dna/tDna = target.dna
- for(var/datum/dna/D in absorbed_dna)
- if(tDna.is_same_as(D))
- user << "We already have that DNA in storage."
- return
+ if(has_dna(target.dna))
+ user << "We already have this DNA in storage!"
if(!check_dna_integrity(target))
user << "[target] is not compatible with our biology."
return
diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm
index c7ff6471f7b..e8caa412086 100644
--- a/code/game/gamemodes/changeling/evolution_menu.dm
+++ b/code/game/gamemodes/changeling/evolution_menu.dm
@@ -259,7 +259,7 @@ var/list/sting_paths
- Evolve [P][ownsthis ? " - Purchased" : ((P.dna_cost > 1) ? " - Cost: [P.dna_cost]" : "")]
+ Evolve [P][ownsthis ? " - Purchased" : (P.req_dna>changeling.absorbedcount ? " - Requires [P.req_dna] absorptions" : " - Cost: [P.dna_cost]")]
@@ -312,6 +312,10 @@ var/list/sting_paths user << "This is awkward. Changeling power purchase failed, please report this bug to a coder!" return + if(absorbedcount < thepower.req_dna) + user << "We lack the energy to evolve this ability!" + return + if(has_sting(thepower)) user << "We have already evolved this ability!" return @@ -334,14 +338,17 @@ var/list/sting_paths //Reselect powers /datum/changeling/proc/lingRespec(var/mob/user) + if(!ishuman(user)) + user << "We can't remove our evolutions in this form!" + return if(canrespec) - user << "We have removed our evolutions from this form, and are now ready to readapt." + user << "We have removed our evolutions from this form, and are now ready to readapt." user.remove_changeling_powers(1) canrespec = 0 user.make_changeling() return 1 else - user << "You lack the power to readapt your evolutions!" + user << "You lack the power to readapt your evolutions!" return 0 /mob/proc/make_changeling() @@ -361,7 +368,7 @@ var/list/sting_paths if(!S.dna_cost) if(!mind.changeling.has_sting(S)) mind.changeling.purchasedpowers+=S - S.on_purchase(src) + S.on_purchase(src) var/mob/living/carbon/C = src //only carbons have dna now, so we have to typecaste mind.changeling.absorbed_dna |= C.dna diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index bd1b910f90e..2ee15c20d73 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -32,6 +32,7 @@ var/datum/changeling/changeling = user.mind.changeling var/obj/item/weapon/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting + changeling.isabsorbing = 1 for(var/stage = 1, stage<=3, stage++) switch(stage) if(1) @@ -55,7 +56,8 @@ user.visible_message("[user] sucks the fluids from [target]!") target << "You have been absorbed by the changeling!" - changeling.absorb_dna(target) + if(!changeling.has_dna(target.dna)) + changeling.absorb_dna(target, user) if(user.nutrition < 400) user.nutrition = min((user.nutrition + target.nutrition), 400) @@ -65,12 +67,13 @@ if(target.mind.changeling)//If the target was a changeling, suck out their extra juice and objective points! changeling.chem_charges += min(target.mind.changeling.chem_charges, changeling.chem_storage) - changeling.absorbedcount += target.mind.changeling.absorbedcount + changeling.absorbedcount += (target.mind.changeling.absorbedcount) target.mind.changeling.absorbed_dna.len = 1 target.mind.changeling.absorbedcount = 0 - else - changeling.chem_charges += 10 + + + changeling.chem_charges=min(changeling.chem_charges+10, changeling.chem_storage) changeling.isabsorbing = 0 changeling.canrespec = 1 @@ -82,7 +85,7 @@ //Absorbs the target DNA. -/datum/changeling/proc/absorb_dna(mob/living/carbon/T) +/datum/changeling/proc/absorb_dna(mob/living/carbon/T, var/mob/user) if(absorbed_dna.len) absorbed_dna.Cut(1,2) T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. @@ -93,5 +96,12 @@ new_dna.species = T.dna.species new_dna.mutant_color = T.dna.mutant_color new_dna.blood_type = T.dna.blood_type - absorbed_dna |= new_dna //And add the target DNA to our absorbed list. - absorbedcount++ //all that done, let's increment the objective counter. \ No newline at end of file + absorbedcount++ + store_dna(new_dna, user) + +/datum/changeling/proc/store_dna(var/datum/dna/new_dna, var/mob/user) + for(var/datum/objective/escape/escape_with_identity/E in user.mind.objectives) + if(E.target_real_name == new_dna.real_name) + protected_dna |= new_dna + return + absorbed_dna |= new_dna diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index a36cf8f2351..6e7add1edf2 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -31,7 +31,7 @@ var/list/datum/dna/hivemind_bank = list() /obj/effect/proc_holder/changeling/hivemind_upload/sting_action(var/mob/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() - for(var/datum/dna/DNA in changeling.absorbed_dna) + for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna)) if(!(DNA in hivemind_bank)) names += DNA.real_name @@ -86,7 +86,7 @@ var/list/datum/dna/hivemind_bank = list() if(changeling.absorbed_dna.len) changeling.absorbed_dna.Cut(1,2) - changeling.absorbed_dna |= chosen_dna + changeling.store_dna(chosen_dna, user) user << "We absorb the DNA of [S] from the air." feedback_add_details("changeling_powers","HD") return 1 \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm index 951cdf80f54..9cccaf83609 100644 --- a/code/game/gamemodes/changeling/powers/humanform.dm +++ b/code/game/gamemodes/changeling/powers/humanform.dm @@ -6,11 +6,12 @@ req_dna = 1 max_genetic_damage = 3 + //Transform into a human. /obj/effect/proc_holder/changeling/humanform/sting_action(var/mob/living/carbon/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() - for(var/datum/dna/DNA in changeling.absorbed_dna) + for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna)) names += "[DNA.real_name]" var/chosen_name = input("Select the target DNA: ", "Target DNA", null) as null|anything in names diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 5781e7e7208..9fc79f95186 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -144,7 +144,7 @@ return if(istype(target, /obj/structure/table)) var/obj/structure/table/T = target - T.table_destroy(1, user) + T.table_destroy(1) else if(istype(target, /obj/machinery/computer)) var/obj/machinery/computer/C = target diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 36842d319c5..ce93fa5d416 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -25,5 +25,7 @@ user.status_flags &= ~(FAKEDEATH) user.update_canmove() user.mind.changeling.purchasedpowers -= src + user.med_hud_set_status() + user.med_hud_set_health() feedback_add_details("changeling_powers","CR") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/spiders.dm b/code/game/gamemodes/changeling/powers/spiders.dm index 693c38ee449..b081d4d2f79 100644 --- a/code/game/gamemodes/changeling/powers/spiders.dm +++ b/code/game/gamemodes/changeling/powers/spiders.dm @@ -10,7 +10,7 @@ /obj/effect/proc_holder/changeling/spiders/sting_action(var/mob/user) for(var/i=0, i<2, i++) var/obj/effect/spider/spiderling/S = new(user.loc) - S.grow_as = /mob/living/simple_animal/hostile/giant_spider/hunter + S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter feedback_add_details("changeling_powers","SI") return 1 diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 5ebff603d96..f25022ce6f3 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -70,6 +70,9 @@ /obj/effect/proc_holder/changeling/sting/transformation/Click() var/mob/user = usr var/datum/changeling/changeling = user.mind.changeling + if(changeling.chosen_sting) + unset_sting(user) + return selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA") if(!selected_dna) return @@ -105,9 +108,10 @@ obj/effect/proc_holder/changeling/sting/extract_dna if(..()) return user.mind.changeling.can_absorb_dna(user, target) -/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/living/carbon/human/target) add_logs(user, target, "stung", object="extraction sting") - user.mind.changeling.absorb_dna(target, user) + if(!(user.mind.changeling.has_dna(target.dna))) + user.mind.changeling.absorb_dna(target, user) feedback_add_details("changeling_powers","ED") return 1 diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm index b6954ccf79c..b732844dc45 100644 --- a/code/game/gamemodes/changeling/powers/transform.dm +++ b/code/game/gamemodes/changeling/powers/transform.dm @@ -27,7 +27,7 @@ /datum/changeling/proc/select_dna(var/prompt, var/title) var/list/names = list() - for(var/datum/dna/DNA in absorbed_dna) + for(var/datum/dna/DNA in (absorbed_dna+protected_dna)) names += "[DNA.real_name]" var/chosen_name = input(prompt, title, null) as null|anything in names diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index eb67ca4895d..a8394f6235f 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -241,52 +241,15 @@ for(var/mob/M in viewers(cult_mind.current)) M << "[cult_mind.current] looks like they just reverted to their old faith!" -/datum/game_mode/proc/update_all_cult_icons() - spawn(0) - for(var/datum/mind/cultist in cult) - if(cultist.current) - if(cultist.current.client) - for(var/image/I in cultist.current.client.images) - if(I.icon_state == "cult") - del(I) - - for(var/datum/mind/cultist in cult) - if(cultist.current) - if(cultist.current.client) - for(var/datum/mind/cultist_1 in cult) - if(cultist_1.current) - var/I = image('icons/mob/mob.dmi', loc = cultist_1.current, icon_state = "cult") - cultist.current.client.images += I - - /datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind) - spawn(0) - for(var/datum/mind/cultist in cult) - if(cultist.current) - if(cultist.current.client) - var/I = image('icons/mob/mob.dmi', loc = cult_mind.current, icon_state = "cult") - cultist.current.client.images += I - if(cult_mind.current) - if(cult_mind.current.client) - var/image/J = image('icons/mob/mob.dmi', loc = cultist.current, icon_state = "cult") - cult_mind.current.client.images += J - + var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT] + culthud.join_hud(cult_mind.current) + set_antag_hud(cult_mind.current, "cult") /datum/game_mode/proc/update_cult_icons_removed(datum/mind/cult_mind) - spawn(0) - for(var/datum/mind/cultist in cult) - if(cultist.current) - if(cultist.current.client) - for(var/image/I in cultist.current.client.images) - if(I.icon_state == "cult" && I.loc == cult_mind.current) - del(I) - - if(cult_mind.current) - if(cult_mind.current.client) - for(var/image/I in cult_mind.current.client.images) - if(I.icon_state == "cult") - del(I) - + var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT] + culthud.leave_hud(cult_mind.current) + set_antag_hud(cult_mind.current, null) /datum/game_mode/cult/proc/get_unconvertables() var/list/ucs = list() diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 33f9322f2f5..d56d30213d5 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -538,131 +538,125 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if (!istype(user.loc,/turf)) user << "You do not have enough space to write a proper rune." return - - - - - if (C>=26+runedec+ticker.mode.cult.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist - alert("The cloth of reality can't take that much of a strain. Remove some runes first!") - return - else - switch(alert("You open the tome",,"Commune","Scribe a rune", "Notes")) //Fuck the "Cancel" option. Rewrite the whole tome interface yourself if you want it to work better. And input() is just ugly. - K0000 - if("Cancel") + switch(alert("You open the tome",,"Commune","Scribe a rune", "Notes")) //Fuck the "Cancel" option. Rewrite the whole tome interface yourself if you want it to work better. And input() is just ugly. - K0000 + if("Cancel") + return + if("Commune") + if(usr.get_active_hand() != src) return - if("Commune") - if(usr.get_active_hand() != src) - return - var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "") - if(!input) - return - usr.whisper("O bidai nabora se[pick("'","`")]sma!") - usr.whisper("[input]") - for(var/datum/mind/H in ticker.mode.cult) - if (H.current) - H.current << "[input]" + var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "") + if(!input) return - if("Notes") - if(usr.get_active_hand() != src) - return - notedat = {" - Read the Arcane Tome. -
Word translation notes
- [words[1]] is [words[words[1]]] Clear
- [words[2]] is [words[words[2]]] Clear
- [words[3]] is [words[words[3]]] Clear
- [words[4]] is [words[words[4]]] Clear
- [words[5]] is [words[words[5]]] Clear
- [words[6]] is [words[words[6]]] Clear
- [words[7]] is [words[words[7]]] Clear
- [words[8]] is [words[words[8]]] Clear
- [words[9]] is [words[words[9]]] Clear
- [words[10]] is [words[words[10]]] Clear
- "} // whoever screwed the tabbing on this originally is an asshole. + usr.whisper("O bidai nabora se[pick("'","`")]sma!") + usr.whisper("[input]") + for(var/datum/mind/H in ticker.mode.cult) + if (H.current) + H.current << "[input]" + return + if("Notes") + if(usr.get_active_hand() != src) + return + notedat = {" + Read the Arcane Tome. +
Word translation notes
+ [words[1]] is [words[words[1]]] Clear
+ [words[2]] is [words[words[2]]] Clear
+ [words[3]] is [words[words[3]]] Clear
+ [words[4]] is [words[words[4]]] Clear
+ [words[5]] is [words[words[5]]] Clear
+ [words[6]] is [words[words[6]]] Clear
+ [words[7]] is [words[words[7]]] Clear
+ [words[8]] is [words[words[8]]] Clear
+ [words[9]] is [words[words[9]]] Clear
+ [words[10]] is [words[words[10]]] Clear
+ "} // whoever screwed the tabbing on this originally is an asshole. // call(/obj/item/weapon/tome/proc/edit_notes)() - user << browse("[notedat]", "window=notes") + user << browse("[notedat]", "window=notes") + return + if("Scribe a rune") //fixed more assbackward tabbing + if(usr.get_active_hand() != src) return - if("Scribe a rune") //fixed more assbackward tabbing + if (C>=26+runedec+ticker.mode.cult.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist + alert("The cloth of reality can't take that much of a strain. Remove some runes first!") + return + var/list/dictionary = list( + "convert" = list("join","blood","self"), + "wall" = list("destroy","travel","self"), + "blood boil" = list("destroy","see","blood"), + "blood drain" = list("travel","blood","self"), + "raise dead" = list("blood","join","hell"), + "summon narsie" = list("hell","join","self"), + "communicate" = list("self","other","technology"), + "emp" = list("destroy","see","technology"), + "manifest" = list("blood","see","travel"), + "summon tome" = list("see","blood","hell"), + "see invisible" = list("see","hell","join"), + "hide" = list("hide","see","blood"), + "reveal" = list("blood","see","hide"), + "astral journey" = list("hell","travel","self"), + "imbue" = list("hell","technology","join"), + "sacrifice" = list("hell","blood","join"), + "summon cultist" = list("join","other","self"), + "free cultist" = list("travel","technology","other"), + "deafen" = list("hide","other","see"), + "blind" = list("destroy","see","other"), + "stun" = list("join","hide","technology"), + "armor" = list("hell","destroy","other"), + "teleport" = list("travel","self"), + "teleport other" = list("travel","other"), + "summon shell" = list("travel","hell","technology") + ) + + + var/list/scribewords = list("none") + + var/list/english = list() + + for (var/entry in words) + if (words[entry] != entry) + english+=list(words[entry] = entry) + + for (var/entry in dictionary) + var/list/required = dictionary[entry] + if (length(english&required) == required.len) + scribewords += entry + + var/chosen_rune = null + + + if(usr) + chosen_rune = input ("Choose a rune to scribe.") in scribewords + if (!chosen_rune) + return + if (chosen_rune == "none") + user << "You decide against scribing a rune, perhaps you should take this time to study your notes." + return + if (chosen_rune == "teleport") + dictionary[chosen_rune] += input ("Choose a destination word") in english + if (chosen_rune == "teleport other") + dictionary[chosen_rune] += input ("Choose a destination word") in english + + if(user.get_active_hand() != src) + return + + for (var/mob/V in viewers(src)) + V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2) + user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world." + user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage + if(do_after(user, 50)) if(usr.get_active_hand() != src) return - - var/list/dictionary = list( - "convert" = list("join","blood","self"), - "wall" = list("destroy","travel","self"), - "blood boil" = list("destroy","see","blood"), - "blood drain" = list("travel","blood","self"), - "raise dead" = list("blood","join","hell"), - "summon narsie" = list("hell","join","self"), - "communicate" = list("self","other","technology"), - "emp" = list("destroy","see","technology"), - "manifest" = list("blood","see","travel"), - "summon tome" = list("see","blood","hell"), - "see invisible" = list("see","hell","join"), - "hide" = list("hide","see","blood"), - "reveal" = list("blood","see","hide"), - "astral journey" = list("hell","travel","self"), - "imbue" = list("hell","technology","join"), - "sacrifice" = list("hell","blood","join"), - "summon cultist" = list("join","other","self"), - "free cultist" = list("travel","technology","other"), - "deafen" = list("hide","other","see"), - "blind" = list("destroy","see","other"), - "stun" = list("join","hide","technology"), - "armor" = list("hell","destroy","other"), - "teleport" = list("travel","self"), - "teleport other" = list("travel","other"), - "summon shell" = list("travel","hell","technology") - ) - - - var/list/scribewords = list("none") - - var/list/english = list() - - for (var/entry in words) - if (words[entry] != entry) - english+=list(words[entry] = entry) - - for (var/entry in dictionary) - var/list/required = dictionary[entry] - if (length(english&required) == required.len) - scribewords += entry - - var/chosen_rune = null - - - if(usr) - chosen_rune = input ("Choose a rune to scribe.") in scribewords - if (!chosen_rune) - return - if (chosen_rune == "none") - user << "You decide against scribing a rune, perhaps you should take this time to study your notes." - return - if (chosen_rune == "teleport") - dictionary[chosen_rune] += input ("Choose a destination word") in english - if (chosen_rune == "teleport other") - dictionary[chosen_rune] += input ("Choose a destination word") in english - - if(user.get_active_hand() != src) - return - - for (var/mob/V in viewers(src)) - V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2) - user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world." - user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage - if(do_after(user, 50)) - if(usr.get_active_hand() != src) - return - var/mob/living/carbon/human/H = user - var/obj/effect/rune/R = new /obj/effect/rune(user.loc) - user << "You finish drawing the arcane markings of the Geometer." - var/list/required = dictionary[chosen_rune] - R.word1 = english[required[1]] - R.word2 = english[required[2]] - R.word3 = english[required[3]] - R.check_icon() - R.blood_DNA = list() - R.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type - return + var/mob/living/carbon/human/H = user + var/obj/effect/rune/R = new /obj/effect/rune(user.loc) + user << "You finish drawing the arcane markings of the Geometer." + var/list/required = dictionary[chosen_rune] + R.word1 = english[required[1]] + R.word2 = english[required[2]] + R.word3 = english[required[3]] + R.check_icon() + R.blood_DNA = list() + R.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type + return else user << "The book seems full of illegible scribbles. Is this a joke?" return diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 9a4374959f7..718f9ad8d65 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -233,127 +233,41 @@ gangster_mind.current.visible_message("[gangster_mind.current] looks like they've given up the life of crime!") gangster_mind.current << "You have been reformed! You are no longer a gangster!" - update_gang_icons_removed(gangster_mind) + update_gang_icons_removed(gangster_mind, gang) +/////////////////////// +//Add/remove gang HUD// +/////////////////////// +/datum/game_mode/proc/get_gang_hud(var/gang) + var/datum/atom_hud/antag/ganghud = null + switch(gang) + if("A") ganghud = huds[ANTAG_HUD_GANG_A] + if("B") ganghud = huds[ANTAG_HUD_GANG_B] + return ganghud -///////////////////////////////////////////////////////////////////////////////////////////////// -//Keeps track of players having the correct icons//////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/update_all_gang_icons() - spawn(0) - var/list/all_gangsters = A_bosses + B_bosses + A_gangsters + B_gangsters +/datum/game_mode/proc/get_gang_bosses(var/gang) + var/bosses = null + switch(gang) + if("A") bosses = A_bosses + if("B") bosses = B_bosses + return bosses - //Delete all gang icons - for(var/datum/mind/gang_mind in all_gangsters) - if(gang_mind.current) - if(gang_mind.current.client) - for(var/image/I in gang_mind.current.client.images) - if(I.icon_state == "gangster" || I.icon_state == "gang_boss") - del(I) - - update_gang_icons("A") - update_gang_icons("B") - -/datum/game_mode/proc/update_gang_icons(var/gang) - var/list/bosses - var/list/gangsters - if(gang == "A") - bosses = A_bosses - gangsters = A_gangsters - else if(gang == "B") - bosses = B_bosses - gangsters = B_gangsters - else - world << "ERROR: Invalid gang in update_gang_icons()" - - //Update gang icons for boss' visions - for(var/datum/mind/boss_mind in bosses) - if(boss_mind.current) - if(boss_mind.current.client) - for(var/datum/mind/gangster_mind in gangsters) - if(gangster_mind.current) - var/I = image('icons/mob/mob.dmi', loc = gangster_mind.current, icon_state = "gangster") - boss_mind.current.client.images += I - for(var/datum/mind/boss2_mind in bosses) - if(boss2_mind.current) - var/I = image('icons/mob/mob.dmi', loc = boss2_mind.current, icon_state = "gang_boss") - boss_mind.current.client.images += I - - //Update boss and self icons for gangsters' visions - for(var/datum/mind/gangster_mind in gangsters) - if(gangster_mind.current) - if(gangster_mind.current.client) - for(var/datum/mind/boss_mind in bosses) - if(boss_mind.current) - var/I = image('icons/mob/mob.dmi', loc = boss_mind.current, icon_state = "gang_boss") - gangster_mind.current.client.images += I - //Tag themselves to see - var/K - if(gangster_mind in bosses) //If the new gangster is a boss himself - K = image('icons/mob/mob.dmi', loc = gangster_mind.current, icon_state = "gang_boss") - else - K = image('icons/mob/mob.dmi', loc = gangster_mind.current, icon_state = "gangster") - gangster_mind.current.client.images += K - -///////////////////////////////////////////////// -//Assigns icons when a new gangster is recruited// -///////////////////////////////////////////////// /datum/game_mode/proc/update_gang_icons_added(datum/mind/recruit_mind, var/gang) - var/list/bosses - if(gang == "A") - bosses = A_bosses - else if(gang == "B") - bosses = B_bosses - if(!gang) - world << "ERROR: Invalid gang in update_gang_icons_added()" + var/datum/atom_hud/antag/ganghud = get_gang_hud(gang) + var/bosses = get_gang_bosses(gang) + if(!ganghud) + ERROR("Invalid gang in update_gang_icons_added(): [gang]") - spawn(0) - for(var/datum/mind/boss_mind in bosses) - //Tagging the new gangster for the bosses to see - if(boss_mind.current) - if(boss_mind.current.client) - var/I - if(recruit_mind in bosses) //If the new gangster is a boss himself - I = image('icons/mob/mob.dmi', loc = recruit_mind.current, icon_state = "gang_boss") - else - I = image('icons/mob/mob.dmi', loc = recruit_mind.current, icon_state = "gangster") - boss_mind.current.client.images += I - //Tagging every boss for the new gangster to see - if(recruit_mind.current) - if(recruit_mind.current.client) - var/image/J = image('icons/mob/mob.dmi', loc = boss_mind.current, icon_state = "gang_boss") - recruit_mind.current.client.images += J - //Tag themselves to see - if(recruit_mind.current) - if(recruit_mind.current.client) - var/K - if(recruit_mind in bosses) //If the new gangster is a boss himself - K = image('icons/mob/mob.dmi', loc = recruit_mind.current, icon_state = "gang_boss") - else - K = image('icons/mob/mob.dmi', loc = recruit_mind.current, icon_state = "gangster") - recruit_mind.current.client.images += K + ganghud.join_hud(recruit_mind.current) + set_antag_hud(recruit_mind.current, ((recruit_mind in bosses) ? "gang_boss" : "gangster")) -//////////////////////////////////////// -//Keeps track of deconverted gangsters// -//////////////////////////////////////// -/datum/game_mode/proc/update_gang_icons_removed(datum/mind/defector_mind) - var/list/all_gangsters = A_bosses + B_bosses + A_gangsters + B_gangsters +/datum/game_mode/proc/update_gang_icons_removed(datum/mind/defector_mind, var/gang) + var/datum/atom_hud/antag/ganghud = get_gang_hud(gang) + if(!ganghud) + ERROR("Invalid gang in update_gang_icons_removed(): [gang]") - spawn(0) - //Remove defector's icon from gangsters' visions - for(var/datum/mind/boss_mind in all_gangsters) - if(boss_mind.current) - if(boss_mind.current.client) - for(var/image/I in boss_mind.current.client.images) - if((I.icon_state == "gangster" || I.icon_state == "gang_boss") && I.loc == defector_mind.current) - del(I) - - //Remove gang icons from defector's vision - if(defector_mind.current) - if(defector_mind.current.client) - for(var/image/I in defector_mind.current.client.images) - if(I.icon_state == "gangster" || I.icon_state == "gang_boss") - del(I) + ganghud.leave_hud(defector_mind.current) + set_antag_hud(defector_mind.current, null) /////////////////////////// //Checks for gang victory// diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index b9ed5c88c54..214683449ef 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -1,13 +1,25 @@ /var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds //set to at least 100 unless you want evarr ruining every round -/var/list/meteorsA = list(/obj/effect/meteor/dust=3, /obj/effect/meteor/medium=8, /obj/effect/meteor/big=3, \ - /obj/effect/meteor/flaming=1, /obj/effect/meteor/irradiated=3) +//Meteors probability of spawning during a given wave +/var/list/meteors_normal = list(/obj/effect/meteor/dust=3, /obj/effect/meteor/medium=8, /obj/effect/meteor/big=3, \ + /obj/effect/meteor/flaming=1, /obj/effect/meteor/irradiated=3) //for normal meteor event -/var/list/meteorsB = list(/obj/effect/meteor/meaty=5, /obj/effect/meteor/meaty/xeno=1) +/var/list/meteors_threatening = list(/obj/effect/meteor/medium=4, /obj/effect/meteor/big=8, \ + /obj/effect/meteor/flaming=3, /obj/effect/meteor/irradiated=3) //for threatening meteor event + +/var/list/meteors_catastrophic = list(/obj/effect/meteor/medium=5, /obj/effect/meteor/big=75, \ + /obj/effect/meteor/flaming=10, /obj/effect/meteor/irradiated=10, /obj/effect/meteor/tunguska = 1) //for catastrophic meteor event + +/var/list/meteorsB = list(/obj/effect/meteor/meaty=5, /obj/effect/meteor/meaty/xeno=1) //for meaty ore event /var/list/meteorsC = list(/obj/effect/meteor/dust) //for space dust event + +/////////////////////////////// +//Meteor spawning global procs +/////////////////////////////// + /proc/spawn_meteors(var/number = 10, var/list/meteortypes) for(var/i = 0; i < number; i++) spawn_meteor(meteortypes) @@ -16,7 +28,7 @@ var/turf/pickedstart var/turf/pickedgoal var/max_i = 10//number of tries to spawn meteor. - while (!istype(pickedstart, /turf/space) || pickedstart.loc.name != "Space" ) + while (!istype(pickedstart, /turf/space)) var/startSide = pick(cardinal) pickedstart = spaceDebrisStartLoc(startSide, 1) pickedgoal = spaceDebrisFinishLoc(startSide, 1) @@ -69,6 +81,9 @@ var/turf/T = locate(endx, endy, Z) return T +/////////////////////// +//The meteor effect +////////////////////// /obj/effect/meteor name = "the concept of meteor" @@ -83,7 +98,7 @@ pass_flags = PASSTABLE var/heavy = 0 var/meteorsound = 'sound/effects/meteorimpact.ogg' - var/z_original + var/z_original = 1 var/meteordrop = /obj/item/weapon/ore/iron var/dropamt = 2 @@ -91,80 +106,66 @@ /obj/effect/meteor/Move() if(z != z_original || loc == dest) qdel(src) - return ..() + return + + . = ..() //process movement... + + if(.)//.. if did move, ram the turf we get in + var/turf/T = get_turf(loc) + ram_turf(T) + + if(prob(10) && !istype(T, /turf/space))//randomly takes a 'hit' from ramming + get_hit() + + return . /obj/effect/meteor/Destroy() walk(src,0) //this cancels the walk_towards() proc ..() -/obj/effect/meteor/dust - name = "space dust" - icon_state = "dust" - pass_flags = PASSTABLE | PASSGRILLE - hits = 1 - hitpwr = 3 - meteorsound = 'sound/weapons/throwtap.ogg' - meteordrop = /obj/item/weapon/ore/glass - -/obj/effect/meteor/medium - name = "meteor" - dropamt = 3 - -/obj/effect/meteor/big - name = "big meteor" - icon_state = "large" - hits = 7 - heavy = 1 - dropamt = 4 - -/obj/effect/meteor/flaming - name = "flaming meteor" - icon_state = "flaming" - hits = 3 - heavy = 1 - meteorsound = 'sound/effects/bamf.ogg' - meteordrop = /obj/item/weapon/ore/plasma - -/obj/effect/meteor/irradiated - name = "glowing meteor" - icon_state = "glowing" - hits = 4 - heavy = 1 - meteordrop = /obj/item/weapon/ore/uranium - -/obj/effect/meteor/meaty - name = "meaty ore" - icon_state = "meateor" - desc = "Just... don't think too hard about where this thing came from." - hits = 2 - heavy = 1 - meteorsound = 'sound/effects/blobattack.ogg' - meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat - var/meteorgibs = /obj/effect/gibspawner/generic - -/obj/effect/meteor/meaty/xeno - color = "#5EFF00" - meteordrop = /obj/item/weapon/reagent_containers/food/snacks/xenomeat - meteorgibs = /obj/effect/gibspawner/xeno - - /obj/effect/meteor/New() ..() SpinAnimation() /obj/effect/meteor/Bump(atom/A) if(A) - A.ex_act(hitpwr) + ram_turf(get_turf(A)) playsound(src.loc, meteorsound, 40, 1) - if(--src.hits <= 0) + get_hit() + +/obj/effect/meteor/proc/ram_turf(var/turf/T) + //first bust whatever is in the turf + for(var/atom/A in T) + if(A != src) + A.ex_act(hitpwr) + + //then, ram the turf if it still exists + if(T) + T.ex_act(hitpwr) + + +//process getting 'hit' by colliding with a dense object +//or randomly when ramming turfs +/obj/effect/meteor/proc/get_hit() + hits-- + if(hits <= 0) make_debris() meteor_effect(heavy) qdel(src) - /obj/effect/meteor/ex_act() return +/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/pickaxe)) + qdel(src) + return + ..() + +/obj/effect/meteor/proc/make_debris() + for(var/throws = dropamt, throws > 0, throws--) + var/obj/item/O = new meteordrop(get_turf(src)) + O.throw_at(dest, 5, 10) /obj/effect/meteor/proc/meteor_effect(var/sound=1) if(sound) @@ -176,20 +177,60 @@ shake_camera(M, dist > 20 ? 3 : 5, dist > 20 ? 1 : 3) M.playsound_local(src.loc, meteorsound, 50, 1, get_rand_frequency(), 10) +/////////////////////// +//Meteor types +/////////////////////// + +//Dust +/obj/effect/meteor/dust + name = "space dust" + icon_state = "dust" + pass_flags = PASSTABLE | PASSGRILLE + hits = 1 + hitpwr = 3 + meteorsound = 'sound/weapons/throwtap.ogg' + meteordrop = /obj/item/weapon/ore/glass + +//Medium-sized +/obj/effect/meteor/medium + name = "meteor" + dropamt = 3 /obj/effect/meteor/medium/meteor_effect() ..(heavy) - explosion(src.loc, 1, 2, 3, 4, 0) + explosion(src.loc, 0, 1, 2, 3, 0) +//Large-sized +/obj/effect/meteor/big + name = "big meteor" + icon_state = "large" + hits = 6 + heavy = 1 + dropamt = 4 /obj/effect/meteor/big/meteor_effect() ..(heavy) - explosion(src.loc, 0, 1, 2, 3, 0) + explosion(src.loc, 1, 2, 3, 4, 0) +//Flaming meteor +/obj/effect/meteor/flaming + name = "flaming meteor" + icon_state = "flaming" + hits = 5 + heavy = 1 + meteorsound = 'sound/effects/bamf.ogg' + meteordrop = /obj/item/weapon/ore/plasma /obj/effect/meteor/flaming/meteor_effect() ..(heavy) - explosion(src.loc, 0, 1, 2, 3, 0, 0, 5) + explosion(src.loc, 1, 2, 3, 4, 0, 0, 5) + +//Radiation meteor +/obj/effect/meteor/irradiated + name = "glowing meteor" + icon_state = "glowing" + heavy = 1 + meteordrop = /obj/item/weapon/ore/uranium /obj/effect/meteor/irradiated/meteor_effect() @@ -199,20 +240,77 @@ for(var/mob/living/L in view(5, src)) L.apply_effect(40, IRRADIATE) - - -/obj/effect/meteor/proc/make_debris() - for(var/throws = dropamt, throws > 0, throws--) - var/obj/item/O = new meteordrop(get_turf(src)) - O.throw_at(dest, 5, 10) +//Meaty Ore +/obj/effect/meteor/meaty + name = "meaty ore" + icon_state = "meateor" + desc = "Just... don't think too hard about where this thing came from." + hits = 2 + heavy = 1 + meteorsound = 'sound/effects/blobattack.ogg' + meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat + var/meteorgibs = /obj/effect/gibspawner/generic /obj/effect/meteor/meaty/make_debris() ..() new meteorgibs(get_turf(src)) -/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pickaxe)) - qdel(src) - return - ..() \ No newline at end of file +/obj/effect/meteor/meaty/ram_turf(var/turf/T) + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/blood (T) + +/obj/effect/meteor/meaty/Bump(atom/A) + A.ex_act(hitpwr) + get_hit() + +//Meaty Ore Xeno edition +/obj/effect/meteor/meaty/xeno + color = "#5EFF00" + meteordrop = /obj/item/weapon/reagent_containers/food/snacks/xenomeat + meteorgibs = /obj/effect/gibspawner/xeno + +/obj/effect/meteor/meaty/xeno/ram_turf(var/turf/T) + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/xenoblood (T) + +//Station buster Tunguska +/obj/effect/meteor/tunguska + name = "tunguska meteor" + icon_state = "flaming" + desc = "Your life briefly passes before your eyes the moment you lay them on this monstruosity" + hits = 30 + hitpwr = 1 + heavy = 1 + meteorsound = 'sound/effects/bamf.ogg' + meteordrop = /obj/item/weapon/ore/plasma + +/obj/effect/meteor/tunguska/meteor_effect() + ..(heavy) + explosion(src.loc, 5, 10, 15, 20, 0) + +/obj/effect/meteor/tunguska/Bump() + ..() + if(prob(20)) + explosion(src.loc,2,4,6,8) + +////////////////////////// +//Spookoween meteors +///////////////////////// + +/var/list/meteorsSPOOKY = list(/obj/effect/meteor/pumpkin) + +/obj/effect/meteor/pumpkin + name = "PUMPKING" + desc = "THE PUMPKING'S COMING!" + icon = 'icons/obj/meteor_spooky.dmi' + icon_state = "pumpkin" + hits = 10 + heavy = 1 + dropamt = 1 + +/obj/effect/meteor/pumpkin/New() + ..() + meteordrop = pick(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin) + meteorsound = pick('sound/hallucinations/im_here1.ogg','sound/hallucinations/im_here2.ogg') +////////////////////////// \ No newline at end of file diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm index 266a7c35e06..29f3a209052 100644 --- a/code/game/gamemodes/monkey/monkey.dm +++ b/code/game/gamemodes/monkey/monkey.dm @@ -63,7 +63,7 @@ ape_infectees += carriermind var/datum/disease/D = new /datum/disease/transformation/jungle_fever - D.hidden = list(1,1) + D.visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC D.holder = carriermind.current D.affected_mob = carriermind.current carriermind.current.viruses += D @@ -71,7 +71,7 @@ /datum/game_mode/monkey/proc/check_monkey_victory() for(var/mob/living/carbon/monkey/M in living_mob_list) - if (M.has_disease(/datum/disease/transformation/jungle_fever)) + if (M.HasDisease(/datum/disease/transformation/jungle_fever)) var/area/A = get_area(M) if(is_type_in_list(A, centcom_areas)) escaped_monkeys++ diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 913aaef67bd..44abc4ce462 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -48,44 +48,15 @@ //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/update_all_synd_icons() - spawn(0) - for(var/datum/mind/synd_mind in syndicates) - if(synd_mind.current) - if(synd_mind.current.client) - for(var/image/I in synd_mind.current.client.images) - if(I.icon_state == "synd") - del(I) - - for(var/datum/mind/synd_mind in syndicates) - if(synd_mind.current) - if(synd_mind.current.client) - for(var/datum/mind/synd_mind_1 in syndicates) - if(synd_mind_1.current) - var/I = image('icons/mob/mob.dmi', loc = synd_mind_1.current, icon_state = "synd") - synd_mind.current.client.images += I - /datum/game_mode/proc/update_synd_icons_added(datum/mind/synd_mind) - spawn(0) - if(synd_mind.current) - if(synd_mind.current.client) - var/I = image('icons/mob/mob.dmi', loc = synd_mind.current, icon_state = "synd") - synd_mind.current.client.images += I + var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS] + opshud.join_hud(synd_mind.current) + set_antag_hud(synd_mind.current, "synd") /datum/game_mode/proc/update_synd_icons_removed(datum/mind/synd_mind) - spawn(0) - for(var/datum/mind/synd in syndicates) - if(synd.current) - if(synd.current.client) - for(var/image/I in synd.current.client.images) - if(I.icon_state == "synd" && I.loc == synd_mind.current) - del(I) - - if(synd_mind.current) - if(synd_mind.current.client) - for(var/image/I in synd_mind.current.client.images) - if(I.icon_state == "synd") - del(I) + var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS] + opshud.leave_hud(synd_mind.current) + set_antag_hud(synd_mind.current, null) //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -129,8 +100,6 @@ spawnpos++ update_synd_icons_added(synd_mind) - update_all_synd_icons() - if(uplinklocker) new /obj/structure/closet/syndicate/nuclear(uplinklocker.loc) if(nuke_spawn && synd_spawn.len > 0) @@ -192,12 +161,12 @@ /datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob) var/radio_freq = SYND_FREQ - var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(synd_mob) + var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(synd_mob) R.set_frequency(radio_freq) synd_mob.equip_to_slot_or_del(R, slot_ears) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(synd_mob), slot_shoes) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), slot_shoes) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id) if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 2ae24e26182..0d5dfc22397 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -149,7 +149,7 @@ var/bomb_set if ((M.client && M.machine == src)) src.attack_hand(M) -/obj/machinery/nuclearbomb/ex_act(severity) +/obj/machinery/nuclearbomb/ex_act(severity, specialty) return /obj/machinery/nuclearbomb/blob_act() @@ -239,8 +239,9 @@ var/bomb_set if(blobstart.len > 0) var/obj/item/weapon/disk/nuclear/NEWDISK = new(pick(blobstart)) transfer_fingerprints_to(NEWDISK) - message_admins("[src] has been destroyed in ([x], [y] ,[z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).") - log_game("[src] has been destroyed in ([x], [y] ,[z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).") + var/turf/diskturf = get_turf(src) + message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).") + log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).") del(src) //Needed to clear all references to it else ERROR("[src] was supposed to be destroyed, but we were unable to locate a blobstart landmark to spawn a new one.") diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 0b07f069680..16d32663163 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -77,7 +77,7 @@ point_at(location) if(mode == 2) point_at(target) - usr << "You activate the pinpointer.,/span>" + usr << "You activate the pinpointer." else active = 0 icon_state = "pinoff" @@ -89,6 +89,9 @@ set name = "Toggle Pinpointer Mode" set src in view(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + active = 0 icon_state = "pinoff" target=null diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 8e8c6a4f021..c42a1adad96 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -63,7 +63,7 @@ datum/objective/assassinate/check_completion() datum/objective/assassinate/update_explanation_text() ..() if(target && target.current) - explanation_text = "Assassinate [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role]." + explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." else explanation_text = "Free Objective" @@ -90,7 +90,7 @@ datum/objective/mutiny/check_completion() datum/objective/mutiny/update_explanation_text() ..() if(target && target.current) - explanation_text = "Assassinate or exile [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role]." + explanation_text = "Assassinate or exile [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." else explanation_text = "Free Objective" @@ -126,7 +126,7 @@ datum/objective/maroon/check_completion() datum/objective/maroon/update_explanation_text() if(target && target.current) - explanation_text = "Prevent [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive." + explanation_text = "Prevent [target.name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive." else explanation_text = "Free Objective" @@ -158,7 +158,7 @@ datum/objective/debrain/check_completion() datum/objective/debrain/update_explanation_text() ..() if(target && target.current) - explanation_text = "Steal the brain of [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role]." + explanation_text = "Steal the brain of [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." else explanation_text = "Free Objective" @@ -185,7 +185,7 @@ datum/objective/protect/check_completion() datum/objective/protect/update_explanation_text() ..() if(target && target.current) - explanation_text = "Protect [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role]." + explanation_text = "Protect [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." else explanation_text = "Free Objective" @@ -274,6 +274,32 @@ datum/objective/escape/check_completion() else return 0 +datum/objective/escape/escape_with_identity + dangerrating = 10 + var/target_real_name // Has to be stored because the target's real_name can change over the course of the round + +datum/objective/escape/escape_with_identity/find_target() + target = ..() + update_explanation_text() + +datum/objective/escape/escape_with_identity/update_explanation_text() + if(target && target.current) + target_real_name = target.current.real_name + explanation_text = "Escape on the shuttle or an escape pod with the identity of [target_real_name], the [target.assigned_role]." + else + explanation_text = "Free Objective." + +datum/objective/escape/escape_with_identity/check_completion() + if(!target_real_name) + return 1 + if(!ishuman(owner.current)) + return 0 + var/mob/living/carbon/human/H = owner.current + if(..()) + if(H.dna.real_name == target_real_name) + if(H.get_id_name()== target_real_name) + return 1 + return 0 datum/objective/survive @@ -394,7 +420,7 @@ datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) datum/objective/steal/exchange/update_explanation_text() ..() if(target && target.current) - explanation_text = "Acquire [targetinfo.name] held by [target.current.real_name], the [target.assigned_role] and syndicate agent" + explanation_text = "Acquire [targetinfo.name] held by [target.name], the [target.assigned_role] and syndicate agent" else explanation_text = "Free Objective" @@ -526,6 +552,6 @@ datum/objective/destroy/check_completion() datum/objective/destroy/update_explanation_text() ..() if(target && target.current) - explanation_text = "Destroy [target.current.real_name], the experimental AI." + explanation_text = "Destroy [target.name], the experimental AI." else - explanation_text = "Free Objective" + explanation_text = "Free Objective" diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index b0e35a07051..0390064db5c 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -33,6 +33,12 @@ datum/objective_item/steal/jetpack targetitem = /obj/item/weapon/tank/jetpack difficulty = 3 +datum/objective_item/steal/defib + name = "a defibrillator" + targetitem = /obj/item/weapon/defibrillator + difficulty = 4 + excludefromjob = list("Chief Medical Officer", "Medical Doctor") + datum/objective_item/steal/magboots name = "the chief engineer's advanced magnetic boots" targetitem = /obj/item/clothing/shoes/magboots/advance diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 419f94c5b71..3dc96cba6fb 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -4,7 +4,6 @@ // Just make sure the converter is a head before you call it! // To remove a rev (from brainwashing or w/e), call ticker.mode:remove_revolutionary(_THE_PLAYERS_MIND_), // this will also check they're not a head, so it can just be called freely -// If the rev icons start going wrong for some reason, ticker.mode:update_all_rev_icons() can be called to correct them. // If the game somtimes isn't registering a win properly, then ticker.mode.check_win() isn't being called somewhere. /datum/game_mode @@ -75,8 +74,7 @@ var/datum/mind/trotsky = pick(head_revolutionaries) antag_candidates += trotsky head_revolutionaries -= trotsky - - heads_to_kill = heads + update_rev_icons_removed(trotsky) for(var/datum/mind/rev_mind in head_revolutionaries) log_game("[rev_mind.key] (ckey) has been selected as a head rev") @@ -164,6 +162,7 @@ rev_obj.target = head_mind rev_obj.explanation_text = "Assassinate [head_mind.name], the [head_mind.assigned_role]." rev_mind.objectives += rev_obj + heads_to_kill += head_mind //////////////////////////////////////////// //Checks if new heads have joined midround// @@ -258,120 +257,21 @@ else M << "[rev_mind.current] looks like they just remembered their real allegiance!" - -///////////////////////////////////////////////////////////////////////////////////////////////// -//Keeps track of players having the correct icons//////////////////////////////////////////////// -//CURRENTLY CONTAINS BUGS://///////////////////////////////////////////////////////////////////// -//-PLAYERS THAT HAVE BEEN REVS FOR AWHILE OBTAIN THE BLUE ICON WHILE STILL NOT BEING A REV HEAD// -// -Possibly caused by cloning of a standard rev///////////////////////////////////////////////// -//-UNCONFIRMED: DECONVERTED REVS NOT LOSING THEIR ICON PROPERLY////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/update_all_rev_icons() - spawn(0) - for(var/datum/mind/head_rev_mind in head_revolutionaries) - if(head_rev_mind.current) - if(head_rev_mind.current.client) - for(var/image/I in head_rev_mind.current.client.images) - if(I.icon_state == "rev" || I.icon_state == "rev_head") - del(I) - - for(var/datum/mind/rev_mind in revolutionaries) - if(rev_mind.current) - if(rev_mind.current.client) - for(var/image/I in rev_mind.current.client.images) - if(I.icon_state == "rev" || I.icon_state == "rev_head") - del(I) - - for(var/datum/mind/head_rev in head_revolutionaries) - if(head_rev.current) - if(head_rev.current.client) - for(var/datum/mind/rev in revolutionaries) - if(rev.current) - var/I = image('icons/mob/mob.dmi', loc = rev.current, icon_state = "rev") - head_rev.current.client.images += I - for(var/datum/mind/head_rev_1 in head_revolutionaries) - if(head_rev_1.current) - var/I = image('icons/mob/mob.dmi', loc = head_rev_1.current, icon_state = "rev_head") - head_rev.current.client.images += I - - for(var/datum/mind/rev in revolutionaries) - if(rev.current) - if(rev.current.client) - for(var/datum/mind/head_rev in head_revolutionaries) - if(head_rev.current) - var/I = image('icons/mob/mob.dmi', loc = head_rev.current, icon_state = "rev_head") - rev.current.client.images += I - for(var/datum/mind/rev_1 in revolutionaries) - if(rev_1.current) - var/I = image('icons/mob/mob.dmi', loc = rev_1.current, icon_state = "rev") - rev.current.client.images += I - -//////////////////////////////////////////////////// -//Keeps track of converted revs icons/////////////// -//Refer to above bugs. They may apply here as well// -//////////////////////////////////////////////////// +///////////////////////////////////// +//Adds the rev hud to a new convert// +///////////////////////////////////// /datum/game_mode/proc/update_rev_icons_added(datum/mind/rev_mind) - spawn(0) - for(var/datum/mind/head_rev_mind in head_revolutionaries) + var/datum/atom_hud/antag/revhud = huds[ANTAG_HUD_REV] + revhud.join_hud(rev_mind.current) + set_antag_hud(rev_mind.current, ((rev_mind in head_revolutionaries) ? "rev_head" : "rev")) - //Tagging the new rev for revheads to see - if(head_rev_mind.current) - if(head_rev_mind.current.client) - var/I - if(rev_mind in head_revolutionaries) //If the new rev is a head rev - I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev_head") - else - I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev") - head_rev_mind.current.client.images += I - - //Tagging the revheads for new rev to see - if(rev_mind.current) - if(rev_mind.current.client) - var/image/J = image('icons/mob/mob.dmi', loc = head_rev_mind.current, icon_state = "rev_head") - rev_mind.current.client.images += J - - for(var/datum/mind/rev_mind_1 in revolutionaries) - - //Tagging the new rev for fellow revs to see - if(rev_mind_1.current) - if(rev_mind_1.current.client) - var/I - if(rev_mind in head_revolutionaries) //If the new rev is a head rev - I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev_head") - else - I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev") - rev_mind_1.current.client.images += I - - //Tagging fellow revs for the new rev to see - if(rev_mind.current) - if(rev_mind.current.client) - var/image/J = image('icons/mob/mob.dmi', loc = rev_mind_1.current, icon_state = "rev") - rev_mind.current.client.images += J - -/////////////////////////////////// -//Keeps track of deconverted revs// -/////////////////////////////////// +///////////////////////////////////////// +//Removes the hud from deconverted revs// +///////////////////////////////////////// /datum/game_mode/proc/update_rev_icons_removed(datum/mind/rev_mind) - spawn(0) - for(var/datum/mind/head_rev_mind in head_revolutionaries) - if(head_rev_mind.current) - if(head_rev_mind.current.client) - for(var/image/I in head_rev_mind.current.client.images) - if((I.icon_state == "rev" || I.icon_state == "rev_head") && I.loc == rev_mind.current) - del(I) - - for(var/datum/mind/rev_mind_1 in revolutionaries) - if(rev_mind_1.current) - if(rev_mind_1.current.client) - for(var/image/I in rev_mind_1.current.client.images) - if((I.icon_state == "rev" || I.icon_state == "rev_head") && I.loc == rev_mind.current) - del(I) - - if(rev_mind.current) - if(rev_mind.current.client) - for(var/image/I in rev_mind.current.client.images) - if(I.icon_state == "rev" || I.icon_state == "rev_head") - del(I) + var/datum/atom_hud/antag/revhud = huds[ANTAG_HUD_REV] + revhud.leave_hud(rev_mind.current) + set_antag_hud(rev_mind.current, null) ////////////////////////// //Checks for rev victory// diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index a0a004c41cc..3fb4cd2c788 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -21,7 +21,7 @@ datum/airlock_maker var/paintjob = "none" var/glassdoor = 0 - var/doorname = "Airlock" + var/doorname = "airlock" datum/airlock_maker/New(var/atom/target_loc) linked = new(target_loc) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index d1c5b769b03..13b89560a57 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -177,7 +177,7 @@ ..() return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder. -/datum/game_mode/proc/give_codewords(mob/living/traitor_mob) +/proc/give_codewords(mob/living/traitor_mob) traitor_mob << "The Syndicate provided you with the following information on how to identify their agents:" traitor_mob << "Code Phrase: [syndicate_code_phrase]" traitor_mob << "Code Response: [syndicate_code_response]" @@ -195,6 +195,8 @@ killer.set_zeroth_law(law, law_borg) killer << "New law: 0. [law]" give_codewords(killer) + killer.set_syndie_radio() + killer << "Your radio has been upgraded! Use :t to speak on an encrypted channel with Syndicate Agents!" /datum/game_mode/proc/auto_declare_completion_traitor() diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 84ab61c9e0c..360d10cd342 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -43,6 +43,7 @@ Captain var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() minor_announce("Captain [H.real_name] on deck!") diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index e7b5df5df67..701acf7fe5d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -250,6 +250,14 @@ Mime access = list(access_theatre, access_maint_tunnels) minimal_access = list(access_theatre) +/datum/job/mime/equip_backpack(var/mob/living/carbon/human/H) + var/obj/item/weapon/storage/backpack/BPK = new default_backpack(H) + + new default_storagebox(BPK) + new /obj/item/toy/crayon/mime(BPK) + new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(BPK) + + H.equip_to_slot_or_del(BPK, slot_back) /datum/job/mime/equip_items(var/mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/mime(H), slot_w_uniform) @@ -259,13 +267,6 @@ Mime H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/suit/suspenders(H), slot_wear_suit) - if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/toy/crayon/mime(H), slot_l_store) - H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_l_hand) - else - H.equip_to_slot_or_del(new /obj/item/toy/crayon/mime(H), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) - if(H.mind) H.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(null) H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/mime/speak(null) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 613b07e545c..2dff7bffd0e 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -22,7 +22,7 @@ Head of Security default_id = /obj/item/weapon/card/id/silver default_pda = /obj/item/device/pda/heads/hos - default_headset = /obj/item/device/radio/headset/heads/hos + default_headset = /obj/item/device/radio/headset/heads/hos/alt default_backpack = /obj/item/weapon/storage/backpack/security default_satchel = /obj/item/weapon/storage/backpack/satchel_sec @@ -53,6 +53,7 @@ Head of Security var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() /* Warden @@ -70,7 +71,7 @@ Warden minimal_player_age = 7 default_pda = /obj/item/device/pda/warden - default_headset = /obj/item/device/radio/headset/headset_sec + default_headset = /obj/item/device/radio/headset/headset_sec/alt default_backpack = /obj/item/weapon/storage/backpack/security default_satchel = /obj/item/weapon/storage/backpack/satchel_sec @@ -94,6 +95,7 @@ Warden var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() /datum/job/warden/get_access() var/list/L = list() @@ -143,6 +145,7 @@ Detective var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() /* Security Officer @@ -187,6 +190,7 @@ Security Officer var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() /datum/job/officer/get_access() var/list/L = list() @@ -250,22 +254,21 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science") wires = new(src) secure_radio_connections = new - if(radio_controller) - initialize() + initialize() recalculateChannels() /obj/item/device/radio/headset/headset_sec/department/engi - keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot = new /obj/item/device/encryptionkey/headset_sec keyslot2 = new /obj/item/device/encryptionkey/headset_eng /obj/item/device/radio/headset/headset_sec/department/supply - keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot = new /obj/item/device/encryptionkey/headset_sec keyslot2 = new /obj/item/device/encryptionkey/headset_cargo /obj/item/device/radio/headset/headset_sec/department/med - keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot = new /obj/item/device/encryptionkey/headset_sec keyslot2 = new /obj/item/device/encryptionkey/headset_med /obj/item/device/radio/headset/headset_sec/department/sci - keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot = new /obj/item/device/encryptionkey/headset_sec keyslot2 = new /obj/item/device/encryptionkey/headset_sci diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 842cb714481..906f167875d 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -123,7 +123,7 @@ var/global/datum/controller/occupations/job_master return -//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until� +//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until //it locates a head or runs out of levels to check //This is basically to ensure that there's atleast a few heads in the round /datum/controller/occupations/proc/FillHeadPosition() @@ -275,6 +275,10 @@ var/global/datum/controller/occupations/job_master // Hand out random jobs to the people who didn't get any in the last check // Also makes sure that they got their preference correct + for(var/mob/new_player/player in unassigned) + if(jobban_isbanned(player, "Assistant")) + GiveRandomJob(player) //you get to roll for random before everyone else just to be sure you don't get assistant. you're so speshul + for(var/mob/new_player/player in unassigned) if(player.client.prefs.userandomjob) GiveRandomJob(player) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index f59ff9c6f1e..2d492dfccfc 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -67,9 +67,11 @@ return if(!in_range(src, user)) return - + if(!storedpda)//is the pda still there? + return storedpda.icon_state = P.icon_state storedpda.desc = P.desc + ejectpda() else user << "The [src] is empty." @@ -80,6 +82,9 @@ set category = "Object" set src in oview(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + if(storedpda) storedpda.loc = get_turf(src.loc) storedpda = null diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7e5801c56fe..4881f8a2658 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -11,8 +11,9 @@ icon_state = "sleeper-open" density = 0 anchored = 1 - var/efficiency + interact_offline = 1 state_open = 1 + var/efficiency var/initial_bin_rating = 1 var/min_health = 25 var/list/injection_chems = list() //list of injectable chems except inaprovaline, coz inaprovaline is always avalible @@ -65,6 +66,7 @@ /obj/machinery/sleeper/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise if(M.environment_smash) + M.do_attack_animation(src) visible_message("[M.name] smashes [src] apart!") qdel(src) return @@ -82,28 +84,9 @@ default_deconstruction_crowbar(I) -/obj/machinery/sleeper/ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - qdel(src) - return - if(2.0) - if(prob(50)) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - qdel(src) - return - if(3.0) - if(prob(25)) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - qdel(src) - +/obj/machinery/sleeper/ex_act(severity, specialty) + go_out() + ..() /obj/machinery/sleeper/emp_act(severity) if(stat & (BROKEN|NOPOWER)) @@ -132,11 +115,17 @@ open_machine() /obj/machinery/sleeper/attack_hand(mob/user) - if(stat & (BROKEN|NOPOWER)) + if(..()) + return + + //powerless interaction + if(!is_operational()) + user.unset_machine()//essential to prevent infinite loops of opening/closing the machine if(state_open) close_machine() else open_machine() + else sleeperUI(user) @@ -233,6 +222,8 @@ ..(target) /obj/machinery/sleeper/proc/inject_chem(mob/user, chem) + if(!is_operational()) + return if(occupant && occupant.reagents) if(chem in injection_chems + "inaprovaline") if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 39308cf600b..e132d8a8abe 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -6,7 +6,6 @@ obj/machinery/door/airlock var/frequency var/shockedby = list() var/datum/radio_frequency/radio_connection - explosion_resistance = 15 obj/machinery/door/airlock/receive_signal(datum/signal/signal) @@ -93,8 +92,10 @@ obj/machinery/door/airlock/New() if(radio_controller) set_frequency(frequency) - - +obj/machinery/door/airlock/Destroy() + if(frequency && radio_controller) + radio_controller.remove_object(src,frequency) + ..() obj/machinery/airlock_sensor icon = 'icons/obj/airlock_machines.dmi' @@ -164,7 +165,10 @@ obj/machinery/airlock_sensor/New() if(radio_controller) set_frequency(frequency) - +obj/machinery/airlock_sensor/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + ..() obj/machinery/access_button @@ -220,4 +224,9 @@ obj/machinery/access_button/New() ..() if(radio_controller) - set_frequency(frequency) \ No newline at end of file + set_frequency(frequency) + +obj/machinery/access_button/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + ..() diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 0467c3c3d62..8d99276354a 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -144,6 +144,11 @@ if(ticker && ticker.current_state == 3)//if the game is running src.initialize() +/obj/machinery/alarm/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + ..() + /obj/machinery/alarm/initialize() set_frequency(frequency) if (!master_is_operating()) @@ -188,7 +193,7 @@ popup.open() refresh_all() - if(panel_open && (!istype(user, /mob/living/silicon))) + if(panel_open && (!istype(user, /mob/living/silicon/ai))) wires.Interact(user) return @@ -582,13 +587,13 @@ table tr:first-child th:first-child { border: none;} if(href_list["atmos_alarm"]) - if (alarm_area.atmosalert(2)) + if (alarm_area.atmosalert(2,src)) post_alert(2) spawn(1) src.updateUsrDialog() update_icon() if(href_list["atmos_reset"]) - if (alarm_area.atmosalert(0)) + if (alarm_area.atmosalert(0,src)) post_alert(0) spawn(1) src.updateUsrDialog() @@ -754,7 +759,7 @@ table tr:first-child th:first-child { border: none;} else if (alert_level==0) alert_signal.data["alert"] = "clear" - frequency.post_signal(src, alert_signal) + frequency.post_signal(src, alert_signal,null,-1) /obj/machinery/alarm/proc/apply_danger_level() var/new_area_danger_level = 0 @@ -762,7 +767,7 @@ table tr:first-child th:first-child { border: none;} for (var/obj/machinery/alarm/AA in A) if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted) new_area_danger_level = max(new_area_danger_level,AA.danger_level) - if (alarm_area.atmosalert(new_area_danger_level)) //if area was in normal state or if area was in alert state + if (alarm_area.atmosalert(new_area_danger_level,src)) //if area was in normal state or if area was in alert state post_alert(new_area_danger_level) update_icon() @@ -851,7 +856,8 @@ table tr:first-child th:first-child { border: none;} else stat |= NOPOWER spawn(rand(0,15)) - update_icon() + if(loc) + update_icon() /* AIR ALARM CIRCUIT @@ -1084,10 +1090,10 @@ FIRE ALARM /obj/machinery/firealarm/power_change() if(powered(ENVIRON)) stat &= ~NOPOWER - update_icon() else - spawn(rand(0,15)) - stat |= NOPOWER + stat |= NOPOWER + spawn(rand(0,15)) + if(loc) update_icon() /obj/machinery/firealarm/attack_hand(mob/user as mob) @@ -1166,14 +1172,14 @@ FIRE ALARM if (stat & (NOPOWER|BROKEN)) // can't reset alarm if it's unpowered or broken. return var/area/A = get_area(src) - A.firereset() + A.firereset(src) return /obj/machinery/firealarm/proc/alarm() if (stat & (NOPOWER|BROKEN)) // can't activate alarm if it's unpowered or broken. return var/area/A = get_area(src) - A.firealert() + A.firealert(src) //playsound(src.loc, 'sound/ambience/signal.ogg', 75, 0) return diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 53624f792ec..46230274a91 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -77,14 +77,15 @@ obj/machinery/air_sensor/New() if(radio_controller) set_frequency(frequency) +obj/machinery/air_sensor/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + ..() + ///////////////////////////////////////////////////////////// // GENERAL AIR CONTROL (a.k.a atmos computer) ///////////////////////////////////////////////////////////// -obj/machinery/computer/general_air_control/Destroy() - radio_controller.remove_object(src, frequency) - ..() - obj/machinery/computer/general_air_control icon = 'icons/obj/computer.dmi' icon_state = "tank" @@ -177,7 +178,8 @@ obj/machinery/computer/general_air_control/proc/return_text() return output obj/machinery/computer/general_air_control/Destroy() - radio_controller.remove_object(src, frequency) + if(radio_controller) + radio_controller.remove_object(src, frequency) ..() obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 82df3de7554..b21f8e75145 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -204,7 +204,7 @@ update_flag healthcheck() ..() -/obj/machinery/portable_atmospherics/canister/ex_act(severity) +/obj/machinery/portable_atmospherics/canister/ex_act(severity, specialty) switch(severity) if(1.0) if(destroyed || prob(30)) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 25bc022a36b..3741c13b09e 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -3,7 +3,7 @@ use_power = 0 var/datum/gas_mixture/air_contents = new - var/obj/machinery/atmospherics/portables_connector/connected_port + var/obj/machinery/atmospherics/unary/portables_connector/connected_port var/obj/item/weapon/tank/holding var/volume = 0 @@ -34,7 +34,7 @@ /obj/machinery/portable_atmospherics/update_icon() return null -/obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/portables_connector/new_port) +/obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/unary/portables_connector/new_port) //Make sure not already connected to something else if(connected_port || !new_port || new_port.connected_device) return 0 @@ -46,32 +46,22 @@ //Perform the connection connected_port = new_port connected_port.connected_device = src + connected_port.parent.reconcile_air() anchored = 1 //Prevent movement - - //Actually enforce the air sharing - var/datum/pipe_network/network = connected_port.return_network(src) - if(network && !network.gases.Find(air_contents)) - network.gases += air_contents - network.update = 1 - return 1 /obj/machinery/portable_atmospherics/proc/disconnect() if(!connected_port) return 0 - - var/datum/pipe_network/network = connected_port.return_network(src) - if(network) - network.gases -= air_contents - anchored = 0 - connected_port.connected_device = null connected_port = null - return 1 +/obj/machinery/portable_atmospherics/portableConnectorReturnAir() + return air_contents + /obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if ((istype(W, /obj/item/weapon/tank) && !( src.destroyed ))) if (src.holding) @@ -90,7 +80,7 @@ update_icon() return else - var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector/) in loc + var/obj/machinery/atmospherics/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/unary/portables_connector) in loc if(possible_port) if(connect(possible_port)) user << "You connect [name] to the port." diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 401410e2040..4b235ec3303 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -111,16 +111,12 @@ var/global/list/autolathe_recipes_hidden = list( \ src.LL = autolathe_recipes_hidden /obj/machinery/autolathe/interact(mob/user) - if(..()) - return - if (src.shocked) - src.shock(user,50) + if(shocked && !(stat & NOPOWER)) + shock(user,50) regular_win(user) return /obj/machinery/autolathe/attackby(obj/item/O, mob/user) - if (stat) - return 1 if (busy) user << "The autolathe is busy. Please wait for completion of previous operation." return 1 @@ -145,6 +141,8 @@ var/global/list/autolathe_recipes_hidden = list( \ else attack_hand(user) return 1 + if (stat) + return 1 if (src.m_amount + O.m_amt > max_m_amount) user << "The autolathe is full. Please remove metal from the autolathe in order to insert more." @@ -189,7 +187,7 @@ var/global/list/autolathe_recipes_hidden = list( \ return attack_hand(user) /obj/machinery/autolathe/attack_hand(mob/user) - if(..()) + if(..(user, 0)) return interact(user) @@ -247,13 +245,13 @@ var/global/list/autolathe_recipes_hidden = list( \ if(istype(template, /obj/item/stack)) src.m_amount -= template.m_amt*multiplier src.g_amount -= template.g_amt*multiplier - var/obj/new_item = new template.type(T) + var/obj/item/new_item = new template.type(T) var/obj/item/stack/S = new_item S.amount = multiplier else src.m_amount -= template.m_amt/coeff src.g_amount -= template.g_amt/coeff - var/obj/new_item = new template.type(T) + var/obj/item/new_item = new template.type(T) new_item.m_amt /= coeff new_item.g_amt /= coeff if(src.m_amount < 0) @@ -280,6 +278,8 @@ var/global/list/autolathe_recipes_hidden = list( \ /obj/machinery/autolathe/proc/regular_win(mob/user) var/dat if(!panel_open) + if(stat) + return var/coeff = 2 ** prod_coeff dat = "
@@ -312,6 +312,10 @@ var/list/sting_paths user << "This is awkward. Changeling power purchase failed, please report this bug to a coder!" return + if(absorbedcount < thepower.req_dna) + user << "We lack the energy to evolve this ability!" + return + if(has_sting(thepower)) user << "We have already evolved this ability!" return @@ -334,14 +338,17 @@ var/list/sting_paths //Reselect powers /datum/changeling/proc/lingRespec(var/mob/user) + if(!ishuman(user)) + user << "We can't remove our evolutions in this form!" + return if(canrespec) - user << "We have removed our evolutions from this form, and are now ready to readapt." + user << "We have removed our evolutions from this form, and are now ready to readapt." user.remove_changeling_powers(1) canrespec = 0 user.make_changeling() return 1 else - user << "You lack the power to readapt your evolutions!" + user << "You lack the power to readapt your evolutions!" return 0 /mob/proc/make_changeling() @@ -361,7 +368,7 @@ var/list/sting_paths if(!S.dna_cost) if(!mind.changeling.has_sting(S)) mind.changeling.purchasedpowers+=S - S.on_purchase(src) + S.on_purchase(src) var/mob/living/carbon/C = src //only carbons have dna now, so we have to typecaste mind.changeling.absorbed_dna |= C.dna diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index bd1b910f90e..2ee15c20d73 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -32,6 +32,7 @@ var/datum/changeling/changeling = user.mind.changeling var/obj/item/weapon/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting + changeling.isabsorbing = 1 for(var/stage = 1, stage<=3, stage++) switch(stage) if(1) @@ -55,7 +56,8 @@ user.visible_message("[user] sucks the fluids from [target]!") target << "You have been absorbed by the changeling!" - changeling.absorb_dna(target) + if(!changeling.has_dna(target.dna)) + changeling.absorb_dna(target, user) if(user.nutrition < 400) user.nutrition = min((user.nutrition + target.nutrition), 400) @@ -65,12 +67,13 @@ if(target.mind.changeling)//If the target was a changeling, suck out their extra juice and objective points! changeling.chem_charges += min(target.mind.changeling.chem_charges, changeling.chem_storage) - changeling.absorbedcount += target.mind.changeling.absorbedcount + changeling.absorbedcount += (target.mind.changeling.absorbedcount) target.mind.changeling.absorbed_dna.len = 1 target.mind.changeling.absorbedcount = 0 - else - changeling.chem_charges += 10 + + + changeling.chem_charges=min(changeling.chem_charges+10, changeling.chem_storage) changeling.isabsorbing = 0 changeling.canrespec = 1 @@ -82,7 +85,7 @@ //Absorbs the target DNA. -/datum/changeling/proc/absorb_dna(mob/living/carbon/T) +/datum/changeling/proc/absorb_dna(mob/living/carbon/T, var/mob/user) if(absorbed_dna.len) absorbed_dna.Cut(1,2) T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. @@ -93,5 +96,12 @@ new_dna.species = T.dna.species new_dna.mutant_color = T.dna.mutant_color new_dna.blood_type = T.dna.blood_type - absorbed_dna |= new_dna //And add the target DNA to our absorbed list. - absorbedcount++ //all that done, let's increment the objective counter. \ No newline at end of file + absorbedcount++ + store_dna(new_dna, user) + +/datum/changeling/proc/store_dna(var/datum/dna/new_dna, var/mob/user) + for(var/datum/objective/escape/escape_with_identity/E in user.mind.objectives) + if(E.target_real_name == new_dna.real_name) + protected_dna |= new_dna + return + absorbed_dna |= new_dna diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index a36cf8f2351..6e7add1edf2 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -31,7 +31,7 @@ var/list/datum/dna/hivemind_bank = list() /obj/effect/proc_holder/changeling/hivemind_upload/sting_action(var/mob/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() - for(var/datum/dna/DNA in changeling.absorbed_dna) + for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna)) if(!(DNA in hivemind_bank)) names += DNA.real_name @@ -86,7 +86,7 @@ var/list/datum/dna/hivemind_bank = list() if(changeling.absorbed_dna.len) changeling.absorbed_dna.Cut(1,2) - changeling.absorbed_dna |= chosen_dna + changeling.store_dna(chosen_dna, user) user << "We absorb the DNA of [S] from the air." feedback_add_details("changeling_powers","HD") return 1 \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm index 951cdf80f54..9cccaf83609 100644 --- a/code/game/gamemodes/changeling/powers/humanform.dm +++ b/code/game/gamemodes/changeling/powers/humanform.dm @@ -6,11 +6,12 @@ req_dna = 1 max_genetic_damage = 3 + //Transform into a human. /obj/effect/proc_holder/changeling/humanform/sting_action(var/mob/living/carbon/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() - for(var/datum/dna/DNA in changeling.absorbed_dna) + for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna)) names += "[DNA.real_name]" var/chosen_name = input("Select the target DNA: ", "Target DNA", null) as null|anything in names diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 5781e7e7208..9fc79f95186 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -144,7 +144,7 @@ return if(istype(target, /obj/structure/table)) var/obj/structure/table/T = target - T.table_destroy(1, user) + T.table_destroy(1) else if(istype(target, /obj/machinery/computer)) var/obj/machinery/computer/C = target diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 36842d319c5..ce93fa5d416 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -25,5 +25,7 @@ user.status_flags &= ~(FAKEDEATH) user.update_canmove() user.mind.changeling.purchasedpowers -= src + user.med_hud_set_status() + user.med_hud_set_health() feedback_add_details("changeling_powers","CR") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/spiders.dm b/code/game/gamemodes/changeling/powers/spiders.dm index 693c38ee449..b081d4d2f79 100644 --- a/code/game/gamemodes/changeling/powers/spiders.dm +++ b/code/game/gamemodes/changeling/powers/spiders.dm @@ -10,7 +10,7 @@ /obj/effect/proc_holder/changeling/spiders/sting_action(var/mob/user) for(var/i=0, i<2, i++) var/obj/effect/spider/spiderling/S = new(user.loc) - S.grow_as = /mob/living/simple_animal/hostile/giant_spider/hunter + S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter feedback_add_details("changeling_powers","SI") return 1 diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 5ebff603d96..f25022ce6f3 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -70,6 +70,9 @@ /obj/effect/proc_holder/changeling/sting/transformation/Click() var/mob/user = usr var/datum/changeling/changeling = user.mind.changeling + if(changeling.chosen_sting) + unset_sting(user) + return selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA") if(!selected_dna) return @@ -105,9 +108,10 @@ obj/effect/proc_holder/changeling/sting/extract_dna if(..()) return user.mind.changeling.can_absorb_dna(user, target) -/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/living/carbon/human/target) add_logs(user, target, "stung", object="extraction sting") - user.mind.changeling.absorb_dna(target, user) + if(!(user.mind.changeling.has_dna(target.dna))) + user.mind.changeling.absorb_dna(target, user) feedback_add_details("changeling_powers","ED") return 1 diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm index b6954ccf79c..b732844dc45 100644 --- a/code/game/gamemodes/changeling/powers/transform.dm +++ b/code/game/gamemodes/changeling/powers/transform.dm @@ -27,7 +27,7 @@ /datum/changeling/proc/select_dna(var/prompt, var/title) var/list/names = list() - for(var/datum/dna/DNA in absorbed_dna) + for(var/datum/dna/DNA in (absorbed_dna+protected_dna)) names += "[DNA.real_name]" var/chosen_name = input(prompt, title, null) as null|anything in names diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index eb67ca4895d..a8394f6235f 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -241,52 +241,15 @@ for(var/mob/M in viewers(cult_mind.current)) M << "[cult_mind.current] looks like they just reverted to their old faith!" -/datum/game_mode/proc/update_all_cult_icons() - spawn(0) - for(var/datum/mind/cultist in cult) - if(cultist.current) - if(cultist.current.client) - for(var/image/I in cultist.current.client.images) - if(I.icon_state == "cult") - del(I) - - for(var/datum/mind/cultist in cult) - if(cultist.current) - if(cultist.current.client) - for(var/datum/mind/cultist_1 in cult) - if(cultist_1.current) - var/I = image('icons/mob/mob.dmi', loc = cultist_1.current, icon_state = "cult") - cultist.current.client.images += I - - /datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind) - spawn(0) - for(var/datum/mind/cultist in cult) - if(cultist.current) - if(cultist.current.client) - var/I = image('icons/mob/mob.dmi', loc = cult_mind.current, icon_state = "cult") - cultist.current.client.images += I - if(cult_mind.current) - if(cult_mind.current.client) - var/image/J = image('icons/mob/mob.dmi', loc = cultist.current, icon_state = "cult") - cult_mind.current.client.images += J - + var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT] + culthud.join_hud(cult_mind.current) + set_antag_hud(cult_mind.current, "cult") /datum/game_mode/proc/update_cult_icons_removed(datum/mind/cult_mind) - spawn(0) - for(var/datum/mind/cultist in cult) - if(cultist.current) - if(cultist.current.client) - for(var/image/I in cultist.current.client.images) - if(I.icon_state == "cult" && I.loc == cult_mind.current) - del(I) - - if(cult_mind.current) - if(cult_mind.current.client) - for(var/image/I in cult_mind.current.client.images) - if(I.icon_state == "cult") - del(I) - + var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT] + culthud.leave_hud(cult_mind.current) + set_antag_hud(cult_mind.current, null) /datum/game_mode/cult/proc/get_unconvertables() var/list/ucs = list() diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 33f9322f2f5..d56d30213d5 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -538,131 +538,125 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if (!istype(user.loc,/turf)) user << "You do not have enough space to write a proper rune." return - - - - - if (C>=26+runedec+ticker.mode.cult.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist - alert("The cloth of reality can't take that much of a strain. Remove some runes first!") - return - else - switch(alert("You open the tome",,"Commune","Scribe a rune", "Notes")) //Fuck the "Cancel" option. Rewrite the whole tome interface yourself if you want it to work better. And input() is just ugly. - K0000 - if("Cancel") + switch(alert("You open the tome",,"Commune","Scribe a rune", "Notes")) //Fuck the "Cancel" option. Rewrite the whole tome interface yourself if you want it to work better. And input() is just ugly. - K0000 + if("Cancel") + return + if("Commune") + if(usr.get_active_hand() != src) return - if("Commune") - if(usr.get_active_hand() != src) - return - var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "") - if(!input) - return - usr.whisper("O bidai nabora se[pick("'","`")]sma!") - usr.whisper("[input]") - for(var/datum/mind/H in ticker.mode.cult) - if (H.current) - H.current << "[input]" + var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "") + if(!input) return - if("Notes") - if(usr.get_active_hand() != src) - return - notedat = {" - Read the Arcane Tome. -
Word translation notes
- [words[1]] is [words[words[1]]] Clear
- [words[2]] is [words[words[2]]] Clear
- [words[3]] is [words[words[3]]] Clear
- [words[4]] is [words[words[4]]] Clear
- [words[5]] is [words[words[5]]] Clear
- [words[6]] is [words[words[6]]] Clear
- [words[7]] is [words[words[7]]] Clear
- [words[8]] is [words[words[8]]] Clear
- [words[9]] is [words[words[9]]] Clear
- [words[10]] is [words[words[10]]] Clear
- "} // whoever screwed the tabbing on this originally is an asshole. + usr.whisper("O bidai nabora se[pick("'","`")]sma!") + usr.whisper("[input]") + for(var/datum/mind/H in ticker.mode.cult) + if (H.current) + H.current << "[input]" + return + if("Notes") + if(usr.get_active_hand() != src) + return + notedat = {" + Read the Arcane Tome. +
Word translation notes
+ [words[1]] is [words[words[1]]] Clear
+ [words[2]] is [words[words[2]]] Clear
+ [words[3]] is [words[words[3]]] Clear
+ [words[4]] is [words[words[4]]] Clear
+ [words[5]] is [words[words[5]]] Clear
+ [words[6]] is [words[words[6]]] Clear
+ [words[7]] is [words[words[7]]] Clear
+ [words[8]] is [words[words[8]]] Clear
+ [words[9]] is [words[words[9]]] Clear
+ [words[10]] is [words[words[10]]] Clear
+ "} // whoever screwed the tabbing on this originally is an asshole. // call(/obj/item/weapon/tome/proc/edit_notes)() - user << browse("[notedat]", "window=notes") + user << browse("[notedat]", "window=notes") + return + if("Scribe a rune") //fixed more assbackward tabbing + if(usr.get_active_hand() != src) return - if("Scribe a rune") //fixed more assbackward tabbing + if (C>=26+runedec+ticker.mode.cult.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist + alert("The cloth of reality can't take that much of a strain. Remove some runes first!") + return + var/list/dictionary = list( + "convert" = list("join","blood","self"), + "wall" = list("destroy","travel","self"), + "blood boil" = list("destroy","see","blood"), + "blood drain" = list("travel","blood","self"), + "raise dead" = list("blood","join","hell"), + "summon narsie" = list("hell","join","self"), + "communicate" = list("self","other","technology"), + "emp" = list("destroy","see","technology"), + "manifest" = list("blood","see","travel"), + "summon tome" = list("see","blood","hell"), + "see invisible" = list("see","hell","join"), + "hide" = list("hide","see","blood"), + "reveal" = list("blood","see","hide"), + "astral journey" = list("hell","travel","self"), + "imbue" = list("hell","technology","join"), + "sacrifice" = list("hell","blood","join"), + "summon cultist" = list("join","other","self"), + "free cultist" = list("travel","technology","other"), + "deafen" = list("hide","other","see"), + "blind" = list("destroy","see","other"), + "stun" = list("join","hide","technology"), + "armor" = list("hell","destroy","other"), + "teleport" = list("travel","self"), + "teleport other" = list("travel","other"), + "summon shell" = list("travel","hell","technology") + ) + + + var/list/scribewords = list("none") + + var/list/english = list() + + for (var/entry in words) + if (words[entry] != entry) + english+=list(words[entry] = entry) + + for (var/entry in dictionary) + var/list/required = dictionary[entry] + if (length(english&required) == required.len) + scribewords += entry + + var/chosen_rune = null + + + if(usr) + chosen_rune = input ("Choose a rune to scribe.") in scribewords + if (!chosen_rune) + return + if (chosen_rune == "none") + user << "You decide against scribing a rune, perhaps you should take this time to study your notes." + return + if (chosen_rune == "teleport") + dictionary[chosen_rune] += input ("Choose a destination word") in english + if (chosen_rune == "teleport other") + dictionary[chosen_rune] += input ("Choose a destination word") in english + + if(user.get_active_hand() != src) + return + + for (var/mob/V in viewers(src)) + V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2) + user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world." + user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage + if(do_after(user, 50)) if(usr.get_active_hand() != src) return - - var/list/dictionary = list( - "convert" = list("join","blood","self"), - "wall" = list("destroy","travel","self"), - "blood boil" = list("destroy","see","blood"), - "blood drain" = list("travel","blood","self"), - "raise dead" = list("blood","join","hell"), - "summon narsie" = list("hell","join","self"), - "communicate" = list("self","other","technology"), - "emp" = list("destroy","see","technology"), - "manifest" = list("blood","see","travel"), - "summon tome" = list("see","blood","hell"), - "see invisible" = list("see","hell","join"), - "hide" = list("hide","see","blood"), - "reveal" = list("blood","see","hide"), - "astral journey" = list("hell","travel","self"), - "imbue" = list("hell","technology","join"), - "sacrifice" = list("hell","blood","join"), - "summon cultist" = list("join","other","self"), - "free cultist" = list("travel","technology","other"), - "deafen" = list("hide","other","see"), - "blind" = list("destroy","see","other"), - "stun" = list("join","hide","technology"), - "armor" = list("hell","destroy","other"), - "teleport" = list("travel","self"), - "teleport other" = list("travel","other"), - "summon shell" = list("travel","hell","technology") - ) - - - var/list/scribewords = list("none") - - var/list/english = list() - - for (var/entry in words) - if (words[entry] != entry) - english+=list(words[entry] = entry) - - for (var/entry in dictionary) - var/list/required = dictionary[entry] - if (length(english&required) == required.len) - scribewords += entry - - var/chosen_rune = null - - - if(usr) - chosen_rune = input ("Choose a rune to scribe.") in scribewords - if (!chosen_rune) - return - if (chosen_rune == "none") - user << "You decide against scribing a rune, perhaps you should take this time to study your notes." - return - if (chosen_rune == "teleport") - dictionary[chosen_rune] += input ("Choose a destination word") in english - if (chosen_rune == "teleport other") - dictionary[chosen_rune] += input ("Choose a destination word") in english - - if(user.get_active_hand() != src) - return - - for (var/mob/V in viewers(src)) - V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2) - user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world." - user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage - if(do_after(user, 50)) - if(usr.get_active_hand() != src) - return - var/mob/living/carbon/human/H = user - var/obj/effect/rune/R = new /obj/effect/rune(user.loc) - user << "You finish drawing the arcane markings of the Geometer." - var/list/required = dictionary[chosen_rune] - R.word1 = english[required[1]] - R.word2 = english[required[2]] - R.word3 = english[required[3]] - R.check_icon() - R.blood_DNA = list() - R.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type - return + var/mob/living/carbon/human/H = user + var/obj/effect/rune/R = new /obj/effect/rune(user.loc) + user << "You finish drawing the arcane markings of the Geometer." + var/list/required = dictionary[chosen_rune] + R.word1 = english[required[1]] + R.word2 = english[required[2]] + R.word3 = english[required[3]] + R.check_icon() + R.blood_DNA = list() + R.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type + return else user << "The book seems full of illegible scribbles. Is this a joke?" return diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 9a4374959f7..718f9ad8d65 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -233,127 +233,41 @@ gangster_mind.current.visible_message("[gangster_mind.current] looks like they've given up the life of crime!") gangster_mind.current << "You have been reformed! You are no longer a gangster!" - update_gang_icons_removed(gangster_mind) + update_gang_icons_removed(gangster_mind, gang) +/////////////////////// +//Add/remove gang HUD// +/////////////////////// +/datum/game_mode/proc/get_gang_hud(var/gang) + var/datum/atom_hud/antag/ganghud = null + switch(gang) + if("A") ganghud = huds[ANTAG_HUD_GANG_A] + if("B") ganghud = huds[ANTAG_HUD_GANG_B] + return ganghud -///////////////////////////////////////////////////////////////////////////////////////////////// -//Keeps track of players having the correct icons//////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/update_all_gang_icons() - spawn(0) - var/list/all_gangsters = A_bosses + B_bosses + A_gangsters + B_gangsters +/datum/game_mode/proc/get_gang_bosses(var/gang) + var/bosses = null + switch(gang) + if("A") bosses = A_bosses + if("B") bosses = B_bosses + return bosses - //Delete all gang icons - for(var/datum/mind/gang_mind in all_gangsters) - if(gang_mind.current) - if(gang_mind.current.client) - for(var/image/I in gang_mind.current.client.images) - if(I.icon_state == "gangster" || I.icon_state == "gang_boss") - del(I) - - update_gang_icons("A") - update_gang_icons("B") - -/datum/game_mode/proc/update_gang_icons(var/gang) - var/list/bosses - var/list/gangsters - if(gang == "A") - bosses = A_bosses - gangsters = A_gangsters - else if(gang == "B") - bosses = B_bosses - gangsters = B_gangsters - else - world << "ERROR: Invalid gang in update_gang_icons()" - - //Update gang icons for boss' visions - for(var/datum/mind/boss_mind in bosses) - if(boss_mind.current) - if(boss_mind.current.client) - for(var/datum/mind/gangster_mind in gangsters) - if(gangster_mind.current) - var/I = image('icons/mob/mob.dmi', loc = gangster_mind.current, icon_state = "gangster") - boss_mind.current.client.images += I - for(var/datum/mind/boss2_mind in bosses) - if(boss2_mind.current) - var/I = image('icons/mob/mob.dmi', loc = boss2_mind.current, icon_state = "gang_boss") - boss_mind.current.client.images += I - - //Update boss and self icons for gangsters' visions - for(var/datum/mind/gangster_mind in gangsters) - if(gangster_mind.current) - if(gangster_mind.current.client) - for(var/datum/mind/boss_mind in bosses) - if(boss_mind.current) - var/I = image('icons/mob/mob.dmi', loc = boss_mind.current, icon_state = "gang_boss") - gangster_mind.current.client.images += I - //Tag themselves to see - var/K - if(gangster_mind in bosses) //If the new gangster is a boss himself - K = image('icons/mob/mob.dmi', loc = gangster_mind.current, icon_state = "gang_boss") - else - K = image('icons/mob/mob.dmi', loc = gangster_mind.current, icon_state = "gangster") - gangster_mind.current.client.images += K - -///////////////////////////////////////////////// -//Assigns icons when a new gangster is recruited// -///////////////////////////////////////////////// /datum/game_mode/proc/update_gang_icons_added(datum/mind/recruit_mind, var/gang) - var/list/bosses - if(gang == "A") - bosses = A_bosses - else if(gang == "B") - bosses = B_bosses - if(!gang) - world << "ERROR: Invalid gang in update_gang_icons_added()" + var/datum/atom_hud/antag/ganghud = get_gang_hud(gang) + var/bosses = get_gang_bosses(gang) + if(!ganghud) + ERROR("Invalid gang in update_gang_icons_added(): [gang]") - spawn(0) - for(var/datum/mind/boss_mind in bosses) - //Tagging the new gangster for the bosses to see - if(boss_mind.current) - if(boss_mind.current.client) - var/I - if(recruit_mind in bosses) //If the new gangster is a boss himself - I = image('icons/mob/mob.dmi', loc = recruit_mind.current, icon_state = "gang_boss") - else - I = image('icons/mob/mob.dmi', loc = recruit_mind.current, icon_state = "gangster") - boss_mind.current.client.images += I - //Tagging every boss for the new gangster to see - if(recruit_mind.current) - if(recruit_mind.current.client) - var/image/J = image('icons/mob/mob.dmi', loc = boss_mind.current, icon_state = "gang_boss") - recruit_mind.current.client.images += J - //Tag themselves to see - if(recruit_mind.current) - if(recruit_mind.current.client) - var/K - if(recruit_mind in bosses) //If the new gangster is a boss himself - K = image('icons/mob/mob.dmi', loc = recruit_mind.current, icon_state = "gang_boss") - else - K = image('icons/mob/mob.dmi', loc = recruit_mind.current, icon_state = "gangster") - recruit_mind.current.client.images += K + ganghud.join_hud(recruit_mind.current) + set_antag_hud(recruit_mind.current, ((recruit_mind in bosses) ? "gang_boss" : "gangster")) -//////////////////////////////////////// -//Keeps track of deconverted gangsters// -//////////////////////////////////////// -/datum/game_mode/proc/update_gang_icons_removed(datum/mind/defector_mind) - var/list/all_gangsters = A_bosses + B_bosses + A_gangsters + B_gangsters +/datum/game_mode/proc/update_gang_icons_removed(datum/mind/defector_mind, var/gang) + var/datum/atom_hud/antag/ganghud = get_gang_hud(gang) + if(!ganghud) + ERROR("Invalid gang in update_gang_icons_removed(): [gang]") - spawn(0) - //Remove defector's icon from gangsters' visions - for(var/datum/mind/boss_mind in all_gangsters) - if(boss_mind.current) - if(boss_mind.current.client) - for(var/image/I in boss_mind.current.client.images) - if((I.icon_state == "gangster" || I.icon_state == "gang_boss") && I.loc == defector_mind.current) - del(I) - - //Remove gang icons from defector's vision - if(defector_mind.current) - if(defector_mind.current.client) - for(var/image/I in defector_mind.current.client.images) - if(I.icon_state == "gangster" || I.icon_state == "gang_boss") - del(I) + ganghud.leave_hud(defector_mind.current) + set_antag_hud(defector_mind.current, null) /////////////////////////// //Checks for gang victory// diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index b9ed5c88c54..214683449ef 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -1,13 +1,25 @@ /var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds //set to at least 100 unless you want evarr ruining every round -/var/list/meteorsA = list(/obj/effect/meteor/dust=3, /obj/effect/meteor/medium=8, /obj/effect/meteor/big=3, \ - /obj/effect/meteor/flaming=1, /obj/effect/meteor/irradiated=3) +//Meteors probability of spawning during a given wave +/var/list/meteors_normal = list(/obj/effect/meteor/dust=3, /obj/effect/meteor/medium=8, /obj/effect/meteor/big=3, \ + /obj/effect/meteor/flaming=1, /obj/effect/meteor/irradiated=3) //for normal meteor event -/var/list/meteorsB = list(/obj/effect/meteor/meaty=5, /obj/effect/meteor/meaty/xeno=1) +/var/list/meteors_threatening = list(/obj/effect/meteor/medium=4, /obj/effect/meteor/big=8, \ + /obj/effect/meteor/flaming=3, /obj/effect/meteor/irradiated=3) //for threatening meteor event + +/var/list/meteors_catastrophic = list(/obj/effect/meteor/medium=5, /obj/effect/meteor/big=75, \ + /obj/effect/meteor/flaming=10, /obj/effect/meteor/irradiated=10, /obj/effect/meteor/tunguska = 1) //for catastrophic meteor event + +/var/list/meteorsB = list(/obj/effect/meteor/meaty=5, /obj/effect/meteor/meaty/xeno=1) //for meaty ore event /var/list/meteorsC = list(/obj/effect/meteor/dust) //for space dust event + +/////////////////////////////// +//Meteor spawning global procs +/////////////////////////////// + /proc/spawn_meteors(var/number = 10, var/list/meteortypes) for(var/i = 0; i < number; i++) spawn_meteor(meteortypes) @@ -16,7 +28,7 @@ var/turf/pickedstart var/turf/pickedgoal var/max_i = 10//number of tries to spawn meteor. - while (!istype(pickedstart, /turf/space) || pickedstart.loc.name != "Space" ) + while (!istype(pickedstart, /turf/space)) var/startSide = pick(cardinal) pickedstart = spaceDebrisStartLoc(startSide, 1) pickedgoal = spaceDebrisFinishLoc(startSide, 1) @@ -69,6 +81,9 @@ var/turf/T = locate(endx, endy, Z) return T +/////////////////////// +//The meteor effect +////////////////////// /obj/effect/meteor name = "the concept of meteor" @@ -83,7 +98,7 @@ pass_flags = PASSTABLE var/heavy = 0 var/meteorsound = 'sound/effects/meteorimpact.ogg' - var/z_original + var/z_original = 1 var/meteordrop = /obj/item/weapon/ore/iron var/dropamt = 2 @@ -91,80 +106,66 @@ /obj/effect/meteor/Move() if(z != z_original || loc == dest) qdel(src) - return ..() + return + + . = ..() //process movement... + + if(.)//.. if did move, ram the turf we get in + var/turf/T = get_turf(loc) + ram_turf(T) + + if(prob(10) && !istype(T, /turf/space))//randomly takes a 'hit' from ramming + get_hit() + + return . /obj/effect/meteor/Destroy() walk(src,0) //this cancels the walk_towards() proc ..() -/obj/effect/meteor/dust - name = "space dust" - icon_state = "dust" - pass_flags = PASSTABLE | PASSGRILLE - hits = 1 - hitpwr = 3 - meteorsound = 'sound/weapons/throwtap.ogg' - meteordrop = /obj/item/weapon/ore/glass - -/obj/effect/meteor/medium - name = "meteor" - dropamt = 3 - -/obj/effect/meteor/big - name = "big meteor" - icon_state = "large" - hits = 7 - heavy = 1 - dropamt = 4 - -/obj/effect/meteor/flaming - name = "flaming meteor" - icon_state = "flaming" - hits = 3 - heavy = 1 - meteorsound = 'sound/effects/bamf.ogg' - meteordrop = /obj/item/weapon/ore/plasma - -/obj/effect/meteor/irradiated - name = "glowing meteor" - icon_state = "glowing" - hits = 4 - heavy = 1 - meteordrop = /obj/item/weapon/ore/uranium - -/obj/effect/meteor/meaty - name = "meaty ore" - icon_state = "meateor" - desc = "Just... don't think too hard about where this thing came from." - hits = 2 - heavy = 1 - meteorsound = 'sound/effects/blobattack.ogg' - meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat - var/meteorgibs = /obj/effect/gibspawner/generic - -/obj/effect/meteor/meaty/xeno - color = "#5EFF00" - meteordrop = /obj/item/weapon/reagent_containers/food/snacks/xenomeat - meteorgibs = /obj/effect/gibspawner/xeno - - /obj/effect/meteor/New() ..() SpinAnimation() /obj/effect/meteor/Bump(atom/A) if(A) - A.ex_act(hitpwr) + ram_turf(get_turf(A)) playsound(src.loc, meteorsound, 40, 1) - if(--src.hits <= 0) + get_hit() + +/obj/effect/meteor/proc/ram_turf(var/turf/T) + //first bust whatever is in the turf + for(var/atom/A in T) + if(A != src) + A.ex_act(hitpwr) + + //then, ram the turf if it still exists + if(T) + T.ex_act(hitpwr) + + +//process getting 'hit' by colliding with a dense object +//or randomly when ramming turfs +/obj/effect/meteor/proc/get_hit() + hits-- + if(hits <= 0) make_debris() meteor_effect(heavy) qdel(src) - /obj/effect/meteor/ex_act() return +/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/pickaxe)) + qdel(src) + return + ..() + +/obj/effect/meteor/proc/make_debris() + for(var/throws = dropamt, throws > 0, throws--) + var/obj/item/O = new meteordrop(get_turf(src)) + O.throw_at(dest, 5, 10) /obj/effect/meteor/proc/meteor_effect(var/sound=1) if(sound) @@ -176,20 +177,60 @@ shake_camera(M, dist > 20 ? 3 : 5, dist > 20 ? 1 : 3) M.playsound_local(src.loc, meteorsound, 50, 1, get_rand_frequency(), 10) +/////////////////////// +//Meteor types +/////////////////////// + +//Dust +/obj/effect/meteor/dust + name = "space dust" + icon_state = "dust" + pass_flags = PASSTABLE | PASSGRILLE + hits = 1 + hitpwr = 3 + meteorsound = 'sound/weapons/throwtap.ogg' + meteordrop = /obj/item/weapon/ore/glass + +//Medium-sized +/obj/effect/meteor/medium + name = "meteor" + dropamt = 3 /obj/effect/meteor/medium/meteor_effect() ..(heavy) - explosion(src.loc, 1, 2, 3, 4, 0) + explosion(src.loc, 0, 1, 2, 3, 0) +//Large-sized +/obj/effect/meteor/big + name = "big meteor" + icon_state = "large" + hits = 6 + heavy = 1 + dropamt = 4 /obj/effect/meteor/big/meteor_effect() ..(heavy) - explosion(src.loc, 0, 1, 2, 3, 0) + explosion(src.loc, 1, 2, 3, 4, 0) +//Flaming meteor +/obj/effect/meteor/flaming + name = "flaming meteor" + icon_state = "flaming" + hits = 5 + heavy = 1 + meteorsound = 'sound/effects/bamf.ogg' + meteordrop = /obj/item/weapon/ore/plasma /obj/effect/meteor/flaming/meteor_effect() ..(heavy) - explosion(src.loc, 0, 1, 2, 3, 0, 0, 5) + explosion(src.loc, 1, 2, 3, 4, 0, 0, 5) + +//Radiation meteor +/obj/effect/meteor/irradiated + name = "glowing meteor" + icon_state = "glowing" + heavy = 1 + meteordrop = /obj/item/weapon/ore/uranium /obj/effect/meteor/irradiated/meteor_effect() @@ -199,20 +240,77 @@ for(var/mob/living/L in view(5, src)) L.apply_effect(40, IRRADIATE) - - -/obj/effect/meteor/proc/make_debris() - for(var/throws = dropamt, throws > 0, throws--) - var/obj/item/O = new meteordrop(get_turf(src)) - O.throw_at(dest, 5, 10) +//Meaty Ore +/obj/effect/meteor/meaty + name = "meaty ore" + icon_state = "meateor" + desc = "Just... don't think too hard about where this thing came from." + hits = 2 + heavy = 1 + meteorsound = 'sound/effects/blobattack.ogg' + meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat + var/meteorgibs = /obj/effect/gibspawner/generic /obj/effect/meteor/meaty/make_debris() ..() new meteorgibs(get_turf(src)) -/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pickaxe)) - qdel(src) - return - ..() \ No newline at end of file +/obj/effect/meteor/meaty/ram_turf(var/turf/T) + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/blood (T) + +/obj/effect/meteor/meaty/Bump(atom/A) + A.ex_act(hitpwr) + get_hit() + +//Meaty Ore Xeno edition +/obj/effect/meteor/meaty/xeno + color = "#5EFF00" + meteordrop = /obj/item/weapon/reagent_containers/food/snacks/xenomeat + meteorgibs = /obj/effect/gibspawner/xeno + +/obj/effect/meteor/meaty/xeno/ram_turf(var/turf/T) + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/xenoblood (T) + +//Station buster Tunguska +/obj/effect/meteor/tunguska + name = "tunguska meteor" + icon_state = "flaming" + desc = "Your life briefly passes before your eyes the moment you lay them on this monstruosity" + hits = 30 + hitpwr = 1 + heavy = 1 + meteorsound = 'sound/effects/bamf.ogg' + meteordrop = /obj/item/weapon/ore/plasma + +/obj/effect/meteor/tunguska/meteor_effect() + ..(heavy) + explosion(src.loc, 5, 10, 15, 20, 0) + +/obj/effect/meteor/tunguska/Bump() + ..() + if(prob(20)) + explosion(src.loc,2,4,6,8) + +////////////////////////// +//Spookoween meteors +///////////////////////// + +/var/list/meteorsSPOOKY = list(/obj/effect/meteor/pumpkin) + +/obj/effect/meteor/pumpkin + name = "PUMPKING" + desc = "THE PUMPKING'S COMING!" + icon = 'icons/obj/meteor_spooky.dmi' + icon_state = "pumpkin" + hits = 10 + heavy = 1 + dropamt = 1 + +/obj/effect/meteor/pumpkin/New() + ..() + meteordrop = pick(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin) + meteorsound = pick('sound/hallucinations/im_here1.ogg','sound/hallucinations/im_here2.ogg') +////////////////////////// \ No newline at end of file diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm index 266a7c35e06..29f3a209052 100644 --- a/code/game/gamemodes/monkey/monkey.dm +++ b/code/game/gamemodes/monkey/monkey.dm @@ -63,7 +63,7 @@ ape_infectees += carriermind var/datum/disease/D = new /datum/disease/transformation/jungle_fever - D.hidden = list(1,1) + D.visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC D.holder = carriermind.current D.affected_mob = carriermind.current carriermind.current.viruses += D @@ -71,7 +71,7 @@ /datum/game_mode/monkey/proc/check_monkey_victory() for(var/mob/living/carbon/monkey/M in living_mob_list) - if (M.has_disease(/datum/disease/transformation/jungle_fever)) + if (M.HasDisease(/datum/disease/transformation/jungle_fever)) var/area/A = get_area(M) if(is_type_in_list(A, centcom_areas)) escaped_monkeys++ diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 913aaef67bd..44abc4ce462 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -48,44 +48,15 @@ //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/update_all_synd_icons() - spawn(0) - for(var/datum/mind/synd_mind in syndicates) - if(synd_mind.current) - if(synd_mind.current.client) - for(var/image/I in synd_mind.current.client.images) - if(I.icon_state == "synd") - del(I) - - for(var/datum/mind/synd_mind in syndicates) - if(synd_mind.current) - if(synd_mind.current.client) - for(var/datum/mind/synd_mind_1 in syndicates) - if(synd_mind_1.current) - var/I = image('icons/mob/mob.dmi', loc = synd_mind_1.current, icon_state = "synd") - synd_mind.current.client.images += I - /datum/game_mode/proc/update_synd_icons_added(datum/mind/synd_mind) - spawn(0) - if(synd_mind.current) - if(synd_mind.current.client) - var/I = image('icons/mob/mob.dmi', loc = synd_mind.current, icon_state = "synd") - synd_mind.current.client.images += I + var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS] + opshud.join_hud(synd_mind.current) + set_antag_hud(synd_mind.current, "synd") /datum/game_mode/proc/update_synd_icons_removed(datum/mind/synd_mind) - spawn(0) - for(var/datum/mind/synd in syndicates) - if(synd.current) - if(synd.current.client) - for(var/image/I in synd.current.client.images) - if(I.icon_state == "synd" && I.loc == synd_mind.current) - del(I) - - if(synd_mind.current) - if(synd_mind.current.client) - for(var/image/I in synd_mind.current.client.images) - if(I.icon_state == "synd") - del(I) + var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS] + opshud.leave_hud(synd_mind.current) + set_antag_hud(synd_mind.current, null) //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -129,8 +100,6 @@ spawnpos++ update_synd_icons_added(synd_mind) - update_all_synd_icons() - if(uplinklocker) new /obj/structure/closet/syndicate/nuclear(uplinklocker.loc) if(nuke_spawn && synd_spawn.len > 0) @@ -192,12 +161,12 @@ /datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob) var/radio_freq = SYND_FREQ - var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(synd_mob) + var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(synd_mob) R.set_frequency(radio_freq) synd_mob.equip_to_slot_or_del(R, slot_ears) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(synd_mob), slot_shoes) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), slot_shoes) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id) if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 2ae24e26182..0d5dfc22397 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -149,7 +149,7 @@ var/bomb_set if ((M.client && M.machine == src)) src.attack_hand(M) -/obj/machinery/nuclearbomb/ex_act(severity) +/obj/machinery/nuclearbomb/ex_act(severity, specialty) return /obj/machinery/nuclearbomb/blob_act() @@ -239,8 +239,9 @@ var/bomb_set if(blobstart.len > 0) var/obj/item/weapon/disk/nuclear/NEWDISK = new(pick(blobstart)) transfer_fingerprints_to(NEWDISK) - message_admins("[src] has been destroyed in ([x], [y] ,[z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).") - log_game("[src] has been destroyed in ([x], [y] ,[z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).") + var/turf/diskturf = get_turf(src) + message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).") + log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).") del(src) //Needed to clear all references to it else ERROR("[src] was supposed to be destroyed, but we were unable to locate a blobstart landmark to spawn a new one.") diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 0b07f069680..16d32663163 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -77,7 +77,7 @@ point_at(location) if(mode == 2) point_at(target) - usr << "You activate the pinpointer.,/span>" + usr << "You activate the pinpointer." else active = 0 icon_state = "pinoff" @@ -89,6 +89,9 @@ set name = "Toggle Pinpointer Mode" set src in view(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + active = 0 icon_state = "pinoff" target=null diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 8e8c6a4f021..c42a1adad96 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -63,7 +63,7 @@ datum/objective/assassinate/check_completion() datum/objective/assassinate/update_explanation_text() ..() if(target && target.current) - explanation_text = "Assassinate [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role]." + explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." else explanation_text = "Free Objective" @@ -90,7 +90,7 @@ datum/objective/mutiny/check_completion() datum/objective/mutiny/update_explanation_text() ..() if(target && target.current) - explanation_text = "Assassinate or exile [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role]." + explanation_text = "Assassinate or exile [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." else explanation_text = "Free Objective" @@ -126,7 +126,7 @@ datum/objective/maroon/check_completion() datum/objective/maroon/update_explanation_text() if(target && target.current) - explanation_text = "Prevent [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive." + explanation_text = "Prevent [target.name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive." else explanation_text = "Free Objective" @@ -158,7 +158,7 @@ datum/objective/debrain/check_completion() datum/objective/debrain/update_explanation_text() ..() if(target && target.current) - explanation_text = "Steal the brain of [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role]." + explanation_text = "Steal the brain of [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." else explanation_text = "Free Objective" @@ -185,7 +185,7 @@ datum/objective/protect/check_completion() datum/objective/protect/update_explanation_text() ..() if(target && target.current) - explanation_text = "Protect [target.current.real_name], the [!target_role_type ? target.assigned_role : target.special_role]." + explanation_text = "Protect [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." else explanation_text = "Free Objective" @@ -274,6 +274,32 @@ datum/objective/escape/check_completion() else return 0 +datum/objective/escape/escape_with_identity + dangerrating = 10 + var/target_real_name // Has to be stored because the target's real_name can change over the course of the round + +datum/objective/escape/escape_with_identity/find_target() + target = ..() + update_explanation_text() + +datum/objective/escape/escape_with_identity/update_explanation_text() + if(target && target.current) + target_real_name = target.current.real_name + explanation_text = "Escape on the shuttle or an escape pod with the identity of [target_real_name], the [target.assigned_role]." + else + explanation_text = "Free Objective." + +datum/objective/escape/escape_with_identity/check_completion() + if(!target_real_name) + return 1 + if(!ishuman(owner.current)) + return 0 + var/mob/living/carbon/human/H = owner.current + if(..()) + if(H.dna.real_name == target_real_name) + if(H.get_id_name()== target_real_name) + return 1 + return 0 datum/objective/survive @@ -394,7 +420,7 @@ datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) datum/objective/steal/exchange/update_explanation_text() ..() if(target && target.current) - explanation_text = "Acquire [targetinfo.name] held by [target.current.real_name], the [target.assigned_role] and syndicate agent" + explanation_text = "Acquire [targetinfo.name] held by [target.name], the [target.assigned_role] and syndicate agent" else explanation_text = "Free Objective" @@ -526,6 +552,6 @@ datum/objective/destroy/check_completion() datum/objective/destroy/update_explanation_text() ..() if(target && target.current) - explanation_text = "Destroy [target.current.real_name], the experimental AI." + explanation_text = "Destroy [target.name], the experimental AI." else - explanation_text = "Free Objective" + explanation_text = "Free Objective" diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index b0e35a07051..0390064db5c 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -33,6 +33,12 @@ datum/objective_item/steal/jetpack targetitem = /obj/item/weapon/tank/jetpack difficulty = 3 +datum/objective_item/steal/defib + name = "a defibrillator" + targetitem = /obj/item/weapon/defibrillator + difficulty = 4 + excludefromjob = list("Chief Medical Officer", "Medical Doctor") + datum/objective_item/steal/magboots name = "the chief engineer's advanced magnetic boots" targetitem = /obj/item/clothing/shoes/magboots/advance diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 419f94c5b71..3dc96cba6fb 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -4,7 +4,6 @@ // Just make sure the converter is a head before you call it! // To remove a rev (from brainwashing or w/e), call ticker.mode:remove_revolutionary(_THE_PLAYERS_MIND_), // this will also check they're not a head, so it can just be called freely -// If the rev icons start going wrong for some reason, ticker.mode:update_all_rev_icons() can be called to correct them. // If the game somtimes isn't registering a win properly, then ticker.mode.check_win() isn't being called somewhere. /datum/game_mode @@ -75,8 +74,7 @@ var/datum/mind/trotsky = pick(head_revolutionaries) antag_candidates += trotsky head_revolutionaries -= trotsky - - heads_to_kill = heads + update_rev_icons_removed(trotsky) for(var/datum/mind/rev_mind in head_revolutionaries) log_game("[rev_mind.key] (ckey) has been selected as a head rev") @@ -164,6 +162,7 @@ rev_obj.target = head_mind rev_obj.explanation_text = "Assassinate [head_mind.name], the [head_mind.assigned_role]." rev_mind.objectives += rev_obj + heads_to_kill += head_mind //////////////////////////////////////////// //Checks if new heads have joined midround// @@ -258,120 +257,21 @@ else M << "[rev_mind.current] looks like they just remembered their real allegiance!" - -///////////////////////////////////////////////////////////////////////////////////////////////// -//Keeps track of players having the correct icons//////////////////////////////////////////////// -//CURRENTLY CONTAINS BUGS://///////////////////////////////////////////////////////////////////// -//-PLAYERS THAT HAVE BEEN REVS FOR AWHILE OBTAIN THE BLUE ICON WHILE STILL NOT BEING A REV HEAD// -// -Possibly caused by cloning of a standard rev///////////////////////////////////////////////// -//-UNCONFIRMED: DECONVERTED REVS NOT LOSING THEIR ICON PROPERLY////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/update_all_rev_icons() - spawn(0) - for(var/datum/mind/head_rev_mind in head_revolutionaries) - if(head_rev_mind.current) - if(head_rev_mind.current.client) - for(var/image/I in head_rev_mind.current.client.images) - if(I.icon_state == "rev" || I.icon_state == "rev_head") - del(I) - - for(var/datum/mind/rev_mind in revolutionaries) - if(rev_mind.current) - if(rev_mind.current.client) - for(var/image/I in rev_mind.current.client.images) - if(I.icon_state == "rev" || I.icon_state == "rev_head") - del(I) - - for(var/datum/mind/head_rev in head_revolutionaries) - if(head_rev.current) - if(head_rev.current.client) - for(var/datum/mind/rev in revolutionaries) - if(rev.current) - var/I = image('icons/mob/mob.dmi', loc = rev.current, icon_state = "rev") - head_rev.current.client.images += I - for(var/datum/mind/head_rev_1 in head_revolutionaries) - if(head_rev_1.current) - var/I = image('icons/mob/mob.dmi', loc = head_rev_1.current, icon_state = "rev_head") - head_rev.current.client.images += I - - for(var/datum/mind/rev in revolutionaries) - if(rev.current) - if(rev.current.client) - for(var/datum/mind/head_rev in head_revolutionaries) - if(head_rev.current) - var/I = image('icons/mob/mob.dmi', loc = head_rev.current, icon_state = "rev_head") - rev.current.client.images += I - for(var/datum/mind/rev_1 in revolutionaries) - if(rev_1.current) - var/I = image('icons/mob/mob.dmi', loc = rev_1.current, icon_state = "rev") - rev.current.client.images += I - -//////////////////////////////////////////////////// -//Keeps track of converted revs icons/////////////// -//Refer to above bugs. They may apply here as well// -//////////////////////////////////////////////////// +///////////////////////////////////// +//Adds the rev hud to a new convert// +///////////////////////////////////// /datum/game_mode/proc/update_rev_icons_added(datum/mind/rev_mind) - spawn(0) - for(var/datum/mind/head_rev_mind in head_revolutionaries) + var/datum/atom_hud/antag/revhud = huds[ANTAG_HUD_REV] + revhud.join_hud(rev_mind.current) + set_antag_hud(rev_mind.current, ((rev_mind in head_revolutionaries) ? "rev_head" : "rev")) - //Tagging the new rev for revheads to see - if(head_rev_mind.current) - if(head_rev_mind.current.client) - var/I - if(rev_mind in head_revolutionaries) //If the new rev is a head rev - I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev_head") - else - I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev") - head_rev_mind.current.client.images += I - - //Tagging the revheads for new rev to see - if(rev_mind.current) - if(rev_mind.current.client) - var/image/J = image('icons/mob/mob.dmi', loc = head_rev_mind.current, icon_state = "rev_head") - rev_mind.current.client.images += J - - for(var/datum/mind/rev_mind_1 in revolutionaries) - - //Tagging the new rev for fellow revs to see - if(rev_mind_1.current) - if(rev_mind_1.current.client) - var/I - if(rev_mind in head_revolutionaries) //If the new rev is a head rev - I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev_head") - else - I = image('icons/mob/mob.dmi', loc = rev_mind.current, icon_state = "rev") - rev_mind_1.current.client.images += I - - //Tagging fellow revs for the new rev to see - if(rev_mind.current) - if(rev_mind.current.client) - var/image/J = image('icons/mob/mob.dmi', loc = rev_mind_1.current, icon_state = "rev") - rev_mind.current.client.images += J - -/////////////////////////////////// -//Keeps track of deconverted revs// -/////////////////////////////////// +///////////////////////////////////////// +//Removes the hud from deconverted revs// +///////////////////////////////////////// /datum/game_mode/proc/update_rev_icons_removed(datum/mind/rev_mind) - spawn(0) - for(var/datum/mind/head_rev_mind in head_revolutionaries) - if(head_rev_mind.current) - if(head_rev_mind.current.client) - for(var/image/I in head_rev_mind.current.client.images) - if((I.icon_state == "rev" || I.icon_state == "rev_head") && I.loc == rev_mind.current) - del(I) - - for(var/datum/mind/rev_mind_1 in revolutionaries) - if(rev_mind_1.current) - if(rev_mind_1.current.client) - for(var/image/I in rev_mind_1.current.client.images) - if((I.icon_state == "rev" || I.icon_state == "rev_head") && I.loc == rev_mind.current) - del(I) - - if(rev_mind.current) - if(rev_mind.current.client) - for(var/image/I in rev_mind.current.client.images) - if(I.icon_state == "rev" || I.icon_state == "rev_head") - del(I) + var/datum/atom_hud/antag/revhud = huds[ANTAG_HUD_REV] + revhud.leave_hud(rev_mind.current) + set_antag_hud(rev_mind.current, null) ////////////////////////// //Checks for rev victory// diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index a0a004c41cc..3fb4cd2c788 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -21,7 +21,7 @@ datum/airlock_maker var/paintjob = "none" var/glassdoor = 0 - var/doorname = "Airlock" + var/doorname = "airlock" datum/airlock_maker/New(var/atom/target_loc) linked = new(target_loc) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index d1c5b769b03..13b89560a57 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -177,7 +177,7 @@ ..() return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder. -/datum/game_mode/proc/give_codewords(mob/living/traitor_mob) +/proc/give_codewords(mob/living/traitor_mob) traitor_mob << "The Syndicate provided you with the following information on how to identify their agents:" traitor_mob << "Code Phrase: [syndicate_code_phrase]" traitor_mob << "Code Response: [syndicate_code_response]" @@ -195,6 +195,8 @@ killer.set_zeroth_law(law, law_borg) killer << "New law: 0. [law]" give_codewords(killer) + killer.set_syndie_radio() + killer << "Your radio has been upgraded! Use :t to speak on an encrypted channel with Syndicate Agents!" /datum/game_mode/proc/auto_declare_completion_traitor() diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 84ab61c9e0c..360d10cd342 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -43,6 +43,7 @@ Captain var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() minor_announce("Captain [H.real_name] on deck!") diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index e7b5df5df67..701acf7fe5d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -250,6 +250,14 @@ Mime access = list(access_theatre, access_maint_tunnels) minimal_access = list(access_theatre) +/datum/job/mime/equip_backpack(var/mob/living/carbon/human/H) + var/obj/item/weapon/storage/backpack/BPK = new default_backpack(H) + + new default_storagebox(BPK) + new /obj/item/toy/crayon/mime(BPK) + new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(BPK) + + H.equip_to_slot_or_del(BPK, slot_back) /datum/job/mime/equip_items(var/mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/mime(H), slot_w_uniform) @@ -259,13 +267,6 @@ Mime H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/suit/suspenders(H), slot_wear_suit) - if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/toy/crayon/mime(H), slot_l_store) - H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_l_hand) - else - H.equip_to_slot_or_del(new /obj/item/toy/crayon/mime(H), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) - if(H.mind) H.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(null) H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/mime/speak(null) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 613b07e545c..2dff7bffd0e 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -22,7 +22,7 @@ Head of Security default_id = /obj/item/weapon/card/id/silver default_pda = /obj/item/device/pda/heads/hos - default_headset = /obj/item/device/radio/headset/heads/hos + default_headset = /obj/item/device/radio/headset/heads/hos/alt default_backpack = /obj/item/weapon/storage/backpack/security default_satchel = /obj/item/weapon/storage/backpack/satchel_sec @@ -53,6 +53,7 @@ Head of Security var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() /* Warden @@ -70,7 +71,7 @@ Warden minimal_player_age = 7 default_pda = /obj/item/device/pda/warden - default_headset = /obj/item/device/radio/headset/headset_sec + default_headset = /obj/item/device/radio/headset/headset_sec/alt default_backpack = /obj/item/weapon/storage/backpack/security default_satchel = /obj/item/weapon/storage/backpack/satchel_sec @@ -94,6 +95,7 @@ Warden var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() /datum/job/warden/get_access() var/list/L = list() @@ -143,6 +145,7 @@ Detective var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() /* Security Officer @@ -187,6 +190,7 @@ Security Officer var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + H.sec_hud_set_implants() /datum/job/officer/get_access() var/list/L = list() @@ -250,22 +254,21 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science") wires = new(src) secure_radio_connections = new - if(radio_controller) - initialize() + initialize() recalculateChannels() /obj/item/device/radio/headset/headset_sec/department/engi - keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot = new /obj/item/device/encryptionkey/headset_sec keyslot2 = new /obj/item/device/encryptionkey/headset_eng /obj/item/device/radio/headset/headset_sec/department/supply - keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot = new /obj/item/device/encryptionkey/headset_sec keyslot2 = new /obj/item/device/encryptionkey/headset_cargo /obj/item/device/radio/headset/headset_sec/department/med - keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot = new /obj/item/device/encryptionkey/headset_sec keyslot2 = new /obj/item/device/encryptionkey/headset_med /obj/item/device/radio/headset/headset_sec/department/sci - keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot = new /obj/item/device/encryptionkey/headset_sec keyslot2 = new /obj/item/device/encryptionkey/headset_sci diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 842cb714481..906f167875d 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -123,7 +123,7 @@ var/global/datum/controller/occupations/job_master return -//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until� +//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until //it locates a head or runs out of levels to check //This is basically to ensure that there's atleast a few heads in the round /datum/controller/occupations/proc/FillHeadPosition() @@ -275,6 +275,10 @@ var/global/datum/controller/occupations/job_master // Hand out random jobs to the people who didn't get any in the last check // Also makes sure that they got their preference correct + for(var/mob/new_player/player in unassigned) + if(jobban_isbanned(player, "Assistant")) + GiveRandomJob(player) //you get to roll for random before everyone else just to be sure you don't get assistant. you're so speshul + for(var/mob/new_player/player in unassigned) if(player.client.prefs.userandomjob) GiveRandomJob(player) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index f59ff9c6f1e..2d492dfccfc 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -67,9 +67,11 @@ return if(!in_range(src, user)) return - + if(!storedpda)//is the pda still there? + return storedpda.icon_state = P.icon_state storedpda.desc = P.desc + ejectpda() else user << "The [src] is empty." @@ -80,6 +82,9 @@ set category = "Object" set src in oview(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + if(storedpda) storedpda.loc = get_turf(src.loc) storedpda = null diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7e5801c56fe..4881f8a2658 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -11,8 +11,9 @@ icon_state = "sleeper-open" density = 0 anchored = 1 - var/efficiency + interact_offline = 1 state_open = 1 + var/efficiency var/initial_bin_rating = 1 var/min_health = 25 var/list/injection_chems = list() //list of injectable chems except inaprovaline, coz inaprovaline is always avalible @@ -65,6 +66,7 @@ /obj/machinery/sleeper/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise if(M.environment_smash) + M.do_attack_animation(src) visible_message("[M.name] smashes [src] apart!") qdel(src) return @@ -82,28 +84,9 @@ default_deconstruction_crowbar(I) -/obj/machinery/sleeper/ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - qdel(src) - return - if(2.0) - if(prob(50)) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - qdel(src) - return - if(3.0) - if(prob(25)) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - qdel(src) - +/obj/machinery/sleeper/ex_act(severity, specialty) + go_out() + ..() /obj/machinery/sleeper/emp_act(severity) if(stat & (BROKEN|NOPOWER)) @@ -132,11 +115,17 @@ open_machine() /obj/machinery/sleeper/attack_hand(mob/user) - if(stat & (BROKEN|NOPOWER)) + if(..()) + return + + //powerless interaction + if(!is_operational()) + user.unset_machine()//essential to prevent infinite loops of opening/closing the machine if(state_open) close_machine() else open_machine() + else sleeperUI(user) @@ -233,6 +222,8 @@ ..(target) /obj/machinery/sleeper/proc/inject_chem(mob/user, chem) + if(!is_operational()) + return if(occupant && occupant.reagents) if(chem in injection_chems + "inaprovaline") if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 39308cf600b..e132d8a8abe 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -6,7 +6,6 @@ obj/machinery/door/airlock var/frequency var/shockedby = list() var/datum/radio_frequency/radio_connection - explosion_resistance = 15 obj/machinery/door/airlock/receive_signal(datum/signal/signal) @@ -93,8 +92,10 @@ obj/machinery/door/airlock/New() if(radio_controller) set_frequency(frequency) - - +obj/machinery/door/airlock/Destroy() + if(frequency && radio_controller) + radio_controller.remove_object(src,frequency) + ..() obj/machinery/airlock_sensor icon = 'icons/obj/airlock_machines.dmi' @@ -164,7 +165,10 @@ obj/machinery/airlock_sensor/New() if(radio_controller) set_frequency(frequency) - +obj/machinery/airlock_sensor/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + ..() obj/machinery/access_button @@ -220,4 +224,9 @@ obj/machinery/access_button/New() ..() if(radio_controller) - set_frequency(frequency) \ No newline at end of file + set_frequency(frequency) + +obj/machinery/access_button/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + ..() diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 0467c3c3d62..8d99276354a 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -144,6 +144,11 @@ if(ticker && ticker.current_state == 3)//if the game is running src.initialize() +/obj/machinery/alarm/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + ..() + /obj/machinery/alarm/initialize() set_frequency(frequency) if (!master_is_operating()) @@ -188,7 +193,7 @@ popup.open() refresh_all() - if(panel_open && (!istype(user, /mob/living/silicon))) + if(panel_open && (!istype(user, /mob/living/silicon/ai))) wires.Interact(user) return @@ -582,13 +587,13 @@ table tr:first-child th:first-child { border: none;} if(href_list["atmos_alarm"]) - if (alarm_area.atmosalert(2)) + if (alarm_area.atmosalert(2,src)) post_alert(2) spawn(1) src.updateUsrDialog() update_icon() if(href_list["atmos_reset"]) - if (alarm_area.atmosalert(0)) + if (alarm_area.atmosalert(0,src)) post_alert(0) spawn(1) src.updateUsrDialog() @@ -754,7 +759,7 @@ table tr:first-child th:first-child { border: none;} else if (alert_level==0) alert_signal.data["alert"] = "clear" - frequency.post_signal(src, alert_signal) + frequency.post_signal(src, alert_signal,null,-1) /obj/machinery/alarm/proc/apply_danger_level() var/new_area_danger_level = 0 @@ -762,7 +767,7 @@ table tr:first-child th:first-child { border: none;} for (var/obj/machinery/alarm/AA in A) if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted) new_area_danger_level = max(new_area_danger_level,AA.danger_level) - if (alarm_area.atmosalert(new_area_danger_level)) //if area was in normal state or if area was in alert state + if (alarm_area.atmosalert(new_area_danger_level,src)) //if area was in normal state or if area was in alert state post_alert(new_area_danger_level) update_icon() @@ -851,7 +856,8 @@ table tr:first-child th:first-child { border: none;} else stat |= NOPOWER spawn(rand(0,15)) - update_icon() + if(loc) + update_icon() /* AIR ALARM CIRCUIT @@ -1084,10 +1090,10 @@ FIRE ALARM /obj/machinery/firealarm/power_change() if(powered(ENVIRON)) stat &= ~NOPOWER - update_icon() else - spawn(rand(0,15)) - stat |= NOPOWER + stat |= NOPOWER + spawn(rand(0,15)) + if(loc) update_icon() /obj/machinery/firealarm/attack_hand(mob/user as mob) @@ -1166,14 +1172,14 @@ FIRE ALARM if (stat & (NOPOWER|BROKEN)) // can't reset alarm if it's unpowered or broken. return var/area/A = get_area(src) - A.firereset() + A.firereset(src) return /obj/machinery/firealarm/proc/alarm() if (stat & (NOPOWER|BROKEN)) // can't activate alarm if it's unpowered or broken. return var/area/A = get_area(src) - A.firealert() + A.firealert(src) //playsound(src.loc, 'sound/ambience/signal.ogg', 75, 0) return diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 53624f792ec..46230274a91 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -77,14 +77,15 @@ obj/machinery/air_sensor/New() if(radio_controller) set_frequency(frequency) +obj/machinery/air_sensor/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + ..() + ///////////////////////////////////////////////////////////// // GENERAL AIR CONTROL (a.k.a atmos computer) ///////////////////////////////////////////////////////////// -obj/machinery/computer/general_air_control/Destroy() - radio_controller.remove_object(src, frequency) - ..() - obj/machinery/computer/general_air_control icon = 'icons/obj/computer.dmi' icon_state = "tank" @@ -177,7 +178,8 @@ obj/machinery/computer/general_air_control/proc/return_text() return output obj/machinery/computer/general_air_control/Destroy() - radio_controller.remove_object(src, frequency) + if(radio_controller) + radio_controller.remove_object(src, frequency) ..() obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 82df3de7554..b21f8e75145 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -204,7 +204,7 @@ update_flag healthcheck() ..() -/obj/machinery/portable_atmospherics/canister/ex_act(severity) +/obj/machinery/portable_atmospherics/canister/ex_act(severity, specialty) switch(severity) if(1.0) if(destroyed || prob(30)) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 25bc022a36b..3741c13b09e 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -3,7 +3,7 @@ use_power = 0 var/datum/gas_mixture/air_contents = new - var/obj/machinery/atmospherics/portables_connector/connected_port + var/obj/machinery/atmospherics/unary/portables_connector/connected_port var/obj/item/weapon/tank/holding var/volume = 0 @@ -34,7 +34,7 @@ /obj/machinery/portable_atmospherics/update_icon() return null -/obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/portables_connector/new_port) +/obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/unary/portables_connector/new_port) //Make sure not already connected to something else if(connected_port || !new_port || new_port.connected_device) return 0 @@ -46,32 +46,22 @@ //Perform the connection connected_port = new_port connected_port.connected_device = src + connected_port.parent.reconcile_air() anchored = 1 //Prevent movement - - //Actually enforce the air sharing - var/datum/pipe_network/network = connected_port.return_network(src) - if(network && !network.gases.Find(air_contents)) - network.gases += air_contents - network.update = 1 - return 1 /obj/machinery/portable_atmospherics/proc/disconnect() if(!connected_port) return 0 - - var/datum/pipe_network/network = connected_port.return_network(src) - if(network) - network.gases -= air_contents - anchored = 0 - connected_port.connected_device = null connected_port = null - return 1 +/obj/machinery/portable_atmospherics/portableConnectorReturnAir() + return air_contents + /obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if ((istype(W, /obj/item/weapon/tank) && !( src.destroyed ))) if (src.holding) @@ -90,7 +80,7 @@ update_icon() return else - var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector/) in loc + var/obj/machinery/atmospherics/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/unary/portables_connector) in loc if(possible_port) if(connect(possible_port)) user << "You connect [name] to the port." diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 401410e2040..4b235ec3303 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -111,16 +111,12 @@ var/global/list/autolathe_recipes_hidden = list( \ src.LL = autolathe_recipes_hidden /obj/machinery/autolathe/interact(mob/user) - if(..()) - return - if (src.shocked) - src.shock(user,50) + if(shocked && !(stat & NOPOWER)) + shock(user,50) regular_win(user) return /obj/machinery/autolathe/attackby(obj/item/O, mob/user) - if (stat) - return 1 if (busy) user << "The autolathe is busy. Please wait for completion of previous operation." return 1 @@ -145,6 +141,8 @@ var/global/list/autolathe_recipes_hidden = list( \ else attack_hand(user) return 1 + if (stat) + return 1 if (src.m_amount + O.m_amt > max_m_amount) user << "The autolathe is full. Please remove metal from the autolathe in order to insert more." @@ -189,7 +187,7 @@ var/global/list/autolathe_recipes_hidden = list( \ return attack_hand(user) /obj/machinery/autolathe/attack_hand(mob/user) - if(..()) + if(..(user, 0)) return interact(user) @@ -247,13 +245,13 @@ var/global/list/autolathe_recipes_hidden = list( \ if(istype(template, /obj/item/stack)) src.m_amount -= template.m_amt*multiplier src.g_amount -= template.g_amt*multiplier - var/obj/new_item = new template.type(T) + var/obj/item/new_item = new template.type(T) var/obj/item/stack/S = new_item S.amount = multiplier else src.m_amount -= template.m_amt/coeff src.g_amount -= template.g_amt/coeff - var/obj/new_item = new template.type(T) + var/obj/item/new_item = new template.type(T) new_item.m_amt /= coeff new_item.g_amt /= coeff if(src.m_amount < 0) @@ -280,6 +278,8 @@ var/global/list/autolathe_recipes_hidden = list( \ /obj/machinery/autolathe/proc/regular_win(mob/user) var/dat if(!panel_open) + if(stat) + return var/coeff = 2 ** prod_coeff dat = "
Metal amount: [src.m_amount] / [max_m_amount] cm3
" dat += "Glass amount: [src.g_amount] / [max_g_amount] cm3
" @@ -287,7 +287,7 @@ var/global/list/autolathe_recipes_hidden = list( \ objs += src.L if(src.hacked) objs += src.LL - for(var/obj/t in objs) + for(var/obj/item/t in objs) if(disabled || m_amount[t]", "The ", "")
else
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index e897262769f..6bd8d4f84a4 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -6,6 +6,7 @@
luminosity = 3
use_power = 0
var/obj/item/weapon/card/id/botcard // the ID card that the bot "holds"
+ var/list/prev_access = list()
var/on = 1
var/health = 0 //do not forget to set health for your bot!
var/maxhealth = 0
@@ -14,8 +15,74 @@
var/open = 0//Maint panel
var/locked = 1
var/hacked = 0 //Used to differentiate between being hacked by silicons and emagged by humans.
+ var/text_hack = "" //Custom text returned to a silicon upon hacking a bot.
+ var/text_dehack = "" //Text shown when resetting a bots hacked status to normal.
+ var/text_dehack_fail = "" //Shown when a silicon tries to reset a bot emagged with the emag item, which cannot be reset.
+ var/declare_message = "" //What the bot will display to the HUD user.
+ var/frustration = 0 //Used by some bots for tracking failures to reach their target.
+ var/speed = 2 //The speed at which the bot moves, or the number of times it moves per process() tick.
+ var/turf/ai_waypoint //The end point of a bot's path, or the target location.
+ var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint.
+ var/pathset = 0
+ var/list/ignore_list = list() //List of unreachable targets for an ignore-list enabled bot to ignore.
+ var/mode = 0 //Standardizes the vars that indicate the bot is busy with its function.
+ var/tries = 0 //Number of times the bot tried and failed to move.
+ var/remote_disabled = 0 //If enabled, the AI cannot *Remotely* control a bot. It can still control it through cameras.
+ var/mob/living/silicon/ai/calling_ai //Links a bot to the AI calling it.
+ var/obj/item/device/radio/Radio //The bot's radio, for speaking to people.
+ var/radio_frequency //The bot's default radio speaking freqency. Recommended to be on a department frequency.
//var/emagged = 0 //Urist: Moving that var to the general /bot tree as it's used by most bots
+ var/auto_patrol = 0// set to make bot automatically patrol
+ var/turf/patrol_target // this is turf to navigate to (location of beacon)
+ var/turf/summon_target // The turf of a user summoning a bot.
+ var/new_destination // pending new destination (waiting for beacon response)
+ var/destination // destination description tag
+ var/next_destination // the next destination in the patrol route
+ var/blockcount = 0 //number of times retried a blocked path
+ var/awaiting_beacon = 0 // count of pticks awaiting a beacon response
+
+ var/nearest_beacon // the nearest beacon's tag
+ var/turf/nearest_beacon_loc // the nearest beacon's location
+
+ var/beacon_freq = 1445 // navigation beacon frequency
+ var/control_freq = 1447 // bot control frequency
+
+ var/bot_filter // The radio filter the bot uses to identify itself on the network.
+
+ var/bot_type = 0 //The type of bot it is, for radio control.
+ #define SEC_BOT 1 // Secutritrons (Beepsky) and ED-209s
+ #define MULE_BOT 2 // MULEbots
+ #define FLOOR_BOT 3 // Floorbots
+ #define CLEAN_BOT 4 // Cleanbots
+ #define MED_BOT 5 // Medibots
+
+ #define DEFAULT_SCAN_RANGE 7 //default view range for finding targets.
+
+ //Mode defines
+ #define BOT_IDLE 0 // idle
+ #define BOT_HUNT 1 // found target, hunting
+ #define BOT_PREP_ARREST 2 // at target, preparing to arrest
+ #define BOT_ARREST 3 // arresting target
+ #define BOT_START_PATROL 4 // start patrol
+ #define BOT_PATROL 5 // patrolling
+ #define BOT_SUMMON 6 // summoned by PDA
+ #define BOT_CLEANING 7 // cleaning (cleanbots)
+ #define BOT_REPAIRING 8 // repairing hull breaches (floorbots)
+ #define BOT_MOVING 9 // for clean/floor bots, when moving.
+ #define BOT_HEALING 10 // healing people (medbots)
+ #define BOT_RESPONDING 11 // responding to a call from the AI
+ #define BOT_LOADING 12 // loading/unloading
+ #define BOT_DELIVER 13 // moving to deliver
+ #define BOT_GO_HOME 14 // returning to home
+ #define BOT_BLOCKED 15 // blocked
+ #define BOT_NAV 16 // computing navigation
+ #define BOT_WAIT_FOR_NAV 17 // waiting for nav computation
+ #define BOT_NO_ROUTE 18 // no destination beacon found (or no route)
+ var/list/mode_name = list("In Pursuit","Preparing to Arrest","Arresting","Beginning Patrol","Patrolling","Summoned by PDA", \
+ "Cleaning", "Repairing", "Proceeding to work site","Healing","Responding","Loading/Unloading","Navigating to Delivery Location","Navigating to Home", \
+ "Waiting for clear path","Calculating navigation path","Pinging beacon network","Unable to reach destination")
+ //This holds text for what the bot is mode doing, reported on the AI's bot control interface.
/obj/machinery/bot/proc/turn_on()
if(stat) return 0
@@ -26,26 +93,56 @@
/obj/machinery/bot/proc/turn_off()
on = 0
SetLuminosity(0)
+ bot_reset() //Resets an AI's call, should it exist.
+
+/obj/machinery/bot/New()
+ ..()
+ aibots += src //Global bot list
+ botcard = new /obj/item/weapon/card/id(src)
+ set_custom_texts()
+ Radio = new /obj/item/device/radio(src)
+ Radio.listening = 0 //Makes bot radios transmit only so no one hears things while adjacent to one.
+
+/obj/machinery/bot/Destroy()
+ if(radio_controller)
+ radio_controller.remove_object(src,beacon_freq)
+ if(bot_filter)
+ radio_controller.remove_object(src,control_freq)
+ ..()
+
+/obj/machinery/bot/proc/add_to_beacons(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots.
+ if(radio_controller)
+ radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+ if(bot_filter)
+ radio_controller.add_object(src, control_freq, filter = bot_filter)
+
/obj/machinery/bot/proc/explode()
+ aibots -= src
qdel(src)
/obj/machinery/bot/proc/healthcheck()
- if (src.health <= 0)
- src.explode()
+ if (health <= 0)
+ explode()
-/obj/machinery/bot/proc/Emag(mob/user as mob)
- if(locked)
+/obj/machinery/bot/proc/Emag(mob/user as mob) //Master Emag proc. Ensure this is called in your bot before setting unique functions.
+ if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again.
locked = 0
emagged = 1
user << "You bypass [src]'s controls."
- if(!locked && open)
+ if(!locked && open) //Bot panel is unlocked by ID or emag, and the panel is screwed open. Ready for emagging.
emagged = 2
+ remote_disabled = 1 //Manually emagging the bot locks out the AI built in panel.
+ locked = 1 //Access denied forever!
+ bot_reset()
+ turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP.
+ else //Bot is unlocked, but the maint panel has not been opened with a screwdriver yet.
+ user << "You need to open maintenance panel first."
/obj/machinery/bot/examine(mob/user)
..()
- if (src.health < maxhealth)
- if (src.health > maxhealth/3)
+ if (health < maxhealth)
+ if (health > maxhealth/3)
user << "[src]'s parts look loose."
else
user << "[src]'s parts look very loose."
@@ -54,62 +151,130 @@
/obj/machinery/bot/attack_alien(var/mob/living/carbon/alien/user as mob)
user.changeNext_move(CLICK_CD_MELEE)
- src.health -= rand(15,30)*brute_dam_coeff
- src.visible_message("[user] has slashed [src]!")
- playsound(src.loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ user.do_attack_animation(src)
+ health -= rand(15,30)*brute_dam_coeff
+ visible_message("[user] has slashed [src]!")
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
if(prob(10))
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
healthcheck()
/obj/machinery/bot/attack_animal(var/mob/living/simple_animal/M as mob)
- if(M.melee_damage_upper == 0) return
+ M.do_attack_animation(src)
+ if(M.melee_damage_upper == 0)
+ return
M.changeNext_move(CLICK_CD_MELEE)
- src.health -= M.melee_damage_upper
- src.visible_message("[M] has [M.attacktext] [src]!")
+ health -= M.melee_damage_upper
+ visible_message("[M] has [M.attacktext] [src]!")
add_logs(M, src, "attacked", admin=0)
if(prob(10))
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
healthcheck()
+/obj/machinery/bot/Topic(href, href_list) //Master Topic to handle common functions.
+ . = ..()
+ if (.)
+ return
+ if(topic_denied(usr))
+ usr << "[src]'s interface is not responding!"
+ href_list = list()
+ return
+ usr.set_machine(src)
+ add_fingerprint(usr)
+ if((href_list["power"]) && (allowed(usr) || !locked))
+ if (on)
+ turn_off()
+ else
+ turn_on()
+
+ switch(href_list["operation"])
+ if("patrol")
+ auto_patrol = !auto_patrol
+ mode = BOT_IDLE
+ if("remote")
+ remote_disabled = !remote_disabled
+ if("hack")
+ if(emagged != 2)
+ emagged = 2
+ hacked = 1
+ locked = 1
+ usr << "[text_hack]"
+ bot_reset()
+ else if(!hacked)
+ usr << "[text_dehack_fail]"
+ else
+ emagged = 0
+ hacked = 0
+ usr << "[text_dehack]"
+ bot_reset()
+ updateUsrDialog()
+
+/obj/machinery/bot/proc/topic_denied(mob/user) //Access check proc for bot topics! Remember to place in a bot's individual Topic if desired.
+ // 0 for access, 1 for denied.
+ if(emagged == 2) //An emagged bot cannot be controlled by humans, silicons can if one hacked it.
+ if(!hacked) //Manually emagged by a human - access denied to all.
+ return 1
+ else if(!issilicon(user)) //Bot is hacked, so only silicons are allowed access.
+ return 1
+ else
+ return 0
+
+/obj/machinery/bot/proc/bot_process() //Master process which handles code common across most bots.
+
+ set background = BACKGROUND_ENABLED
+
+ if(!on)
+ return
+
+ switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command.
+ if(BOT_RESPONDING) //Called by the AI.
+ call_mode()
+ return
+ if(BOT_SUMMON) //Called by PDA
+ bot_summon()
+ return
+ return 1 //Successful completion. Used to prevent child process() continuing if this one is ended early.
/obj/machinery/bot/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/screwdriver))
if(!locked)
open = !open
- user << "Maintenance panel is now [src.open ? "opened" : "closed"]."
+ user << "Maintenance panel is now [open ? "opened" : "closed"]."
else
user << "Maintenance panel is locked."
- else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
- if(health < maxhealth)
- if(open)
- var/obj/item/weapon/weldingtool/WT = W
- if(!WT.isOn())
- user << "The welder must be on for this task."
- health = min(maxhealth, health+10)
- user.visible_message("[user] repairs [src]!","You repair [src]!")
- else
- user << "Unable to repair with the maintenance panel closed."
- else
- user << "[src] does not need a repair."
else if (istype(W, /obj/item/weapon/card/emag) && emagged < 2)
Emag(user)
else
user.changeNext_move(CLICK_CD_MELEE)
- if(W.force) //if force is non-zero
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(5, 1, src)
- switch(W.damtype)
- if("fire")
- src.health -= W.force * fire_dam_coeff
- s.start()
- if("brute")
- src.health -= W.force * brute_dam_coeff
- s.start()
- ..()
- healthcheck()
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
+ if(health >= maxhealth)
+ user << "[src] does not need a repair."
+ return
+ if(!open)
+ user << "Unable to repair with the maintenance panel closed."
+ return
+ var/obj/item/weapon/weldingtool/WT = W
+ if(WT.remove_fuel(0, user))
+ health = min(maxhealth, health+10)
+ user.visible_message("[user] repairs [src]!","You repair [src]!")
+ else
+ user << "The welder must be on for this task."
+ else
+ if(W.force) //if force is non-zero
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(5, 1, src)
+ switch(W.damtype)
+ if("fire")
+ health -= W.force * fire_dam_coeff
+ s.start()
+ if("brute")
+ health -= W.force * brute_dam_coeff
+ s.start()
+ ..()
+ healthcheck()
/obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj)
@@ -124,24 +289,24 @@
return
/obj/machinery/bot/blob_act()
- src.health -= rand(20,40)*fire_dam_coeff
+ health -= rand(20,40)*fire_dam_coeff
healthcheck()
return
-/obj/machinery/bot/ex_act(severity)
+/obj/machinery/bot/ex_act(severity, specialty)
switch(severity)
if(1.0)
- src.explode()
+ explode()
return
if(2.0)
- src.health -= rand(5,10)*fire_dam_coeff
- src.health -= rand(10,20)*brute_dam_coeff
+ health -= rand(5,10)*fire_dam_coeff
+ health -= rand(10,20)*brute_dam_coeff
healthcheck()
return
if(3.0)
if (prob(50))
- src.health -= rand(1,5)*fire_dam_coeff
- src.health -= rand(1,5)*brute_dam_coeff
+ health -= rand(1,5)*fire_dam_coeff
+ health -= rand(1,5)*brute_dam_coeff
healthcheck()
return
return
@@ -149,7 +314,7 @@
/obj/machinery/bot/emp_act(severity)
var/was_on = on
stat |= EMPED
- var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
+ var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( loc )
pulse2.icon = 'icons/effects/effects.dmi'
pulse2.icon_state = "empdisable"
pulse2.name = "emp sparks"
@@ -167,17 +332,466 @@
/obj/machinery/bot/proc/hack(mob/user)
var/hack
- if(issilicon(user))
- hack += "[src.emagged ? "Software compromised! Unit may exhibit dangerous or erratic behavior." : "Unit operating normally. Release safety lock?"]
" - hack += "Harm Prevention Safety System: [src.emagged ? "DANGER" : "Engaged"]
" + if(issilicon(user)) //Allows silicons to toggle the emag status of a bot. + hack += "[emagged == 2 ? "Software compromised! Unit may exhibit dangerous or erratic behavior." : "Unit operating normally. Release safety lock?"]
" + hack += "Harm Prevention Safety System: [emagged ? "DANGER" : "Engaged"]
" + else if(!locked) //Humans with access can use this option to hide a bot from the AI's remote control panel and PDA control. + hack += "Remote network control radio: [remote_disabled ? "Disconnected" : "Connected"]
" return hack -/obj/machinery/bot/attack_ai(mob/user as mob) - src.attack_hand(user) +/obj/machinery/bot/proc/set_custom_texts() //Superclass for setting hack texts. Appears only if a set is not given to a bot locally. + text_hack = "You hack [name]." + text_dehack = "You reset [name]." + text_dehack_fail = "You fail to reset [name]." -/obj/machinery/bot/proc/speak(var/message) - if((!src.on) || (!message)) +/obj/machinery/bot/attack_ai(mob/user as mob) + attack_hand(user) + +/obj/machinery/bot/proc/speak(var/message, freq) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. + if((!on) || (!message)) return - audible_message("[src] beeps, \"[message]\"",2) + if(freq) + Radio.set_frequency(radio_frequency) + Radio.talk_into(src, message, radio_frequency) + else + say(message) return + //Generalized behavior code, override where needed! + +/* +scan() will search for a given type (such as turfs, human mobs, or objects) in the bot's view range, and return a single result. +Arguments: The object type to be searched (such as "/mob/living/carbon/human"), the old scan result to be ignored, if one exists, +and the view range, which defaults to 7 (full screen) if an override is not passed. +If the bot maintains an ignore list, it is also checked here. + +Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1) +The proc would return a human next to the bot to be set to the patient var. +Pass the desired type path itself, declaring a temporary var beforehand is not required. +*/ +obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFAULT_SCAN_RANGE) + var/final_result + for (var/scan in view (scan_range, src) ) //Search for something in range! + if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! + continue //If not, keep searching! + if( !(scan in ignore_list) && (scan != old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness + var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected. + if( scan_result ) + final_result = scan_result + else + continue //The current element failed assessment, move on to the next. + return final_result + +//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. +obj/machinery/bot/proc/process_scan(var/scan_target) + return scan_target + + +/obj/machinery/bot/proc/add_to_ignore(var/subject) + if(ignore_list.len < 50) //This will help keep track of them, so the bot is always trying to reach a blocked spot. + ignore_list |= subject + else if (ignore_list.len >= subject) //If the list is full, insert newest, delete oldest. + ignore_list -= ignore_list[1] + ignore_list |= subject + +/* +Movement proc for stepping a bot through a path generated through A-star. +Pass a positive integer as an argument to override a bot's default speed. +*/ +obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) + + if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. + path = list() + return 0 + if(get_turf(src) == get_turf(dest)) //We have arrived, no need to move again. + return 1 + var/success + var/step_count = move_speed ? move_speed : speed //If a value is passed into move_speed, use that instead of the default speed var. + if(step_count >= 1 && tries < 4) + for(step_count, step_count >= 1,step_count--) + success = bot_step(dest) + if (success) + tries = 0 + else + tries++ + break + sleep(4) + else + return 0 + return 1 + + +obj/machinery/bot/proc/bot_step(var/dest) + if(path && path.len > 1) + step_towards(src, path[1]) + if(get_turf(src) == path[1]) //Successful move + path -= path[1] + else + return 0 + else if(path.len == 1) + step_to(src, dest) + path = list() + return 1 + + +/obj/machinery/bot/proc/check_bot_access() + if(mode != BOT_SUMMON && mode != BOT_RESPONDING) + botcard.access = prev_access + +/obj/machinery/bot/proc/call_bot(var/caller, var/turf/waypoint) + bot_reset() //Reset a bot before setting it to call mode. + var/area/end_area = get_area(waypoint) + + //For giving the bot temporary all-access. + var/obj/item/weapon/card/id/all_access = new /obj/item/weapon/card/id + var/datum/job/captain/All = new/datum/job/captain + all_access.access = All.get_access() + + path = get_path_to(src, waypoint, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 200, id=all_access) + calling_ai = caller //Link the AI to the bot! + ai_waypoint = waypoint + + if(path && path.len) //Ensures that a valid path is calculated! + if(!on) + turn_on() //Saves the AI the hassle of having to activate a bot manually. + botcard = all_access //Give the bot all-access while under the AI's command. + calling_ai << "\icon[src] [name] called to [end_area.name]. [path.len-1] meters to destination." + pathset = 1 + mode = BOT_RESPONDING + tries = 0 + else + calling_ai << "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range." + calling_ai = null + path = list() + +/obj/machinery/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc. +//Handles the bot's movement during a call. + var/success = bot_move(ai_waypoint, 3) + if (!success) + if(calling_ai) + calling_ai << "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[src] failed to reach waypoint."]" + calling_ai = null + bot_reset() + +obj/machinery/bot/proc/bot_reset() + if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot. + calling_ai << "Call command to a bot has been reset." + calling_ai = null + path = list() + summon_target = null + pathset = 0 + botcard.access = prev_access + tries = 0 + mode = BOT_IDLE + + + + + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//Patrol and summon code! +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +/obj/machinery/bot/proc/bot_patrol() + patrol_step() + spawn(5) + if(mode == BOT_PATROL) + patrol_step() + return + +obj/machinery/bot/proc/start_patrol() + + if(tries >= 4) //Bot is trapped, so stop trying to patrol. + auto_patrol = 0 + tries = 0 + speak("Unable to start patrol.") + + return + + if(!auto_patrol) //A bot not set to patrol should not be patrolling. + mode = BOT_IDLE + return + + if(patrol_target) // has patrol target + spawn(0) + calc_path() // Find a route to it + if(path.len == 0) + patrol_target = 0 + return + mode = BOT_PATROL + else // no patrol target, so need a new one + find_patrol_target() + speak("Engaging patrol mode.") + tries++ + return + +// perform a single patrol step + +/obj/machinery/bot/proc/patrol_step() + + if(loc == patrol_target) // reached target + + at_patrol_target() + return + + else if(path.len > 0 && patrol_target) // valid path + var/turf/next = path[1] + if(next == loc) + path -= next + return + + + var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move + if(moved) // successful move + blockcount = 0 + + else // failed to move + blockcount++ + + if(blockcount > 5) // attempt 5 times before recomputing + // find new path excluding blocked turf + + spawn(2) + calc_path(next) + if(path.len == 0) + find_patrol_target() + else + blockcount = 0 + tries = 0 + + return + + return + + else // no path, so calculate new one + mode = BOT_START_PATROL + + return + +// finds a new patrol target +/obj/machinery/bot/proc/find_patrol_target() + send_status() + if(awaiting_beacon) // awaiting beacon response + awaiting_beacon++ + if(awaiting_beacon > 5) // wait 5 secs for beacon response + find_nearest_beacon() // then go to nearest instead + return + if(next_destination) + set_destination(next_destination) + else + + find_nearest_beacon() + return + + +// finds the nearest beacon to self +// signals all beacons matching the patrol code +/obj/machinery/bot/proc/find_nearest_beacon() + nearest_beacon = null + new_destination = "__nearest__" + post_signal(beacon_freq, "findbeacon", "patrol") + awaiting_beacon = 1 + spawn(10) + awaiting_beacon = 0 + if(nearest_beacon) + set_destination(nearest_beacon) + tries = 0 + else + auto_patrol = 0 + mode = BOT_IDLE + speak("Disengaging patrol mode.") + send_status() + + +/obj/machinery/bot/proc/at_patrol_target() + + find_patrol_target() + return + + +// sets the current destination +// signals all beacons matching the patrol code +// beacons will return a signal giving their locations +/obj/machinery/bot/proc/set_destination(var/new_dest) + new_destination = new_dest + post_signal(beacon_freq, "findbeacon", "patrol") + awaiting_beacon = 1 + + +// receive a radio signal +// used for beacon reception + +/obj/machinery/bot/receive_signal(datum/signal/signal) + //log_admin("DEBUG \[[// world.timeofday]\]: /obj/machinery/bot/receive_signal([signal.debug_print()])") + if(!on) + return +/* + if(!signal.data["beacon"]) + + for(var/x in signal.data) + world << "* [x] = [signal.data[x]]" + */ + + var/recv = signal.data["command"] + // process all-bot input + + if(recv=="bot_status") + send_status() + + // check to see if we are the commanded bot + if(signal.data["active"] == src) + if(emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands. + return + // process control input + switch(recv) + if("stop") + bot_reset() //HOLD IT!! + auto_patrol = 0 + return + + if("go") + auto_patrol = 1 + return + + if("summon") + bot_reset() + var/list/user_access = signal.data["useraccess"] + summon_target = signal.data["target"] //Location of the user + if(user_access.len != 0) + botcard.access = user_access + prev_access //Adds the user's access, if any. + mode = BOT_SUMMON + calc_summon_path() + speak("Responding.", radio_frequency) + return + + // receive response from beacon + recv = signal.data["beacon"] + var/valid = signal.data["patrol"] + if(!recv || !valid) + return + if(recv == new_destination) // if the recvd beacon location matches the set destination + // the we will navigate there + destination = new_destination + patrol_target = signal.source.loc + next_destination = signal.data["next_patrol"] + awaiting_beacon = 0 + + // if looking for nearest beacon + else if(new_destination == "__nearest__") + var/dist = get_dist(src,signal.source.loc) + if(nearest_beacon) + // note we ignore the beacon we are located at + if(dist>1 && dist 1)
+ nearest_beacon = recv
+ nearest_beacon_loc = signal.source.loc
+ return
+
+
+// send a radio signal with a single data key/value pair
+/obj/machinery/bot/proc/post_signal(var/freq, var/key, var/value)
+ post_signal_multiple(freq, list("[key]" = value) )
+
+// send a radio signal with multiple data key/values
+/obj/machinery/bot/proc/post_signal_multiple(var/freq, var/list/keyval)
+ if(!z || z != 1) //Bot control will only work on station.
+ return
+ var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
+
+ if(!frequency) return
+
+ var/datum/signal/signal = new()
+ signal.source = src
+ signal.transmission_method = 1
+// for(var/key in keyval)
+// signal.data[key] = keyval[key]
+ signal.data = keyval
+// world << "sent [key],[keyval[key]] on [freq]"
+ if(signal.data["findbeacon"])
+ frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
+ else if(signal.data["type"] == bot_type)
+ frequency.post_signal(src, signal, filter = bot_filter)
+ else
+ frequency.post_signal(src, signal)
+
+// signals bot status etc. to controller
+/obj/machinery/bot/proc/send_status()
+ if(remote_disabled || emagged == 2)
+ return
+ var/list/kv = list(
+ "type" = bot_type,
+ "name" = name,
+ "loca" = get_area(src), // area
+ "mode" = mode
+ )
+ post_signal_multiple(control_freq, kv)
+
+
+obj/machinery/bot/proc/bot_summon()
+ // summoned to PDA
+ summon_step()
+ return
+
+// calculates a path to the current destination
+// given an optional turf to avoid
+/obj/machinery/bot/proc/calc_path(var/turf/avoid)
+ check_bot_access()
+ path = get_path_to(loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid)
+
+/obj/machinery/bot/proc/calc_summon_path(var/turf/avoid)
+ check_bot_access()
+ path = get_path_to(loc, summon_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 150, id=botcard, exclude=avoid)
+ if(!path.len || tries >= 5) //Cannot reach target. Give up and announce the issue.
+ speak("Summon command failed, destination unreachable.",radio_frequency)
+ bot_reset()
+
+/obj/machinery/bot/proc/summon_step()
+
+ if(loc == summon_target) // Arrived to summon location.
+ bot_reset()
+ return
+
+ else if(path.len > 0 && summon_target) //Proper path acquired!
+ var/turf/next = path[1]
+ if(next == loc)
+ path -= next
+ return
+
+ var/moved = bot_move(summon_target, 3) // Move attempt
+ if(moved)
+ blockcount = 0
+
+ else // failed to move
+ blockcount++
+
+ if(blockcount > 5) // attempt 5 times before recomputing
+ // find new path excluding blocked turf
+ spawn(2)
+ calc_summon_path(next)
+ tries++
+ return
+
+ return
+
+ else // no path, so calculate new one
+ calc_summon_path()
+
+ return
+
+
+/obj/machinery/bot/Bump(M as mob|obj) //Leave no door unopened!
+ if((istype(M, /obj/machinery/door/airlock) || istype(M, /obj/machinery/door/window)) && (!isnull(botcard)))
+ var/obj/machinery/door/D = M
+ if(D.check_access(botcard))
+ D.open()
+ frustration = 0
+ else if((istype(M, /mob/living/)) && (!anchored))
+ var/mob/living/Mb = M
+ loc = Mb.loc
+ frustration = 0
+ return
\ No newline at end of file
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index 592b1686c4a..ef1fcd654cf 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -24,51 +24,57 @@
//weight = 1.0E7
health = 25
maxhealth = 25
- var/cleaning = 0
var/blood = 1
var/list/target_types = list()
var/obj/effect/decal/cleanable/target
var/obj/effect/decal/cleanable/oldtarget
+ var/max_targets = 50 //Maximum number of targets a cleanbot can ignore.
var/oldloc = null
- req_access = list(access_janitor)
- var/path[] = new()
- var/patrol_path[] = null
- var/beacon_freq = 1445 // navigation beacon frequency
+ req_one_access = list(access_janitor, access_robotics)
+// var/patrol_path[] = null
+// var/beacon_freq = 1445 // navigation beacon frequency
var/closest_dist
var/closest_loc
var/failed_steps
- var/should_patrol
var/next_dest
var/next_dest_loc
+ radio_frequency = SERV_FREQ //Service
+ bot_type = CLEAN_BOT
+ bot_filter = RADIO_CLEANBOT
/obj/machinery/bot/cleanbot/New()
..()
- src.get_targets()
- src.icon_state = "cleanbot[src.on]"
+ get_targets()
+ icon_state = "cleanbot[on]"
- should_patrol = 1
-
- src.botcard = new /obj/item/weapon/card/id(src)
var/datum/job/janitor/J = new/datum/job/janitor
- src.botcard.access = J.get_access()
-
- if(radio_controller)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+ botcard.access = J.get_access()
+ prev_access = botcard.access
+ spawn(5)
+ add_to_beacons(bot_filter)
/obj/machinery/bot/cleanbot/turn_on()
- . = ..()
- src.icon_state = "cleanbot[src.on]"
- src.updateUsrDialog()
+ ..()
+ icon_state = "cleanbot[on]"
+ updateUsrDialog()
/obj/machinery/bot/cleanbot/turn_off()
..()
- src.target = null
- src.oldtarget = null
- src.oldloc = null
- src.icon_state = "cleanbot[src.on]"
- src.path = new()
- src.updateUsrDialog()
+ icon_state = "cleanbot[on]"
+ updateUsrDialog()
+
+/obj/machinery/bot/cleanbot/bot_reset()
+ ..()
+ ignore_list = list() //Allows the bot to clean targets it previously ignored due to being unreachable.
+ target = null
+ oldtarget = null
+ oldloc = null
+
+/obj/machinery/bot/cleanbot/set_custom_texts()
+ text_hack = "You corrupt [name]'s cleaning software."
+ text_dehack = "[name]'s software has been reset!"
+ text_dehack_fail = "[name] does not seem to respond to your repair code!"
/obj/machinery/bot/cleanbot/attack_hand(mob/user as mob)
. = ..()
@@ -81,76 +87,39 @@
var/dat
dat += hack(user)
dat += text({"
-Automatic Station Cleaner v1.0
+Cleaner v1.1 controls
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]"}, -text("[src.on ? "On" : "Off"]")) - if(!src.locked || issilicon(user)) - dat += text({"
Cleans Blood: []
"}, text("[src.blood ? "Yes" : "No"]")) - dat += text({"
Patrol station: []
"}, text("[src.should_patrol ? "Yes" : "No"]")) - // dat += text({"
Beacon frequency: []
"}, text("[src.beacon_freq]")) -/* if(src.open && !src.locked) - dat += text({" -Odd looking screw twiddled: []
-Weird button pressed: []"}, -text("[src.screwloose ? "Yes" : "No"]"), -text("[src.oddbutton ? "Yes" : "No"]"))*/ +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"}, +text("[on ? "On" : "Off"]")) + if(!locked || issilicon(user)) + dat += text({"
Cleans Blood: []
"}, text("[blood ? "Yes" : "No"]")) + dat += text({"
Patrol station: []
"}, text("[auto_patrol ? "Yes" : "No"]")) - user << browse("Cleaner v1.0 controls [dat]", "window=autocleaner")
- onclose(user, "autocleaner")
+ var/datum/browser/popup = new(user, "autoclean", "Automatic Station Cleaner v1.1")
+ popup.set_content(dat)
+ popup.open()
return
/obj/machinery/bot/cleanbot/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
+
+ ..()
switch(href_list["operation"])
- if("start")
- if (src.on && !src.emagged)
- turn_off()
- else
- turn_on()
if("blood")
- src.blood =!src.blood
- src.get_targets()
- src.updateUsrDialog()
- if("patrol")
- src.should_patrol =!src.should_patrol
- src.patrol_path = null
- src.updateUsrDialog()
+ blood =!blood
+ get_targets()
+ updateUsrDialog()
if("freq")
var/freq = text2num(input("Select frequency for navigation beacons", "Frequency", num2text(beacon_freq / 10))) * 10
if (freq > 0)
- src.beacon_freq = freq
- src.updateUsrDialog()
-/* if("screw")
- src.screwloose = !src.screwloose
- usr << ""
- src.updateUsrDialog() */
- if("hack")
- if(!src.emagged)
- src.emagged = 2
- src.hacked = 1
- usr << "You corrupt [src]'s cleaning software."
- else if(!src.hacked)
- usr << "[src] does not seem to respond to your repair code!"
- else
- src.hacked = 0
- src.emagged = 0
- usr << "[src]'s software has been reset!"
- src.updateUsrDialog()
+ beacon_freq = freq
+ updateUsrDialog()
/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob)
if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if(src.allowed(usr) && !open && !emagged)
- src.locked = !src.locked
- user << "You [ src.locked ? "lock" : "unlock"] the [src] behaviour controls."
+ if(allowed(usr) && !open && !emagged)
+ locked = !locked
+ user << "You [ locked ? "lock" : "unlock"] the [src] behaviour controls."
else
if(emagged)
user << "ERROR"
@@ -163,135 +132,77 @@ text("[src.oddbutton ? "Yes" : "No"
/obj/machinery/bot/cleanbot/Emag(mob/user as mob)
..()
- if(open && !locked)
- if(user) user << "[src] buzzes and beeps."
- src.emagged = 2
+ if(emagged == 2)
+ if(user)
+ user << "[src] buzzes and beeps."
-/obj/machinery/bot/cleanbot/process()
- set background = BACKGROUND_ENABLED
+/obj/machinery/bot/cleanbot/process_scan(var/obj/effect/decal/cleanable/D)
+ for(var/T in target_types)
+ if(istype(D, T))
+ return D
- if(!src.on)
+/obj/machinery/bot/cleanbot/bot_process()
+ if (!..())
return
- if(src.cleaning)
- return
- var/list/cleanbottargets = list()
- if(!src.emagged && prob(5))
+ if(mode == BOT_CLEANING)
+ return
+
+ if(emagged == 2) //Emag functions
+ if(istype(loc,/turf/simulated))
+
+ if(prob(10)) //Wets floors randomly
+ var/turf/simulated/T = loc
+ T.MakeSlippery()
+
+ if(prob(5)) //Spawns foam!
+ visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
+ new /obj/effect/effect/foam(loc)
+
+ else if (prob(5))
visible_message("[src] makes an excited beeping booping sound!")
- if(src.emagged && prob(10)) //Wets floors randomly
- if(istype(loc,/turf/simulated))
- var/turf/simulated/T = src.loc
- T.MakeSlippery()
+ if(!target) //Search for cleanables it can see.
+ target = scan(/obj/effect/decal/cleanable/, oldtarget)
+ oldtarget = target
- if(src.emagged && prob(5)) //Spawns foam!
- visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
- new /obj/effect/effect/foam(src.loc)
+ if(!target)
+ if(loc != oldloc)
+ oldtarget = null
- if(!src.target || src.target == null)
- for (var/obj/effect/decal/cleanable/D in view(7,src))
- for(var/T in src.target_types)
- if(!(D in cleanbottargets) && (D.type == T || D.parent_type == T) && D != src.oldtarget)
- src.oldtarget = D
- src.target = D
- return
+ if(auto_patrol)
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
- if(!src.target || src.target == null)
- if(src.loc != src.oldloc)
- src.oldtarget = null
+ if(mode == BOT_PATROL)
+ bot_patrol()
- if (!should_patrol)
+ return
+
+ if(target)
+ if(!path || path.len == 0) //No path, need a new one
+ //Try to produce a path to the target, and ignore airlocks to which it has access.
+ path = get_path_to(loc, target.loc, /turf/proc/AdjacentTurfsWithAccess, /turf/proc/Distance, 0, 30, id=botcard)
+ if (!bot_move(target))
+ add_to_ignore(target)
+ target = null
+ path = list()
+ return
+ mode = BOT_MOVING
+ else if (!bot_move(target))
+ target = null
+ mode = BOT_IDLE
return
- if (!patrol_path || patrol_path.len < 1)
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(beacon_freq)
+ if(target && loc == target.loc)
+ clean(target)
+ path = list()
+ target = null
- if(!frequency) return
-
- closest_dist = 9999
- closest_loc = null
- next_dest_loc = null
-
- var/datum/signal/signal = new()
- signal.source = src
- signal.transmission_method = 1
- signal.data = list("findbeacon" = "patrol")
- frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- spawn(5)
- if (!next_dest_loc)
- next_dest_loc = closest_loc
- if (next_dest_loc)
- src.patrol_path = AStar(src.loc, next_dest_loc, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=null)
- if(!patrol_path)
- patrol_path = list()
- else
- patrol_move()
-
- return
-
- if(target && path.len == 0)
- spawn(0)
- if(!src || !target) return
- src.path = AStar(src.loc, src.target.loc, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30)
- if(!src.path)
- src.path = list()
- if(src.path.len == 0)
- src.oldtarget = src.target
- src.target = null
- return
- if(src.path.len > 0 && src.target && (src.target != null))
- step_to(src, src.path[1])
- src.path -= src.path[1]
- else if(src.path.len == 1)
- step_to(src, target)
-
- if(src.target && (src.target != null))
- patrol_path = null
- if(src.loc == src.target.loc)
- clean(src.target)
- src.path = new()
- src.target = null
- return
-
- src.oldloc = src.loc
-
-/obj/machinery/bot/cleanbot/proc/patrol_move()
- if (src.patrol_path.len <= 0)
- return
-
- var/next = src.patrol_path[1]
- src.patrol_path -= next
- if (next == src.loc)
- return
-
- var/moved = step_towards(src, next)
- if (!moved)
- failed_steps++
- if (failed_steps > 4)
- patrol_path = null
- next_dest = null
- failed_steps = 0
- else
- failed_steps = 0
-
-/obj/machinery/bot/cleanbot/receive_signal(datum/signal/signal)
- var/recv = signal.data["beacon"]
- var/valid = signal.data["patrol"]
- if(!recv || !valid)
- return
-
- var/dist = get_dist(src, signal.source.loc)
- if (dist < closest_dist && signal.source.loc != src.loc)
- closest_dist = dist
- closest_loc = signal.source.loc
- next_dest = signal.data["next_patrol"]
-
- if (recv == next_dest)
- next_dest_loc = signal.source.loc
- next_dest = signal.data["next_patrol"]
+ oldloc = loc
/obj/machinery/bot/cleanbot/proc/get_targets()
- src.target_types = new/list()
+ target_types = new/list()
target_types += /obj/effect/decal/cleanable/oil
target_types += /obj/effect/decal/cleanable/vomit
@@ -306,7 +217,7 @@ text("[src.oddbutton ? "Yes" : "No"
target_types += /obj/effect/decal/cleanable/greenglow
target_types += /obj/effect/decal/cleanable/dirt
- if(src.blood)
+ if(blood)
target_types += /obj/effect/decal/cleanable/xenoblood/
target_types += /obj/effect/decal/cleanable/xenoblood/xgibs
target_types += /obj/effect/decal/cleanable/blood/
@@ -314,20 +225,21 @@ text("[src.oddbutton ? "Yes" : "No"
target_types += /obj/effect/decal/cleanable/trail_holder
/obj/machinery/bot/cleanbot/proc/clean(var/obj/effect/decal/cleanable/target)
- src.anchored = 1
- src.icon_state = "cleanbot-c"
+ anchored = 1
+ icon_state = "cleanbot-c"
visible_message("[src] begins to clean up [target]")
- src.cleaning = 1
+ mode = BOT_CLEANING
spawn(50)
- src.cleaning = 0
- qdel(target)
- src.icon_state = "cleanbot[src.on]"
- src.anchored = 0
- src.target = null
+ if(mode == BOT_CLEANING)
+ qdel(target)
+ anchored = 0
+ target = null
+ mode = BOT_IDLE
+ icon_state = "cleanbot[on]"
/obj/machinery/bot/cleanbot/explode()
- src.on = 0
- src.visible_message("[src] blows apart!")
+ on = 0
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
@@ -348,17 +260,17 @@ text("[src.oddbutton ? "Yes" : "No"
if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
user.drop_item()
qdel(W)
- var/turf/T = get_turf(src.loc)
+ var/turf/T = get_turf(loc)
var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T)
- A.name = src.created_name
+ A.name = created_name
user << "You add the robot arm to the bucket and sensor assembly. Beep boop!"
user.unEquip(src, 1)
qdel(src)
else if (istype(W, /obj/item/weapon/pen))
- var/t = copytext(stripped_input(user, "Enter new robot name", src.name, src.created_name),1,MAX_NAME_LEN)
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if (!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.created_name = t
+ created_name = t
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index fd0f7ae848e..b9a2e1b766b 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -25,7 +25,6 @@
var/threatlevel = 0
var/target_lastloc //Loc of target when arrested.
var/last_found //There's a delay
- var/frustration = 0
//var/emagged = 0 //Emagged Secbots view everyone as a criminal
var/declare_arrests = 1 //When making an arrest, should it notify everyone wearing sechuds?
var/idcheck = 1 //If true, arrest people with no IDs
@@ -34,38 +33,17 @@
var/arrest_type = 0 //If true, don't handcuff
var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
var/shoot_sound = 'sound/weapons/Taser.ogg'
-
- var/mode = 0
-#define SECBOT_IDLE 0 // idle
-#define SECBOT_HUNT 1 // found target, hunting
-#define SECBOT_PREP_ARREST 2 // at target, preparing to arrest
-#define SECBOT_ARREST 3 // arresting target
-#define SECBOT_START_PATROL 4 // start patrol
-#define SECBOT_PATROL 5 // patrolling
-#define SECBOT_SUMMON 6 // summoned by PDA
-
- var/auto_patrol = 0 // set to make bot automatically patrol
-
- var/beacon_freq = 1445 // navigation beacon frequency
- var/control_freq = 1447 // bot control frequency
+ radio_frequency = SEC_FREQ
+ bot_type = SEC_BOT
+ bot_filter = RADIO_SECBOT
//List of weapons that secbots will not arrest for
var/safe_weapons = list(\
/obj/item/weapon/gun/energy/laser/bluetag,\
/obj/item/weapon/gun/energy/laser/redtag,\
- /obj/item/weapon/gun/energy/laser/practice)
-
- var/turf/patrol_target // this is turf to navigate to (location of beacon)
- var/new_destination // pending new destination (waiting for beacon response)
- var/destination // destination description tag
- var/next_destination // the next destination in the patrol route
- var/list/path = new // list of path turfs
-
- var/blockcount = 0 //number of times retried a blocked path
- var/awaiting_beacon = 0 // count of pticks awaiting a beacon response
-
- var/nearest_beacon // the nearest beacon's tag
- var/turf/nearest_beacon_loc // the nearest beacon's location
+ /obj/item/weapon/gun/energy/laser/practice,\
+ /obj/item/weapon/melee/telebaton,\
+ /obj/item/weapon/gun/energy/kinetic_accelerator)
/obj/item/weapon/ed209_assembly
@@ -85,16 +63,15 @@
name = created_name
if(created_lasercolor)
lasercolor = created_lasercolor
- src.icon_state = "[lasercolor]ed209[src.on]"
- src.set_weapon() //giving it the right projectile and firing sound.
+ icon_state = "[lasercolor]ed209[on]"
+ set_weapon() //giving it the right projectile and firing sound.
spawn(3)
- src.botcard = new /obj/item/weapon/card/id(src)
var/datum/job/detective/J = new/datum/job/detective
- src.botcard.access = J.get_access()
+ botcard.access = J.get_access()
+ prev_access = botcard.access
- if(radio_controller)
- radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+
+ add_to_beacons(bot_filter)
if(lasercolor)
shot_delay = 6//Longer shot delay because JESUS CHRIST
check_records = 0//Don't actively target people set to arrest
@@ -108,19 +85,28 @@
/obj/machinery/bot/ed209/turn_on()
. = ..()
- src.icon_state = "[lasercolor]ed209[src.on]"
- src.mode = SECBOT_IDLE
- src.updateUsrDialog()
+ icon_state = "[lasercolor]ed209[on]"
+ mode = BOT_IDLE
+ updateUsrDialog()
/obj/machinery/bot/ed209/turn_off()
..()
- src.target = null
- src.oldtarget_name = null
- src.anchored = 0
- src.mode = SECBOT_IDLE
+ icon_state = "[lasercolor]ed209[on]"
+ updateUsrDialog()
+
+/obj/machinery/bot/ed209/bot_reset()
+ ..()
+ target = null
+ oldtarget_name = null
+ anchored = 0
walk_to(src,0)
- src.icon_state = "[lasercolor]ed209[src.on]"
- src.updateUsrDialog()
+ last_found = world.time
+ set_weapon()
+
+/obj/machinery/bot/ed209/set_custom_texts()
+ text_hack = "You disable [name]'s combat inhibitor."
+ text_dehack = "You restore [name]'s combat inhibitor."
+ text_dehack_fail = "[name] ignores your attempts to restrict him!"
/obj/machinery/bot/ed209/attack_hand(mob/user as mob)
. = ..()
@@ -129,13 +115,14 @@
var/dat
dat += hack(user)
dat += text({"
+Security Unit v2.6 controls
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]
"}, +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]
"}, -"[src.on ? "On" : "Off"]" ) +"[on ? "On" : "Off"]" ) - if(!src.locked || issilicon(user)) + if(!locked || issilicon(user)) if(!lasercolor) dat += text({"
Arrest Unidentifiable Persons: []
@@ -143,82 +130,50 @@ Arrest for Unauthorized Weapons: []
Arrest for Warrant: []
Operating Mode: []
-Report Arrests[]"}, - -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]" ) - - dat += text({"
-Auto Patrol: []"}, +Report Arrests[]
+Auto Patrol[]"}, +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - - var/datum/browser/popup = new(user, "autosec", "Securitron v2.0.9 controls") + var/datum/browser/popup = new(user, "autoed209", "Automatic Security Unit v2.6") popup.set_content(dat) popup.open() return /obj/machinery/bot/ed209/Topic(href, href_list) - if (..()) - return - usr.set_machine(src) - src.add_fingerprint(usr) if(lasercolor && (istype(usr,/mob/living/carbon/human))) var/mob/living/carbon/human/H = usr if((lasercolor == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))//Opposing team cannot operate it return else if((lasercolor == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag))) return - if ((href_list["power"]) && (src.allowed(usr))) - if (src.on && !src.emagged) - turn_off() - else - turn_on() - return + ..() switch(href_list["operation"]) if ("idcheck") - src.idcheck = !src.idcheck - src.updateUsrDialog() + idcheck = !idcheck if("weaponscheck") - src.weaponscheck = !src.weaponscheck - src.updateUsrDialog() - if("ignorerec") - src.check_records = !src.check_records - src.updateUsrDialog() - if("switchmode") - src.arrest_type = !src.arrest_type - src.updateUsrDialog() - if("patrol") - auto_patrol = !auto_patrol - mode = SECBOT_IDLE + weaponscheck = !weaponscheck + updateUsrDialog() + if ("ignorerec") + check_records = !check_records + updateUsrDialog() + if ("switchmode") + arrest_type = !arrest_type updateUsrDialog() if("declarearrests") - src.declare_arrests = !src.declare_arrests - src.updateUsrDialog() - if("hack") - if(!src.emagged) - src.emagged = 2 - src.hacked = 1 - src.set_weapon() - usr << "You disable [src]'s combat inhibitor." - else if(!src.hacked) - usr << "[src] ignores your attempts to restrict it!" - else - src.emagged = 0 - src.hacked = 0 - src.set_weapon() - usr << "You restore [src]'s combat inhibitor." - src.updateUsrDialog() + declare_arrests = !declare_arrests + updateUsrDialog() /obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if (src.allowed(user) && !open && !emagged) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked" : "unlocked"]." + if (allowed(user) && !open && !emagged) + locked = !locked + user << "Controls are now [locked ? "locked" : "unlocked"]." else if(emagged) user << "ERROR" @@ -230,79 +185,75 @@ Auto Patrol: []"}, ..() if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. return - if (!istype(W, /obj/item/weapon/screwdriver) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if (!istype(W, /obj/item/weapon/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. if(W.force && W.damtype != STAMINA)//If force is non-zero and damage type isn't stamina. threatlevel = user.assess_threat(src) threatlevel += 6 if(threatlevel >= 4) - src.target = user + target = user if(lasercolor)//To make up for the fact that lasertag bots don't hunt - src.shootAt(user) - src.mode = SECBOT_HUNT + shootAt(user) + mode = BOT_HUNT /obj/machinery/bot/ed209/Emag(mob/user as mob) ..() - if(open && !locked) - if(user) user << "You short out [src]'s target assessment circuits." - spawn(0) - audible_message("[src] buzzes oddly!") - src.target = null - if(user) src.oldtarget_name = user.name - src.last_found = world.time - src.anchored = 0 - src.declare_arrests = 0 - src.emagged = 2 - src.on = 1 - src.icon_state = "[lasercolor]ed209[src.on]" - src.set_weapon() - mode = SECBOT_IDLE + if(emagged == 2) + if(user) + user << "You short out [src]'s target assessment circuits." + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "[lasercolor]ed209[on]" + set_weapon() -/obj/machinery/bot/ed209/process() - set background = BACKGROUND_ENABLED - - if (!src.on || src.disabled) +/obj/machinery/bot/ed209/bot_process() + if (!..()) return + + if(disabled) + return + var/list/targets = list() - for (var/mob/living/carbon/C in view(9,src)) //Let's find us a target + for (var/mob/living/carbon/C in view(7,src)) //Let's find us a target var/threatlevel = 0 if ((C.stat) || (C.lying)) continue threatlevel = C.assess_threat(src, lasercolor) - //src.speak(C.real_name + text(": threat: []", threatlevel)) + //speak(C.real_name + text(": threat: []", threatlevel)) if (threatlevel < 4 ) continue var/dst = get_dist(src, C) - if ( dst <= 1 || dst > 12) + if ( dst <= 1 || dst > 7) continue targets += C if (targets.len>0) var/mob/living/carbon/t = pick(targets) if ((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down. - src.shootAt(t) + shootAt(t) switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) - if(!src.lasercolor) //lasertag bots don't want to arrest anyone + if(!lasercolor) //lasertag bots don't want to arrest anyone look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol - mode = SECBOT_START_PATROL // switch to patrol mode + mode = BOT_START_PATROL // switch to patrol mode - if(SECBOT_HUNT) // hunting for perp + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if(src.frustration >= 8) + if (frustration >= 8) walk_to(src,0) back_to_idle() if(target) // make sure target exists - if(src.Adjacent(target) && isturf(src.target.loc)) // if right next to perp - playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - src.icon_state = "[lasercolor]ed209-c" + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + icon_state = "[lasercolor]ed209-c" spawn(2) - src.icon_state = "[lasercolor]ed209[src.on]" - var/mob/living/carbon/M = src.target + icon_state = "[lasercolor]ed209[on]" + var/mob/living/carbon/M = target if(istype(M, /mob/living/carbon/human)) if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 @@ -315,45 +266,45 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) - broadcast_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] scumbag [target.name] in [location]", src) - target.visible_message("[src.target] has been stunned by [src]!",\ - "[src.target] has been stunned by [src]!") + speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) + target.visible_message("[target] has been stunned by [src]!",\ + "[target] has been stunned by [src]!") - mode = SECBOT_PREP_ARREST - src.anchored = 1 - src.target_lastloc = M.loc + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = M.loc return else // not next to perp - var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) - if((get_dist(src, src.target)) >= (olddist)) - src.frustration++ + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if ((get_dist(src, target)) >= (olddist)) + frustration++ else - src.frustration = 0 + frustration = 0 else back_to_idle() - if(SECBOT_PREP_ARREST) // preparing to arrest target + if(BOT_PREP_ARREST) // preparing to arrest target // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. - if( !src.Adjacent(target) || !isturf(src.target.loc) || src.target.weakened < 2 ) + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if(!src.arrest_type) - if(!src.target.handcuffed) //he's not cuffed? Try to cuff him! - mode = SECBOT_ARREST - playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - target.visible_message("[src] is trying to put zipties on [src.target]!",\ - "[src] is trying to put zipties on [src.target]!") + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + mode = BOT_ARREST + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + target.visible_message("[src] is trying to put zipties on [target]!",\ + "[src] is trying to put zipties on [target]!") spawn(60) - if( !src.Adjacent(target) || !isturf(src.target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - if(!src.target.handcuffed) - src.target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(src.target) + if(!target.handcuffed) + target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) target.update_inv_handcuffed(0) //update the handcuffs overlay back_to_idle() else @@ -363,327 +314,80 @@ Auto Patrol: []"}, back_to_idle() return - if(SECBOT_ARREST) + if(BOT_ARREST) if (!target) - src.anchored = 0 - mode = SECBOT_IDLE - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + last_found = world.time frustration = 0 return - if(src.target.handcuffed) //no target or target cuffed? back to idle. + if(target.handcuffed) //no target or target cuffed? back to idle. back_to_idle() return - if( !src.Adjacent(target) || !isturf(src.target.loc) || (src.target.loc != src.target_lastloc && src.target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. + if( !Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. back_to_hunt() return + else + mode = BOT_PREP_ARREST + anchored = 0 + + if(BOT_START_PATROL) + look_for_perp() + start_patrol() + + if(BOT_PATROL) + look_for_perp() + bot_patrol() - if(SECBOT_START_PATROL) // start a patrol - - if(path.len > 0 && patrol_target) // have a valid path, so just resume - mode = SECBOT_PATROL - return - - else if(patrol_target) // has patrol target already - spawn(0) - calc_path() // so just find a route to it - if(path.len == 0) - patrol_target = 0 - return - mode = SECBOT_PATROL - - - else // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - - - if(SECBOT_PATROL) // patrol mode - patrol_step() - spawn(5) - if(mode == SECBOT_PATROL) - patrol_step() - - if(SECBOT_SUMMON) // summoned to PDA - patrol_step() - spawn(4) - if(mode == SECBOT_SUMMON) - patrol_step() - sleep(4) - patrol_step() return /obj/machinery/bot/ed209/proc/back_to_idle() - src.anchored = 0 - mode = SECBOT_IDLE - src.target = null - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + target = null + last_found = world.time frustration = 0 spawn(0) - process() //ensure bot quickly responds + bot_process() //ensure bot quickly responds /obj/machinery/bot/ed209/proc/back_to_hunt() - src.anchored = 0 - src.frustration = 0 - mode = SECBOT_HUNT + anchored = 0 + frustration = 0 + mode = BOT_HUNT spawn(0) - process() //ensure bot quickly responds - -// perform a single patrol step -/obj/machinery/bot/ed209/proc/patrol_step() - - if(loc == patrol_target) // reached target - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - if(istype( next, /turf/simulated)) - - var/moved = step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - path -= loc - - if(lasercolor) - sleep(20) - else - look_for_perp() - else // failed to move - - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - - return - - return - - else // not a valid turf - mode = SECBOT_IDLE - return - - else // no path, so calculate new one - mode = SECBOT_START_PATROL - - -// finds a new patrol target -/obj/machinery/bot/ed209/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 5) // wait 5 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - - if(next_destination) - set_destination(next_destination) - else - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/ed209/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(10) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - else - auto_patrol = 0 - mode = SECBOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/ed209/proc/at_patrol_target() - if(auto_patrol) - find_patrol_target() - else - mode = SECBOT_IDLE - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/ed209/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/ed209/receive_signal(datum/signal/signal) - - if(!on) - return - - /* - world << "rec signal: [signal.source]" - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - // process control input - switch(recv) - if("stop") - mode = SECBOT_IDLE - auto_patrol = 0 - return - - if("go") - mode = SECBOT_IDLE - auto_patrol = 1 - return - - if("summon") - patrol_target = signal.data["target"] - next_destination = destination - destination = null - awaiting_beacon = 0 - mode = SECBOT_SUMMON - calc_path() - speak("Responding.") - - return - - - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - - // note we ignore the beacon we are located at - if(dist>1 && dist 1)
- nearest_beacon = recv
- nearest_beacon_loc = signal.source.loc
- return
-
-
-// send a radio signal with a single data key/value pair
-/obj/machinery/bot/ed209/proc/post_signal(var/freq, var/key, var/value)
- post_signal_multiple(freq, list("[key]" = value) )
-
-// send a radio signal with multiple data key/values
-/obj/machinery/bot/ed209/proc/post_signal_multiple(var/freq, var/list/keyval)
-
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
-
- if(!frequency) return
-
- var/datum/signal/signal = new()
- signal.source = src
- signal.transmission_method = 1
- //for(var/key in keyval)
- // signal.data[key] = keyval[key]
- //world << "sent [key],[keyval[key]] on [freq]"
- signal.data = keyval
- if (signal.data["findbeacon"])
- frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- else if (signal.data["type"] == "secbot")
- frequency.post_signal(src, signal, filter = RADIO_SECBOT)
- else
- frequency.post_signal(src, signal)
-
-// signals bot status etc. to controller
-/obj/machinery/bot/ed209/proc/send_status()
- var/list/kv = list(
- "type" = "secbot",
- "name" = name,
- "loca" = loc.loc, // area
- "mode" = mode,
- )
- post_signal_multiple(control_freq, kv)
-
-
-
-// calculates a path to the current destination
-// given an optional turf to avoid
-/obj/machinery/bot/ed209/proc/calc_path(var/turf/avoid = null)
- src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid)
- if(!src.path)
- src.path = list()
-
+ bot_process() //ensure bot quickly responds
// look for a criminal in view of the bot
/obj/machinery/bot/ed209/proc/look_for_perp()
- if(src.disabled)
+ if(disabled)
return
- src.anchored = 0
- src.threatlevel = 0
- for (var/mob/living/carbon/C in view(12,src)) //Let's find us a criminal
+ anchored = 0
+ threatlevel = 0
+ for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
if ((C.stat) || (C.handcuffed))
continue
- if ((C.name == src.oldtarget_name) && (world.time < src.last_found + 100))
+ if ((C.name == oldtarget_name) && (world.time < last_found + 100))
continue
- src.threatlevel = C.assess_threat(src, lasercolor)
+ threatlevel = C.assess_threat(src, lasercolor)
- if (!src.threatlevel)
+ if (!threatlevel)
continue
- else if (src.threatlevel >= 4)
- src.target = C
- src.oldtarget_name = C.name
- src.speak("Level [src.threatlevel] infraction alert!")
- playsound(src.loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/EDPlaceholder.ogg'), 50, 0)
- src.visible_message("[src] points at [C.name]!")
- mode = SECBOT_HUNT
+ else if (threatlevel >= 4)
+ target = C
+ oldtarget_name = C.name
+ speak("Level [threatlevel] infraction alert!")
+ playsound(loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/EDPlaceholder.ogg'), 50, 0)
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
spawn(0)
- process() // ensure bot quickly responds to a perp
+ bot_process() // ensure bot quickly responds to a perp
break
else
continue
@@ -694,17 +398,6 @@ Auto Patrol: []"},
return 1
return 0
-/obj/machinery/bot/ed209/Bump(M as mob|obj) //Leave no door unopened!
- if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
- var/obj/machinery/door/D = M
- if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
- D.open()
- src.frustration = 0
- else if ((istype(M, /mob/living/)) && (!src.anchored))
- src.loc = M:loc
- src.frustration = 0
- return
-
/* terrible
/obj/machinery/bot/ed209/Bumped(atom/movable/M as mob|obj)
spawn(0)
@@ -715,13 +408,13 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/explode()
walk_to(src,0)
- src.visible_message("[src] blows apart!")
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/ed209_assembly/Sa = new /obj/item/weapon/ed209_assembly(Tsec)
Sa.build_step = 1
Sa.overlays += image('icons/obj/aibots.dmi', "hs_hole")
- Sa.created_name = src.name
+ Sa.created_name = name
new /obj/item/device/assembly/prox_sensor(Tsec)
if(!lasercolor)
@@ -756,12 +449,12 @@ Auto Patrol: []"},
s.set_up(3, 1, src)
s.start()
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
qdel(src)
/obj/machinery/bot/ed209/proc/set_weapon() //used to update the projectile type and firing sound
shoot_sound = 'sound/weapons/laser.ogg'
- if(src.emagged == 2)
+ if(emagged == 2)
if(lasercolor)
projectile = /obj/item/projectile/lasertag
else
@@ -796,20 +489,17 @@ Auto Patrol: []"},
if (!( istype(U, /turf) ))
return
var/obj/item/projectile/A = new projectile (loc)
- playsound(src.loc, shoot_sound, 50, 1)
+ playsound(loc, shoot_sound, 50, 1)
A.current = U
A.yo = U.y - T.y
A.xo = U.x - T.x
- spawn( 0 )
- A.process()
- return
- return
+ A.fire()
/obj/machinery/bot/ed209/attack_alien(var/mob/living/carbon/alien/user as mob)
..()
if (!isalien(target))
- src.target = user
- src.mode = SECBOT_HUNT
+ target = user
+ mode = BOT_HUNT
/obj/machinery/bot/ed209/emp_act(severity)
@@ -817,7 +507,7 @@ Auto Patrol: []"},
if(severity==2 && prob(70))
..(severity-1)
else
- var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
+ var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( loc )
pulse2.icon = 'icons/effects/effects.dmi'
pulse2.icon_state = "empdisable"
pulse2.name = "emp sparks"
@@ -847,8 +537,8 @@ Auto Patrol: []"},
if(targets.len)
var/mob/toarrest = pick(targets)
if (toarrest)
- src.target = toarrest
- src.mode = SECBOT_HUNT
+ target = toarrest
+ mode = BOT_HUNT
@@ -856,9 +546,9 @@ Auto Patrol: []"},
..()
if(istype(W, /obj/item/weapon/pen))
- var/t = copytext(stripped_input(user, "Enter new robot name", src.name, src.created_name),1,MAX_NAME_LEN)
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if(!t) return
- if(!in_range(src, usr) && src.loc != usr) return
+ if(!in_range(src, usr) && loc != usr) return
created_name = t
return
@@ -962,14 +652,14 @@ Auto Patrol: []"},
return
build_step++
user << "You add [W] to [src]."
- src.item_state = "[lasercolor]ed209_taser"
- src.icon_state = "[lasercolor]ed209_taser"
+ item_state = "[lasercolor]ed209_taser"
+ icon_state = "[lasercolor]ed209_taser"
user.drop_item()
qdel(W)
if(8)
if(istype(W, /obj/item/weapon/screwdriver))
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
var/turf/T = get_turf(user)
user << "Now attaching the gun to the frame..."
sleep(40)
@@ -993,18 +683,18 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj)
if(!disabled)
var/lasertag_check = 0
- if((src.lasercolor == "b"))
+ if((lasercolor == "b"))
if(istype(Proj, /obj/item/projectile/lasertag/redtag))
lasertag_check++
- else if((src.lasercolor == "r"))
+ else if((lasercolor == "r"))
if(istype(Proj, /obj/item/projectile/lasertag/bluetag))
lasertag_check++
if(lasertag_check)
icon_state = "[lasercolor]ed2090"
- src.disabled = 1
+ disabled = 1
target = null
spawn(100)
- src.disabled = 0
+ disabled = 0
icon_state = "[lasercolor]ed2091"
return 1
else
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 195c07958a6..01d94d68bab 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -36,35 +36,64 @@
maxhealth = 25
//weight = 1.0E7
var/amount = 10
- var/repairing = 0
- var/improvefloors = 0
+ var/replacetiles = 0
var/eattiles = 0
var/maketiles = 0
+ var/fixfloors = 0
+ var/autotile = 0
+ var/nag_on_empty = 1
+ var/nagged = 0 //Prevents the Floorbot nagging more than once per refill.
+ var/max_targets = 50
var/turf/target
var/turf/oldtarget
var/oldloc = null
- req_access = list(access_construction)
- var/path[] = new()
+ req_one_access = list(access_construction, access_robotics)
var/targetdirection
-
+ radio_frequency = ENG_FREQ //Engineering channel
+ bot_type = FLOOR_BOT
+ bot_filter = RADIO_FLOORBOT
+ var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
+ #define HULL_BREACH 1
+ #define BRIDGE_MODE 2
+ #define FIX_TILE 3
+ #define AUTO_TILE 4
+ #define REPLACE_TILE 5
+ #define TILE_EMAG 6
/obj/machinery/bot/floorbot/New()
..()
- src.updateicon()
+ updateicon()
+ var/datum/job/engineer/J = new/datum/job/engineer
+ botcard.access = J.get_access()
+ prev_access = botcard.access
+
+ spawn(5)
+ add_to_beacons(bot_filter)
/obj/machinery/bot/floorbot/turn_on()
. = ..()
- src.updateicon()
- src.updateUsrDialog()
+ updateicon()
+ updateUsrDialog()
/obj/machinery/bot/floorbot/turn_off()
..()
- src.target = null
- src.oldtarget = null
- src.oldloc = null
- src.updateicon()
- src.path = new()
- src.updateUsrDialog()
+ updateicon()
+ updateUsrDialog()
+
+/obj/machinery/bot/floorbot/bot_reset()
+ ..()
+ target = null
+ oldtarget = null
+ oldloc = null
+ ignore_list = list()
+ nagged = 0
+ anchored = 0
+ update_icon()
+
+/obj/machinery/bot/floorbot/set_custom_texts()
+ text_hack = "You corrupt [name]'s construction protocols."
+ text_dehack = "You detect errors in [name] and reset his programming."
+ text_dehack_fail = "[name] is not responding to reset commands!"
/obj/machinery/bot/floorbot/attack_hand(mob/user as mob)
. = ..()
@@ -76,44 +105,51 @@
/obj/machinery/bot/floorbot/interact(mob/user as mob)
var/dat
dat += hack(user)
- dat += "Automatic Station Floor Repairer v1.0
" - dat += "Status: [src.on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" - dat += "Tiles left: [src.amount]
" - dat += "Behvaiour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked || issilicon(user)) - dat += "Improves floors: [src.improvefloors ? "Yes" : "No"]
" - dat += "Finds tiles: [src.eattiles ? "Yes" : "No"]
" - dat += "Make singles pieces of metal into tiles when empty: [src.maketiles ? "Yes" : "No"]
" + dat += "Floor Repairer Controls v1.1
" + dat += "Status: [on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" + dat += "Tiles left: [amount]
" + dat += "Behvaiour controls are [locked ? "locked" : "unlocked"]
" + if(!locked || issilicon(user)) + dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
" + dat += "Replace floor tiles: [replacetiles ? "Yes" : "No"]
" + dat += "Finds tiles: [eattiles ? "Yes" : "No"]
" + dat += "Make pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
" + dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
" + dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
" + dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
" + dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" var/bmode - if (src.targetdirection) - bmode = dir2text(src.targetdirection) + if (targetdirection) + bmode = dir2text(targetdirection) else - bmode = "Disabled" - dat += "
Bridge Mode : [bmode]
" + bmode = "disabled" + dat += "Bridge Mode : [bmode]
" - user << browse("Repairbot v1.0 controls [dat]", "window=autorepair")
- onclose(user, "autorepair")
+ var/datum/browser/popup = new(user, "autofloor", "Automatic Station Floor Repairer v1.1")
+ popup.set_content(dat)
+ popup.open()
return
/obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob)
if(istype(W, /obj/item/stack/tile/plasteel))
var/obj/item/stack/tile/plasteel/T = W
- if(src.amount >= 50)
+ if(amount >= 50)
return
- var/loaded = min(50 - src.amount, T.get_amount())
+ var/loaded = min(50-amount, T.amount)
T.use(loaded)
- src.amount += loaded
+ amount += loaded
if (loaded > 0)
- user << "You load [loaded] tiles into the floorbot. He now contains [src.amount] tiles."
- src.updateicon()
+ user << "You load [loaded] tiles into the floorbot. He now contains [amount] tiles."
+ nagged = 0
+ updateicon()
else
- user << "You need at least one floor tile to put into the floorbot."
+ user << "You need at least one floor tile to put into [src]"
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if(src.allowed(usr) && !open && !emagged)
- src.locked = !src.locked
- user << "You [src.locked ? "lock" : "unlock"] the [src] behaviour controls."
+ if(allowed(user) && !open && !emagged)
+ locked = !locked
+ user << "You [locked ? "lock" : "unlock"] \the [src] behaviour controls."
else
if(emagged)
user << "ERROR"
@@ -121,265 +157,296 @@
user << "Please close the access panel before locking it."
else
user << "Access denied."
- src.updateUsrDialog()
+ updateUsrDialog()
else
..()
/obj/machinery/bot/floorbot/Emag(mob/user as mob)
..()
- if(open && !locked)
- if(user) user << "The [src] buzzes and beeps."
+ if(emagged == 2)
+ if(user)
+ user << "[src] buzzes and beeps."
/obj/machinery/bot/floorbot/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
+ ..()
switch(href_list["operation"])
- if("start")
- if (src.on && !src.emagged)
- turn_off()
- else
- turn_on()
- if("improve")
- src.improvefloors = !src.improvefloors
- src.updateUsrDialog()
+ if("replace")
+ replacetiles = !replacetiles
if("tiles")
- src.eattiles = !src.eattiles
- src.updateUsrDialog()
+ eattiles = !eattiles
if("make")
- src.maketiles = !src.maketiles
- src.updateUsrDialog()
- if("hack")
- if(!src.emagged)
- src.emagged = 2
- src.hacked = 1
- usr << "You corrupt [src]'s construction protocols."
- else if(!src.hacked)
- usr << "[src] is not responding to reset commands!"
- else
- src.emagged = 0
- src.hacked = 0
- usr << "You detect errors in [src] and reset its programming."
- src.updateUsrDialog()
+ maketiles = !maketiles
+ if("fix")
+ fixfloors = !fixfloors
+ if("autotile")
+ autotile = !autotile
+ if("emptynag")
+ nag_on_empty = !nag_on_empty
+ if("anchor")
+ anchored = !anchored
+
if("bridgemode")
- switch(src.targetdirection)
- if(null)
+ var/setdir = input("Select construction direction:") as null|anything in list("north","east","south","west","disable")
+ switch(setdir)
+ if("north")
targetdirection = 1
- if(1)
+ if("south")
targetdirection = 2
- if(2)
+ if("east")
targetdirection = 4
- if(4)
+ if("west")
targetdirection = 8
- if(8)
+ if("disable")
targetdirection = null
- else
- targetdirection = null
- src.updateUsrDialog()
+ updateUsrDialog()
-/obj/machinery/bot/floorbot/process()
- set background = BACKGROUND_ENABLED
+/obj/machinery/bot/floorbot/bot_process()
+ if (!..())
+ return
- if(!src.on)
+ if(mode == BOT_REPAIRING)
return
- if(src.repairing)
- return
- var/list/floorbottargets = list()
- if(src.amount <= 0 && ((src.target == null) || !src.target))
- if(src.eattiles)
- for(var/obj/item/stack/tile/plasteel/T in view(7, src))
- if(T != src.oldtarget && !(target in floorbottargets))
- src.oldtarget = T
- src.target = T
- break
- if(src.target == null || !src.target)
- if(src.maketiles)
- if(src.target == null || !src.target)
- for(var/obj/item/stack/sheet/metal/M in view(7, src))
- if(!(M in floorbottargets) && M != src.oldtarget && M.amount == 1 && !(istype(M.loc, /turf/simulated/wall)))
- src.oldtarget = M
- src.target = M
- break
- else
+
+ if(amount <= 0 && !target) //Out of tiles! We must refill!
+ if(eattiles) //Configured to find and consume floortiles!
+ target = scan(/obj/item/stack/tile/plasteel, oldtarget)
+ process_type = null
+
+ if(!target && maketiles) //We did not manage to find any floor tiles! Scan for metal stacks and make our own!
+ target = scan(/obj/item/stack/sheet/metal, oldtarget)
+ process_type = null
return
+ else
+ if(nag_on_empty) //Floorbot is empty and cannot acquire more tiles, nag the engineers for more!
+ nag()
+
if(prob(5))
visible_message("[src] makes an excited booping beeping sound!")
- if((!src.target || src.target == null) && emagged < 2)
- if(targetdirection != null)
- /*
- for (var/turf/space/D in view(7,src))
- if(!(D in floorbottargets) && D != src.oldtarget) // Added for bridging mode
- if(get_dir(src, D) == targetdirection)
- src.oldtarget = D
- src.target = D
- break
- */
+ //Normal scanning procedure. We have tiles loaded, are not emagged.
+ if(!target && emagged < 2 && amount > 0)
+ if(targetdirection != null) //The bot is in bridge mode.
+ //Try to find a space tile immediately in our selected direction.
var/turf/T = get_step(src, targetdirection)
if(istype(T, /turf/space))
- src.oldtarget = T
- src.target = T
- if(!src.target || src.target == null)
- for (var/turf/space/D in view(7,src))
- if(!(D in floorbottargets) && D != src.oldtarget && (D.loc.name != "Space"))
- src.oldtarget = D
- src.target = D
- break
- if((!src.target || src.target == null ) && src.improvefloors)
- for (var/turf/simulated/floor/F in view(7,src))
- if(!(F in floorbottargets) && F != src.oldtarget && F.icon_state == "Floor1" && !(istype(F, /turf/simulated/floor/plating)))
- src.oldtarget = F
- src.target = F
- break
- if((!src.target || src.target == null) && src.eattiles)
- for(var/obj/item/stack/tile/plasteel/T in view(7, src))
- if(!(T in floorbottargets) && T != src.oldtarget)
- src.oldtarget = T
- src.target = T
- break
+ target = T
- if((!src.target || src.target == null) && emagged == 2)
- if(!src.target || src.target == null)
- for (var/turf/simulated/floor/D in view(7,src))
- if(!(D in floorbottargets) && D != src.oldtarget && D.floor_tile)
- src.oldtarget = D
- src.target = D
- break
+ else //Find a space tile farther way!
+ target = scan(/turf/space, oldtarget)
+ process_type = BRIDGE_MODE
- if(!src.target || src.target == null)
- if(src.loc != src.oldloc)
- src.oldtarget = null
+ if(!target)
+ process_type = HULL_BREACH //Ensures the floorbot does not try to "fix" space areas or shuttle docking zones.
+ target = scan(/turf/space, oldtarget)
+
+ if(!target && replacetiles) //Finds a floor without a tile and gives it one.
+ process_type = REPLACE_TILE //The target must be the floor and not a tile. The floor must not already have a floortile.
+ target = scan(/turf/simulated/floor, oldtarget)
+
+ if(!target && fixfloors) //Repairs damaged floors and tiles.
+ process_type = FIX_TILE
+ target = scan(/turf/simulated/floor, oldtarget)
+
+ if(!target && emagged == 2) //We are emagged! Time to rip up the floors!
+ process_type = TILE_EMAG
+ target = scan(/turf/simulated/floor, oldtarget)
+
+
+ if(!target)
+
+ if(auto_patrol)
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
+
+ if(mode == BOT_PATROL)
+ bot_patrol()
+
+ if(!target)
+ if(loc != oldloc)
+ oldtarget = null
return
- if(src.target && (src.target != null) && src.path.len == 0)
- spawn(0)
- if(!istype(src.target, /turf/))
+ if(target)
+ if(path.len == 0)
+ if(!istype(target, /turf/))
var/turf/TL = get_turf(target)
- src.path = AStar(src.loc, TL, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30)
+ path = get_path_to(loc, TL, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
else
- src.path = AStar(src.loc, src.target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30)
- if(!src.path)
- src.path = list()
- if(src.path.len == 0)
- src.oldtarget = src.target
- src.target = null
- return
- if(src.path.len > 0 && src.target && (src.target != null))
- step_to(src, src.path[1])
- src.path -= src.path[1]
- else if(src.path.len == 1)
- step_to(src, target)
- src.path = new()
+ path = get_path_to(loc, target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
- if(src.loc == src.target || src.loc == src.target.loc)
- if(istype(src.target, /obj/item/stack/tile/plasteel))
- src.eattile(src.target)
- else if(istype(src.target, /obj/item/stack/sheet/metal))
- src.maketile(src.target)
- else if(istype(src.target, /turf/) && emagged < 2)
- repair(src.target)
- else if(emagged == 2 && istype(src.target,/turf/simulated/floor))
- var/turf/simulated/floor/F = src.target
- src.anchored = 1
- src.repairing = 1
- if(prob(90))
- F.break_tile_to_plating()
- else
- F.ReplaceWithLattice()
- visible_message("[src] makes an excited booping sound.")
- spawn(50)
- src.amount ++
- src.anchored = 0
- src.repairing = 0
- src.target = null
- src.path = new()
- return
-
- src.oldloc = src.loc
-
-
-/obj/machinery/bot/floorbot/proc/repair(var/turf/target)
- if(istype(target, /turf/space/))
- if(target.loc.name == "Space")
+ if(!bot_move(target))
+ add_to_ignore(target)
+ oldtarget = target
+ target = null
+ mode = BOT_IDLE
+ return
+ else if( !bot_move(target) )
+ oldtarget = target
+ target = null
+ mode = BOT_IDLE
return
- else if(!istype(target, /turf/simulated/floor))
- return
- if(src.amount <= 0)
- return
- src.anchored = 1
- src.icon_state = "floorbot-c"
- if(istype(target, /turf/space/))
- visible_message("[src] begins to repair the hole.")
- var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
- src.repairing = 1
- spawn(50)
- T.build(src.loc)
- src.repairing = 0
- src.amount -= 1
- src.updateicon()
- src.anchored = 0
- src.target = null
+
+ if(loc == target || loc == target.loc)
+ if(istype(target, /obj/item/stack/tile/plasteel))
+ eattile(target)
+ else if(istype(target, /obj/item/stack/sheet/metal))
+ maketile(target)
+ else if(istype(target, /turf/) && emagged < 2)
+ repair(target)
+ else if(emagged == 2 && istype(target,/turf/simulated/floor))
+ var/turf/simulated/floor/F = target
+ anchored = 1
+ mode = BOT_REPAIRING
+ if(prob(90))
+ F.break_tile_to_plating()
+ else
+ F.ReplaceWithLattice()
+ visible_message("[src] makes an excited booping sound.")
+ spawn(50)
+ amount ++
+ anchored = 0
+ mode = BOT_IDLE
+ target = null
+ path = list()
+ return
+
+ oldloc = loc
+
+/obj/machinery/bot/floorbot/proc/nag() //Annoy everyone on the channel to refill us!
+ if(!nagged)
+ speak("Requesting refill at [get_area(src)]!", radio_frequency)
+ nagged = 1
+
+/obj/machinery/bot/floorbot/proc/is_hull_breach(var/turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas.
+ var/area/t_area = get_area(t)
+ if (t_area && (t_area.name == "Space" || findtext(t_area.name, "huttle")))
+ return 0
else
- visible_message("[src] begins to improve the floor.")
- src.repairing = 1
+ return 1
+
+//Floorbots, having several functions, need sort out special conditions here.
+obj/machinery/bot/floorbot/process_scan(var/scan_target)
+ var/result
+ var/turf/simulated/floor/F
+ switch(process_type)
+ if(HULL_BREACH) //The most common job, patching breaches in the station's hull.
+ if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space.
+ result = scan_target
+ anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach.
+ if(BRIDGE_MODE) //Only space turfs in our chosen direction are considered.
+ if(get_dir(src, scan_target) == targetdirection)
+ result = scan_target
+ anchored = 1
+ if(REPLACE_TILE)
+ F = scan_target
+ if(istype(F, /turf/simulated/floor/plating)) //The floor must not already have a tile.
+ result = F
+ if(FIX_TILE) //Selects only damaged floors.
+ F = scan_target
+ if(F.broken || F.burnt)
+ result = F
+ if(TILE_EMAG) //Emag mode! Rip up the floor and cause breaches to space!
+ F = scan_target
+ if(!istype(F, /turf/simulated/floor/plating))
+ result = F
+ else //If no special processing is needed, simply return the result.
+ result = scan_target
+ return result
+
+/obj/machinery/bot/floorbot/proc/repair(var/turf/target_turf)
+
+ if(istype(target_turf, /turf/space/))
+ //Must be a hull breach or in bridge mode to continue.
+ if(!is_hull_breach(target_turf) && !targetdirection)
+ target = null
+ return
+ else if(!istype(target_turf, /turf/simulated/floor))
+ return
+ if(amount <= 0)
+ mode = BOT_IDLE
+ target = null
+ return
+ anchored = 1
+ icon_state = "floorbot-c"
+ if(istype(target_turf, /turf/space/)) //If we are fixing an area not part of pure space, it is
+ visible_message("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ")
+ mode = BOT_REPAIRING
spawn(50)
- src.loc.icon_state = "floor"
- src.repairing = 0
- src.amount -= 1
- src.updateicon()
- src.anchored = 0
- src.target = null
+ if(mode == BOT_REPAIRING)
+ if(autotile) //Build the floor and include a tile.
+ target_turf.ChangeTurf(/turf/simulated/floor/plasteel)
+ else //Build a hull plating without a floor tile.
+ target_turf.ChangeTurf(/turf/simulated/floor/plating)
+ mode = BOT_IDLE
+ amount -= 1
+ updateicon()
+ anchored = 0
+ target = null
+ else
+ var/turf/simulated/floor/F = target_turf
+ mode = BOT_REPAIRING
+ visible_message("[src] begins repairing the floor.")
+ spawn(50)
+ if(mode == BOT_REPAIRING)
+ F.broken = 0
+ F.burnt = 0
+ F.ChangeTurf(/turf/simulated/floor/plasteel)
+ mode = BOT_IDLE
+ amount -= 1
+ updateicon()
+ anchored = 0
+ target = null
/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T)
if(!istype(T, /obj/item/stack/tile/plasteel))
return
- visible_message("[src] begins to collect tiles.")
- src.repairing = 1
+ visible_message(" [src] begins to collect tiles.")
+ mode = BOT_REPAIRING
spawn(20)
if(isnull(T))
- src.target = null
- src.repairing = 0
+ target = null
+ mode = BOT_IDLE
return
- if(src.amount + T.amount > 50)
- var/i = 50 - src.amount
- src.amount += i
+ if(amount + T.amount > 50)
+ var/i = 50 - amount
+ amount += i
T.amount -= i
else
- src.amount += T.amount
+ amount += T.amount
qdel(T)
- src.updateicon()
- src.target = null
- src.repairing = 0
+ updateicon()
+ target = null
+ mode = BOT_IDLE
/obj/machinery/bot/floorbot/proc/maketile(var/obj/item/stack/sheet/metal/M)
if(!istype(M, /obj/item/stack/sheet/metal))
return
- if(M.amount > 1)
- return
- visible_message("[src] begins to create tiles.")
- src.repairing = 1
+ visible_message(" [src] begins to create tiles.")
+ mode = BOT_REPAIRING
spawn(20)
if(isnull(M))
- src.target = null
- src.repairing = 0
+ target = null
+ mode = BOT_IDLE
return
var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
T.amount = 4
T.loc = M.loc
- qdel(M)
- src.target = null
- src.repairing = 0
+ if(M.amount > 1)
+ M.amount--
+ else
+ qdel(M)
+ target = null
+ mode = BOT_IDLE
/obj/machinery/bot/floorbot/proc/updateicon()
- if(src.amount > 0)
- src.icon_state = "floorbot[src.on]"
+ if(amount > 0)
+ icon_state = "floorbot[on]"
else
- src.icon_state = "floorbot[src.on]e"
+ icon_state = "floorbot[on]e"
/obj/machinery/bot/floorbot/explode()
- src.on = 0
- src.visible_message("[src] blows apart!")
+ on = 0
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
@@ -397,7 +464,7 @@
amount -= 16
else
var/obj/item/stack/tile/plasteel/T = new (Tsec)
- T.amount = src.amount
+ T.amount = amount
amount = 0
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -411,7 +478,7 @@
if(!istype(T, /obj/item/stack/tile/plasteel))
..()
return
- if(src.contents.len >= 1)
+ if(contents.len >= 1)
user << "They won't fit in, as there is already stuff inside."
return
if(T.use(10))
@@ -431,20 +498,20 @@
if(isprox(W))
qdel(W)
var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor()
- B.created_name = src.created_name
+ B.created_name = created_name
user.put_in_hands(B)
user << "You add the sensor to the toolbox and tiles!"
user.unEquip(src, 1)
qdel(src)
else if (istype(W, /obj/item/weapon/pen))
- var/t = copytext(stripped_input(user, "Enter new robot name", src.name, src.created_name),1,MAX_NAME_LEN)
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if (!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.created_name = t
+ created_name = t
/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
..()
@@ -452,16 +519,15 @@
qdel(W)
var/turf/T = get_turf(user.loc)
var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T)
- A.name = src.created_name
+ A.name = created_name
user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!"
user.unEquip(src, 1)
qdel(src)
else if (istype(W, /obj/item/weapon/pen))
- var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
-
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if (!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.created_name = t
\ No newline at end of file
+ created_name = t
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index 6642dcbbe41..385baaaecea 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -13,31 +13,34 @@
anchored = 0
health = 20
maxhealth = 20
- req_access =list(access_medical)
+ req_one_access =list(access_medical, access_robotics)
var/stunned = 0 //It can be stunned by tasers. Delicate circuits.
// var/emagged = 0
var/list/botcard_access = list(access_medical)
var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
- var/frustration = 0
- var/path[] = new()
var/mob/living/carbon/patient = null
var/mob/living/carbon/oldpatient = null
var/oldloc = null
var/last_found = 0
var/last_newpatient_speak = 0 //Don't spam the "HEY I'M COMING" messages
- var/currently_healing = 0
var/injection_amount = 15 //How much reagent do we inject at a time?
var/heal_threshold = 10 //Start healing when they have this much damage in a category
var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents.
-
+ var/declare_crit = 1 //If active, the bot will transmit a critical patient alert to MedHUD users.
+ var/declare_cooldown = 0 //Prevents spam of critical patient alerts.
+ var/stationary_mode = 0 //If enabled, the Medibot will not move automatically.
+ radio_frequency = MED_FREQ //Medical frequency
//Setting which reagents to use to treat what by default. By id.
var/treatment_brute = "tricordrazine"
var/treatment_oxy = "tricordrazine"
var/treatment_fire = "tricordrazine"
var/treatment_tox = "tricordrazine"
var/treatment_virus = "spaceacillin"
+ var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
var/shut_up = 0 //self explanatory :)
+ bot_type = MED_BOT
+ bot_filter = RADIO_MEDBOT
/obj/machinery/bot/medbot/mysterious
name = "\improper Mysterious Medibot"
@@ -58,43 +61,63 @@
var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
w_class = 3.0
- New()
+ /obj/item/weapon/firstaid_arm_assembly/New()
..()
spawn(5)
- if(src.skin)
- src.overlays += image('icons/obj/aibots.dmi', "kit_skin_[src.skin]")
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "kit_skin_[skin]")
+/obj/machinery/bot/medbot/proc/updateicon()
+ if(!on)
+ icon_state = "medibot0"
+ return
+ if(mode == BOT_HEALING)
+ icon_state = "medibots[stationary_mode]"
+ return
+ else if(stationary_mode) //Bot has yellow light to indicate stationary mode.
+ icon_state = "medibot2"
+ else
+ icon_state = "medibot1"
/obj/machinery/bot/medbot/New()
..()
- src.icon_state = "medibot[src.on]"
+ updateicon()
spawn(4)
- if(src.skin)
- src.overlays += image('icons/obj/aibots.dmi', "medskin_[src.skin]")
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "medskin_[skin]")
- src.botcard = new /obj/item/weapon/card/id(src)
- if(isnull(src.botcard_access) || (src.botcard_access.len < 1))
+ if(isnull(botcard_access) || (botcard_access.len < 1))
var/datum/job/doctor/J = new/datum/job/doctor
- src.botcard.access = J.get_access()
+ botcard.access = J.get_access()
else
- src.botcard.access = src.botcard_access
+ botcard.access = botcard_access
+ prev_access = botcard.access
+ add_to_beacons(bot_filter)
/obj/machinery/bot/medbot/turn_on()
. = ..()
- src.icon_state = "medibot[src.on]"
- src.updateUsrDialog()
+ updateicon()
+ updateUsrDialog()
/obj/machinery/bot/medbot/turn_off()
..()
- src.patient = null
- src.oldpatient = null
- src.oldloc = null
- src.path = new()
- src.currently_healing = 0
- src.last_found = world.time
- src.icon_state = "medibot[src.on]"
- src.updateUsrDialog()
+ updateicon()
+ updateUsrDialog()
+
+/obj/machinery/bot/medbot/bot_reset()
+ ..()
+ patient = null
+ oldpatient = null
+ oldloc = null
+ last_found = world.time
+ declare_cooldown = 0
+
+/obj/machinery/bot/medbot/set_custom_texts()
+
+ text_hack = "You corrupt [name]'s reagent processor circuits."
+ text_dehack = "You reset [name]'s reagent processor circuits."
+ text_dehack_fail = "[name] seems damaged and does not respond to reprogramming!"
/obj/machinery/bot/medbot/attack_paw(mob/user as mob)
return attack_hand(user)
@@ -105,99 +128,93 @@
return
var/dat
dat += hack(user)
- dat += "Automatic Medical Unit v1.0
" - dat += "Status: [src.on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" + dat += "Medical Unit Controls v1.1
" + dat += "Status: [on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" dat += "Beaker: " - if (src.reagent_glass) - dat += "Loaded \[[src.reagent_glass.reagents.total_volume]/[src.reagent_glass.reagents.maximum_volume]\]" + if (reagent_glass) + dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]" else dat += "None Loaded" - dat += "
Behaviour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked || issilicon(user)) + dat += "
Behaviour controls are [locked ? "locked" : "unlocked"]
" + if(!locked || issilicon(user)) dat += "Healing Threshold: " dat += "-- " dat += "- " - dat += "[src.heal_threshold] " + dat += "[heal_threshold] " dat += "+ " dat += "++" dat += "
" dat += "Injection Level: " dat += "- " - dat += "[src.injection_amount] " + dat += "[injection_amount] " dat += "+ " dat += "
" dat += "Reagent Source: " - dat += "[src.use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" + dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" - dat += "The speaker switch is [src.shut_up ? "off" : "on"]. Toggle" + dat += "Treat Viral Infections: [treat_virus ? "Yes" : "No"]
" + dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle
" + dat += "Critical Patient Alerts: [declare_crit ? "Yes" : "No"]
" + dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" + dat += "Stationary Mode: [stationary_mode ? "Yes" : "No"]
" - user << browse("Medibot v1.0 controls [dat]", "window=automed")
- onclose(user, "automed")
+ var/datum/browser/popup = new(user, "automed", "Automatic Medical Unit v1.1")
+ popup.set_content(dat)
+ popup.open()
return
/obj/machinery/bot/medbot/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
- if ((href_list["power"]) && (src.allowed(usr)))
- if (src.on && !src.emagged)
- turn_off()
- else
- turn_on()
+ ..()
- else if((href_list["adj_threshold"]) && (!src.locked || issilicon(usr)))
+ if(href_list["adj_threshold"])
var/adjust_num = text2num(href_list["adj_threshold"])
- src.heal_threshold += adjust_num
- if(src.heal_threshold < 5)
- src.heal_threshold = 5
- if(src.heal_threshold > 75)
- src.heal_threshold = 75
+ heal_threshold += adjust_num
+ if(heal_threshold < 5)
+ heal_threshold = 5
+ if(heal_threshold > 75)
+ heal_threshold = 75
- else if((href_list["adj_inject"]) && (!src.locked || issilicon(usr)))
+ else if(href_list["adj_inject"])
var/adjust_num = text2num(href_list["adj_inject"])
- src.injection_amount += adjust_num
- if(src.injection_amount < 5)
- src.injection_amount = 5
- if(src.injection_amount > 15)
- src.injection_amount = 15
+ injection_amount += adjust_num
+ if(injection_amount < 5)
+ injection_amount = 5
+ if(injection_amount > 15)
+ injection_amount = 15
- else if((href_list["use_beaker"]) && (!src.locked || issilicon(usr)))
- src.use_beaker = !src.use_beaker
+ else if(href_list["use_beaker"])
+ use_beaker = !use_beaker
- else if (href_list["eject"] && (!isnull(src.reagent_glass)))
- if(!src.locked)
- src.reagent_glass.loc = get_turf(src)
- src.reagent_glass = null
- else
- usr << "You cannot eject the beaker because the panel is locked."
+ else if (href_list["eject"] && (!isnull(reagent_glass)))
+ reagent_glass.loc = get_turf(src)
+ reagent_glass = null
- else if ((href_list["togglevoice"]) && (!src.locked || issilicon(usr)))
- src.shut_up = !src.shut_up
+ else if (href_list["togglevoice"])
+ shut_up = !shut_up
- else if (href_list["operation"])
- if(!src.emagged)
- src.emagged = 2
- src.hacked = 1
- usr << "You corrupt [src]'s reagent processor circuits."
- else if(!src.hacked)
- usr << "[src] seems damaged and does not respond to reprogramming!"
- else
- src.hacked = 0
- src.emagged = 0
- usr << "You reset [src]'s reagent circuits."
- src.updateUsrDialog()
+ else if (href_list["critalerts"])
+ declare_crit = !declare_crit
+
+ else if (href_list["stationary"])
+ stationary_mode = !stationary_mode
+ path = list()
+ updateicon()
+
+ else if (href_list["virus"])
+ treat_virus = !treat_virus
+
+ updateUsrDialog()
return
/obj/machinery/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if (src.allowed(user) && !open && !emagged)
- src.locked = !src.locked
- user << "Controls are now [src.locked ? "locked." : "unlocked."]"
- src.updateUsrDialog()
+ if (allowed(user) && !open && !emagged)
+ locked = !locked
+ user << "Controls are now [locked ? "locked." : "unlocked."]"
+ updateUsrDialog()
else
if(emagged)
user << "ERROR"
@@ -207,18 +224,18 @@
user << "Access denied."
else if (istype(W, /obj/item/weapon/reagent_containers/glass))
- if(src.locked)
+ if(locked)
user << "You cannot insert a beaker because the panel is locked."
return
- if(!isnull(src.reagent_glass))
+ if(!isnull(reagent_glass))
user << "There is already a beaker loaded."
return
user.drop_item()
W.loc = src
- src.reagent_glass = W
+ reagent_glass = W
user << "You insert [W]."
- src.updateUsrDialog()
+ updateUsrDialog()
return
else
@@ -229,106 +246,103 @@
/obj/machinery/bot/medbot/Emag(mob/user as mob)
..()
- if(open && !locked)
- if(user) user << "You short out [src]'s reagent synthesis circuits."
+ if(emagged == 2)
+ declare_crit = 0
+ if(user)
+ user << "You short out [src]'s reagent synthesis circuits."
spawn(0)
audible_message("[src] buzzes oddly!")
flick("medibot_spark", src)
- src.patient = null
- if(user) src.oldpatient = user
- src.currently_healing = 0
- src.last_found = world.time
- src.anchored = 0
- src.emagged = 2
- src.on = 1
- src.icon_state = "medibot[src.on]"
+ if(user)
+ oldpatient = user
-/obj/machinery/bot/medbot/process()
- set background = BACKGROUND_ENABLED
-
- if(!src.on)
- src.stunned = 0
+/obj/machinery/bot/medbot/process_scan(var/mob/living/carbon/human/H)
+ if (H.stat == 2)
return
- if(src.stunned)
- src.icon_state = "medibota"
- src.stunned--
-
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
-
- if(src.stunned <= 0)
- src.icon_state = "medibot[src.on]"
- src.stunned = 0
+ if ((H == oldpatient) && (world.time < last_found + 100))
return
- if(src.frustration > 8)
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
- src.path = new()
+ if(assess_patient(H))
+ last_found = world.time
+ if((last_newpatient_speak + 300) < world.time) //Don't spam these messages!
+ var/message = pick("Hey, [H.name]! Hold on, I'm coming.","Wait [H.name]! I want to help!","[H.name], you appear to be injured!")
+ speak(message)
+ last_newpatient_speak = world.time
+ return H
+ else
+ return
- if(!src.patient)
- if(!src.shut_up && prob(1))
+/obj/machinery/bot/medbot/bot_process()
+ if (!..())
+ return
+
+ if(mode == BOT_HEALING)
+ return
+
+ if(stunned)
+ icon_state = "medibota"
+ stunned--
+
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+
+ if(stunned <= 0)
+ updateicon()
+ stunned = 0
+ return
+
+ if(frustration > 8)
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
+ path = list()
+
+ if(!patient)
+ if(!shut_up && prob(1))
var/message = pick("Radar, put a mask on!","There's always a catch, and it's the best there is.","I knew it, I should've been a plastic surgeon.","What kind of medbay is this? Everyone's dropping like dead flies.","Delicious!")
- src.speak(message)
+ speak(message)
+ var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE) //If in stationary mode, scan range is limited to adjacent patients.
+ patient = scan(/mob/living/carbon/human, oldpatient, scan_range)
+ oldpatient = patient
- for (var/mob/living/carbon/C in view(7,src)) //Time to find a patient!
- if ((C.stat == 2) || !istype(C, /mob/living/carbon/human))
- continue
-
- if ((C == src.oldpatient) && (world.time < src.last_found + 100))
- continue
-
- if(src.assess_patient(C))
- src.patient = C
- src.oldpatient = C
- src.last_found = world.time
- if((src.last_newpatient_speak + 300) < world.time) //Don't spam these messages!
- var/message = pick("Hey, [C.name]! Hold on, I'm coming.","Wait [C.name]! I want to help!","[C.name], you appear to be injured!")
- src.speak(message)
- src.last_newpatient_speak = world.time
- break
- else
- continue
-
-
- if(src.patient && (get_dist(src,src.patient) <= 1))
- if(!src.currently_healing)
- src.currently_healing = 1
- src.frustration = 0
- src.medicate_patient(src.patient)
+ if(patient && (get_dist(src,patient) <= 1)) //Patient is next to us, begin treatment!
+ if(mode != BOT_HEALING)
+ mode = BOT_HEALING
+ updateicon()
+ frustration = 0
+ medicate_patient(patient)
return
- else if(src.patient && (src.path.len) && (get_dist(src.patient,src.path[src.path.len]) > 2))
- src.path = new()
- src.currently_healing = 0
- src.last_found = world.time
+ //Patient has moved away from us!
+ else if(patient && path && path.len && (get_dist(patient,path[path.len]) > 2))
+ path = list()
+ mode = BOT_IDLE
+ last_found = world.time
- if(src.patient && src.path.len == 0 && (get_dist(src,src.patient) > 1))
+ if(!stationary_mode && patient && path.len == 0 && (get_dist(src,patient) > 1))
spawn(0)
- src.path = AStar(src.loc, get_turf(src.patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30,id=botcard)
- if(!src.path)
- src.path = list()
- if(src.path.len == 0)
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
+ path = get_path_to(loc, get_turf(patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30,id=botcard)
+
+ if(path.len > 0 && patient)
+ if(!bot_move(patient))
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
return
- if(src.path.len > 0 && src.patient)
- step_to(src, src.path[1])
- src.path -= src.path[1]
- spawn(3)
- if(src.path.len)
- step_to(src, src.path[1])
- src.path -= src.path[1]
+ if(path.len > 8 && patient)
+ frustration++
- if(src.path.len > 8 && src.patient)
- src.frustration++
+ if(auto_patrol && !stationary_mode && !patient)
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
+
+ if(mode == BOT_PATROL)
+ bot_patrol()
return
@@ -340,127 +354,133 @@
if(C.suiciding)
return 0 //Kevorkian school of robotic medical assistants.
- if(src.emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
+ if(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
return 1
+ if(declare_crit && C.health <= 0) //Critical condition! Call for help!
+ declare(C)
+
//If they're injured, we're using a beaker, and don't have one of our WONDERCHEMS.
- if((src.reagent_glass) && (src.use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15))))
- for(var/datum/reagent/R in src.reagent_glass.reagents.reagent_list)
+ if((reagent_glass) && (use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15))))
+ for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
if(!C.reagents.has_reagent(R.id))
return 1
//They're injured enough for it!
- if((C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_brute)))
+ if((C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute)))
return 1 //If they're already medicated don't bother!
- if((C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(src.treatment_oxy)))
+ if((C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy)))
return 1
- if((C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_fire)))
+ if((C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire)))
return 1
- if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_tox)))
+ if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_tox)))
return 1
+ if(treat_virus)
+ for(var/datum/disease/D in C.viruses)
+ //the medibot can't detect viruses that are undetectable to Health Analyzers or Pandemic machines.
+ if(D.visibility_flags & HIDDEN_SCANNER || D.visibility_flags & HIDDEN_PANDEMIC)
+ return 0
+ if(D.severity == NONTHREAT) // medibot doesn't try to heal truly harmless viruses
+ return 0
+ if((D.stage > 1) || (D.spread_flags & AIRBORNE)) // medibot can't detect a virus in its initial stage unless it spreads airborne.
- for(var/datum/disease/D in C.viruses)
- if((D.hidden[SCANNER]) || (D.hidden[PANDEMIC])) //the medibot can't detect viruses that are undetectable to Health Analyzers or Pandemic machines.
- return 0
- if(D.severity == D.non_threat) // medibot doesn't try to heal truly harmless viruses
- return 0
- if((D.stage > 1) || (D.spread_type == AIRBORNE)) // medibot can't detect a virus in its initial stage unless it spreads airborne.
-
- if (!C.reagents.has_reagent(src.treatment_virus))
- return 1 //STOP DISEASE FOREVER
+ if (!C.reagents.has_reagent(treatment_virus))
+ return 1 //STOP DISEASE FOREVER
return 0
/obj/machinery/bot/medbot/proc/medicate_patient(mob/living/carbon/C as mob)
- if(!src.on)
+ if(!on)
return
if(!istype(C))
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
return
if(C.stat == 2)
var/death_message = pick("No! NO!","Live, damnit! LIVE!","I...I've never lost a patient before. Not today, I mean.")
- src.speak(death_message)
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
+ speak(death_message)
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
return
var/reagent_id = null
- if(src.emagged == 2) //Emagged! Time to poison everybody.
+ if(emagged == 2) //Emagged! Time to poison everybody.
reagent_id = "toxin"
else
- var/virus = 0
- for(var/datum/disease/D in C.viruses)
- if((!D.hidden[SCANNER]) && (!D.hidden[PANDEMIC])) //detectable virus
- if(D.severity != D.non_threat) //virus is harmful
- if((D.stage > 1) || (D.spread_type == AIRBORNE))
- virus = 1
+ if(treat_virus)
+ var/virus = 0
+ for(var/datum/disease/D in C.viruses)
+ //detectable virus
+ if((!(D.visibility_flags & HIDDEN_SCANNER)) || (!(D.visibility_flags & HIDDEN_PANDEMIC)))
+ if(D.severity != NONTHREAT) //virus is harmful
+ if((D.stage > 1) || (D.spread_flags & AIRBORNE))
+ virus = 1
- if (!reagent_id && (virus))
- if(!C.reagents.has_reagent(src.treatment_virus))
- reagent_id = src.treatment_virus
+ if (!reagent_id && (virus))
+ if(!C.reagents.has_reagent(treatment_virus))
+ reagent_id = treatment_virus
if (!reagent_id && (C.getBruteLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(src.treatment_brute))
- reagent_id = src.treatment_brute
+ if(!C.reagents.has_reagent(treatment_brute))
+ reagent_id = treatment_brute
if (!reagent_id && (C.getOxyLoss() >= (15 + heal_threshold)))
- if(!C.reagents.has_reagent(src.treatment_oxy))
- reagent_id = src.treatment_oxy
+ if(!C.reagents.has_reagent(treatment_oxy))
+ reagent_id = treatment_oxy
if (!reagent_id && (C.getFireLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(src.treatment_fire))
- reagent_id = src.treatment_fire
+ if(!C.reagents.has_reagent(treatment_fire))
+ reagent_id = treatment_fire
if (!reagent_id && (C.getToxLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(src.treatment_tox))
- reagent_id = src.treatment_tox
+ if(!C.reagents.has_reagent(treatment_tox))
+ reagent_id = treatment_tox
//If the patient is injured but doesn't have our special reagent in them then we should give it to them first
- if(reagent_id && src.use_beaker && src.reagent_glass && src.reagent_glass.reagents.total_volume)
- for(var/datum/reagent/R in src.reagent_glass.reagents.reagent_list)
+ if(reagent_id && use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
+ for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
if(!C.reagents.has_reagent(R.id))
reagent_id = "internal_beaker"
break
if(!reagent_id) //If they don't need any of that they're probably cured!
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
var/message = pick("All patched up!","An apple a day keeps me away.","Feel better soon!")
- src.speak(message)
+ speak(message)
+ updateicon()
return
else
- src.icon_state = "medibots"
- C.visible_message("[src] is trying to inject [src.patient]!", \
- "[src] is trying to inject [src.patient]!")
+ C.visible_message("[src] is trying to inject [patient]!", \
+ "[src] is trying to inject [patient]!")
spawn(30)
- if ((get_dist(src, src.patient) <= 1) && (src.on))
+ if ((get_dist(src, patient) <= 1) && (on))
if(reagent_id == "internal_beaker")
- if(src.use_beaker && src.reagent_glass && src.reagent_glass.reagents.total_volume)
- src.reagent_glass.reagents.trans_to(src.patient,src.injection_amount) //Inject from beaker instead.
- src.reagent_glass.reagents.reaction(src.patient, 2)
+ if(use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
+ reagent_glass.reagents.trans_to(patient,injection_amount) //Inject from beaker instead.
+ reagent_glass.reagents.reaction(patient, 2)
else
- src.patient.reagents.add_reagent(reagent_id,src.injection_amount)
- C.visible_message("[src] injects [src.patient] with the syringe!", \
- "[src] injects [src.patient] with the syringe!")
+ patient.reagents.add_reagent(reagent_id,injection_amount)
+ C.visible_message("[src] injects [patient] with the syringe!", \
+ "[src] injects [patient] with the syringe!")
- src.icon_state = "medibot[src.on]"
- src.currently_healing = 0
+ mode = BOT_IDLE
+ updateicon()
return
reagent_id = null
@@ -468,11 +488,11 @@
/obj/machinery/bot/medbot/bullet_act(var/obj/item/projectile/Proj)
if(Proj.flag == "taser")
- src.stunned = min(stunned+10,20)
+ stunned = min(stunned+10,20)
..()
/obj/machinery/bot/medbot/explode()
- src.on = 0
+ on = 0
visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
@@ -482,9 +502,9 @@
new /obj/item/device/healthanalyzer(Tsec)
- if(src.reagent_glass)
- src.reagent_glass.loc = Tsec
- src.reagent_glass = null
+ if(reagent_glass)
+ reagent_glass.loc = Tsec
+ reagent_glass = null
if (prob(50))
new /obj/item/robot_parts/l_arm(Tsec)
@@ -495,54 +515,14 @@
qdel(src)
return
-/obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened!
- if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
- var/obj/machinery/door/D = M
- if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
- D.open()
- src.frustration = 0
- else if ((istype(M, /mob/living/)) && (!src.anchored))
- src.loc = M:loc
- src.frustration = 0
- return
-
-/* terrible
-/obj/machinery/bot/medbot/Bumped(atom/movable/M as mob|obj)
- spawn(0)
- if (M)
- var/turf/T = get_turf(src)
- M:loc = T
-*/
-
-/*
- * Pathfinding procs, allow the medibot to path through doors it has access to.
- */
-
-//Pretty ugh
-/*
-/turf/proc/AdjacentTurfsAllowMedAccess()
- var/L[] = new()
- for(var/turf/t in oview(src,1))
- if(!t.density)
- if(!LinkBlocked(src, t) && !TurfBlockedNonWindowNonDoor(t,get_access("Medical Doctor")))
- L.Add(t)
- return L
-
-
-//It isn't blocked if we can open it, man.
-/proc/TurfBlockedNonWindowNonDoor(turf/loc, var/list/access)
- for(var/obj/O in loc)
- if(O.density && !istype(O, /obj/structure/window) && !istype(O, /obj/machinery/door))
- return 1
-
- if (O.density && (istype(O, /obj/machinery/door)) && (access.len))
- var/obj/machinery/door/D = O
- for(var/req in D.req_access)
- if(!(req in access)) //doesn't have this access
- return 1
-
- return 0
-*/
+/obj/machinery/bot/medbot/proc/declare(var/crit_patient)
+ if(declare_cooldown)
+ return
+ var/area/location = get_area(src)
+ speak("Medical emergency! [crit_patient ? "[crit_patient]" : "A patient"] is in critical condition at [location]!",radio_frequency)
+ declare_cooldown = 1
+ spawn(200) //Twenty seconds
+ declare_cooldown = 0
/*
* Medbot Assembly -- Can be made out of all three medkits.
@@ -555,7 +535,7 @@
return
//Making a medibot!
- if(src.contents.len >= 1)
+ if(contents.len >= 1)
user << "You need to empty [src] out first."
return
@@ -577,33 +557,33 @@
/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/weapon/pen))
- var/t = copytext(stripped_input(user, "Enter new robot name", src.name, src.created_name),1,MAX_NAME_LEN)
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if (!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.created_name = t
+ created_name = t
else
switch(build_step)
if(0)
if(istype(W, /obj/item/device/healthanalyzer))
user.drop_item()
qdel(W)
- src.build_step++
+ build_step++
user << "You add the health sensor to [src]."
- src.name = "First aid/robot arm/health analyzer assembly"
- src.overlays += image('icons/obj/aibots.dmi', "na_scanner")
+ name = "First aid/robot arm/health analyzer assembly"
+ overlays += image('icons/obj/aibots.dmi', "na_scanner")
if(1)
if(isprox(W))
user.drop_item()
qdel(W)
- src.build_step++
+ build_step++
user << "You complete the Medibot! Beep boop."
var/turf/T = get_turf(src)
var/obj/machinery/bot/medbot/S = new /obj/machinery/bot/medbot(T)
- S.skin = src.skin
- S.name = src.created_name
+ S.skin = skin
+ S.name = created_name
user.unEquip(src, 1)
qdel(src)
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index bad30b9b2e5..98f9c7525c6 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -19,34 +19,28 @@ var/global/mulebot_count = 0
fire_dam_coeff = 0.7
brute_dam_coeff = 0.5
var/atom/movable/load = null // the loaded crate (usually)
- var/beacon_freq = 1400
- var/control_freq = 1447
+ var/list/delivery_beacons = list() //List of beacons that serve as delivery locations.
+ beacon_freq = 1400
+ control_freq = 1447
+ bot_type = MULE_BOT
+ bot_filter = RADIO_MULEBOT
suffix = ""
var/turf/target // this is turf to navigate to (location of beacon)
var/loaddir = 0 // this the direction to unload onto/load from
- var/new_destination = "" // pending new destination (waiting for beacon response)
- var/destination = "" // destination description
var/home_destination = "" // tag of home beacon
req_access = list(access_cargo) // added robotics access so assembly line drop-off works properly -veyveyr //I don't think so, Tim. You need to add it to the MULE's hidden robot ID card. -NEO
- var/path[] = new()
- var/mode = 0 //0 = idle/ready
- //1 = loading/unloading
- //2 = moving to deliver
- //3 = returning to home
- //4 = blocked
- //5 = computing navigation
- //6 = waiting for nav computation
- //7 = no destination beacon found (or no route)
+ mode = BOT_IDLE
- var/blockcount = 0 //number of times retried a blocked path
+ blockcount = 0 //number of times retried a blocked path
var/reached_target = 1 //true if already reached the target
- var/refresh = 1 // true to refresh dialogue
- var/auto_return = 1 // true if auto return to home beacon after unload
- var/auto_pickup = 1 // true if auto-pickup at beacon
+ var/refresh = 1 // true to refresh dialogue
+ var/auto_return = 1 // true if auto return to home beacon after unload
+ var/auto_pickup = 1 // true if auto-pickup at beacon
+ var/report_delivery = 1 // true if bot will announce an arrival to a location.
var/obj/item/weapon/stock_parts/cell/cell
var/datum/wires/mulebot/wires = null
@@ -67,18 +61,16 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/New()
..()
wires = new(src)
- botcard = new(src)
var/datum/job/cargo_tech/J = new/datum/job/cargo_tech
botcard.access = J.get_access()
+ prev_access = botcard.access
// botcard.access += access_robotics //Why --Ikki
cell = new(src)
cell.charge = 2000
cell.maxcharge = 2000
spawn(5) // must wait for map loading to finish
- if(radio_controller)
- radio_controller.add_object(src, control_freq, filter = RADIO_MULEBOT)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+ add_to_beacons(bot_filter)
mulebot_count += 1
if(!suffix)
@@ -86,9 +78,6 @@ var/global/mulebot_count = 0
name = "\improper Mulebot ([suffix])"
- verbs -= /atom/movable/verb/pull
-
-
// attack by item
// emag : lock/unlock,
@@ -100,8 +89,8 @@ var/global/mulebot_count = 0
locked = !locked
user << "You [locked ? "lock" : "unlock"] the mulebot's controls!"
flick("mulebot-emagged", src)
- playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 0)
- else if(istype(I, /obj/item/weapon/card/id))
+ playsound(loc, 'sound/effects/sparks1.ogg', 100, 0)
+ else if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda))
if(toggle_lock(user))
user << "Controls [(locked ? "locked" : "unlocked")]."
@@ -118,30 +107,30 @@ var/global/mulebot_count = 0
open = !open
if(open)
- src.visible_message("[user] opens the maintenance hatch of [src]", "You open [src]'s maintenance hatch.")
+ visible_message("[user] opens the maintenance hatch of [src]", "You open [src]'s maintenance hatch.")
on = 0
icon_state="mulebot-hatch"
else
- src.visible_message("[user] closes the maintenance hatch of [src]", "You close [src]'s maintenance hatch.")
+ visible_message("[user] closes the maintenance hatch of [src]", "You close [src]'s maintenance hatch.")
icon_state = "mulebot0"
updateDialog()
else if (istype(I, /obj/item/weapon/wrench))
- if (src.health < maxhealth)
- src.health = min(maxhealth, src.health+25)
+ if (health < maxhealth)
+ health = min(maxhealth, health+25)
user.visible_message(
- "[user] repairs [src]!",
+ "[user] repairs [src]!",
"You repair [src]!"
)
else
- user << "[src] does not need a repair!"
+ user << " [src] does not need a repair!"
else if(istype(I, /obj/item/device/multitool) || istype(I, /obj/item/weapon/wirecutters))
if(open)
attack_hand(usr)
else if(load && ismob(load)) // chance to knock off rider
if(prob(1+I.force * 2))
unload(0)
- user.visible_message("[user] knocks [load] off [src] with \the [I]!", "You knock [load] off [src] with \the [I]!")
+ user.visible_message(" [user] knocks [load] off [src] with \the [I]!", " You knock [load] off [src] with \the [I]!")
else
user << "You hit [src] with \the [I] but to no effect."
else
@@ -152,19 +141,20 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/ex_act(var/severity)
unload(0)
switch(severity)
+ if(1)
+ qdel(src)
if(2)
for(var/i = 1; i < 3; i++)
wires.RandomCut()
if(3)
wires.RandomCut()
- ..()
return
/obj/machinery/bot/mulebot/bullet_act()
if(prob(50) && !isnull(load))
unload(0)
if(prob(25))
- src.visible_message("Something shorts out inside [src]!")
+ visible_message(" Something shorts out inside [src]!")
wires.RandomCut()
..()
@@ -182,29 +172,30 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/interact(var/mob/user, var/ai=0)
var/dat
- dat += "
" dat += "Power: [on ? "On" : "Off"]
" if(!open) dat += "
" @@ -225,6 +216,7 @@ var/global/mulebot_count = 0 dat += "Set Home
" dat += "Toggle Auto Return Home ([auto_return ? "On":"Off"])
" dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
" + dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
" if(load) dat += "Unload Now
" @@ -245,9 +237,9 @@ var/global/mulebot_count = 0 //user << browse("M.U.L.E. Mk. III [suffix ? "([suffix])" : ""] [dat]", "window=mulebot;size=350x500")
//onclose(user, "mulebot")
- var/datum/browser/popup = new(user, "mulebot", "M.U.L.E. Mk. III [suffix ? "([suffix])" : ""]", 350, 500)
+ var/datum/browser/popup = new(user, "mulebot", "M.U.L.E. Mk. V [suffix ? "([suffix])" : ""]", 350, 500)
popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+ popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
popup.open()
return
@@ -261,7 +253,7 @@ var/global/mulebot_count = 0
return
if (usr.stat)
return
- if ((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
+ if ((in_range(src, usr) && istype(loc, /turf)) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
switch(href_list["op"])
@@ -269,7 +261,7 @@ var/global/mulebot_count = 0
toggle_lock(usr)
if("power")
- if (src.on)
+ if (on)
turn_off()
else if (cell && !open)
if (!turn_on())
@@ -305,23 +297,23 @@ var/global/mulebot_count = 0
if("stop")
- if(mode >=2)
- mode = 0
+ if(mode >= BOT_DELIVER)
+ bot_reset()
updateDialog()
if("go")
- if(mode == 0)
+ if(mode == BOT_IDLE)
start()
updateDialog()
if("home")
- if(mode == 0 || mode == 2)
+ if(mode == BOT_IDLE || mode == BOT_DELIVER)
start_home()
updateDialog()
if("destination")
refresh=0
- var/new_dest = input("Enter new destination tag", "Mulebot [suffix ? "([suffix])" : ""]", destination) as text|null
+ var/new_dest = input("Select M.U.L.E. Destination", "Mulebot [suffix ? "([suffix])" : ""]", destination) as null|anything in delivery_beacons
refresh=1
if(new_dest)
set_destination(new_dest)
@@ -357,12 +349,15 @@ var/global/mulebot_count = 0
if("autopick")
auto_pickup = !auto_pickup
+ if("report")
+ report_delivery = !report_delivery
+
if("close")
usr.unset_machine()
usr << browse(null,"window=mulebot")
updateDialog()
- //src.updateUsrDialog()
+ //updateUsrDialog()
else
usr << browse(null, "window=mulebot")
usr.unset_machine()
@@ -375,7 +370,7 @@ var/global/mulebot_count = 0
return !open && cell && cell.charge > 0 && wires.HasPower()
/obj/machinery/bot/mulebot/proc/toggle_lock(var/mob/user)
- if(src.allowed(user))
+ if(allowed(user))
locked = !locked
updateDialog()
return 1
@@ -403,8 +398,8 @@ var/global/mulebot_count = 0
// called to load a crate
/obj/machinery/bot/mulebot/proc/load(var/atom/movable/C)
if(wires.LoadCheck() && !istype(C,/obj/structure/closet/crate))
- src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
return // if not emagged, only allow crates to be loaded
//I'm sure someone will come along and ask why this is here... well people were dragging screen items onto the mule, and that was not cool.
@@ -416,16 +411,16 @@ var/global/mulebot_count = 0
if(get_dist(C, src) > 1 || load || !on)
return
- mode = 1
+ mode = BOT_LOADING
// if a create, close before loading
var/obj/structure/closet/crate/crate = C
if(istype(crate))
crate.close()
- C.loc = src.loc
+ C.loc = loc
sleep(2)
- if(C.loc != src.loc) //To prevent you from going onto more thano ne bot.
+ if(C.loc != loc) //To prevent you from going onto more thano ne bot.
return
C.loc = src
load = C
@@ -441,7 +436,7 @@ var/global/mulebot_count = 0
M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src
- mode = 0
+ mode = BOT_IDLE
send_status()
// called to unload the bot
@@ -451,7 +446,7 @@ var/global/mulebot_count = 0
if(!load)
return
- mode = 1
+ mode = BOT_LOADING
overlays.Cut()
if(ismob(load))
@@ -461,11 +456,11 @@ var/global/mulebot_count = 0
M.client.eye = src
- load.loc = src.loc
+ load.loc = loc
load.pixel_y -= 9
load.layer = initial(load.layer)
if(dirn)
- var/turf/T = src.loc
+ var/turf/T = loc
var/turf/newT = get_step(T,dirn)
if(load.CanPass(load,newT)) //Can't get off onto anything that wouldn't let you pass normally
step(load, dirn)
@@ -477,9 +472,9 @@ var/global/mulebot_count = 0
// with items dropping as mobs are loaded
for(var/atom/movable/AM in src)
- if(AM == cell || AM == botcard) continue
+ if(AM == cell || istype(AM , botcard) || AM == Radio) continue
- AM.loc = src.loc
+ AM.loc = loc
AM.layer = initial(AM.layer)
AM.pixel_y = initial(AM.pixel_y)
if(ismob(AM))
@@ -487,10 +482,19 @@ var/global/mulebot_count = 0
if(M.client)
M.client.perspective = MOB_PERSPECTIVE
M.client.eye = src
- mode = 0
+ mode = BOT_IDLE
+/obj/machinery/bot/mulebot/call_bot()
+ ..()
+ var/area/dest_area
+ if (path && path.len)
+ target = ai_waypoint //Target is the end point of the path, the waypoint set by the AI.
+ dest_area = get_area(target)
+ destination = format_text(dest_area.name)
+ pathset = 1 //Indicates the AI's custom path is initialized.
+ start()
-/obj/machinery/bot/mulebot/process()
+/obj/machinery/bot/mulebot/bot_process()
if(!has_power())
on = 0
return
@@ -520,13 +524,14 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/proc/process_bot()
//if(mode) world << "Mode: [mode]"
+
switch(mode)
- if(0) // idle
+ if(BOT_IDLE) // idle
icon_state = "mulebot0"
return
- if(1) // loading/unloading
+ if(BOT_LOADING) // loading/unloading
return
- if(2,3,4) // navigating to deliver,home, or blocked
+ if(BOT_DELIVER,BOT_GO_HOME,BOT_BLOCKED) // navigating to deliver,home, or blocked
if(loc == target) // reached target
at_target()
@@ -569,14 +574,14 @@ var/global/mulebot_count = 0
path -= loc
- if(mode==4)
+ if(mode == BOT_BLOCKED)
spawn(1)
send_status()
if(destination == home_destination)
- mode = 3
+ mode = BOT_GO_HOME
else
- mode = 2
+ mode = BOT_DELIVER
else // failed to move
@@ -585,73 +590,72 @@ var/global/mulebot_count = 0
blockcount++
- mode = 4
+ mode = BOT_BLOCKED
if(blockcount == 3)
- src.visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
+ visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
+ playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
if(blockcount > 10) // attempt 10 times before recomputing
// find new path excluding blocked turf
- src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
spawn(2)
calc_path(next)
if(path.len > 0)
- src.visible_message("[src] makes a delighted ping!", "You hear a ping.")
- playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
- mode = 4
- mode =6
+ visible_message("[src] makes a delighted ping!", "You hear a ping.")
+ playsound(loc, 'sound/machines/ping.ogg', 50, 0)
+ mode = BOT_BLOCKED
+ mode = BOT_WAIT_FOR_NAV
return
return
else
- src.visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
+ visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
+ playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
//world << "Bad turf."
- mode = 5
+ mode = BOT_NAV
return
else
//world << "No path."
- mode = 5
+ mode = BOT_NAV
return
- if(5) // calculate new path
+ if(BOT_NAV) // calculate new path
//world << "Calc new path."
- mode = 6
+ mode = BOT_WAIT_FOR_NAV
spawn(0)
calc_path()
if(path.len > 0)
blockcount = 0
- mode = 4
- src.visible_message("[src] makes a delighted ping!", "You hear a ping.")
- playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+ mode = BOT_BLOCKED
+ visible_message("[src] makes a delighted ping!", "You hear a ping.")
+ playsound(loc, 'sound/machines/ping.ogg', 50, 0)
else
- src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
- mode = 7
+ mode = BOT_NO_ROUTE
//if(6)
//world << "Pending path calc."
//if(7)
//world << "No dest / no route."
+
return
// calculates a path to the current destination
// given an optional turf to avoid
-/obj/machinery/bot/mulebot/proc/calc_path(var/turf/avoid = null)
- src.path = AStar(src.loc, src.target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 250, id=botcard, exclude=avoid)
- if(!src.path)
- src.path = list()
+/obj/machinery/bot/mulebot/calc_path(var/turf/avoid = null)
+ path = get_path_to(loc, target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 250, id=botcard, exclude=avoid)
// sets the current destination
// signals all beacons matching the delivery code
// beacons will return a signal giving their locations
-/obj/machinery/bot/mulebot/proc/set_destination(var/new_dest)
+/obj/machinery/bot/mulebot/set_destination(var/new_dest)
spawn(0)
new_destination = new_dest
post_signal(beacon_freq, "findbeacon", "delivery")
@@ -660,9 +664,9 @@ var/global/mulebot_count = 0
// starts bot moving to current destination
/obj/machinery/bot/mulebot/proc/start()
if(destination == home_destination)
- mode = 3
+ mode = BOT_GO_HOME
else
- mode = 2
+ mode = BOT_DELIVER
icon_state = "mulebot[(wires.MobAvoid() != 0)]"
// starts bot moving to home
@@ -670,17 +674,27 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/proc/start_home()
spawn(0)
set_destination(home_destination)
- mode = 4
+ mode = BOT_BLOCKED
icon_state = "mulebot[(wires.MobAvoid() != 0)]"
// called when bot reaches current target
/obj/machinery/bot/mulebot/proc/at_target()
if(!reached_target)
- src.visible_message("[src] makes a chiming sound!", "You hear a chime.")
- playsound(src.loc, 'sound/machines/chime.ogg', 50, 0)
+ radio_frequency = SUPP_FREQ //Supply channel
+ visible_message("[src] makes a chiming sound!", "You hear a chime.")
+ playsound(loc, 'sound/machines/chime.ogg', 50, 0)
reached_target = 1
+ if(pathset) //The AI called us here, so notify it of our arrival.
+ loaddir = dir //The MULE will attempt to load a crate in whatever direction the MULE is "facing".
+ if(calling_ai)
+ calling_ai << "\icon[src] [src] wirelessly plays a chiming sound!"
+ playsound(calling_ai, 'sound/machines/chime.ogg',40, 0)
+ calling_ai = null
+ radio_frequency = AIPRIV_FREQ //Report on AI Private instead if the AI is controlling us.
+
if(load) // if loaded, unload at target
+ speak("Destination [destination] reached. Unloading [load].",radio_frequency)
unload(loaddir)
else
// not loaded
@@ -695,14 +709,16 @@ var/global/mulebot_count = 0
AM = locate(/obj/structure/closet/crate) in get_step(loc,loaddir)
if(AM)
load(AM)
+ if(report_delivery)
+ speak("Now loading [load] at [get_area(src)].", radio_frequency)
// whatever happened, check to see if we return home
if(auto_return && destination != home_destination)
// auto return set and not at home already
start_home()
- mode = 4
+ mode = BOT_BLOCKED
else
- mode = 0 // otherwise go idle
+ bot_reset() // otherwise go idle
send_status() // report status to anyone listening
@@ -714,13 +730,12 @@ var/global/mulebot_count = 0
var/mob/M = obs
if(ismob(M))
if(istype(M,/mob/living/silicon/robot))
- src.visible_message("[src] bumps into [M]!")
+ visible_message("[src] bumps into [M]!")
else
- src.visible_message("[src] knocks over [M]!")
+ visible_message("[src] knocks over [M]!")
M.stop_pulling()
M.Stun(8)
M.Weaken(5)
- M.lying = 1
..()
/obj/machinery/bot/mulebot/alter_health()
@@ -730,8 +745,8 @@ var/global/mulebot_count = 0
// called from mob/living/carbon/human/Crossed()
// when mulebot is in the same loc
/obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H)
- src.visible_message("[src] drives over [H]!")
- playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
+ visible_message("[src] drives over [H]!")
+ playsound(loc, 'sound/effects/splat.ogg', 50, 1)
var/damage = rand(5,15)
H.apply_damage(2*damage, BRUTE, "head")
@@ -741,7 +756,7 @@ var/global/mulebot_count = 0
H.apply_damage(0.5*damage, BRUTE, "l_arm")
H.apply_damage(0.5*damage, BRUTE, "r_arm")
- var/obj/effect/decal/cleanable/blood/B = new(src.loc)
+ var/obj/effect/decal/cleanable/blood/B = new(loc)
B.blood_DNA = list()
B.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type
@@ -779,7 +794,7 @@ var/global/mulebot_count = 0
// process control input
switch(recv)
if("stop")
- mode = 0
+ bot_reset()
return
if("go")
@@ -815,6 +830,7 @@ var/global/mulebot_count = 0
// receive response from beacon
recv = signal.data["beacon"]
+
if(wires.BeaconRX())
if(recv == new_destination) // if the recvd beacon location matches the set destination
// the we will navigate there
@@ -829,12 +845,18 @@ var/global/mulebot_count = 0
calc_path()
updateDialog()
+ //Detects and stores current active delivery beacons.
+ if(signal.data["beacon"])
+ if(!delivery_beacons)
+ delivery_beacons = new()
+ delivery_beacons[signal.data["beacon"] ] = signal.source
+
// send a radio signal with a single data key/value pair
-/obj/machinery/bot/mulebot/proc/post_signal(var/freq, var/key, var/value)
+/obj/machinery/bot/mulebot/post_signal(var/freq, var/key, var/value)
post_signal_multiple(freq, list("[key]" = value) )
// send a radio signal with multiple data key/values
-/obj/machinery/bot/mulebot/proc/post_signal_multiple(var/freq, var/list/keyval)
+/obj/machinery/bot/mulebot/post_signal_multiple(var/freq, var/list/keyval)
if(freq == beacon_freq && !(wires.BeaconRX()))
return
@@ -856,17 +878,17 @@ var/global/mulebot_count = 0
//world << "sent [key],[keyval[key]] on [freq]"
if (signal.data["findbeacon"])
frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- else if (signal.data["type"] == "mulebot")
+ else if (signal.data["type"] == MULE_BOT)
frequency.post_signal(src, signal, filter = RADIO_MULEBOT)
else
frequency.post_signal(src, signal)
// signals bot status etc. to controller
-/obj/machinery/bot/mulebot/proc/send_status()
+/obj/machinery/bot/mulebot/send_status()
var/list/kv = list(
- "type" = "mulebot",
+ "type" = MULE_BOT,
"name" = suffix,
- "loca" = (loc ? loc.loc : "Unknown"), // somehow loc can be null and cause a runtime - Quarxink
+ "loca" = get_area(src),
"mode" = mode,
"powr" = (cell ? cell.percent() : 0),
"dest" = destination,
@@ -886,7 +908,7 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/explode()
- src.visible_message("[src] blows apart!")
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/device/assembly/prox_sensor(Tsec)
@@ -902,6 +924,6 @@ var/global/mulebot_count = 0
s.set_up(3, 1, src)
s.start()
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
unload(0)
qdel(src)
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index dc7a6800c8a..dc04bb2fdb9 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -17,45 +17,23 @@
var/threatlevel = 0
var/target_lastloc //Loc of target when arrested.
var/last_found //There's a delay
- var/frustration = 0
// var/emagged = 0 //Emagged Secbots view everyone as a criminal
- var/declare_arrests = 1 //When making an arrest, should it notify everyone wearing sechuds?
+ var/declare_arrests = 1 //When making an arrest, should it notify everyone on the security channel?
var/idcheck = 0 //If true, arrest people with no IDs
- var/weaponscheck = 0 //If true, arrest people for weapons if they don't have access
+ var/weaponscheck = 0 //If true, arrest people for weapons if they lack access
var/check_records = 1 //Does it check security records?
var/arrest_type = 0 //If true, don't handcuff
-
- var/mode = 0
-#define SECBOT_IDLE 0 // idle
-#define SECBOT_HUNT 1 // found target, hunting
-#define SECBOT_PREP_ARREST 2 // at target, preparing to arrest
-#define SECBOT_ARREST 3 // arresting target
-#define SECBOT_START_PATROL 4 // start patrol
-#define SECBOT_PATROL 5 // patrolling
-#define SECBOT_SUMMON 6 // summoned by PDA
-
- var/auto_patrol = 0 // set to make bot automatically patrol
-
- var/beacon_freq = 1445 // navigation beacon frequency
- var/control_freq = 1447 // bot control frequency
+ radio_frequency = SEC_FREQ //Security channel
+ bot_type = SEC_BOT
+ bot_filter = RADIO_SECBOT
//List of weapons that secbots will not arrest for
var/safe_weapons = list(\
/obj/item/weapon/gun/energy/laser/bluetag,\
/obj/item/weapon/gun/energy/laser/redtag,\
- /obj/item/weapon/gun/energy/laser/practice)
-
- var/turf/patrol_target // this is turf to navigate to (location of beacon)
- var/new_destination // pending new destination (waiting for beacon response)
- var/destination // destination description tag
- var/next_destination // the next destination in the patrol route
- var/list/path = new // list of path turfs
-
- var/blockcount = 0 //number of times retried a blocked path
- var/awaiting_beacon = 0 // count of pticks awaiting a beacon response
-
- var/nearest_beacon // the nearest beacon's tag
- var/turf/nearest_beacon_loc // the nearest beacon's location
+ /obj/item/weapon/gun/energy/laser/practice,\
+ /obj/item/weapon/melee/telebaton,\
+ /obj/item/weapon/gun/energy/kinetic_accelerator)
/obj/machinery/bot/secbot/beepsky
@@ -68,7 +46,7 @@
/obj/machinery/bot/secbot/pingsky
name = "Officer Pingsky"
desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
- declare_arrests = 0
+ radio_frequency = AIPRIV_FREQ
/obj/item/weapon/secbot_assembly
name = "incomplete securitron assembly"
@@ -83,30 +61,38 @@
/obj/machinery/bot/secbot/New()
..()
- src.icon_state = "secbot[src.on]"
+ icon_state = "secbot[on]"
spawn(3)
- src.botcard = new /obj/item/weapon/card/id(src)
- var/datum/job/detective/J = new /datum/job/detective
- src.botcard.access = J.get_access()
- if(radio_controller)
- radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+
+ var/datum/job/detective/J = new/datum/job/detective
+ botcard.access = J.get_access()
+ prev_access = botcard.access
+ add_to_beacons(bot_filter)
/obj/machinery/bot/secbot/turn_on()
..()
- src.icon_state = "secbot[src.on]"
- src.updateUsrDialog()
+ icon_state = "secbot[on]"
+ updateUsrDialog()
/obj/machinery/bot/secbot/turn_off()
..()
- src.target = null
- src.oldtarget_name = null
- src.anchored = 0
- src.mode = SECBOT_IDLE
+ icon_state = "secbot[on]"
+ updateUsrDialog()
+
+/obj/machinery/bot/secbot/bot_reset()
+ ..()
+ target = null
+ oldtarget_name = null
+ anchored = 0
walk_to(src,0)
- src.icon_state = "secbot[src.on]"
- src.updateUsrDialog()
+ last_found = world.time
+
+/obj/machinery/bot/secbot/set_custom_texts()
+
+ text_hack = "You overload [name]'s target identification system."
+ text_dehack = "You reboot [name] and restore the target identification."
+ text_dehack_fail = "[name] refuses to accept your authority!"
/obj/machinery/bot/secbot/attack_hand(mob/user as mob)
. = ..()
@@ -119,147 +105,118 @@
var/dat
dat += hack(user)
dat += text({"
+Securitron v1.6 controls
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]
"}, +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"}, -"[src.on ? "On" : "Off"]" ) +"[on ? "On" : "Off"]" ) - if(!src.locked || issilicon(user)) + if(!locked || issilicon(user)) dat += text({"
Arrest Unidentifiable Persons: []
Arrest for Unauthorized Weapons: []
Arrest for Warrant: []
-
Operating Mode: []
Report Arrests[]
Auto Patrol: []"}, -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]", +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - var/datum/browser/popup = new(user, "autosec", "Securitron v1.5.1 controls") + var/datum/browser/popup = new(user, "autosec", "Automatic Security Unit v1.6") popup.set_content(dat) popup.open() return /obj/machinery/bot/secbot/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - if((href_list["power"]) && (src.allowed(usr))) - if (src.on && !src.emagged) - turn_off() - else - turn_on() - return + + ..() switch(href_list["operation"]) if("idcheck") - src.idcheck = !src.idcheck - src.updateUsrDialog() + idcheck = !idcheck + updateUsrDialog() if("weaponscheck") - src.weaponscheck = !src.weaponscheck - src.updateUsrDialog() + weaponscheck = !weaponscheck + updateUsrDialog() if("ignorerec") - src.check_records = !src.check_records - src.updateUsrDialog() + check_records = !check_records + updateUsrDialog() if("switchmode") - src.arrest_type = !src.arrest_type - src.updateUsrDialog() - if("patrol") - auto_patrol = !auto_patrol - mode = SECBOT_IDLE + arrest_type = !arrest_type updateUsrDialog() if("declarearrests") - src.declare_arrests = !src.declare_arrests - src.updateUsrDialog() - if("hack") - if(!src.emagged) - src.emagged = 2 - src.hacked = 1 - usr << "You overload [src]'s target identification system." - else if(!src.hacked) - usr << "[src] refuses to accept your authority!" - else - src.emagged = 0 - src.hacked = 0 - usr << "You reboot [src] and restore the target identification." - src.updateUsrDialog() + declare_arrests = !declare_arrests + updateUsrDialog() + /obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if(src.allowed(user) && !open && !emagged) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + if(allowed(user) && !open && !emagged) + locked = !locked + user << "Controls are now [locked ? "locked." : "unlocked."]" else if(emagged) user << "ERROR" if(open) user << "Please close the access panel before locking it." else - user << "Access denied." + user << " Access denied." else ..() if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. return - if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. threatlevel = user.assess_threat(src) threatlevel += 6 if(threatlevel >= 4) - src.target = user - src.mode = SECBOT_HUNT + target = user + mode = BOT_HUNT /obj/machinery/bot/secbot/Emag(mob/user as mob) ..() - if(open && !locked) - if(user) user << "You short out [src]'s target assessment circuits." - spawn(0) - audible_message("[src] buzzes oddly!") - src.target = null - if(user) src.oldtarget_name = user.name - src.last_found = world.time - src.anchored = 0 - src.declare_arrests = 0 - src.emagged = 2 - src.on = 1 - src.icon_state = "secbot[src.on]" - mode = SECBOT_IDLE -/obj/machinery/bot/secbot/process() - set background = BACKGROUND_ENABLED + if(emagged == 2) + if(user) + user << " You short out [src]'s target assessment circuits." + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "secbot[on]" - if(!src.on) +/obj/machinery/bot/secbot/bot_process() + if (!..()) return switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol - mode = SECBOT_START_PATROL // switch to patrol mode + mode = BOT_START_PATROL // switch to patrol mode - if(SECBOT_HUNT) // hunting for perp + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if(src.frustration >= 8) + if(frustration >= 8) walk_to(src,0) back_to_idle() return if(target) // make sure target exists - if(src.Adjacent(target) && isturf(src.target.loc)) // if right next to perp - playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - src.icon_state = "secbot-c" + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + icon_state = "secbot-c" spawn(2) - src.icon_state = "secbot[src.on]" - var/mob/living/carbon/M = src.target + icon_state = "secbot[on]" + var/mob/living/carbon/M = target if(istype(M, /mob/living/carbon/human)) if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 @@ -272,46 +229,46 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) - broadcast_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] scumbag [target.name] in [location]", src) - target.visible_message("[src.target] has been stunned by [src]!",\ - "[src.target] has been stunned by [src]!") + speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) + target.visible_message("[target] has been stunned by [src]!",\ + "[target] has been stunned by [src]!") - mode = SECBOT_PREP_ARREST - src.anchored = 1 - src.target_lastloc = M.loc + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = M.loc return else // not next to perp - var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) - if((get_dist(src, src.target)) >= (olddist)) - src.frustration++ + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if((get_dist(src, target)) >= (olddist)) + frustration++ else - src.frustration = 0 + frustration = 0 else back_to_idle() - if(SECBOT_PREP_ARREST) // preparing to arrest target + if(BOT_PREP_ARREST) // preparing to arrest target // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. - if( !src.Adjacent(target) || !isturf(src.target.loc) || src.target.weakened < 2 ) + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if(!src.arrest_type) - if(!src.target.handcuffed) //he's not cuffed? Try to cuff him! - mode = SECBOT_ARREST - playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - target.visible_message("[src] is trying to put zipties on [src.target]!",\ - "[src] is trying to put zipties on [src.target]!") + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + mode = BOT_ARREST + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + target.visible_message("[src] is trying to put zipties on [target]!",\ + "[src] is trying to put zipties on [target]!") spawn(60) - if( !src.Adjacent(target) || !isturf(src.target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - if(!src.target.handcuffed) + if(!target.handcuffed) target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) target.update_inv_handcuffed(0) //update the handcuffs overlay - playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) + playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) back_to_idle() else back_to_idle() @@ -320,362 +277,95 @@ Auto Patrol: []"}, back_to_idle() return - if(SECBOT_ARREST) - + if(BOT_ARREST) if (!target) - src.anchored = 0 - mode = SECBOT_IDLE - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + last_found = world.time frustration = 0 return - if(src.target.handcuffed) //no target or target cuffed? back to idle. + if(target.handcuffed) //no target or target cuffed? back to idle. back_to_idle() return - if( !src.Adjacent(target) || !isturf(src.target.loc) || (src.target.loc != src.target_lastloc && src.target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. + if( !Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. back_to_hunt() return + else //Try arresting again if the target escapes. + mode = BOT_PREP_ARREST + anchored = 0 + + if(BOT_START_PATROL) + look_for_perp() + start_patrol() + + if(BOT_PATROL) + look_for_perp() + bot_patrol() - if(SECBOT_START_PATROL) // start a patrol - - if(path.len > 0 && patrol_target) // have a valid path, so just resume - mode = SECBOT_PATROL - return - - else if(patrol_target) // has patrol target already - spawn(0) - calc_path() // so just find a route to it - if(path.len == 0) - patrol_target = 0 - return - mode = SECBOT_PATROL - - - else // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - - - if(SECBOT_PATROL) // patrol mode - - patrol_step() - spawn(5) - if(mode == SECBOT_PATROL) - patrol_step() - - if(SECBOT_SUMMON) // summoned to PDA - patrol_step() - spawn(4) - if(mode == SECBOT_SUMMON) - patrol_step() - sleep(4) - patrol_step() return /obj/machinery/bot/secbot/proc/back_to_idle() - src.anchored = 0 - mode = SECBOT_IDLE - src.target = null - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + target = null + last_found = world.time frustration = 0 spawn(0) - process() //ensure bot quickly responds + bot_process() //ensure bot quickly responds /obj/machinery/bot/secbot/proc/back_to_hunt() - src.anchored = 0 - src.frustration = 0 - mode = SECBOT_HUNT + anchored = 0 + frustration = 0 + mode = BOT_HUNT spawn(0) - process() //ensure bot quickly responds - -// perform a single patrol step -/obj/machinery/bot/secbot/proc/patrol_step() - - if(loc == patrol_target) // reached target - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - if(istype( next, /turf/simulated)) - - var/moved = step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - path -= loc - - look_for_perp() - else // failed to move - - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - - return - - return - - else // not a valid turf - mode = SECBOT_IDLE - return - - else // no path, so calculate new one - mode = SECBOT_START_PATROL - - -// finds a new patrol target -/obj/machinery/bot/secbot/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 5) // wait 5 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - - if(next_destination) - set_destination(next_destination) - else - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/secbot/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(10) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - else - auto_patrol = 0 - mode = SECBOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/secbot/proc/at_patrol_target() - if(auto_patrol) - find_patrol_target() - else - mode = SECBOT_IDLE - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/secbot/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/secbot/receive_signal(datum/signal/signal) - //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/bot/secbot/receive_signal([signal.debug_print()])") - if(!on) - return - - /* - world << "rec signal: [signal.source]" - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - // process control input - switch(recv) - if("stop") - mode = SECBOT_IDLE - auto_patrol = 0 - return - - if("go") - mode = SECBOT_IDLE - auto_patrol = 1 - return - - if("summon") - patrol_target = signal.data["target"] - next_destination = destination - destination = null - awaiting_beacon = 0 - mode = SECBOT_SUMMON - calc_path() - speak("Responding.") - - return - - - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - - // note we ignore the beacon we are located at - if(dist>1 && dist 1)
- nearest_beacon = recv
- nearest_beacon_loc = signal.source.loc
- return
-
-
-// send a radio signal with a single data key/value pair
-/obj/machinery/bot/secbot/proc/post_signal(var/freq, var/key, var/value)
- post_signal_multiple(freq, list("[key]" = value) )
-
-// send a radio signal with multiple data key/values
-/obj/machinery/bot/secbot/proc/post_signal_multiple(var/freq, var/list/keyval)
-
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
-
- if(!frequency) return
-
- var/datum/signal/signal = new()
- signal.source = src
- signal.transmission_method = 1
- //for(var/key in keyval)
- // signal.data[key] = keyval[key]
- signal.data = keyval
- //world << "sent [key],[keyval[key]] on [freq]"
- if(signal.data["findbeacon"])
- frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- else if(signal.data["type"] == "secbot")
- frequency.post_signal(src, signal, filter = RADIO_SECBOT)
- else
- frequency.post_signal(src, signal)
-
-// signals bot status etc. to controller
-/obj/machinery/bot/secbot/proc/send_status()
- var/list/kv = list(
- "type" = "secbot",
- "name" = name,
- "loca" = loc.loc, // area
- "mode" = mode
- )
- post_signal_multiple(control_freq, kv)
-
-
-
-// calculates a path to the current destination
-// given an optional turf to avoid
-/obj/machinery/bot/secbot/proc/calc_path(var/turf/avoid = null)
- src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid)
- if(!src.path)
- src.path = list()
-
-
+ bot_process() //ensure bot quickly responds
// look for a criminal in view of the bot
/obj/machinery/bot/secbot/proc/look_for_perp()
- src.anchored = 0
+ anchored = 0
for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
if((C.stat) || (C.handcuffed))
continue
- if((C.name == src.oldtarget_name) && (world.time < src.last_found + 100))
+ if((C.name == oldtarget_name) && (world.time < last_found + 100))
continue
- src.threatlevel = C.assess_threat(src)
+ threatlevel = C.assess_threat(src)
- if(!src.threatlevel)
+ if(!threatlevel)
continue
- else if(src.threatlevel >= 4)
- src.target = C
- src.oldtarget_name = C.name
- src.speak("Level [src.threatlevel] infraction alert!")
- playsound(src.loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
- src.visible_message("[src] points at [C.name]!")
- mode = SECBOT_HUNT
+ else if(threatlevel >= 4)
+ target = C
+ oldtarget_name = C.name
+ speak("Level [threatlevel] infraction alert!")
+ playsound(loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
spawn(0)
- process() // ensure bot quickly responds to a perp
+ bot_process() // ensure bot quickly responds to a perp
break
else
continue
-
/obj/machinery/bot/secbot/proc/check_for_weapons(var/obj/item/slot_item)
if(istype(slot_item, /obj/item/weapon/gun) || istype(slot_item, /obj/item/weapon/melee))
if(!(slot_item.type in safe_weapons))
return 1
return 0
-/obj/machinery/bot/secbot/Bump(M as mob|obj) //Leave no door unopened!
- if((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
- var/obj/machinery/door/D = M
- if(!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
- D.open()
- src.frustration = 0
- else if((istype(M, /mob/living/)) && (!src.anchored))
- src.loc = M:loc
- src.frustration = 0
- return
-
-/* terrible
-/obj/machinery/bot/secbot/Bumped(atom/movable/M as mob|obj)
- spawn(0)
- if(M)
- var/turf/T = get_turf(src)
- M:loc = T
-*/
-
/obj/machinery/bot/secbot/explode()
walk_to(src,0)
- src.visible_message("[src] blows apart!")
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec)
Sa.build_step = 1
Sa.overlays += "hs_hole"
- Sa.created_name = src.name
+ Sa.created_name = name
new /obj/item/device/assembly/prox_sensor(Tsec)
new /obj/item/weapon/melee/baton(Tsec)
@@ -686,14 +376,14 @@ Auto Patrol: []"},
s.set_up(3, 1, src)
s.start()
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
qdel(src)
/obj/machinery/bot/secbot/attack_alien(var/mob/living/carbon/alien/user as mob)
..()
if(!isalien(target))
- src.target = user
- src.mode = SECBOT_HUNT
+ target = user
+ mode = BOT_HUNT
//Secbot Construction
@@ -703,7 +393,7 @@ Auto Patrol: []"},
..()
return
- if(src.type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets.
+ if(type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets.
return
if(S.secured)
@@ -759,7 +449,7 @@ Auto Patrol: []"},
qdel(src)
else if(istype(I, /obj/item/weapon/pen))
- var/t = copytext(stripped_input(user, "Enter new robot name", name, created_name),1,MAX_NAME_LEN)
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if(!t)
return
if(!in_range(src, usr) && loc != usr)
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index b76e33dad0b..28c7bf2c642 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -93,11 +93,11 @@
..()
-/obj/machinery/camera/ex_act(severity)
+/obj/machinery/camera/ex_act(severity, specialty)
if(src.invuln)
return
else
- ..(severity)
+ ..()
return
/obj/machinery/camera/blob_act()
@@ -116,6 +116,7 @@
/obj/machinery/camera/attack_paw(mob/living/carbon/alien/humanoid/user as mob)
if(!istype(user))
return
+ user.do_attack_animation(src)
status = 0
visible_message("\The [user] slashes at [src]!")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index cc44b26c0c3..a6e179c1050 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -80,7 +80,7 @@
if(istype(W, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- var/input = strip_html(input(usr, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13"))
+ var/input = stripped_input(usr, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13")
if(!input)
usr << "No input found please hang up and try your call again."
return
@@ -99,7 +99,7 @@
C.network = tempnetwork
var/area/A = get_area_master(src)
- C.c_tag = "[A.name] ([rand(1, 999)]"
+ C.c_tag = "[A.name] ([rand(1, 999)])"
for(var/i = 5; i >= 0; i -= 1)
var/direct = input(user, "Direction?", "Assembling Camera", null) in list("LEAVE IT", "NORTH", "EAST", "SOUTH", "WEST" )
diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm
index 24c115bc5ce..e80f0799943 100644
--- a/code/game/machinery/camera/motion.dm
+++ b/code/game/machinery/camera/motion.dm
@@ -49,7 +49,8 @@
/obj/machinery/camera/proc/triggerAlarm()
if (!detectTime) return 0
for (var/mob/living/silicon/aiPlayer in player_list)
- if (status) aiPlayer.triggerAlarm("Motion", src.loc.loc, src)
+ if (status)
+ aiPlayer.triggerAlarm("Motion", get_area(src), list(src), src)
detectTime = -1
return 1
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index f9c26d959bd..1cf5d5306be 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -112,7 +112,7 @@
/obj/machinery/clonepod/attack_paw(mob/user as mob)
return attack_hand(user)
/obj/machinery/clonepod/attack_hand(mob/user as mob)
- if ((isnull(src.occupant)) || (stat & NOPOWER))
+ if (isnull(src.occupant) || !is_operational())
return
if ((!isnull(src.occupant)) && (src.occupant.stat != 2))
var/completion = (100 * ((src.occupant.health + 100) / (src.heal_level + 100)))
@@ -152,6 +152,7 @@
src.eject_wait = 0
var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
+ H.silent = 20 //Prevents an extreme edge case where clones could speak if they said something at exactly the right moment.
occupant = H
if(!clonename) //to prevent null names
@@ -167,25 +168,11 @@
//Here let's calculate their health so the pod doesn't immediately eject them!!!
H.updatehealth()
- H.silent = 5 //Prevents an extreme edge case where clones could speak if they said something at exactly the right moment.
+ H.refresh_huds(clonemind.current)
clonemind.transfer_to(H)
H.ckey = ckey
H << "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?" - // -- Mode/mind specific stuff goes here - - if((H.mind in ticker.mode.revolutionaries) || (H.mind in ticker.mode.head_revolutionaries)) - ticker.mode.update_all_rev_icons() //So the icon actually appears - if((H.mind in ticker.mode.A_bosses) || ((H.mind in ticker.mode.A_gangsters) || (H.mind in ticker.mode.B_bosses)) || (H.mind in ticker.mode.B_gangsters)) - ticker.mode.update_all_gang_icons() - if(H.mind in ticker.mode.syndicates) - ticker.mode.update_all_synd_icons() - if (H.mind in ticker.mode.cult) - ticker.mode.add_cultist(src.occupant.mind) - ticker.mode.update_all_cult_icons() //So the icon actually appears - - // -- End mode specific stuff - hardset_dna(H, ui, se, null, null, mrace, mcolor) if(efficiency > 2) @@ -205,7 +192,7 @@ //Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process() - if(stat & NOPOWER) //Autoeject if power is lost + if(!is_operational()) //Autoeject if power is lost if (src.occupant) src.locked = 0 src.go_out() @@ -302,7 +289,7 @@ if(!usr) return - if (usr.stat != 0) + if(usr.stat || !usr.canmove || usr.restrained()) return src.go_out() add_fingerprint(usr) @@ -361,29 +348,10 @@ if(prob(100/(severity*efficiency))) malfunction() ..() -/obj/machinery/clonepod/ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - qdel(src) - return - if(2.0) - if (prob(50)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - qdel(src) - return - if(3.0) - if (prob(25)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - qdel(src) - return - return +/obj/machinery/clonepod/ex_act(severity, specialty) + ..() + if(!gc_destroyed) + go_out() /* * Diskette Box diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 787f3a867a9..f851aaa7981 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -146,7 +146,7 @@ ..() -/obj/machinery/computer/HolodeckControl/ex_act(severity) +/obj/machinery/computer/HolodeckControl/ex_act(severity, specialty) emergencyShutdown() ..() @@ -281,30 +281,23 @@ // Holographic Items! -/turf/simulated/floor/holofloor/ +/turf/simulated/floor/holofloor + icon_state = "floor" thermal_conductivity = 0 -/turf/simulated/floor/holofloor/grass - gender = PLURAL - name = "lush grass" - icon_state = "grass1" - floor_tile = new/obj/item/stack/tile/grass - - New() - floor_tile.New() //I guess New() isn't run on objects spawned without the definition of a turf to house them, ah well. - icon_state = "grass[pick("1","2","3","4")]" - ..() - spawn(4) - update_icon() - for(var/direction in cardinal) - if(istype(get_step(src,direction),/turf/simulated/floor)) - var/turf/simulated/floor/FF = get_step(src,direction) - FF.update_icon() //so siding get updated properly - /turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob) return // HOLOFLOOR DOES NOT GIVE A FUCK +/turf/simulated/floor/fancy/grass/holo + thermal_conductivity = 0 + gender = PLURAL + name = "lush grass" + +/turf/simulated/floor/fancy/grass/holo/attackby(obj/item/weapon/W as obj, mob/user as mob) + return + // HOLOGRASS DOES NOT GIVE A FUCK + /obj/structure/table/holotable name = "table" diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 959e93bec35..dbb47efeab8 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -233,6 +233,7 @@ That prevents a few funky behaviors. new /obj/structure/AIcore/deactivated(T.loc)//Spawns a deactivated terminal at AI location. T.aiRestorePowerRoutine = 0//So the AI initially has power. T.control_disabled = 1//Can't control things remotely if you're stuck in a card! + T.radio_enabled = 0 //No talking on the built-in radio for you either! T.loc = C//Throw AI into the card. C.name = "inteliCard - [T.name]" if (T.stat == 2) @@ -259,6 +260,7 @@ That prevents a few funky behaviors. new /obj/structure/AIcore/deactivated(T.loc) T.aiRestorePowerRoutine = 0 T.control_disabled = 1 + T.radio_enabled = 0 T.loc = C C.AI = T T.cancel_camera() @@ -273,6 +275,7 @@ That prevents a few funky behaviors. var/mob/living/silicon/ai/A = locate() in C//I love locate(). Best proc ever. if(A)//If AI exists on the card. Else nothing since both are empty. A.control_disabled = 0 + A.radio_enabled = 1 A.loc = T.loc//To replace the terminal. C.icon_state = "aicard" C.name = "inteliCard" @@ -286,6 +289,7 @@ That prevents a few funky behaviors. var/mob/living/silicon/ai/A = C.AI if(A) A.control_disabled = 0 + A.radio_enabled = 1 C.AI = null A.loc = T.loc A.cancel_camera() @@ -307,6 +311,7 @@ That prevents a few funky behaviors. A.loc = T T.occupier = A A.control_disabled = 1 + A.radio_enabled = 0 if (A.stat == 2) T.overlays += image('icons/obj/computer.dmi', "ai-fixer-404") else @@ -347,6 +352,7 @@ That prevents a few funky behaviors. T.occupier = A C.AI = null A.control_disabled = 1 + A.radio_enabled = 0 T.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-empty") A.cancel_camera() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6b5ad607a94..e7d1b3e7c67 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -23,8 +23,11 @@ /obj/item/toy/prize/mauler = 1, /obj/item/toy/prize/odysseus = 1, /obj/item/toy/prize/phazon = 1, + /obj/item/toy/prize/reticence = 1, /obj/item/toy/cards/deck = 2, - /obj/item/toy/nuke = 2 + /obj/item/toy/nuke = 2, + /obj/item/toy/minimeteor = 2, + /obj/item/toy/carpplushie = 2 ) /obj/machinery/computer/arcade/New() diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 2ce3087b2f1..c7622c6344b 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -17,7 +17,8 @@ set_frequency(receive_frequency) /obj/machinery/computer/atmos_alert/Destroy() - radio_controller.remove_object(src, receive_frequency) + if(radio_controller) + radio_controller.remove_object(src, receive_frequency) ..() /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 5140790e6f8..58012daaf90 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -74,6 +74,12 @@ name = "circuit board (Communications)" build_path = /obj/machinery/computer/communications origin_tech = "programming=2;magnets=2" + var/cooldown = 0 +/obj/item/weapon/circuitboard/communications/New() + ..() + processing_objects |= src +/obj/item/weapon/circuitboard/communications/process() + cooldown = max(cooldown - 1, 0) /obj/item/weapon/circuitboard/card name = "circuit board (ID Console)" build_path = /obj/machinery/computer/card @@ -317,7 +323,7 @@ circuit = P user.drop_item() circuit.add_fingerprint(user) - P.loc = src + P.loc = null else user << "This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/screwdriver) && circuit) @@ -387,18 +393,6 @@ if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You connect the monitor." - var/obj/B = new src.circuit.build_path (src.loc) - if(circuit.powernet) B:powernet = circuit.powernet - if(circuit.id) B:id = circuit.id - if(circuit.records) B:records = circuit.records - if(circuit.frequency) B:frequency = circuit.frequency - if(istype(circuit,/obj/item/weapon/circuitboard/supplycomp)) - var/obj/machinery/computer/supplycomp/SC = B - var/obj/item/weapon/circuitboard/supplycomp/C = circuit - SC.can_order_contraband = C.contraband_enabled - else if(istype(circuit,/obj/item/weapon/circuitboard/shuttle)) - var/obj/machinery/computer/shuttle/S = B - var/obj/item/weapon/circuitboard/shuttle/C = circuit - S.id = C.id + var/obj/B = new src.circuit.build_path (src.loc, circuit) transfer_fingerprints_to(B) qdel(src) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 31be4f0c434..0aa6ed942bc 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -20,9 +20,6 @@ /obj/machinery/computer/security/attack_hand(var/mob/user as mob) if(!stat) - if (src.z > 6) - user << "Unable to establish a connection: \black You're too far away from the station!" - return if (!network) ERROR("A computer lacks a network at [x],[y],[z].") @@ -36,6 +33,8 @@ var/list/L = list() for (var/obj/machinery/camera/C in cameranet.cameras) + if((z > 7 || C.z > 7) && (C.z != z))//if on away mission, can only recieve feed from same z_level cameras + continue L.Add(C) camera_sort(L) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6fbba86fd4d..5d49b12a1e5 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -54,12 +54,12 @@ // Try to find a scanner in that direction scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) - // If found, then we break, and return the scanner - if (!isnull(scannerf)) - break + // If found and operational, return the scanner + if (!isnull(scannerf) && scannerf.is_operational()) + return scannerf // If no scanner was found, it will return null - return scannerf + return null /obj/machinery/computer/cloning/proc/findcloner() var/obj/machinery/clonepod/podf = null @@ -68,10 +68,10 @@ podf = locate(/obj/machinery/clonepod, get_step(src, dir)) - if (!isnull(podf)) - break + if (!isnull(podf) && podf.is_operational()) + return podf - return podf + return null /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES @@ -233,25 +233,25 @@ if("stopautoprocess") autoprocess = 0 - else if ((href_list["scan"]) && (!isnull(src.scanner))) + else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational()) scantemp = "" loading = 1 src.updateUsrDialog() spawn(20) - src.scan_mob(src.scanner.occupant) + src.scan_mob(scanner.occupant) loading = 0 src.updateUsrDialog() //No locking an open scanner. - else if ((href_list["lock"]) && (!isnull(src.scanner))) - if ((!src.scanner.locked) && (src.scanner.occupant)) - src.scanner.locked = 1 + else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational()) + if ((!scanner.locked) && (scanner.occupant)) + scanner.locked = 1 else - src.scanner.locked = 0 + scanner.locked = 0 else if(href_list["view_rec"]) src.active_record = find_record("id", href_list["view_rec"], records) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index fd2320b0182..2733f92b123 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -57,6 +57,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(!href_list["operation"]) return + var/obj/item/weapon/circuitboard/communications/CM = circuit switch(href_list["operation"]) // main interface if("main") @@ -199,7 +200,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 // OMG CENTCOM LETTERHEAD if("MessageCentcomm") if(src.authenticated==2) - if(centcom_message_cooldown) + if(CM.cooldown) usr << "Arrays recycling. Please stand by." return var/input = stripped_input(usr, "Please choose a message to transmit to Centcom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") @@ -208,26 +209,22 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 Centcomm_announce(input, usr) usr << "Message transmitted." log_say("[key_name(usr)] has made a Centcom announcement: [input]") - centcom_message_cooldown = 1 - spawn(600)//One minute cooldown - centcom_message_cooldown = 0 + CM.cooldown = 55 // OMG SYNDICATE ...LETTERHEAD if("MessageSyndicate") if((src.authenticated==2) && (src.emagged)) - if(centcom_message_cooldown) + if(CM.cooldown) usr << "Arrays recycling. Please stand by." return - var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") + var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return Syndicate_announce(input, usr) usr << "Message transmitted." log_say("[key_name(usr)] has made a Syndicate announcement: [input]") - centcom_message_cooldown = 1 - spawn(600)//One minute cooldown - centcom_message_cooldown = 0 + CM.cooldown = 55 //about one minute if("RestoreBackup") usr << "Backup routing data restored!" @@ -585,7 +582,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 user << "The emergency shuttle is already on its way." return - call_reason = strip_html_simple(trim(call_reason)) + call_reason = strip_html_properly(trim(call_reason)) if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) user << "You must provide a reason." diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 99c19755b5c..3529f9ce314 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -9,8 +9,13 @@ var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly var/processing = 0 -/obj/machinery/computer/New() - ..() +/obj/machinery/computer/New(location, obj/item/weapon/circuitboard/C) + ..(location) + if(C && istype(C)) + circuit = C + else + if(circuit) + circuit = new circuit(null) power_change() /obj/machinery/computer/initialize() @@ -26,7 +31,7 @@ ..() -/obj/machinery/computer/ex_act(severity) +/obj/machinery/computer/ex_act(severity, specialty) switch(severity) if(1.0) qdel(src) @@ -89,9 +94,9 @@ user << " You start to disconnect the monitor." if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/M = new circuit( A ) - A.circuit = M + A.circuit = circuit A.anchored = 1 + circuit = null for (var/obj/C in src) C.loc = src.loc if (src.stat & BROKEN) @@ -110,7 +115,8 @@ . = ..() return -/obj/machinery/computer/attack_paw(mob/user) +/obj/machinery/computer/attack_paw(mob/living/user) + user.do_attack_animation(src) if(circuit) if(prob(10)) user.visible_message("[user.name] smashes the [src.name] with its paws.",\ @@ -122,7 +128,8 @@ "You smash against the [src.name] with your paws.",\ "You hear a clicking sound.") -/obj/machinery/computer/attack_alien(mob/user) +/obj/machinery/computer/attack_alien(mob/living/user) + user.do_attack_animation(src) if(circuit) if(prob(80)) user.visible_message("[user.name] smashes the [src.name] with its claws.",\ diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index c4e52d403ad..f68c7bf7c36 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -34,6 +34,37 @@ proc/crewmonitor(mob/user,var/atom/source) + var/jobs[0] + jobs["Captain"] = 00 + jobs["Head of Personnel"] = 50 + jobs["Head of Security"] = 10 + jobs["Warden"] = 11 + jobs["Security Officer"] = 12 + jobs["Detective"] = 13 + jobs["Chief Medical Officer"] = 20 + jobs["Chemist"] = 21 + jobs["Geneticist"] = 22 + jobs["Virologist"] = 23 + jobs["Medical Doctor"] = 24 + jobs["Research Director"] = 30 + jobs["Scientist"] = 31 + jobs["Roboticist"] = 32 + jobs["Chief Engineer"] = 40 + jobs["Station Engineer"] = 41 + jobs["Atmospheric Technician"] = 42 + jobs["Quartermaster"] = 51 + jobs["Shaft Miner"] = 52 + jobs["Cargo Technician"] = 53 + jobs["Bartender"] = 61 + jobs["Chef"] = 62 + jobs["Botanist"] = 63 + jobs["Librarian"] = 64 + jobs["Chaplain"] = 65 + jobs["Clown"] = 66 + jobs["Mime"] = 67 + jobs["Janitor"] = 68 + jobs["Assistant"] = 99 //Unknowns/custom jobs should appear after civilians, and before assistants + var/t = "
"
+ //Chatroom Logs
+ if(5)
+
+ var/index = 0
+ //var/sender = "Anon"
+ //var/channel = "ss13"
+ //var/message = "Blank"
+ dat += "Back - Refresh
" + dat += "
"
+
message = defaultmsg
//user << browse(dat, "window=message;size=700x700")
//onclose(user, "message")
@@ -321,6 +341,14 @@
if(auth)
src.linkedServer.rc_msgs = list()
message = "NOTICE: Logs cleared."
+ //Clears the chatroom logs - KEY REQUIRED
+ if (href_list["clearc"])
+ if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
+ message = noserver
+ else
+ if(auth)
+ src.linkedServer.chat_msgs = list()
+ message = "NOTICE: Logs cleared."
//Change the password - KEY REQUIRED
if (href_list["pass"])
if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
@@ -464,6 +492,13 @@
else
if(auth)
src.screen = 4
+ //Chatroom Logs - KEY REQUIRED
+ if(href_list["viewc"])
+ if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
+ message = noserver
+ else
+ if(auth)
+ src.screen = 5
//usr << href_list["select"]
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 12bccdebc53..1b9c7ca9682 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -92,8 +92,10 @@
R << "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered."
R.ResetSecurityCodes()
else
- message_admins("[key_name_admin(usr)] detonated [R.name]!")
- log_game("\[key_name(usr)] detonated [R.name]!")
+ message_admins("[key_name(usr, usr.client)](JMP) detonated [key_name(R, R.client)](JMP)!")
+ log_game("\[key_name(usr)] detonated [key_name(R)]!")
+ if(R.connected_ai)
+ R.connected_ai << "
ALERT - Cyborg detonation detected: [R.name]
" R.self_destruct() else usr << "Access Denied." @@ -104,10 +106,12 @@ if(can_control(usr, R)) var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm" && can_control(usr, R) && !..()) - message_admins("[key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") - log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") + message_admins("[key_name(usr, usr.client)](JMP) [R.canmove ? "locked down" : "released"] [key_name(R, R.client)](JMP)!") + log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!") R.SetLockdown(!R.lockcharge) R << "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]" + if(R.connected_ai) + R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
" else usr << "Access Denied." diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index ad296e20065..5fe0b91cc05 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -122,7 +122,7 @@ for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order)) var/crimstat = "" for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"])) + if ((E.fields["name"] == R.fields["name"]) && (E.fields["id"] == R.fields["id"])) crimstat = E.fields["criminal"] var/background switch(crimstat) @@ -413,8 +413,10 @@ What a mess.*/ temp += "No" if ("Purge All Records") + investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records") for(var/datum/data/record/R in data_core.security) del(R) + data_core.security.Cut() temp = "All Security records deleted." if ("Add Entry") @@ -460,6 +462,7 @@ What a mess.*/ screen = 3 if ("New Record (General)") + //General Record var/datum/data/record/G = new /datum/data/record() G.fields["name"] = "New Record" G.fields["id"] = "[num2hex(rand(1, 1.6777215E7), 6)]" @@ -472,6 +475,7 @@ What a mess.*/ data_core.general += G active1 = G + //Security Record var/datum/data/record/R = new /datum/data/record() R.fields["name"] = active1.fields["name"] R.fields["id"] = active1.fields["id"] @@ -483,7 +487,7 @@ What a mess.*/ data_core.security += R active2 = R - //Medical Record + //Medical Record var/datum/data/record/M = new /datum/data/record() M.fields["id"] = active1.fields["id"] M.fields["name"] = active1.fields["name"] @@ -506,13 +510,17 @@ What a mess.*/ if ("Edit Field") var/a1 = active1 var/a2 = active2 + switch(href_list["field"]) if("name") - if (istype(active1, /datum/data/record)) + if (istype(active1, /datum/data/record) || istype(active2, /datum/data/record)) var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null) as text if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1) return - active1.fields["name"] = t1 + if(istype(active1, /datum/data/record)) + active1.fields["name"] = t1 + if(istype(active2, /datum/data/record)) + active2.fields["name"] = t1 if("id") if(istype(active2,/datum/data/record) || istype(active1,/datum/data/record)) var/t1 = copytext(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text),1,MAX_MESSAGE_LEN) @@ -607,6 +615,7 @@ What a mess.*/ if ("Change Criminal Status") if (active2) + var/old_field = active2.fields["criminal"] switch(href_list["criminal2"]) if("none") active2.fields["criminal"] = "None" @@ -618,19 +627,28 @@ What a mess.*/ active2.fields["criminal"] = "Parolled" if("released") active2.fields["criminal"] = "Discharged" - + investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "records") + for(var/mob/living/carbon/human/H in mob_list) //thanks for forcing me to do this, whoever wrote this shitty records system + H.sec_hud_set_security_status() if ("Delete Record (Security) Execute") + investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records") if (active2) + data_core.security -= active2 del(active2) if ("Delete Record (ALL) Execute") if (active1) + investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records") for(var/datum/data/record/R in data_core.medical) if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) + data_core.medical -= R del(R) - else + break + data_core.general -= active1 del(active1) + if (active2) + data_core.security -= active2 del(active2) else temp = "This function does not appear to be working at the moment. Our apologies." diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 099048a567f..71caffa4260 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -51,7 +51,9 @@ return -/obj/machinery/computer/station_alert/proc/triggerAlarm(var/class, area/A, var/O, var/alarmsource) +/obj/machinery/computer/station_alert/proc/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) + if(alarmsource.z != z) + return if(stat & (BROKEN)) return var/list/L = src.alarms[class] @@ -70,7 +72,7 @@ C = CL[1] else if (O && istype(O, /obj/machinery/camera)) C = O - L[A.name] = list(A, (C) ? C : O, list(alarmsource)) + L[A.name] = list(A, (C ? C : O), list(alarmsource)) return 1 diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 4f95efac03d..d7bde33688d 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -22,10 +22,16 @@ req_component_names = new() for(var/tname in req_components) - var/path = text2path(tname) + var/path = tname var/obj/O = new path() req_component_names[tname] = O.name +/obj/machinery/constructable_frame/proc/get_req_components_amt() + var/amt = 0 + for(var/path in req_components) + amt += req_components[path] + return amt + // update description of required components remaining /obj/machinery/constructable_frame/proc/update_req_desc() if(!req_components || !req_component_names) @@ -102,6 +108,7 @@ playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) state = 2 circuit.loc = src.loc + components.Remove(circuit) circuit = null if(components.len == 0) user << "You remove the circuit board." @@ -133,10 +140,38 @@ new_machine.RefreshParts() qdel(src) - if(istype(P, /obj/item)) + if(istype(P, /obj/item/weapon/storage/part_replacer) && P.contents.len && get_req_components_amt()) + var/obj/item/weapon/storage/part_replacer/replacer = P + var/list/added_components = list() + var/list/part_list = list() + + //Assemble a list of current parts, then sort them by their rating! + for(var/obj/item/weapon/stock_parts/co in replacer) + part_list += co + //Sort the parts. This ensures that higher tier items are applied first. + part_list = sortTim(part_list, /proc/cmp_rped_sort) + + for(var/path in req_components) + while(req_components[path] > 0 && (locate(path) in part_list)) + var/obj/item/part = (locate(path) in part_list) + if(!part.crit_fail) + added_components[part] = path + replacer.remove_from_storage(part, src) + req_components[path]-- + part_list -= part + + for(var/obj/item/weapon/stock_parts/part in added_components) + components += part + user << "[part.name] applied." + replacer.play_rped_sound() + + update_req_desc() + return + + if(istype(P, /obj/item) && get_req_components_amt()) var/success for(var/I in req_components) - if(istype(P, text2path(I)) && (req_components[I] > 0)) + if(istype(P, I) && (req_components[I] > 0)) success=1 if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CP = P @@ -173,13 +208,13 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=1" req_components = list( - "/obj/item/weapon/vending_refill/boozeomat" = 3) + /obj/item/weapon/vending_refill/boozeomat = 3) var/list/names_paths = list(/obj/machinery/vending/boozeomat = "Booze-O-Mat", - /obj/machinery/vending/coffee = "Hot Drinks", + /obj/machinery/vending/coffee = "Solar's Best Hot Drinks", /obj/machinery/vending/snack = "Getmore Chocolate Corp", /obj/machinery/vending/cola = "Robust Softdrinks", - /obj/machinery/vending/cigarette = "Cigarette", + /obj/machinery/vending/cigarette = "ShadyCigs Deluxe", /obj/machinery/vending/autodrobe = "AutoDrobe") /obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user) @@ -191,7 +226,7 @@ to destroy them and players will be able to make replacements. build_path = typepath name = "circuit board ([names_paths[build_path]] Vendor)" user << "You set the board to [names_paths[build_path]]." - req_components = list("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]" = 3) //Never before has i used a method as horrible as this one, im so sorry + req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3) //Never before has i used a method as horrible as this one, im so sorry /obj/item/weapon/circuitboard/smes name = "circuit board (SMES)" @@ -199,9 +234,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;powerstorage=5;engineering=5" req_components = list( - "/obj/item/stack/cable_coil" = 5, - "/obj/item/weapon/stock_parts/cell" = 5, - "/obj/item/weapon/stock_parts/capacitor" = 1) + /obj/item/stack/cable_coil = 5, + /obj/item/weapon/stock_parts/cell = 5, + /obj/item/weapon/stock_parts/capacitor = 1) /obj/item/weapon/circuitboard/power_compressor name = "circuit board (Power Compressor)" @@ -209,8 +244,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;powerstorage=5;engineering=4" req_components = list( - "/obj/item/stack/cable_coil" = 5, - "/obj/item/weapon/stock_parts/manipulator" = 6) + /obj/item/stack/cable_coil = 5, + /obj/item/weapon/stock_parts/manipulator = 6) /obj/item/weapon/circuitboard/power_turbine name = "circuit board (Power Turbine)" @@ -218,8 +253,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;powerstorage=4;engineering=5" req_components = list( - "/obj/item/stack/cable_coil" = 5, - "/obj/item/weapon/stock_parts/capacitor" = 6) + /obj/item/stack/cable_coil = 5, + /obj/item/weapon/stock_parts/capacitor = 6) /obj/item/weapon/circuitboard/mech_recharger name = "circuit board (Mechbay Recharger)" @@ -227,8 +262,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;powerstorage=4;engineering=4" req_components = list( - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/capacitor" = 5) + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/capacitor = 5) /obj/item/weapon/circuitboard/teleporter_hub name = "circuit board (Teleporter Hub)" @@ -236,8 +271,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;engineering=5;bluespace=5;materials=4" req_components = list( - "/obj/item/bluespace_crystal" = 3, - "/obj/item/weapon/stock_parts/matter_bin" = 1) + /obj/item/bluespace_crystal = 3, + /obj/item/weapon/stock_parts/matter_bin = 1) /obj/item/weapon/circuitboard/teleporter_station name = "circuit board (Teleporter Station)" @@ -245,9 +280,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;engineering=4;bluespace=4" req_components = list( - "/obj/item/bluespace_crystal" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/bluespace_crystal = 2, + /obj/item/weapon/stock_parts/capacitor = 2, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/telesci_pad name = "circuit board (Telepad)" @@ -255,10 +290,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;engineering=3;materials=3;bluespace=4" req_components = list( - "/obj/item/bluespace_crystal" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 1, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/bluespace_crystal = 2, + /obj/item/weapon/stock_parts/capacitor = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/sleeper name = "circuit board (Sleeper)" @@ -266,10 +301,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;biotech=2;engineering=3;materials=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 2) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 2) /obj/item/weapon/circuitboard/cryo_tube name = "circuit board (Cryotube)" @@ -277,9 +312,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;biotech=3;engineering=4" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 4) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 4) /obj/item/weapon/circuitboard/thermomachine name = "circuit board (Freezer)" @@ -288,10 +323,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;plasmatech=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/micro_laser" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/micro_laser = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/thermomachine/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/weapon/screwdriver)) @@ -310,10 +345,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;biotech=2;materials=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/hydroponics name = "circuit board (Hydroponics Tray)" @@ -321,8 +356,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=1;biotech=1" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/microwave name = "circuit board (Microwave)" @@ -330,9 +365,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=1" req_components = list( - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/chem_dispenser name = "circuit board (Portable Chem Dispenser)" @@ -340,11 +375,11 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "materials=4;engineering=4;programming=4;plasmatech=3;biotech=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/stock_parts/cell" = 1) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/capacitor = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/weapon/stock_parts/cell = 1) /obj/item/weapon/circuitboard/destructive_analyzer @@ -353,9 +388,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "magnets=2;engineering=2;programming=2" req_components = list( - "/obj/item/weapon/stock_parts/scanning_module" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1) + /obj/item/weapon/stock_parts/scanning_module = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/micro_laser = 1) /obj/item/weapon/circuitboard/autolathe name = "circuit board (Autolathe)" @@ -363,9 +398,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 3, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 3, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/protolathe name = "circuit board (Protolathe)" @@ -373,9 +408,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/reagent_containers/glass/beaker" = 2) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/weapon/reagent_containers/glass/beaker = 2) /obj/item/weapon/circuitboard/circuit_imprinter @@ -384,9 +419,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/reagent_containers/glass/beaker" = 2) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/reagent_containers/glass/beaker = 2) /obj/item/weapon/circuitboard/pacman name = "circuit board (PACMAN-type Generator)" @@ -394,10 +429,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;powerstorage=3;plasmatech=3;engineering=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 1) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/capacitor = 1) /obj/item/weapon/circuitboard/pacman/super name = "circuit board (SUPERPACMAN-type Generator)" @@ -415,8 +450,8 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3" req_components = list( - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/scanning_module" = 1) + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/scanning_module = 1) /obj/item/weapon/circuitboard/mechfab name = "circuit board (Exosuit Fabricator)" @@ -424,10 +459,10 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3;engineering=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/clonepod name = "circuit board (Clone Pod)" @@ -435,10 +470,10 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3;biotech=3" req_components = list( - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/scanning_module" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/scanning_module = 2, + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/clonescanner name = "circuit board (Cloning Scanner)" @@ -446,11 +481,11 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;biotech=2" req_components = list( - "/obj/item/weapon/stock_parts/scanning_module" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/stack/cable_coil" = 2,) + /obj/item/weapon/stock_parts/scanning_module = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 2,) /obj/item/weapon/circuitboard/cyborgrecharger name = "circuit board (Cyborg Recharger)" @@ -458,9 +493,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "powerstorage=3;engineering=3" req_components = list( - "/obj/item/weapon/stock_parts/capacitor" = 2, - "/obj/item/weapon/stock_parts/cell" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1,) + /obj/item/weapon/stock_parts/capacitor = 2, + /obj/item/weapon/stock_parts/cell = 1, + /obj/item/weapon/stock_parts/manipulator = 1,) // Telecomms circuit boards: @@ -470,10 +505,10 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=1" req_components = list( - "/obj/item/weapon/stock_parts/subspace/ansible" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/stock_parts/micro_laser" = 1) + /obj/item/weapon/stock_parts/subspace/ansible = 1, + /obj/item/weapon/stock_parts/subspace/filter = 1, + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/weapon/stock_parts/micro_laser = 1) /obj/item/weapon/circuitboard/telecomms/hub name = "circuit board (Hub Mainframe)" @@ -481,9 +516,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/filter" = 2) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/subspace/filter = 2) /obj/item/weapon/circuitboard/telecomms/relay name = "circuit board (Relay Mainframe)" @@ -491,9 +526,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/filter" = 2) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/subspace/filter = 2) /obj/item/weapon/circuitboard/telecomms/bus name = "circuit board (Bus Mainframe)" @@ -501,9 +536,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/subspace/filter = 1) /obj/item/weapon/circuitboard/telecomms/processor name = "circuit board (Processor Unit)" @@ -511,12 +546,12 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 3, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/subspace/treatment" = 2, - "/obj/item/weapon/stock_parts/subspace/analyzer" = 1, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/amplifier" = 1) + /obj/item/weapon/stock_parts/manipulator = 3, + /obj/item/weapon/stock_parts/subspace/filter = 1, + /obj/item/weapon/stock_parts/subspace/treatment = 2, + /obj/item/weapon/stock_parts/subspace/analyzer = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/subspace/amplifier = 1) /obj/item/weapon/circuitboard/telecomms/server name = "circuit board (Telecommunication Server)" @@ -524,9 +559,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/subspace/filter = 1) /obj/item/weapon/circuitboard/telecomms/broadcaster name = "circuit board (Subspace Broadcaster)" @@ -534,20 +569,20 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=1" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/subspace/crystal" = 1, - "/obj/item/weapon/stock_parts/micro_laser/high" = 2) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/subspace/filter = 1, + /obj/item/weapon/stock_parts/subspace/crystal = 1, + /obj/item/weapon/stock_parts/micro_laser/high = 2) /obj/item/weapon/circuitboard/ore_redemption name = "circuit board (Ore Redemption)" build_path = /obj/machinery/mineral/ore_redemption board_type = "machine" origin_tech = "programming=1;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/device/assembly/igniter" = 1) + /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/device/assembly/igniter = 1) /obj/item/weapon/circuitboard/mining_equipment_vendor name = "circuit board (Mining Equipment Vendor)" @@ -555,5 +590,5 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=1;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/stock_parts/matter_bin" = 3) \ No newline at end of file + /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/weapon/stock_parts/matter_bin = 3) \ No newline at end of file diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index e5acc1ea5af..eb5faffcafd 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -4,6 +4,7 @@ icon_state = "cell-off" density = 1 anchored = 1.0 + interact_offline = 1 layer = 4 var/on = 0 @@ -45,7 +46,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/process() ..() - if(!node) + if(!node || !is_operational()) return if(!on) updateDialog() @@ -61,7 +62,7 @@ process_occupant() if(abs(temperature_archived-air_contents.temperature) > 1) - network.update = 1 + parent.update = 1 updateDialog() return 1 @@ -97,11 +98,17 @@ user << "Seems empty." /obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user) - if(stat & (NOPOWER|BROKEN)) - if(state_open == 1) + if(..()) + return + + //powerless interaction + if(!is_operational()) + user.unset_machine()//essential to prevent infinite loops of opening/closing the machine + if(state_open) close_machine() else open_machine() + else ui_interact(user) @@ -258,7 +265,7 @@ if(state_open) icon_state = "cell-open" return - if(on) + if(on && is_operational()) if(occupant) icon_state = "cell-occupied" else @@ -266,6 +273,9 @@ else icon_state = "cell-off" +/obj/machinery/atmospherics/unary/cryo_cell/power_change() + ..() + update_icon() /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() if(air_contents.total_moles() < 10) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index a5ca16a2368..3989ee35d2c 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -91,7 +91,7 @@ for reference: qdel(src) ..() -/obj/structure/barricade/wooden/ex_act(severity) +/obj/structure/barricade/wooden/ex_act(severity, specialty) switch(severity) if(1.0) visible_message("The barricade is blown apart!") @@ -210,7 +210,7 @@ for reference: src.explode() ..() -/obj/machinery/deployable/barrier/ex_act(severity) +/obj/machinery/deployable/barrier/ex_act(severity, specialty) switch(severity) if(1.0) src.explode() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 0a642258374..cea529f563e 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -245,7 +245,7 @@ name = "bananium airlock" desc = "Honkhonkhonk" icon = 'icons/obj/doors/Doorbananium.dmi' - var/mineral = "clown" + var/mineral = "bananium" doortype = /obj/structure/door_assembly/door_assembly_clown /obj/machinery/door/airlock/sandstone @@ -1033,8 +1033,6 @@ About the new airlock wires panel: autoclose() return - crush() - if(forced < 2) if(emagged) return @@ -1053,7 +1051,13 @@ About the new airlock wires panel: killthis.ex_act(2)//Smashin windows ..() - + if(locate(/mob/living) in get_turf(src)) + if(!safe) + crush() + else + open() + return + return /obj/machinery/door/airlock/New() ..() @@ -1179,4 +1183,6 @@ About the new airlock wires panel: heat_proof = 0 update_icon() - +/obj/machinery/door/airlock/CanAStarPass(var/obj/item/weapon/card/id/ID) +//Airlock is passable if it is open (!density), bot has access, and is not bolted shut) + return !density || (check_access(ID) && !locked) \ No newline at end of file diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index aef1c2a08d3..5db76850d2d 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -14,13 +14,17 @@ ..() air_connection = new +/obj/machinery/door/airlock/alarmlock/Destroy() + if(radio_controller) + radio_controller.remove_object(src,air_frequency) + ..() + /obj/machinery/door/airlock/alarmlock/initialize() ..() radio_controller.remove_object(src, air_frequency) air_connection = radio_controller.add_object(src, air_frequency, RADIO_TO_AIRALARM) open() - /obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal) ..() if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 8061ba7f4d2..f3bee16d85f 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -24,9 +24,10 @@ var/id = null // id of door it controls. var/releasetime = 0 // when world.time reaches it - release the prisoneer var/timelength = 0 // the length of time this door will be set for - var/timing = 1 // boolean, true/1 timer is on, false/0 means it's not timing + var/timing = 0 // boolean, true/1 timer is on, false/0 means it's not timing var/picture_state // icon_state of alert picture, if not displaying text/numbers var/list/obj/machinery/targets = list() + var/obj/item/device/radio/Radio //needed to send messages to sec radio maptext_height = 26 maptext_width = 32 @@ -34,6 +35,9 @@ /obj/machinery/door_timer/New() ..() + Radio = new/obj/item/device/radio(src) + Radio.listening = 0 + pixel_x = ((src.dir & 3)? (0) : (src.dir == 4 ? 32 : -32)) pixel_y = ((src.dir & 3)? (src.dir ==1 ? 24 : -32) : (0)) @@ -64,7 +68,8 @@ if(stat & (NOPOWER|BROKEN)) return if(timing) if(world.time > src.releasetime) - broadcast_hud_message("[src]'s timer has expired. Releasing prisoner.", src) + Radio.set_frequency(SEC_FREQ) + Radio.talk_into(src, "Timer has expired. Releasing prisoner.", SEC_FREQ) src.timer_end() // open doors, reset timer, clear status screen timing = 0 timeset(0) diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index 9005a7fda49..cbccae2035c 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -2,7 +2,7 @@ if(!src.loc) return 0 for(var/obj/machinery/door/D in src.loc) - if(!istype(D, /obj/machinery/door/window) && D.density) + if(!istype(D, /obj/machinery/door/window) && D.density && D != src) return 0 return 1 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 91890d4b665..d994c0aba9e 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -22,10 +22,8 @@ ..() if(density) layer = 3.1 //Above most items if closed - explosion_resistance = initial(explosion_resistance) else layer = 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 - explosion_resistance = 0 update_freelook_sight() air_update_turf(1) airlocks += src @@ -85,7 +83,7 @@ //used in the AStar algorithm to determinate if the turf the door is on is passable /obj/machinery/door/proc/CanAStarPass(var/obj/item/weapon/card/id/ID) - return !density || check_access(ID) + return !density /obj/machinery/door/proc/bumpopen(mob/user as mob) if(operating) @@ -171,20 +169,14 @@ ..() -/obj/machinery/door/ex_act(severity) - switch(severity) - if(1.0) - qdel(src) - if(2.0) - if(prob(25)) - qdel(src) - if(3.0) - if(prob(80)) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(2, 1, src) - s.start() - return - +/obj/machinery/door/ex_act(severity, specialty) + if(severity == 3) + if(prob(80)) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, src) + s.start() + return + ..() /obj/machinery/door/update_icon() if(density) @@ -223,7 +215,6 @@ sleep(10) src.layer = 2.7 src.density = 0 - explosion_resistance = 0 update_icon() SetOpacity(0) air_update_turf(1) @@ -240,10 +231,9 @@ operating = 1 do_animate("closing") - src.density = 1 - explosion_resistance = initial(explosion_resistance) src.layer = 3.1 sleep(10) + src.density = 1 update_icon() if(visible && !glass) SetOpacity(1) //caaaaarn! diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 4f3c30e26bf..ae4d161a869 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -3,11 +3,13 @@ /obj/machinery/door/firedoor name = "firelock" - desc = "Apply crowbar" - icon = 'icons/obj/doors/Doorfire.dmi' + desc = "Apply crowbar." + icon = 'icons/obj/doors/Doorfireglass.dmi' icon_state = "door_open" opacity = 0 density = 0 + heat_proof = 1 + glass = 1 var/blocked = 0 var/nextstate = null @@ -104,10 +106,6 @@ /obj/machinery/door/firedoor/border_only icon = 'icons/obj/doors/edge_Doorfire.dmi' - glass = 1 //There is a glass window so you can see through the door - //This is needed due to BYOND limitations in controlling visibility - heat_proof = 1 - flags = ON_BORDER /obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0) @@ -132,6 +130,10 @@ else return 1 -//used in the AStar algorithm to determinate if the turf the door is on is passable -/obj/machinery/door/firedoor/CanAStarPass() - return !density \ No newline at end of file + +/obj/machinery/door/firedoor/heavy + name = "heavy firelock" + icon = 'icons/obj/doors/Doorfire.dmi' + glass = 0 + + diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 3695c80ef45..07c94eed7cc 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -3,7 +3,6 @@ desc = "A heavy duty blast door that opens mechanically." icon = 'icons/obj/doors/blastdoor.dmi' icon_state = "closed" - explosion_resistance = 25 var/id = 1 var/auto_close = 0 // Time in seconds to automatically close when opened, 0 if it doesn't. @@ -49,7 +48,6 @@ sleep(10) density = 0 - explosion_resistance = 0 air_update_turf(1) update_freelook_sight() operating = 0 @@ -72,14 +70,13 @@ operating = 1 flick("closing", src) - crush() icon_state = "closed" - density = 1 - explosion_resistance = initial(explosion_resistance) SetOpacity(1) air_update_turf(1) update_freelook_sight() sleep(10) + crush() + density = 1 operating = 0 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index fa3d6098f00..05caa8ff585 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -9,7 +9,6 @@ flags = ON_BORDER opacity = 0 var/obj/item/weapon/airlock_electronics/electronics = null - explosion_resistance = 5 /obj/machinery/door/window/New() ..() @@ -43,13 +42,13 @@ if(src.check_access(bot.botcard)) open_and_close() else - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) else if(istype(AM, /obj/mecha)) var/obj/mecha/mecha = AM if(mecha.occupant && src.allowed(mecha.occupant)) open_and_close() else - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) return if (!( ticker )) return @@ -68,7 +67,7 @@ if(allowed(user)) open_and_close() else - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) return /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0) @@ -110,12 +109,11 @@ return 0 if(!src.operating) //in case of emag src.operating = 1 - flick(text("[]opening", src.base_state), src) + flick("[src.base_state]opening", src) playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) - src.icon_state = text("[]open", src.base_state) + src.icon_state ="[src.base_state]open" sleep(10) - explosion_resistance = 0 src.density = 0 // src.sd_SetOpacity(0) //TODO: why is this here? Opaque windoors? ~Carn air_update_turf(1) @@ -135,12 +133,11 @@ if(emagged) return 0 src.operating = 1 - flick(text("[]closing", src.base_state), src) + flick("[src.base_state]closing", src) playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) src.icon_state = src.base_state src.density = 1 - explosion_resistance = initial(explosion_resistance) // if(src.visible) // SetOpacity(1) //TODO: why is this here? Opaque windoors? ~Carn air_update_turf(1) @@ -165,6 +162,19 @@ qdel(src) return +/obj/machinery/door/window/ex_act(severity, specialty) + switch(severity) + if(1.0) + qdel(src) + if(2.0) + if(prob(25)) + qdel(src) + else + take_damage(120) + if(3.0) + take_damage(60) + + /obj/machinery/door/window/bullet_act(var/obj/item/projectile/Proj) if(Proj.damage) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) @@ -187,6 +197,15 @@ return +/obj/machinery/door/window/mech_melee_attack(obj/mecha/M) + if(M.damtype == "brute") + playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + M.occupant_message("You hit [src].") + visible_message("[src] has been hit by [M.name].") + take_damage(M.force) + return + + /obj/machinery/door/window/attack_ai(mob/user as mob) return src.attack_hand(user) @@ -199,21 +218,24 @@ "[user] smashes against the [src.name].") take_damage(damage) -/obj/machinery/door/window/attack_alien(mob/user as mob) +/obj/machinery/door/window/attack_alien(mob/living/user as mob) + user.do_attack_animation(src) if(islarva(user)) return attack_generic(user, 25) -/obj/machinery/door/window/attack_animal(mob/user as mob) +/obj/machinery/door/window/attack_animal(mob/living/user as mob) if(!isanimal(user)) return var/mob/living/simple_animal/M = user + M.do_attack_animation(src) if(M.melee_damage_upper <= 0) return attack_generic(M, M.melee_damage_upper) /obj/machinery/door/window/attack_slime(mob/living/carbon/slime/user as mob) + user.do_attack_animation(src) if(!user.is_adult) return attack_generic(user, 25) @@ -224,7 +246,7 @@ /obj/machinery/door/window/attack_hand(mob/user as mob) return src.attackby(user, user) -/obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/user as mob) +/obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/living/user as mob) //If it's in the process of opening/closing, ignore the click if (src.operating) @@ -323,6 +345,7 @@ //If it's a weapon, smash windoor. Unless it's an id card, agent card, ect.. then ignore it (Cards really shouldnt damage a door anyway) if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card) ) user.changeNext_move(CLICK_CD_MELEE) + user.do_attack_animation(src) if( (I.flags&NOBLUDGEON) || !I.force ) return var/aforce = I.force @@ -343,7 +366,7 @@ close() else if (src.density) - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) return diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 910feb64a41..7e3d588f5f5 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -38,7 +38,7 @@ var/list/doppler_arrays = list() if(!usr || !isturf(usr.loc)) return - if(usr.stat || usr.restrained()) + if(usr.stat || usr.restrained() || !usr.canmove) return src.dir = turn(src.dir, 90) return diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index f5f4ed67fcd..b7645d58a2b 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -74,15 +74,20 @@ obj/machinery/embedded_controller/radio var/frequency var/datum/radio_frequency/radio_connection - initialize() - set_frequency(frequency) +obj/machinery/embedded_controller/radio/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + ..() - post_signal(datum/signal/signal) - signal.transmission_method = TRANSMISSION_RADIO - if(radio_connection) - return radio_connection.post_signal(src, signal) - else - signal = null +obj/machinery/embedded_controller/radio/initialize() + set_frequency(frequency) + +obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal) + signal.transmission_method = TRANSMISSION_RADIO + if(radio_connection) + return radio_connection.post_signal(src, signal) + else + signal = null obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 8e7bf8d9cfd..5e52de0bb9a 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -40,11 +40,13 @@ /obj/machinery/flasher/attackby(obj/item/weapon/W, mob/user) if (istype(W, /obj/item/weapon/wirecutters)) if (bulb) + user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb.") playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") - bulb.loc = src.loc - bulb = null - power_change() + if(do_after(user, 30) && bulb) + user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") + bulb.loc = src.loc + bulb = null + power_change() else if (istype(W, /obj/item/device/flash/handheld)) if (!bulb) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index a3468565a36..bb2cab0a197 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -84,13 +84,12 @@ var/const/HOLOPAD_MODE = RANGE_BASED For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/holopad/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq) if(speaker && masters.len && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios. - for (var/mob/living/silicon/ai/master in masters) + for(var/mob/living/silicon/ai/master in masters) if(masters[master] && speaker != master) raw_message = master.lang_treat(speaker, message_langs, raw_message) var/name_used = speaker.GetVoice() - var/rendered = "Holopad received, [name_used] " + var/rendered = "Holopad received, [name_used] " master.show_message(rendered, 2) - return /obj/machinery/hologram/holopad/proc/create_holo(mob/living/silicon/ai/A, turf/T = loc) var/obj/effect/overlay/h = new(T)//Spawn a blank effect at the location. @@ -163,7 +162,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ stat |= ~NOPOWER //Destruction procs. -/obj/machinery/hologram/ex_act(severity) +/obj/machinery/hologram/ex_act(severity, specialty) switch(severity) if(1.0) qdel(src) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 44be02fadac..5104069e662 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -84,6 +84,8 @@ Class Procs: process() 'game/machinery/machine.dm' Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. + is_operational() + Returns 0 if the machine is unpowered, broken or undergoing maintenance, 1 if not Compiled by Aygar */ @@ -113,6 +115,7 @@ Class Procs: /obj/machinery/New() ..() machines += src + auto_use_power() /obj/machinery/Destroy() machines.Remove(src) @@ -139,19 +142,21 @@ Class Procs: ..() /obj/machinery/proc/open_machine() - var/turf/T = get_turf(src) - if(T) - state_open = 1 - density = 0 - T.contents += contents - if(occupant) - if(occupant.client) - occupant.client.eye = occupant - occupant.client.perspective = MOB_PERSPECTIVE - occupant = null + state_open = 1 + density = 0 + dropContents() update_icon() updateUsrDialog() +/obj/machinery/proc/dropContents() + var/turf/T = get_turf(src) + T.contents += contents + if(occupant) + if(occupant.client) + occupant.client.eye = occupant + occupant.client.perspective = MOB_PERSPECTIVE + occupant = null + /obj/machinery/proc/close_machine(mob/living/target = null) state_open = 0 density = 1 @@ -171,22 +176,6 @@ Class Procs: updateUsrDialog() update_icon() -/obj/machinery/ex_act(severity) - switch(severity) - if(1.0) - qdel(src) - return - if(2.0) - if (prob(50)) - qdel(src) - return - if(3.0) - if (prob(25)) - qdel(src) - return - else - return - /obj/machinery/blob_act() if(prob(50)) qdel(src) @@ -202,13 +191,23 @@ Class Procs: /obj/machinery/Topic(href, href_list) ..() - if(!interact_offline && stat & (NOPOWER|BROKEN)) - return 1 - if(!usr.canUseTopic(src)) + if(!can_be_used_by(usr)) return 1 add_fingerprint(usr) return 0 +/obj/machinery/proc/can_be_used_by(mob/user) + if(!interact_offline && stat & (NOPOWER|BROKEN)) + return 0 + if(!user.canUseTopic(src)) + return 0 + return 1 + +/obj/machinery/proc/is_operational() + return !(stat & (NOPOWER|BROKEN|MAINT)) + +//////////////////////////////////////////////////////////////////////////////////////////// + /mob/proc/canUseTopic() //TODO: once finished, place these procs on the respective mob files return @@ -224,10 +223,13 @@ Class Procs: src << "You don't have the dexterity to do this!" return -/mob/living/carbon/human/canUseTopic(atom/movable/M) +/mob/living/carbon/human/canUseTopic(atom/movable/M, be_close = 0) if(restrained() || lying || stat || stunned || weakened) return if(!in_range(M, src)) + if((be_close == 0) && (TK in mutations)) + if(tkMaxRangeCheck(src, M)) + return 1 return if(!isturf(M.loc) && M.loc != src) return @@ -259,8 +261,10 @@ Class Procs: /obj/machinery/attack_paw(mob/user as mob) return src.attack_hand(user) -/obj/machinery/attack_hand(mob/user as mob) - if(!interact_offline && stat & (NOPOWER|BROKEN|MAINT)) +/obj/machinery/attack_hand(mob/user as mob, var/check_power = 1) + if(check_power && stat & NOPOWER) + return 1 + if(!interact_offline && stat & (BROKEN|MAINT)) return 1 if(user.lying || user.stat) return 1 @@ -297,12 +301,13 @@ Class Procs: gl_uid++ /obj/machinery/proc/default_deconstruction_crowbar(var/obj/item/weapon/crowbar/C, var/ignore_panel = 0) - if(istype(C) && (panel_open || ignore_panel)) + . = istype(C) && (panel_open || ignore_panel) + if(.) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) M.state = 2 M.icon_state = "box_1" - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc @@ -342,14 +347,15 @@ Class Procs: return 0 /obj/machinery/proc/exchange_parts(mob/user, obj/item/weapon/storage/part_replacer/W) + var/shouldplaysound = 0 if(istype(W) && component_parts) if(panel_open) var/obj/item/weapon/circuitboard/CB = locate(/obj/item/weapon/circuitboard) in component_parts var/P for(var/obj/item/weapon/stock_parts/A in component_parts) for(var/D in CB.req_components) - if(ispath(A.type, text2path(D))) - P = text2path(D) + if(ispath(A.type, D)) + P = D break for(var/obj/item/weapon/stock_parts/B in W.contents) if(istype(B, P) && istype(A, P)) @@ -360,11 +366,14 @@ Class Procs: component_parts += B B.loc = null user << "[A.name] replaced with [B.name]." + shouldplaysound = 1 //Only play the sound when parts are actually replaced! break RefreshParts() else user << "Following parts detected in the machine:" for(var/var/obj/item/C in component_parts) user << " [C.name]" + if(shouldplaysound) + W.play_rped_sound() return 1 return 0 diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index cbc0b08d818..490280f4edc 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -42,6 +42,11 @@ spawn() magnetic_process() +/obj/machinery/magnetic_module/Destroy() + if(radio_controller) + radio_controller.remove_object(src, freq) + ..() + // update the invisibility and icon /obj/machinery/magnetic_module/hide(var/intact) invisibility = intact ? 101 : 0 @@ -235,6 +240,10 @@ if(path) // check for default path filter_path() // renders rpath +/obj/machinery/magnetic_controller/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + ..() /obj/machinery/magnetic_controller/process() if(magnets.len == 0 && autolink) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 1aed8927d45..b2ee6d682c3 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -32,7 +32,12 @@ if(radio_controller) radio_controller.add_object(src, freq, RADIO_NAVBEACONS) - // set the transponder codes assoc list from codes_txt +/obj/machinery/navbeacon/Destroy() + if(radio_controller) + radio_controller.remove_object(src, freq) + ..() + +// set the transponder codes assoc list from codes_txt /obj/machinery/navbeacon/proc/set_codes() if(!codes_txt) return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 9e1bd0616fa..f933cb9366e 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -2,6 +2,11 @@ //################### NEWSCASTERS BE HERE! #### //###-Agouri################################### +/datum/feed_comment + var/author = "" + var/body = "" + var/time_stamp = "" + /datum/feed_message var/author ="" var/body ="" @@ -11,6 +16,9 @@ var/is_admin_message = 0 var/icon/img = null var/time_stamp = "" + var/list/datum/feed_comment/comments = list() + var/locked = 0 + var/caption = "" /datum/feed_channel var/channel_name="" @@ -29,6 +37,7 @@ src.backup_body = "" src.backup_author = "" src.img = null + src.locked = 0 /datum/feed_channel/proc/clear() src.channel_name = "" @@ -54,14 +63,16 @@ newChannel.is_admin_channel = adminChannel network_channels += newChannel -/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0) +/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/allow_comments = 1) var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = author newMsg.body = msg newMsg.time_stamp = "[worldtime2text()]" newMsg.is_admin_message = adminMessage + newMsg.locked = !allow_comments if(photo) newMsg.img = photo.img + newMsg.caption = photo.scribble for(var/datum/feed_channel/FC in network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg //Adding message to the network's appropriate feed_channel @@ -151,6 +162,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/c_locked=0; //Will our new channel be locked to public submissions? var/hitstaken = 0 //Death at 3 hits from an item with force>=15 var/datum/feed_channel/viewing_channel = null + var/allow_comments = 1 luminosity = 0 anchored = 1 @@ -208,7 +220,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.update_icon() -/obj/machinery/newscaster/ex_act(severity) +/obj/machinery/newscaster/ex_act(severity, specialty) switch(severity) if(1.0) qdel(src) @@ -293,6 +305,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="Message Author: [src.scanned_user]
" dat+="Message Body: [src.msg]
" dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].
" @@ -362,8 +375,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="-[MESSAGE.body]
" if(MESSAGE.img) usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") - dat+="
" + dat+="
" + if(MESSAGE.caption) + dat+="[MESSAGE.caption]
" + dat+="
" dat+="\[Story by [MESSAGE.author] \] - ([MESSAGE.time_stamp])
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body]
[comment.author] [comment.time_stamp]
" + if(MESSAGE.locked) + dat+="Comments locked
" + else + dat+="Comment
" dat+="
Refresh" dat+="
Back" if(10) @@ -400,6 +423,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" @@ -492,7 +518,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) usr.set_machine(src) if(href_list["set_channel_name"]) - src.channel_name = strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")) + src.channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN) while (findtext(src.channel_name," ") == 1) src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1) src.updateUsrDialog() @@ -537,9 +563,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.updateUsrDialog() else if(href_list["set_new_message"]) - src.msg = strip_html(input(usr, "Write your Feed story", "Network Channel Handler", "")) - while (findtext(src.msg," ") == 1) - src.msg = copytext(src.msg,2,lentext(src.msg)+1) + src.msg = trim(stripped_input(usr, "Write your Feed story", "Network Channel Handler")) src.updateUsrDialog() else if(href_list["set_attachment"]) @@ -550,7 +574,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) src.screen=6 else - news_network.SubmitArticle(msg, scanned_user, channel_name, photo) + news_network.SubmitArticle(msg, scanned_user, channel_name, photo, allow_comments) feedback_inc("newscaster_stories",1) src.screen=4 src.updateUsrDialog() @@ -594,15 +618,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.updateUsrDialog() else if(href_list["set_wanted_name"]) - src.channel_name = strip_html(input(usr, "Provide the name of the Wanted person", "Network Security Handler", "")) - while (findtext(src.channel_name," ") == 1) - src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1) + src.channel_name = trim(stripped_input(usr, "Provide the name of the Wanted person", "Network Security Handler")) src.updateUsrDialog() else if(href_list["set_wanted_desc"]) - src.msg = strip_html(input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler", "")) - while (findtext(src.msg," ") == 1) - src.msg = copytext(src.msg,2,lentext(src.msg)+1) + src.msg = trim(stripped_input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler")) src.updateUsrDialog() else if(href_list["submit_wanted"]) @@ -728,11 +748,39 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.screen = 12 src.updateUsrDialog() + else if(href_list["new_comment"]) + var/datum/feed_message/FM = locate(href_list["new_comment"]) + var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141) + if(cominput) + var/datum/feed_comment/FC = new/datum/feed_comment + FC.author = scanned_user + FC.body = cominput + FC.time_stamp = worldtime2text() + FM.comments += FC + log_comment("[usr]/([usr.ckey]) as [scanned_user] commented on message [FM.body] -- [FC.body]") + updateUsrDialog() + + else if(href_list["del_comment"]) + var/datum/feed_comment/FC = locate(href_list["del_comment"]) + var/datum/feed_message/FM = locate(href_list["del_comment_msg"]) + FM.comments -= FC + qdel(FC) + updateUsrDialog() + + else if(href_list["lock_comment"]) + var/datum/feed_message/FM = locate(href_list["lock_comment"]) + FM.locked ^= 1 + updateUsrDialog() + + else if(href_list["set_comment"]) + allow_comments ^= 1 + updateUsrDialog() + else if(href_list["refresh"]) src.updateUsrDialog() -/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/user as mob) +/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob) /* if (istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda) ) //Name verification for channels or messages if(src.screen == 4 || src.screen == 5) @@ -758,24 +806,25 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if (src.isbroken) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] further abuses the shattered [src.name].") + O.show_message("[user.name] further abuses the shattered [src.name].") else if(istype(I, /obj/item/weapon) ) + user.do_attack_animation(src) var/obj/item/weapon/W = I if(W.force <15) for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." ) + O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." ) playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else src.hitstaken++ if(src.hitstaken==3) for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] smashes the [src.name]!" ) + O.show_message("[user.name] smashes the [src.name]!" ) src.isbroken=1 playsound(src.loc, 'sound/effects/Glassbr3.ogg', 100, 1) else for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" ) + O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" ) playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else user << "This does nothing." @@ -972,10 +1021,9 @@ obj/item/weapon/newspaper/Topic(href, href_list) obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/pen)) if(src.scribble_page == src.curr_page) - user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?" + user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?" else - var/s = strip_html( input(user, "Write something", "Newspaper", "") ) - s = copytext(sanitize(s), 1, MAX_MESSAGE_LEN) + var/s = stripped_input(user, "Write something", "Newspaper") if (!s) return if (!in_range(src, usr) && src.loc != usr) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 7120b1d1550..d36763e98e8 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -27,7 +27,6 @@ Buildable meters name = "pipe" desc = "A pipe" var/pipe_type = 0 - //var/pipe_dir = 0 var/pipename force = 7 icon = 'icons/obj/pipe-item.dmi' @@ -37,7 +36,7 @@ Buildable meters level = 2 var/flipped = 0 -/obj/item/pipe/New(var/loc, var/pipe_type as num, var/dir as num, var/obj/machinery/atmospherics/make_from = null) +/obj/item/pipe/New(loc, pipe_type, dir, obj/machinery/atmospherics/make_from) ..() if (make_from) src.dir = make_from.dir @@ -55,7 +54,7 @@ Buildable meters src.pipe_type = PIPE_INSULATED_STRAIGHT + is_bent else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple)) src.pipe_type = PIPE_SIMPLE_STRAIGHT + is_bent - else if(istype(make_from, /obj/machinery/atmospherics/portables_connector)) + else if(istype(make_from, /obj/machinery/atmospherics/unary/portables_connector)) src.pipe_type = PIPE_CONNECTOR else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold)) src.pipe_type = PIPE_MANIFOLD @@ -63,7 +62,7 @@ Buildable meters src.pipe_type = PIPE_UVENT else if(istype(make_from, /obj/machinery/atmospherics/valve/digital)) src.pipe_type = PIPE_DVALVE - else if(istype(make_from, /obj/machinery/atmospherics/valve)) + else if(istype(make_from, /obj/machinery/atmospherics/binary/valve)) src.pipe_type = PIPE_MVALVE else if(istype(make_from, /obj/machinery/atmospherics/binary/pump)) src.pipe_type = PIPE_PUMP @@ -155,7 +154,7 @@ Buildable meters set name = "Rotate Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return src.dir = turn(src.dir, -90) @@ -169,7 +168,7 @@ Buildable meters set name = "Flip Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return if (pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) @@ -305,275 +304,90 @@ Buildable meters switch(pipe_type) if(PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT) var/obj/machinery/atmospherics/pipe/simple/P = new( src.loc ) - P.dir = src.dir - P.initialize_directions = pipe_dir - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - if (P.node1) - P.node1.initialize() - P.node1.addMember(P) - if (P.node2) - P.node2.initialize() - P.node2.addMember(P) - P.build_network() + P.construction(dir, pipe_dir) if(PIPE_HE_STRAIGHT, PIPE_HE_BENT) var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/P = new ( src.loc ) - P.dir = src.dir - P.initialize_directions = pipe_dir P.initialize_directions_he = pipe_dir - //var/turf/T = P.loc - //P.level = T.intact ? 2 : 1 - P.initialize() - if (P.node1) - P.node1.initialize() - P.node1.addMember(P) - if (P.node2) - P.node2.initialize() - P.node2.addMember(P) - P.build_network() + P.construction(dir, pipe_dir) - if(PIPE_CONNECTOR) // connector - var/obj/machinery/atmospherics/portables_connector/C = new( src.loc ) - C.dir = dir - C.initialize_directions = pipe_dir + if(PIPE_CONNECTOR) + var/obj/machinery/atmospherics/unary/portables_connector/C = new( src.loc ) if (pipename) C.name = pipename - var/turf/T = C.loc - C.level = T.intact ? 2 : 1 - C.initialize() - C.build_network() - if (C.node) - C.node.initialize() - C.node.build_network() + C.construction(dir, pipe_dir) - - if(PIPE_MANIFOLD) //manifold + if(PIPE_MANIFOLD) var/obj/machinery/atmospherics/pipe/manifold/M = new(loc) - M.dir = dir - M.initialize_directions = pipe_dir - var/turf/T = M.loc - M.level = T.intact ? 2 : 1 - M.initialize() - if (M.node1) - M.node1.initialize() - M.node1.addMember(M) - if (M.node2) - M.node2.initialize() - M.node2.addMember(M) - if (M.node3) - M.node3.initialize() - M.node3.addMember(M) - M.build_network() + M.construction(dir, pipe_dir) - if(PIPE_4WAYMANIFOLD) //manifold + if(PIPE_4WAYMANIFOLD) var/obj/machinery/atmospherics/pipe/manifold4w/M = new( src.loc ) - - var/turf/T = M.loc - M.level = T.intact ? 2 : 1 - M.initialize() - if (M.node1) - M.node1.initialize() - M.node1.addMember(M) - if (M.node2) - M.node2.initialize() - M.node2.addMember(M) - if (M.node3) - M.node3.initialize() - M.node3.addMember(M) - if (M.node4) - M.node4.initialize() - M.node4.addMember(M) - M.build_network() + M.construction(dir, pipe_dir) if(PIPE_JUNCTION) var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/P = new ( src.loc ) - P.dir = src.dir - P.initialize_directions = src.get_pdir() P.initialize_directions_he = src.get_hdir() - //var/turf/T = P.loc - //P.level = T.intact ? 2 : 1 - P.initialize() - if (P.node1) - P.node1.initialize() - P.node1.addMember(P) - if (P.node2) - P.node2.initialize() - P.node2.addMember(P) - P.build_network() + P.construction(dir, get_pdir()) - if(PIPE_UVENT) //unary vent + if(PIPE_UVENT) var/obj/machinery/atmospherics/unary/vent_pump/V = new( src.loc ) - V.dir = dir - V.initialize_directions = pipe_dir + V.construction(dir, pipe_dir) + + if(PIPE_MVALVE) + var/obj/machinery/atmospherics/binary/valve/V = new(src.loc) if (pipename) V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node) - V.node.initialize() - V.node.build_network() + V.construction(dir, get_pdir()) - - if(PIPE_MVALVE) //manual valve - var/obj/machinery/atmospherics/valve/V = new(src.loc) - V.dir = dir - V.initialize_directions = pipe_dir - if (pipename) - V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node1) -// world << "[V.node1.name] is connected to valve, forcing it to update its nodes." - V.node1.initialize() - V.node1.build_network() - if (V.node2) -// world << "[V.node2.name] is connected to valve, forcing it to update its nodes." - V.node2.initialize() - V.node2.build_network() - - if(PIPE_DVALVE) //Digital valves. Shameless copypaste from manual valves because I don't into atmos code. + if(PIPE_DVALVE) var/obj/machinery/atmospherics/valve/digital/V = new(src.loc) - V.dir = dir - V.initialize_directions = pipe_dir if (pipename) V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node1) - V.node1.initialize() - V.node1.build_network() - if (V.node2) - V.node2.initialize() - V.node2.build_network() + V.construction(dir, get_pdir()) - if(PIPE_PUMP) //gas pump + if(PIPE_PUMP) var/obj/machinery/atmospherics/binary/pump/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir - if (pipename) - P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - - if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) //Trinary stuff + P.construction(dir, pipe_dir) + if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) var/obj/machinery/atmospherics/trinary/P if(pipe_type == PIPE_GAS_FILTER) P = new /obj/machinery/atmospherics/trinary/filter(src.loc) else if(pipe_type == PIPE_GAS_MIXER) P = new /obj/machinery/atmospherics/trinary/mixer(src.loc) - P.flipped = flipped - P.dir = unflip(dir) - P.initialize_directions = pipe_dir if (pipename) P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - if (P.node3) - P.node3.initialize() - P.node3.build_network() + P.construction(unflip(dir), pipe_dir) - if(PIPE_SCRUBBER) //scrubber + if(PIPE_SCRUBBER) var/obj/machinery/atmospherics/unary/vent_scrubber/S = new(src.loc) - S.dir = dir - S.initialize_directions = pipe_dir if (pipename) S.name = pipename - var/turf/T = S.loc - S.level = T.intact ? 2 : 1 - S.initialize() - S.build_network() - if (S.node) - S.node.initialize() - S.node.build_network() + S.construction(dir, pipe_dir) if(PIPE_INSULATED_STRAIGHT, PIPE_INSULATED_BENT) var/obj/machinery/atmospherics/pipe/simple/insulated/P = new( src.loc ) - P.dir = src.dir - P.initialize_directions = pipe_dir - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - if (P.node1) - P.node1.initialize() - P.node1.addMember(P) - if (P.node2) - P.node2.initialize() - P.node2.addMember(P) - P.build_network() + P.construction(dir, pipe_dir) - if(PIPE_PASSIVE_GATE) //passive gate + if(PIPE_PASSIVE_GATE) var/obj/machinery/atmospherics/binary/passive_gate/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir if (pipename) P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() + P.construction(dir, pipe_dir) - if(PIPE_VOLUME_PUMP) //volume pump + if(PIPE_VOLUME_PUMP) var/obj/machinery/atmospherics/binary/volume_pump/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir if (pipename) P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() + P.construction(dir, pipe_dir) - if(PIPE_HEAT_EXCHANGE) // heat exchanger + if(PIPE_HEAT_EXCHANGE) var/obj/machinery/atmospherics/unary/heat_exchanger/C = new( src.loc ) - C.dir = dir - C.initialize_directions = pipe_dir if (pipename) C.name = pipename - var/turf/T = C.loc - C.level = T.intact ? 2 : 1 - C.initialize() - C.build_network() - if (C.node) - C.node.initialize() - C.node.build_network() + C.construction(dir, pipe_dir) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user.visible_message( \ diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index ddc44cc8610..2ee4138a9ab 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -142,7 +142,7 @@ Nah /obj/machinery/pipedispenser/disposal/attack_hand(user as mob) if(..()) - return + return 1 var/dat = {"Disposal Pipes
Pipe
@@ -164,7 +164,7 @@ Nah /obj/machinery/pipedispenser/disposal/Topic(href, href_list) if(..()) - return + return 1 usr.set_machine(src) src.add_fingerprint(usr) if(href_list["dmake"]) @@ -211,7 +211,7 @@ Nah /obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(user as mob) if(..()) - return + return 1 var/dat = {"Transit Tubes:
Straight Tube
@@ -230,9 +230,9 @@ Nah return -/obj/machinery/pipedispenser/disposal/Topic(href, href_list) +/obj/machinery/pipedispenser/disposal/transit_tube/Topic(href, href_list) if(..()) - return + return 1 usr.set_machine(src) src.add_fingerprint(usr) if(!wait) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index d1892e8f628..42c627dbd0d 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -370,7 +370,7 @@ ..() -/obj/machinery/porta_turret/ex_act(severity) +/obj/machinery/porta_turret/ex_act(severity, specialty) if(severity >= 3) //turret dies if an explosion touches it! qdel(src) else @@ -459,31 +459,18 @@ targets += C //if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee - if(targets.len > 0) //if there are targets to shoot - - var/atom/t = pick(targets) //pick a perp from the list of targets. Targets go first because they are the most important - - if(istype(t, /mob/living)) //if a mob - var/mob/living/M = t //simple typecasting - if(M.stat != DEAD) //if the target is not dead - spawn() - popUp() //pop the turret up if it's not already up. - dir = get_dir(src, M) //even if you can't shoot, follow the target - spawn() - shootAt(M) //shoot the target, finally - - else - if(secondarytargets.len > 0) //if there are no primary targets, go for secondary targets - var/mob/t = pick(secondarytargets) - if(istype(t, /mob/living)) - if(t.stat != DEAD) - spawn() - popUp() - dir=get_dir(src, t) - shootAt(t) - else + if(!tryToShootAt(targets)) + if(!tryToShootAt(secondarytargets)) // if no valid targets, go for secondary targets spawn() - popDown() + popDown() // no valid targets, close the cover + + +/obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets) + while(targets.len > 0) + var/mob/living/M = pick(targets) + targets -= M + if(target(M)) + return 1 /obj/machinery/porta_turret/proc/popUp() //pops the turret up @@ -573,15 +560,19 @@ return threatcount -/obj/machinery/porta_turret/proc/shootAt(atom/movable/target) //shoots at a target +/obj/machinery/porta_turret/proc/target(var/mob/living/target) if(disabled) return + if(target && (target.stat != DEAD) && (!(target.lying) || emagged)) + spawn() + popUp() //pop the turret up if it's not already up. + dir = get_dir(src, target) //even if you can't shoot, follow the target + spawn() + shootAt(target) + return 1 + return - if(lasercolor && istype(target,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = target - if(H.lying) - return - +/obj/machinery/porta_turret/proc/shootAt(var/mob/living/target) if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate if(last_fired || !raised) //prevents rapid-fire shooting, unless it's been emagged return @@ -619,8 +610,7 @@ A.current = T A.yo = U.y - T.y A.xo = U.x - T.x - spawn( 1 ) - A.process() + A.fire() /obj/machinery/porta_turret/proc/setState(var/on, var/emagged) if(controllock) @@ -1133,13 +1123,19 @@ Status: []
"}, usr << "Control panel is locked!" return if (href_list["toggleOn"]) - src.enabled = !src.enabled - src.updateTurrets() + toggle_on() else if (href_list["toggleLethal"]) - src.lethal = !src.lethal - src.updateTurrets() + toggle_lethal() src.attack_hand(usr) +/obj/machinery/turretid/proc/toggle_lethal() + lethal = !lethal + updateTurrets() + +/obj/machinery/turretid/proc/toggle_on() + enabled = !enabled + updateTurrets() + /obj/machinery/turretid/proc/updateTurrets() if(control_area) for (var/obj/machinery/porta_turret/aTurret in get_area_all_atoms(control_area)) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 522483a63be..aabb4e0dc20 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -66,10 +66,10 @@ open_machine() ..(severity) -/obj/machinery/recharge_station/ex_act(severity) +/obj/machinery/recharge_station/ex_act(severity, specialty) if(occupier) open_machine() - ..(severity) + ..() /obj/machinery/recharge_station/attack_paw(user as mob) return attack_hand(user) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index a5006803963..87c62079b33 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -46,7 +46,7 @@ if (src.health <= 0) - visible_message("The [src] dissapates.") + visible_message("[src] dissipates.") qdel(src) return @@ -58,13 +58,13 @@ health -= Proj.damage ..() if(health <=0) - visible_message("The [src] dissapates.") + visible_message("The [src] dissipates.") qdel(src) return opacity = 1 spawn(20) if(src) opacity = 0 -/obj/machinery/shield/ex_act(severity) +/obj/machinery/shield/ex_act(severity, specialty) switch(severity) if(1.0) if (prob(75)) @@ -107,7 +107,7 @@ //Handle the destruction of the shield if (src.health <= 0) - visible_message("The [src] dissapates.") + visible_message("[src] dissipates.") qdel(src) return @@ -181,7 +181,7 @@ update_icon() return -/obj/machinery/shieldgen/ex_act(severity) +/obj/machinery/shieldgen/ex_act(severity, specialty) switch(severity) if(1.0) src.health -= 75 @@ -475,8 +475,8 @@ user << "Access denied." else - src.add_fingerprint(user) - visible_message("The [src.name] has been hit with the [W.name] by [user.name]!") + add_fingerprint(user) + ..() /obj/machinery/shieldwallgen/proc/cleanup(var/NSEW) var/obj/machinery/shieldwall/F @@ -567,7 +567,7 @@ return -/obj/machinery/shieldwall/ex_act(severity) +/obj/machinery/shieldwall/ex_act(severity, specialty) if(needs_power) var/obj/machinery/shieldwallgen/G switch(severity) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 5ef5602e803..cda18f4b731 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -41,12 +41,17 @@ // new display // register for radio system + /obj/machinery/status_display/New() ..() spawn(5) // must wait for map loading to finish if(radio_controller) radio_controller.add_object(src, frequency) +/obj/machinery/status_display/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + ..() // timed process diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 2cacd1b075e..47782404352 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -124,7 +124,7 @@ dump_everything() update_icon() -/obj/machinery/suit_storage_unit/ex_act(severity) +/obj/machinery/suit_storage_unit/ex_act(severity, specialty) switch(severity) if(1.0) if(prob(50)) @@ -428,7 +428,7 @@ var/mob/living/user = usr if(islocked) user.changeNext_move(CLICK_CD_BREAKOUT) - user.last_special = world.time + CLICK_CD_BREAKOUT + user.last_special = world.time + CLICK_CD_BREAKOUT var/breakout_time = 2 user << "You start kicking against the doors to escape! (This will take about [breakout_time] minutes.)" visible_message("You see [user] kicking against the doors of the [src]!") diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 205886991aa..ecf707cc2e8 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -100,7 +100,101 @@ selfdestructing = 1 spawn() explosion(src.loc, rand(3,8), rand(1,3), 1, 10) +//////////////////////////////////////// +//Singularity beacon +//////////////////////////////////////// +/obj/machinery/power/singularity_beacon + name = "ominous beacon" + desc = "This looks suspicious..." + icon = 'icons/obj/singularity.dmi' + icon_state = "beacon" + anchored = 0 + density = 1 + layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS + stat = 0 + + var/active = 0 + var/icontype = "beacon" + + +/obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null) + if(surplus() < 1500) + if(user) user << "The connected wire doesn't have enough current." + return + for(var/obj/machinery/singularity/singulo in world) + if(singulo.z == z) + singulo.target = src + icon_state = "[icontype]1" + active = 1 + machines |= src + if(user) + user << "You activate the beacon." + + +/obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) + for(var/obj/machinery/singularity/singulo in world) + if(singulo.target == src) + singulo.target = null + icon_state = "[icontype]0" + active = 0 + if(user) + user << "You deactivate the beacon." + + +/obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob) + return + + +/obj/machinery/power/singularity_beacon/attack_hand(var/mob/user as mob) + if(anchored) + return active ? Deactivate(user) : Activate(user) + else + user << "You need to screw the beacon to the floor first!" + return + + +/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/screwdriver)) + if(active) + user << "You need to deactivate the beacon first!" + return + + if(anchored) + anchored = 0 + user << "You unscrew the beacon from the floor." + disconnect_from_network() + return + else + if(!connect_to_network()) + user << "This device must be placed over an exposed cable." + return + anchored = 1 + user << "You screw the beacon to the floor and attach the cable." + return + ..() + return + + +/obj/machinery/power/singularity_beacon/Destroy() + if(active) + Deactivate() + ..() + +//stealth direct power usage +/obj/machinery/power/singularity_beacon/process() + if(!active) + return PROCESS_KILL + else + if(surplus() > 1500) + add_load(1500) + else + Deactivate() + + +/obj/machinery/power/singularity_beacon/syndicate + icontype = "beaconsynd" + icon_state = "beaconsynd0" // SINGULO BEACON SPAWNER /obj/item/device/sbeacondrop @@ -110,7 +204,7 @@ desc = "A label on it reads: Warning: Activating this device will send a special beacon to your location." origin_tech = "bluespace=1;syndicate=7" w_class = 2 - var/droptype = /obj/machinery/singularity_beacon/syndicate + var/droptype = /obj/machinery/power/singularity_beacon/syndicate /obj/item/device/sbeacondrop/attack_self(mob/user as mob) @@ -124,119 +218,3 @@ /obj/item/device/sbeacondrop/bomb desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location." droptype = /obj/machinery/syndicatebomb - -#define SCREWED 32 - -/obj/machinery/singularity_beacon //not the best place for it but it's a hack job anyway -- Urist - name = "ominous beacon" - desc = "This looks suspicious..." - icon = 'icons/obj/singularity.dmi' - icon_state = "beacon" - - anchored = 0 - density = 1 - layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS - stat = 0 - - var/active = 0 //It doesn't use up power, so use_power wouldn't really suit it - var/icontype = "beacon" - var/obj/structure/cable/attached = null - - -/obj/machinery/singularity_beacon/proc/Activate(mob/user = null) - if(!checkWirePower()) - if(user) user << "The connected wire doesn't have enough current." - return - for(var/obj/machinery/singularity/singulo in world) - if(singulo.z == z) - singulo.target = src - icon_state = "[icontype]1" - active = 1 - if(user) user << "You activate the beacon." - - -/obj/machinery/singularity_beacon/proc/Deactivate(mob/user = null) - for(var/obj/machinery/singularity/singulo in world) - if(singulo.target == src) - singulo.target = null - icon_state = "[icontype]0" - active = 0 - if(user) user << "You deactivate the beacon." - - -/obj/machinery/singularity_beacon/attack_ai(mob/user as mob) - return - - -/obj/machinery/singularity_beacon/attack_hand(var/mob/user as mob) - if(stat & SCREWED) - return active ? Deactivate(user) : Activate(user) - else - user << "You need to screw the beacon to the floor first!" - return - - -/obj/machinery/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/screwdriver)) - if(active) - user << "You need to deactivate the beacon first!" - return - - if(stat & SCREWED) - stat &= ~SCREWED - anchored = 0 - user << "You unscrew the beacon from the floor." - attached = null - return - else - var/turf/T = loc - if(isturf(T) && !T.intact) - attached = locate() in T - if(!attached) - user << "This device must be placed over an exposed cable." - return - stat |= SCREWED - anchored = 1 - user << "You screw the beacon to the floor and attach the cable." - return - ..() - return - - -/obj/machinery/singularity_beacon/Destroy() - if(active) Deactivate() - ..() - - /* - * Added for a simple way to check power. Verifies that the beacon - * is connected to a wire, the wire is part of a powernet (that part's - * sort of redundant, since all wires either join or create one when placed) - * and that the powernet has at least 1500 power units available for use. - * Doesn't use them, though, just makes sure they're there. - * - QualityVan, Aug 11 2012 - */ -/obj/machinery/singularity_beacon/proc/checkWirePower() - if(!attached) - return 0 - var/datum/powernet/PN = attached.get_powernet() - if(!PN) - return 0 - if(PN.avail < 1500) - return 0 - return 1 - -/obj/machinery/singularity_beacon/process() - if(!active) - return - else - if(!checkWirePower()) - Deactivate() - return - - -/obj/machinery/singularity_beacon/syndicate - icontype = "beaconsynd" - icon_state = "beaconsynd0" - -#undef SCREWED - diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 668f94b2327..7459017d183 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -180,7 +180,7 @@ origin_tech = "syndicate=6;combat=5" var/adminlog = null -/obj/item/weapon/bombcore/ex_act(severity) //Little boom can chain a big boom +/obj/item/weapon/bombcore/ex_act(severity, specialty) //Little boom can chain a big boom src.detonate() /obj/item/weapon/bombcore/proc/detonate() diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index f3d1796d3a2..bfb60668ac4 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -65,7 +65,7 @@ // Drop all the component stuff if(component_parts) - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 17cfec9e569..d6e177569c5 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -386,6 +386,7 @@ else user << "This station cant hold more information, try to use better parts." if(default_deconstruction_screwdriver(user, "controller-o", "controller", W)) + update_icon() return if(exchange_parts(user, W)) @@ -430,10 +431,9 @@ /obj/machinery/teleport/station/power_change() ..() - if(stat & NOPOWER) - update_icon() - if(teleporter_hub) - teleporter_hub.update_icon() + update_icon() + if(teleporter_hub) + teleporter_hub.update_icon() /obj/machinery/teleport/station/update_icon() if(panel_open) diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index f178b810d39..3cb48b9984e 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -235,8 +235,7 @@ A.current = T A.yo = U.y - T.y A.xo = U.x - T.x - spawn( 0 ) - A.process() + A.fire() return @@ -292,7 +291,7 @@ power_change() ..() -/obj/machinery/turret/ex_act(severity) +/obj/machinery/turret/ex_act(severity, specialty) if(severity < 3) src.die() @@ -311,6 +310,7 @@ /obj/machinery/turret/attack_animal(mob/living/simple_animal/M as mob) M.changeNext_move(CLICK_CD_MELEE) + M.do_attack_animation(src) if(M.melee_damage_upper == 0) return if(!(stat & BROKEN)) visible_message("[M] [M.attacktext] [src]!") @@ -328,9 +328,10 @@ /obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob) M.changeNext_move(CLICK_CD_MELEE) + M.do_attack_animation(src) if(!(stat & BROKEN)) playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("[] has slashed at []!", M, src) + visible_message("[M] has slashed at [src]!") src.health -= 15 if (src.health <= 0) src.die() @@ -360,7 +361,7 @@ ..() take_damage(0) //check your health -/obj/machinery/gun_turret/ex_act(severity) +/obj/machinery/gun_turret/ex_act(severity, specialty) switch(severity) if(1) die() @@ -411,9 +412,10 @@ return attack_hand(user) -/obj/machinery/gun_turret/attack_alien(mob/user as mob) +/obj/machinery/gun_turret/attack_alien(mob/living/user as mob) user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] slashes at [src]", "You slash at [src]") + user.do_attack_animation(src) + user.visible_message("[user] slashes at [src]", "You slash at [src]") take_damage(15) return @@ -482,8 +484,7 @@ A.current = curloc A.yo = targloc.y - curloc.y A.xo = targloc.x - curloc.x - spawn(0) - A.process() + A.fire() return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 70058da3def..71536af209e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -77,19 +77,11 @@ for(var/obj/item/weapon/vending_refill/VR in component_parts) refill_inventory(VR, product_records) -/obj/machinery/vending/ex_act(severity) - switch(severity) - if(1.0) - qdel(src) - return - if(2.0) - if(prob(50)) - qdel(src) - return - if(3.0) - if(prob(25)) - malfunction() - +/obj/machinery/vending/ex_act(severity, specialty) + ..() + if(!gc_destroyed) + if(prob(25)) + malfunction() /obj/machinery/vending/blob_act() if(prob(75)) @@ -216,24 +208,15 @@ /obj/machinery/vending/attack_hand(mob/user) - if(stat & (BROKEN|NOPOWER)) - return - user.set_machine(src) - - if(seconds_electrified != 0) - if(shock(user, 100)) + var/dat = "" + if(panel_open) + dat += wires() + if(product_slogans != "") + dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle" + else + if(stat & (BROKEN|NOPOWER)) return - var/dat = "" - - if(premium.len > 0) - dat += "Coin slot: " - if (coin) - dat += "[coin] Remove" - else - dat += "No coin Remove" - - if(!panel_open)//Vending machines do not dispense items when they are unscrewed dat += "
" return output -/obj/machinery/mecha_part_fabricator/proc/remove_resources(var/obj/item/part) -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(hasvar(part, "construction_time") && hasvar(part, "construction_cost")) - for(var/resource in part:construction_cost) - if(resource in src.resources) - src.resources[resource] -= get_resource_cost_w_coeff(part,resource) - else - return +/obj/machinery/mecha_part_fabricator/proc/remove_resources(datum/design/D) + for(var/resource in D.materials) + if(resource in resources) + resources[resource] -= get_resource_cost_w_coeff(D,resource) -/obj/machinery/mecha_part_fabricator/proc/check_resources(var/obj/item/part) -// if(istype(part, /obj/item/robot_parts) || istype(part, /obj/item/mecha_parts) || istype(part,/obj/item/borg/upgrade)) -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(hasvar(part, "construction_time") && hasvar(part, "construction_cost")) - for(var/resource in part:construction_cost) - if(resource in src.resources) - if(src.resources[resource] < get_resource_cost_w_coeff(part,resource)) - return 0 - return 1 - else - return 0 +/obj/item/mechavars //until these values are extracted from the design datum (most objects on the mech fabricators don't have these), this is necessary, to make the initial() work. + var/construction_time -/obj/machinery/mecha_part_fabricator/proc/build_part(var/obj/item/part) - if(!part) return +/obj/machinery/mecha_part_fabricator/proc/check_resources(datum/design/D) + for(var/R in D.materials) + if(R in resources) + if(resources[R] < get_resource_cost_w_coeff(D, R)) + return 0 + else + return 0 + return 1 - // critical exploit prevention, do not remove unless you replace it - if( (part.loc != src) || !(hasvar(part, "construction_time")) || !(hasvar(part, "construction_cost")) ) // these 3 are the current requirements for an object being buildable by the mech_fabricator - return - - src.being_built = new part.type(src) - src.desc = "It's building \a [src.being_built]." - src.remove_resources(part) - part.m_amt = get_resource_cost_w_coeff(part,"metal") - part.g_amt = get_resource_cost_w_coeff(part,"glass") - src.overlays += "fab-active" - src.use_power = 2 - src.updateUsrDialog() +/obj/machinery/mecha_part_fabricator/proc/build_part(datum/design/D) + var/obj/part = D.build_path + being_built = D + desc = "It's building \a [initial(part.name)]." + remove_resources(D) + overlays += "fab-active" + use_power = 2 + updateUsrDialog() sleep(get_construction_time_w_coeff(part)) - src.use_power = 1 - src.overlays -= "fab-active" - src.desc = initial(src.desc) - if(being_built) - src.being_built.loc = get_step(src,SOUTH) - src.visible_message("\icon[src] \The [src] beeps, \"\The [src.being_built] is complete.\"") - src.being_built = null - src.updateUsrDialog() + use_power = 1 + overlays -= "fab-active" + desc = initial(desc) + + var/obj/item/I = new D.build_path + I.loc = get_step(src,SOUTH) + I.m_amt = get_resource_cost_w_coeff(D,"$metal") + I.g_amt = get_resource_cost_w_coeff(D,"$glass") + visible_message("\icon[src] \The [src] beeps, \"\The [I] is complete.\"") + being_built = null + + updateUsrDialog() return 1 /obj/machinery/mecha_part_fabricator/proc/update_queue_on_page() - send_byjax(usr,"mecha_fabricator.browser","queue",src.list_queue()) + send_byjax(usr,"mecha_fabricator.browser","queue",list_queue()) return /obj/machinery/mecha_part_fabricator/proc/add_part_set_to_queue(set_name) if(set_name in part_sets) - var/list/part_set = part_sets[set_name] - if(islist(part_set)) - for(var/obj/item/part in part_set) - add_to_queue(part) - return + for(var/datum/design/D in files.known_designs) + if(D.build_type&16) + if(D.category == set_name) + add_to_queue(D) -/obj/machinery/mecha_part_fabricator/proc/add_to_queue(part) +/obj/machinery/mecha_part_fabricator/proc/add_to_queue(D) if(!istype(queue)) queue = list() - if(part) - queue[++queue.len] = part + if(D) + queue[++queue.len] = D return queue.len /obj/machinery/mecha_part_fabricator/proc/remove_from_queue(index) @@ -415,30 +216,26 @@ return 1 /obj/machinery/mecha_part_fabricator/proc/process_queue() - var/obj/item/part = listgetindex(src.queue, 1) - if(!part) + var/datum/design/D = queue[1] + if(!D) remove_from_queue(1) - if(src.queue.len) + if(queue.len) return process_queue() else return - if(!(hasvar(part, "construction_time")) || !(hasvar(part, "construction_cost")))//If it shouldn't be printed - remove_from_queue(1)//Take it out of the quene - return process_queue()//Then reprocess it temp = null - while(part) + while(D) if(stat&(NOPOWER|BROKEN)) return 0 - if(!check_resources(part)) - src.visible_message("\icon[src] \The [src] beeps, \"Not enough resources. Queue processing stopped.\"") + if(!check_resources(D)) + visible_message("\icon[src] \The [src] beeps, \"Not enough resources. Queue processing stopped.\"") temp = {"Not enough resources to build next part.
Try again | Return"} return 0 remove_from_queue(1) - build_part(part) - part = listgetindex(src.queue, 1) - src.visible_message("\icon[src] \The [src] beeps, \"Queue processing finished successfully.\"") - return 1 + build_part(D) + D = listgetindex(queue, 1) + visible_message("\icon[src] \The [src] beeps, \"Queue processing finished successfully.\"") /obj/machinery/mecha_part_fabricator/proc/list_queue() var/output = "Queue contains:" @@ -446,31 +243,29 @@ output += "
Nothing" else output += "[initial(part.name)] - [i>1?"↑":null] [i↓":null] Remove"
+
output += ""
output += "\[Process queue | Clear queue\]"
return output
-
+/*
/obj/machinery/mecha_part_fabricator/proc/convert_designs()
if(!files) return
var/i = 0
for(var/datum/design/D in files.known_designs)
if(D.build_type&16)
if(D.category in part_sets)//Checks if it's a valid category
- if(add_part_to_set(D.category, D.build_path))//Adds it to said category
+ if(add_part_to_set(D.category, D))//Adds it to said category
i++
else
- if(add_part_to_set("Misc", D.build_path))//If in doubt, chunk it into the Misc
+ if(add_part_to_set("Misc", D))//If in doubt, chunk it into the Misc
i++
return i
-
+*/
/obj/machinery/mecha_part_fabricator/proc/update_tech()
if(!files) return
var/output
@@ -501,17 +296,10 @@
return output
-/obj/machinery/mecha_part_fabricator/proc/sync(silent=null)
-/* if(queue.len)
- if(!silent)
- temp = "Error. Please clear processing queue before updating!"
- src.updateUsrDialog()
- return
-*/
- if(!silent)
- temp = "Updating local R&D database..."
- src.updateUsrDialog()
- sleep(30) //only sleep if called by user
+/obj/machinery/mecha_part_fabricator/proc/sync()
+ temp = "Updating local R&D database..."
+ updateUsrDialog()
+ sleep(30) //only sleep if called by user
var/found = 0
for(var/obj/machinery/computer/rdconsole/RDC in area_contents(get_area(src)))
@@ -523,36 +311,25 @@
for(var/datum/design/D in RDC.files.known_designs)
files.AddDesign2Known(D)
files.RefreshResearch()
- var/i = src.convert_designs()
- var/tech_output = update_tech()
- if(!silent)
- temp = "Processed [i] equipment designs.
" - temp += tech_output - temp += "Return" - src.updateUsrDialog() - if(i || tech_output) - src.visible_message("\icon[src] \The [src] beeps, \"Successfully synchronized with R&D server. New data processed.\"") - if(!silent && !found) + //var/i = convert_designs() aran + //var/tech_output = update_tech() + temp = "Processed equipment designs.
" + //temp += tech_output + temp += "Return" + updateUsrDialog() + //if(i || tech_output) + visible_message("\icon[src] \The [src] beeps, \"Successfully synchronized with R&D server.\"") + if(!found) temp = "Unable to connect to local R&D Database.
Please check your connections and try again.
Return" - src.updateUsrDialog() + updateUsrDialog() return -/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(var/obj/item/part as obj,var/resource as text, var/roundto=1) -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(hasvar(part, "construction_time") && hasvar(part, "construction_cost")) - var/list/L = part_sets["Misc"] - if(L.Find(part.type)) - return round(part:construction_cost[resource]*(resource_coeff/2)*resource_coeff_tech, roundto) //hacky scary skeletons send shivers down your spine - return round(part:construction_cost[resource]*resource_coeff*resource_coeff_tech, roundto) - else - return 0 +/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(datum/design/D, resource, roundto = 1) + return round(D.materials[resource]*resource_coeff*resource_coeff_tech, roundto) -/obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(var/obj/item/part as obj, var/roundto=1) -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(hasvar(part, "construction_time") && hasvar(part, "construction_cost")) - return round(part:construction_time*time_coeff*time_coeff_tech, roundto) - else - return 0 +/obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(P, roundto = 1) //aran + var/obj/item/mechavars/part = P + return round(initial(part.construction_time)*time_coeff*time_coeff_tech, roundto) /obj/machinery/mecha_part_fabricator/attack_hand(mob/user) if(!(..())) @@ -562,17 +339,16 @@ var/dat, left_part if (..()) return - if(!operation_allowed(user)) - return user.set_machine(src) var/turf/exit = get_step(src,SOUTH) if(exit.density) - src.visible_message("\icon[src] \The [src] beeps, \"Error! Part outlet is obstructed.\"") + visible_message("\icon[src] \The [src] beeps, \"Error! Part outlet is obstructed.\"") return if(temp) left_part = temp - else if(src.being_built) - left_part = {"Building [src.being_built.name].
+ else if(being_built) + var/obj/I = being_built.build_path + left_part = {"Building [initial(I.name)].
Please wait until completion..."} else switch(screen) @@ -586,7 +362,7 @@ left_part += "
Return" dat = {" -[src.name]
+ [name]
" dat += "Glass amount: [src.g_amount] / [max_g_amount] cm3
" @@ -287,7 +287,7 @@ var/global/list/autolathe_recipes_hidden = list( \ objs += src.L if(src.hacked) objs += src.LL - for(var/obj/t in objs) + for(var/obj/item/t in objs) if(disabled || m_amount
" - hack += "Harm Prevention Safety System: [src.emagged ? "DANGER" : "Engaged"]
" + if(issilicon(user)) //Allows silicons to toggle the emag status of a bot. + hack += "[emagged == 2 ? "Software compromised! Unit may exhibit dangerous or erratic behavior." : "Unit operating normally. Release safety lock?"]
" + hack += "Harm Prevention Safety System: [emagged ? "DANGER" : "Engaged"]
" + else if(!locked) //Humans with access can use this option to hide a bot from the AI's remote control panel and PDA control. + hack += "Remote network control radio: [remote_disabled ? "Disconnected" : "Connected"]
" return hack -/obj/machinery/bot/attack_ai(mob/user as mob) - src.attack_hand(user) +/obj/machinery/bot/proc/set_custom_texts() //Superclass for setting hack texts. Appears only if a set is not given to a bot locally. + text_hack = "You hack [name]." + text_dehack = "You reset [name]." + text_dehack_fail = "You fail to reset [name]." -/obj/machinery/bot/proc/speak(var/message) - if((!src.on) || (!message)) +/obj/machinery/bot/attack_ai(mob/user as mob) + attack_hand(user) + +/obj/machinery/bot/proc/speak(var/message, freq) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. + if((!on) || (!message)) return - audible_message("[src] beeps, \"[message]\"",2) + if(freq) + Radio.set_frequency(radio_frequency) + Radio.talk_into(src, message, radio_frequency) + else + say(message) return + //Generalized behavior code, override where needed! + +/* +scan() will search for a given type (such as turfs, human mobs, or objects) in the bot's view range, and return a single result. +Arguments: The object type to be searched (such as "/mob/living/carbon/human"), the old scan result to be ignored, if one exists, +and the view range, which defaults to 7 (full screen) if an override is not passed. +If the bot maintains an ignore list, it is also checked here. + +Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1) +The proc would return a human next to the bot to be set to the patient var. +Pass the desired type path itself, declaring a temporary var beforehand is not required. +*/ +obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFAULT_SCAN_RANGE) + var/final_result + for (var/scan in view (scan_range, src) ) //Search for something in range! + if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! + continue //If not, keep searching! + if( !(scan in ignore_list) && (scan != old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness + var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected. + if( scan_result ) + final_result = scan_result + else + continue //The current element failed assessment, move on to the next. + return final_result + +//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. +obj/machinery/bot/proc/process_scan(var/scan_target) + return scan_target + + +/obj/machinery/bot/proc/add_to_ignore(var/subject) + if(ignore_list.len < 50) //This will help keep track of them, so the bot is always trying to reach a blocked spot. + ignore_list |= subject + else if (ignore_list.len >= subject) //If the list is full, insert newest, delete oldest. + ignore_list -= ignore_list[1] + ignore_list |= subject + +/* +Movement proc for stepping a bot through a path generated through A-star. +Pass a positive integer as an argument to override a bot's default speed. +*/ +obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) + + if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. + path = list() + return 0 + if(get_turf(src) == get_turf(dest)) //We have arrived, no need to move again. + return 1 + var/success + var/step_count = move_speed ? move_speed : speed //If a value is passed into move_speed, use that instead of the default speed var. + if(step_count >= 1 && tries < 4) + for(step_count, step_count >= 1,step_count--) + success = bot_step(dest) + if (success) + tries = 0 + else + tries++ + break + sleep(4) + else + return 0 + return 1 + + +obj/machinery/bot/proc/bot_step(var/dest) + if(path && path.len > 1) + step_towards(src, path[1]) + if(get_turf(src) == path[1]) //Successful move + path -= path[1] + else + return 0 + else if(path.len == 1) + step_to(src, dest) + path = list() + return 1 + + +/obj/machinery/bot/proc/check_bot_access() + if(mode != BOT_SUMMON && mode != BOT_RESPONDING) + botcard.access = prev_access + +/obj/machinery/bot/proc/call_bot(var/caller, var/turf/waypoint) + bot_reset() //Reset a bot before setting it to call mode. + var/area/end_area = get_area(waypoint) + + //For giving the bot temporary all-access. + var/obj/item/weapon/card/id/all_access = new /obj/item/weapon/card/id + var/datum/job/captain/All = new/datum/job/captain + all_access.access = All.get_access() + + path = get_path_to(src, waypoint, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 200, id=all_access) + calling_ai = caller //Link the AI to the bot! + ai_waypoint = waypoint + + if(path && path.len) //Ensures that a valid path is calculated! + if(!on) + turn_on() //Saves the AI the hassle of having to activate a bot manually. + botcard = all_access //Give the bot all-access while under the AI's command. + calling_ai << "\icon[src] [name] called to [end_area.name]. [path.len-1] meters to destination." + pathset = 1 + mode = BOT_RESPONDING + tries = 0 + else + calling_ai << "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range." + calling_ai = null + path = list() + +/obj/machinery/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc. +//Handles the bot's movement during a call. + var/success = bot_move(ai_waypoint, 3) + if (!success) + if(calling_ai) + calling_ai << "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[src] failed to reach waypoint."]" + calling_ai = null + bot_reset() + +obj/machinery/bot/proc/bot_reset() + if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot. + calling_ai << "Call command to a bot has been reset." + calling_ai = null + path = list() + summon_target = null + pathset = 0 + botcard.access = prev_access + tries = 0 + mode = BOT_IDLE + + + + + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//Patrol and summon code! +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +/obj/machinery/bot/proc/bot_patrol() + patrol_step() + spawn(5) + if(mode == BOT_PATROL) + patrol_step() + return + +obj/machinery/bot/proc/start_patrol() + + if(tries >= 4) //Bot is trapped, so stop trying to patrol. + auto_patrol = 0 + tries = 0 + speak("Unable to start patrol.") + + return + + if(!auto_patrol) //A bot not set to patrol should not be patrolling. + mode = BOT_IDLE + return + + if(patrol_target) // has patrol target + spawn(0) + calc_path() // Find a route to it + if(path.len == 0) + patrol_target = 0 + return + mode = BOT_PATROL + else // no patrol target, so need a new one + find_patrol_target() + speak("Engaging patrol mode.") + tries++ + return + +// perform a single patrol step + +/obj/machinery/bot/proc/patrol_step() + + if(loc == patrol_target) // reached target + + at_patrol_target() + return + + else if(path.len > 0 && patrol_target) // valid path + var/turf/next = path[1] + if(next == loc) + path -= next + return + + + var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move + if(moved) // successful move + blockcount = 0 + + else // failed to move + blockcount++ + + if(blockcount > 5) // attempt 5 times before recomputing + // find new path excluding blocked turf + + spawn(2) + calc_path(next) + if(path.len == 0) + find_patrol_target() + else + blockcount = 0 + tries = 0 + + return + + return + + else // no path, so calculate new one + mode = BOT_START_PATROL + + return + +// finds a new patrol target +/obj/machinery/bot/proc/find_patrol_target() + send_status() + if(awaiting_beacon) // awaiting beacon response + awaiting_beacon++ + if(awaiting_beacon > 5) // wait 5 secs for beacon response + find_nearest_beacon() // then go to nearest instead + return + if(next_destination) + set_destination(next_destination) + else + + find_nearest_beacon() + return + + +// finds the nearest beacon to self +// signals all beacons matching the patrol code +/obj/machinery/bot/proc/find_nearest_beacon() + nearest_beacon = null + new_destination = "__nearest__" + post_signal(beacon_freq, "findbeacon", "patrol") + awaiting_beacon = 1 + spawn(10) + awaiting_beacon = 0 + if(nearest_beacon) + set_destination(nearest_beacon) + tries = 0 + else + auto_patrol = 0 + mode = BOT_IDLE + speak("Disengaging patrol mode.") + send_status() + + +/obj/machinery/bot/proc/at_patrol_target() + + find_patrol_target() + return + + +// sets the current destination +// signals all beacons matching the patrol code +// beacons will return a signal giving their locations +/obj/machinery/bot/proc/set_destination(var/new_dest) + new_destination = new_dest + post_signal(beacon_freq, "findbeacon", "patrol") + awaiting_beacon = 1 + + +// receive a radio signal +// used for beacon reception + +/obj/machinery/bot/receive_signal(datum/signal/signal) + //log_admin("DEBUG \[[// world.timeofday]\]: /obj/machinery/bot/receive_signal([signal.debug_print()])") + if(!on) + return +/* + if(!signal.data["beacon"]) + + for(var/x in signal.data) + world << "* [x] = [signal.data[x]]" + */ + + var/recv = signal.data["command"] + // process all-bot input + + if(recv=="bot_status") + send_status() + + // check to see if we are the commanded bot + if(signal.data["active"] == src) + if(emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands. + return + // process control input + switch(recv) + if("stop") + bot_reset() //HOLD IT!! + auto_patrol = 0 + return + + if("go") + auto_patrol = 1 + return + + if("summon") + bot_reset() + var/list/user_access = signal.data["useraccess"] + summon_target = signal.data["target"] //Location of the user + if(user_access.len != 0) + botcard.access = user_access + prev_access //Adds the user's access, if any. + mode = BOT_SUMMON + calc_summon_path() + speak("Responding.", radio_frequency) + return + + // receive response from beacon + recv = signal.data["beacon"] + var/valid = signal.data["patrol"] + if(!recv || !valid) + return + if(recv == new_destination) // if the recvd beacon location matches the set destination + // the we will navigate there + destination = new_destination + patrol_target = signal.source.loc + next_destination = signal.data["next_patrol"] + awaiting_beacon = 0 + + // if looking for nearest beacon + else if(new_destination == "__nearest__") + var/dist = get_dist(src,signal.source.loc) + if(nearest_beacon) + // note we ignore the beacon we are located at + if(dist>1 && dist
+Cleaner v1.1 controls
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]"}, -text("[src.on ? "On" : "Off"]")) - if(!src.locked || issilicon(user)) - dat += text({"
Cleans Blood: []
"}, text("[src.blood ? "Yes" : "No"]")) - dat += text({"
Patrol station: []
"}, text("[src.should_patrol ? "Yes" : "No"]")) - // dat += text({"
Beacon frequency: []
"}, text("[src.beacon_freq]")) -/* if(src.open && !src.locked) - dat += text({" -Odd looking screw twiddled: []
-Weird button pressed: []"}, -text("[src.screwloose ? "Yes" : "No"]"), -text("[src.oddbutton ? "Yes" : "No"]"))*/ +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"}, +text("[on ? "On" : "Off"]")) + if(!locked || issilicon(user)) + dat += text({"
Cleans Blood: []
"}, text("[blood ? "Yes" : "No"]")) + dat += text({"
Patrol station: []
"}, text("[auto_patrol ? "Yes" : "No"]")) - user << browse("
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]
"}, +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]
"}, -"[src.on ? "On" : "Off"]" ) +"[on ? "On" : "Off"]" ) - if(!src.locked || issilicon(user)) + if(!locked || issilicon(user)) if(!lasercolor) dat += text({"
Arrest Unidentifiable Persons: []
@@ -143,82 +130,50 @@ Arrest for Unauthorized Weapons: []
Arrest for Warrant: []
Operating Mode: []
-Report Arrests[]"}, - -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]" ) - - dat += text({"
-Auto Patrol: []"}, +Report Arrests[]
+Auto Patrol[]"}, +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - - var/datum/browser/popup = new(user, "autosec", "Securitron v2.0.9 controls") + var/datum/browser/popup = new(user, "autoed209", "Automatic Security Unit v2.6") popup.set_content(dat) popup.open() return /obj/machinery/bot/ed209/Topic(href, href_list) - if (..()) - return - usr.set_machine(src) - src.add_fingerprint(usr) if(lasercolor && (istype(usr,/mob/living/carbon/human))) var/mob/living/carbon/human/H = usr if((lasercolor == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))//Opposing team cannot operate it return else if((lasercolor == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag))) return - if ((href_list["power"]) && (src.allowed(usr))) - if (src.on && !src.emagged) - turn_off() - else - turn_on() - return + ..() switch(href_list["operation"]) if ("idcheck") - src.idcheck = !src.idcheck - src.updateUsrDialog() + idcheck = !idcheck if("weaponscheck") - src.weaponscheck = !src.weaponscheck - src.updateUsrDialog() - if("ignorerec") - src.check_records = !src.check_records - src.updateUsrDialog() - if("switchmode") - src.arrest_type = !src.arrest_type - src.updateUsrDialog() - if("patrol") - auto_patrol = !auto_patrol - mode = SECBOT_IDLE + weaponscheck = !weaponscheck + updateUsrDialog() + if ("ignorerec") + check_records = !check_records + updateUsrDialog() + if ("switchmode") + arrest_type = !arrest_type updateUsrDialog() if("declarearrests") - src.declare_arrests = !src.declare_arrests - src.updateUsrDialog() - if("hack") - if(!src.emagged) - src.emagged = 2 - src.hacked = 1 - src.set_weapon() - usr << "You disable [src]'s combat inhibitor." - else if(!src.hacked) - usr << "[src] ignores your attempts to restrict it!" - else - src.emagged = 0 - src.hacked = 0 - src.set_weapon() - usr << "You restore [src]'s combat inhibitor." - src.updateUsrDialog() + declare_arrests = !declare_arrests + updateUsrDialog() /obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if (src.allowed(user) && !open && !emagged) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked" : "unlocked"]." + if (allowed(user) && !open && !emagged) + locked = !locked + user << "Controls are now [locked ? "locked" : "unlocked"]." else if(emagged) user << "ERROR" @@ -230,79 +185,75 @@ Auto Patrol: []"}, ..() if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. return - if (!istype(W, /obj/item/weapon/screwdriver) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if (!istype(W, /obj/item/weapon/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. if(W.force && W.damtype != STAMINA)//If force is non-zero and damage type isn't stamina. threatlevel = user.assess_threat(src) threatlevel += 6 if(threatlevel >= 4) - src.target = user + target = user if(lasercolor)//To make up for the fact that lasertag bots don't hunt - src.shootAt(user) - src.mode = SECBOT_HUNT + shootAt(user) + mode = BOT_HUNT /obj/machinery/bot/ed209/Emag(mob/user as mob) ..() - if(open && !locked) - if(user) user << "You short out [src]'s target assessment circuits." - spawn(0) - audible_message("[src] buzzes oddly!") - src.target = null - if(user) src.oldtarget_name = user.name - src.last_found = world.time - src.anchored = 0 - src.declare_arrests = 0 - src.emagged = 2 - src.on = 1 - src.icon_state = "[lasercolor]ed209[src.on]" - src.set_weapon() - mode = SECBOT_IDLE + if(emagged == 2) + if(user) + user << "You short out [src]'s target assessment circuits." + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "[lasercolor]ed209[on]" + set_weapon() -/obj/machinery/bot/ed209/process() - set background = BACKGROUND_ENABLED - - if (!src.on || src.disabled) +/obj/machinery/bot/ed209/bot_process() + if (!..()) return + + if(disabled) + return + var/list/targets = list() - for (var/mob/living/carbon/C in view(9,src)) //Let's find us a target + for (var/mob/living/carbon/C in view(7,src)) //Let's find us a target var/threatlevel = 0 if ((C.stat) || (C.lying)) continue threatlevel = C.assess_threat(src, lasercolor) - //src.speak(C.real_name + text(": threat: []", threatlevel)) + //speak(C.real_name + text(": threat: []", threatlevel)) if (threatlevel < 4 ) continue var/dst = get_dist(src, C) - if ( dst <= 1 || dst > 12) + if ( dst <= 1 || dst > 7) continue targets += C if (targets.len>0) var/mob/living/carbon/t = pick(targets) if ((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down. - src.shootAt(t) + shootAt(t) switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) - if(!src.lasercolor) //lasertag bots don't want to arrest anyone + if(!lasercolor) //lasertag bots don't want to arrest anyone look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol - mode = SECBOT_START_PATROL // switch to patrol mode + mode = BOT_START_PATROL // switch to patrol mode - if(SECBOT_HUNT) // hunting for perp + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if(src.frustration >= 8) + if (frustration >= 8) walk_to(src,0) back_to_idle() if(target) // make sure target exists - if(src.Adjacent(target) && isturf(src.target.loc)) // if right next to perp - playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - src.icon_state = "[lasercolor]ed209-c" + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + icon_state = "[lasercolor]ed209-c" spawn(2) - src.icon_state = "[lasercolor]ed209[src.on]" - var/mob/living/carbon/M = src.target + icon_state = "[lasercolor]ed209[on]" + var/mob/living/carbon/M = target if(istype(M, /mob/living/carbon/human)) if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 @@ -315,45 +266,45 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) - broadcast_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] scumbag [target.name] in [location]", src) - target.visible_message("[src.target] has been stunned by [src]!",\ - "[src.target] has been stunned by [src]!") + speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) + target.visible_message("[target] has been stunned by [src]!",\ + "[target] has been stunned by [src]!") - mode = SECBOT_PREP_ARREST - src.anchored = 1 - src.target_lastloc = M.loc + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = M.loc return else // not next to perp - var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) - if((get_dist(src, src.target)) >= (olddist)) - src.frustration++ + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if ((get_dist(src, target)) >= (olddist)) + frustration++ else - src.frustration = 0 + frustration = 0 else back_to_idle() - if(SECBOT_PREP_ARREST) // preparing to arrest target + if(BOT_PREP_ARREST) // preparing to arrest target // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. - if( !src.Adjacent(target) || !isturf(src.target.loc) || src.target.weakened < 2 ) + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if(!src.arrest_type) - if(!src.target.handcuffed) //he's not cuffed? Try to cuff him! - mode = SECBOT_ARREST - playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - target.visible_message("[src] is trying to put zipties on [src.target]!",\ - "[src] is trying to put zipties on [src.target]!") + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + mode = BOT_ARREST + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + target.visible_message("[src] is trying to put zipties on [target]!",\ + "[src] is trying to put zipties on [target]!") spawn(60) - if( !src.Adjacent(target) || !isturf(src.target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - if(!src.target.handcuffed) - src.target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(src.target) + if(!target.handcuffed) + target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) target.update_inv_handcuffed(0) //update the handcuffs overlay back_to_idle() else @@ -363,327 +314,80 @@ Auto Patrol: []"}, back_to_idle() return - if(SECBOT_ARREST) + if(BOT_ARREST) if (!target) - src.anchored = 0 - mode = SECBOT_IDLE - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + last_found = world.time frustration = 0 return - if(src.target.handcuffed) //no target or target cuffed? back to idle. + if(target.handcuffed) //no target or target cuffed? back to idle. back_to_idle() return - if( !src.Adjacent(target) || !isturf(src.target.loc) || (src.target.loc != src.target_lastloc && src.target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. + if( !Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. back_to_hunt() return + else + mode = BOT_PREP_ARREST + anchored = 0 + + if(BOT_START_PATROL) + look_for_perp() + start_patrol() + + if(BOT_PATROL) + look_for_perp() + bot_patrol() - if(SECBOT_START_PATROL) // start a patrol - - if(path.len > 0 && patrol_target) // have a valid path, so just resume - mode = SECBOT_PATROL - return - - else if(patrol_target) // has patrol target already - spawn(0) - calc_path() // so just find a route to it - if(path.len == 0) - patrol_target = 0 - return - mode = SECBOT_PATROL - - - else // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - - - if(SECBOT_PATROL) // patrol mode - patrol_step() - spawn(5) - if(mode == SECBOT_PATROL) - patrol_step() - - if(SECBOT_SUMMON) // summoned to PDA - patrol_step() - spawn(4) - if(mode == SECBOT_SUMMON) - patrol_step() - sleep(4) - patrol_step() return /obj/machinery/bot/ed209/proc/back_to_idle() - src.anchored = 0 - mode = SECBOT_IDLE - src.target = null - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + target = null + last_found = world.time frustration = 0 spawn(0) - process() //ensure bot quickly responds + bot_process() //ensure bot quickly responds /obj/machinery/bot/ed209/proc/back_to_hunt() - src.anchored = 0 - src.frustration = 0 - mode = SECBOT_HUNT + anchored = 0 + frustration = 0 + mode = BOT_HUNT spawn(0) - process() //ensure bot quickly responds - -// perform a single patrol step -/obj/machinery/bot/ed209/proc/patrol_step() - - if(loc == patrol_target) // reached target - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - if(istype( next, /turf/simulated)) - - var/moved = step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - path -= loc - - if(lasercolor) - sleep(20) - else - look_for_perp() - else // failed to move - - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - - return - - return - - else // not a valid turf - mode = SECBOT_IDLE - return - - else // no path, so calculate new one - mode = SECBOT_START_PATROL - - -// finds a new patrol target -/obj/machinery/bot/ed209/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 5) // wait 5 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - - if(next_destination) - set_destination(next_destination) - else - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/ed209/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(10) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - else - auto_patrol = 0 - mode = SECBOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/ed209/proc/at_patrol_target() - if(auto_patrol) - find_patrol_target() - else - mode = SECBOT_IDLE - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/ed209/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/ed209/receive_signal(datum/signal/signal) - - if(!on) - return - - /* - world << "rec signal: [signal.source]" - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - // process control input - switch(recv) - if("stop") - mode = SECBOT_IDLE - auto_patrol = 0 - return - - if("go") - mode = SECBOT_IDLE - auto_patrol = 1 - return - - if("summon") - patrol_target = signal.data["target"] - next_destination = destination - destination = null - awaiting_beacon = 0 - mode = SECBOT_SUMMON - calc_path() - speak("Responding.") - - return - - - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - - // note we ignore the beacon we are located at - if(dist>1 && dist
" - dat += "Status: [src.on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" - dat += "Tiles left: [src.amount]
" - dat += "Behvaiour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked || issilicon(user)) - dat += "Improves floors: [src.improvefloors ? "Yes" : "No"]
" - dat += "Finds tiles: [src.eattiles ? "Yes" : "No"]
" - dat += "Make singles pieces of metal into tiles when empty: [src.maketiles ? "Yes" : "No"]
" + dat += "Floor Repairer Controls v1.1
" + dat += "Status: [on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" + dat += "Tiles left: [amount]
" + dat += "Behvaiour controls are [locked ? "locked" : "unlocked"]
" + if(!locked || issilicon(user)) + dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
" + dat += "Replace floor tiles: [replacetiles ? "Yes" : "No"]
" + dat += "Finds tiles: [eattiles ? "Yes" : "No"]
" + dat += "Make pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
" + dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
" + dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
" + dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
" + dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" var/bmode - if (src.targetdirection) - bmode = dir2text(src.targetdirection) + if (targetdirection) + bmode = dir2text(targetdirection) else - bmode = "Disabled" - dat += "
Bridge Mode : [bmode]
" + bmode = "disabled" + dat += "Bridge Mode : [bmode]
" - user << browse("
" - dat += "Status: [src.on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" + dat += "Medical Unit Controls v1.1
" + dat += "Status: [on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" dat += "Beaker: " - if (src.reagent_glass) - dat += "Loaded \[[src.reagent_glass.reagents.total_volume]/[src.reagent_glass.reagents.maximum_volume]\]" + if (reagent_glass) + dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]" else dat += "None Loaded" - dat += "
Behaviour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked || issilicon(user)) + dat += "
Behaviour controls are [locked ? "locked" : "unlocked"]
" + if(!locked || issilicon(user)) dat += "Healing Threshold: " dat += "-- " dat += "- " - dat += "[src.heal_threshold] " + dat += "[heal_threshold] " dat += "+ " dat += "++" dat += "
" dat += "Injection Level: " dat += "- " - dat += "[src.injection_amount] " + dat += "[injection_amount] " dat += "+ " dat += "
" dat += "Reagent Source: " - dat += "[src.use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" + dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" - dat += "The speaker switch is [src.shut_up ? "off" : "on"]. Toggle" + dat += "Treat Viral Infections: [treat_virus ? "Yes" : "No"]
" + dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle
" + dat += "Critical Patient Alerts: [declare_crit ? "Yes" : "No"]
" + dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" + dat += "Stationary Mode: [stationary_mode ? "Yes" : "No"]
" - user << browse("
Multiple Utility Load Effector Mk. IV
" + dat += "Multiple Utility Load Effector Mk. V
" dat += "ID: [suffix]" dat += "Power: [on ? "On" : "Off"]
" if(!open) dat += "
Status
" + dat += ""
switch(mode)
- if(0)
- dat += "Ready"
- if(1)
- dat += "Loading/Unloading"
- if(2)
- dat += "Navigating to Delivery Location"
- if(3)
- dat += "Navigating to Home"
- if(4)
- dat += "Waiting for clear path"
- if(5,6)
- dat += "Calculating navigation path"
- if(7)
- dat += "Unable to reach destination"
+ if(BOT_IDLE)
+ dat += "Ready"
+ if(BOT_LOADING)
+ dat += "[mode_name[BOT_LOADING]]"
+ if(BOT_DELIVER)
+ dat += "[mode_name[BOT_DELIVER]]"
+ if(BOT_GO_HOME)
+ dat += "[mode_name[BOT_GO_HOME]]"
+ if(BOT_BLOCKED)
+ dat += "[mode_name[BOT_BLOCKED]]"
+ if(BOT_NAV,BOT_WAIT_FOR_NAV)
+ dat += "[mode_name[BOT_NAV]]"
+ if(BOT_NO_ROUTE)
+ dat += "[mode_name[BOT_NO_ROUTE]]"
dat += "
"
dat += "Current Load: [load ? load.name : "none"]" @@ -225,6 +216,7 @@ var/global/mulebot_count = 0 dat += "Set Home
" dat += "Toggle Auto Return Home ([auto_return ? "On":"Off"])
" dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
" + dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
" if(load) dat += "Unload Now
" @@ -245,9 +237,9 @@ var/global/mulebot_count = 0 //user << browse("
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]
"}, +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"}, -"[src.on ? "On" : "Off"]" ) +"[on ? "On" : "Off"]" ) - if(!src.locked || issilicon(user)) + if(!locked || issilicon(user)) dat += text({"
Arrest Unidentifiable Persons: []
Arrest for Unauthorized Weapons: []
Arrest for Warrant: []
-
Operating Mode: []
Report Arrests[]
Auto Patrol: []"}, -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]", +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - var/datum/browser/popup = new(user, "autosec", "Securitron v1.5.1 controls") + var/datum/browser/popup = new(user, "autosec", "Automatic Security Unit v1.6") popup.set_content(dat) popup.open() return /obj/machinery/bot/secbot/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - if((href_list["power"]) && (src.allowed(usr))) - if (src.on && !src.emagged) - turn_off() - else - turn_on() - return + + ..() switch(href_list["operation"]) if("idcheck") - src.idcheck = !src.idcheck - src.updateUsrDialog() + idcheck = !idcheck + updateUsrDialog() if("weaponscheck") - src.weaponscheck = !src.weaponscheck - src.updateUsrDialog() + weaponscheck = !weaponscheck + updateUsrDialog() if("ignorerec") - src.check_records = !src.check_records - src.updateUsrDialog() + check_records = !check_records + updateUsrDialog() if("switchmode") - src.arrest_type = !src.arrest_type - src.updateUsrDialog() - if("patrol") - auto_patrol = !auto_patrol - mode = SECBOT_IDLE + arrest_type = !arrest_type updateUsrDialog() if("declarearrests") - src.declare_arrests = !src.declare_arrests - src.updateUsrDialog() - if("hack") - if(!src.emagged) - src.emagged = 2 - src.hacked = 1 - usr << "You overload [src]'s target identification system." - else if(!src.hacked) - usr << "[src] refuses to accept your authority!" - else - src.emagged = 0 - src.hacked = 0 - usr << "You reboot [src] and restore the target identification." - src.updateUsrDialog() + declare_arrests = !declare_arrests + updateUsrDialog() + /obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if(src.allowed(user) && !open && !emagged) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + if(allowed(user) && !open && !emagged) + locked = !locked + user << "Controls are now [locked ? "locked." : "unlocked."]" else if(emagged) user << "ERROR" if(open) user << "Please close the access panel before locking it." else - user << "Access denied." + user << " Access denied." else ..() if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. return - if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. threatlevel = user.assess_threat(src) threatlevel += 6 if(threatlevel >= 4) - src.target = user - src.mode = SECBOT_HUNT + target = user + mode = BOT_HUNT /obj/machinery/bot/secbot/Emag(mob/user as mob) ..() - if(open && !locked) - if(user) user << "You short out [src]'s target assessment circuits." - spawn(0) - audible_message("[src] buzzes oddly!") - src.target = null - if(user) src.oldtarget_name = user.name - src.last_found = world.time - src.anchored = 0 - src.declare_arrests = 0 - src.emagged = 2 - src.on = 1 - src.icon_state = "secbot[src.on]" - mode = SECBOT_IDLE -/obj/machinery/bot/secbot/process() - set background = BACKGROUND_ENABLED + if(emagged == 2) + if(user) + user << " You short out [src]'s target assessment circuits." + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "secbot[on]" - if(!src.on) +/obj/machinery/bot/secbot/bot_process() + if (!..()) return switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol - mode = SECBOT_START_PATROL // switch to patrol mode + mode = BOT_START_PATROL // switch to patrol mode - if(SECBOT_HUNT) // hunting for perp + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if(src.frustration >= 8) + if(frustration >= 8) walk_to(src,0) back_to_idle() return if(target) // make sure target exists - if(src.Adjacent(target) && isturf(src.target.loc)) // if right next to perp - playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - src.icon_state = "secbot-c" + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + icon_state = "secbot-c" spawn(2) - src.icon_state = "secbot[src.on]" - var/mob/living/carbon/M = src.target + icon_state = "secbot[on]" + var/mob/living/carbon/M = target if(istype(M, /mob/living/carbon/human)) if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 @@ -272,46 +229,46 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) - broadcast_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] scumbag [target.name] in [location]", src) - target.visible_message("[src.target] has been stunned by [src]!",\ - "[src.target] has been stunned by [src]!") + speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) + target.visible_message("[target] has been stunned by [src]!",\ + "[target] has been stunned by [src]!") - mode = SECBOT_PREP_ARREST - src.anchored = 1 - src.target_lastloc = M.loc + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = M.loc return else // not next to perp - var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) - if((get_dist(src, src.target)) >= (olddist)) - src.frustration++ + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if((get_dist(src, target)) >= (olddist)) + frustration++ else - src.frustration = 0 + frustration = 0 else back_to_idle() - if(SECBOT_PREP_ARREST) // preparing to arrest target + if(BOT_PREP_ARREST) // preparing to arrest target // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. - if( !src.Adjacent(target) || !isturf(src.target.loc) || src.target.weakened < 2 ) + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if(!src.arrest_type) - if(!src.target.handcuffed) //he's not cuffed? Try to cuff him! - mode = SECBOT_ARREST - playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - target.visible_message("[src] is trying to put zipties on [src.target]!",\ - "[src] is trying to put zipties on [src.target]!") + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + mode = BOT_ARREST + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + target.visible_message("[src] is trying to put zipties on [target]!",\ + "[src] is trying to put zipties on [target]!") spawn(60) - if( !src.Adjacent(target) || !isturf(src.target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - if(!src.target.handcuffed) + if(!target.handcuffed) target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) target.update_inv_handcuffed(0) //update the handcuffs overlay - playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) + playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) back_to_idle() else back_to_idle() @@ -320,362 +277,95 @@ Auto Patrol: []"}, back_to_idle() return - if(SECBOT_ARREST) - + if(BOT_ARREST) if (!target) - src.anchored = 0 - mode = SECBOT_IDLE - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + last_found = world.time frustration = 0 return - if(src.target.handcuffed) //no target or target cuffed? back to idle. + if(target.handcuffed) //no target or target cuffed? back to idle. back_to_idle() return - if( !src.Adjacent(target) || !isturf(src.target.loc) || (src.target.loc != src.target_lastloc && src.target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. + if( !Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. back_to_hunt() return + else //Try arresting again if the target escapes. + mode = BOT_PREP_ARREST + anchored = 0 + + if(BOT_START_PATROL) + look_for_perp() + start_patrol() + + if(BOT_PATROL) + look_for_perp() + bot_patrol() - if(SECBOT_START_PATROL) // start a patrol - - if(path.len > 0 && patrol_target) // have a valid path, so just resume - mode = SECBOT_PATROL - return - - else if(patrol_target) // has patrol target already - spawn(0) - calc_path() // so just find a route to it - if(path.len == 0) - patrol_target = 0 - return - mode = SECBOT_PATROL - - - else // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - - - if(SECBOT_PATROL) // patrol mode - - patrol_step() - spawn(5) - if(mode == SECBOT_PATROL) - patrol_step() - - if(SECBOT_SUMMON) // summoned to PDA - patrol_step() - spawn(4) - if(mode == SECBOT_SUMMON) - patrol_step() - sleep(4) - patrol_step() return /obj/machinery/bot/secbot/proc/back_to_idle() - src.anchored = 0 - mode = SECBOT_IDLE - src.target = null - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + target = null + last_found = world.time frustration = 0 spawn(0) - process() //ensure bot quickly responds + bot_process() //ensure bot quickly responds /obj/machinery/bot/secbot/proc/back_to_hunt() - src.anchored = 0 - src.frustration = 0 - mode = SECBOT_HUNT + anchored = 0 + frustration = 0 + mode = BOT_HUNT spawn(0) - process() //ensure bot quickly responds - -// perform a single patrol step -/obj/machinery/bot/secbot/proc/patrol_step() - - if(loc == patrol_target) // reached target - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - if(istype( next, /turf/simulated)) - - var/moved = step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - path -= loc - - look_for_perp() - else // failed to move - - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - - return - - return - - else // not a valid turf - mode = SECBOT_IDLE - return - - else // no path, so calculate new one - mode = SECBOT_START_PATROL - - -// finds a new patrol target -/obj/machinery/bot/secbot/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 5) // wait 5 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - - if(next_destination) - set_destination(next_destination) - else - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/secbot/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(10) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - else - auto_patrol = 0 - mode = SECBOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/secbot/proc/at_patrol_target() - if(auto_patrol) - find_patrol_target() - else - mode = SECBOT_IDLE - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/secbot/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/secbot/receive_signal(datum/signal/signal) - //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/bot/secbot/receive_signal([signal.debug_print()])") - if(!on) - return - - /* - world << "rec signal: [signal.source]" - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - // process control input - switch(recv) - if("stop") - mode = SECBOT_IDLE - auto_patrol = 0 - return - - if("go") - mode = SECBOT_IDLE - auto_patrol = 1 - return - - if("summon") - patrol_target = signal.data["target"] - next_destination = destination - destination = null - awaiting_beacon = 0 - mode = SECBOT_SUMMON - calc_path() - speak("Responding.") - - return - - - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - - // note we ignore the beacon we are located at - if(dist>1 && dist
So this is what cloning feels like?" - // -- Mode/mind specific stuff goes here - - if((H.mind in ticker.mode.revolutionaries) || (H.mind in ticker.mode.head_revolutionaries)) - ticker.mode.update_all_rev_icons() //So the icon actually appears - if((H.mind in ticker.mode.A_bosses) || ((H.mind in ticker.mode.A_gangsters) || (H.mind in ticker.mode.B_bosses)) || (H.mind in ticker.mode.B_gangsters)) - ticker.mode.update_all_gang_icons() - if(H.mind in ticker.mode.syndicates) - ticker.mode.update_all_synd_icons() - if (H.mind in ticker.mode.cult) - ticker.mode.add_cultist(src.occupant.mind) - ticker.mode.update_all_cult_icons() //So the icon actually appears - - // -- End mode specific stuff - hardset_dna(H, ui, se, null, null, mrace, mcolor) if(efficiency > 2) @@ -205,7 +192,7 @@ //Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process() - if(stat & NOPOWER) //Autoeject if power is lost + if(!is_operational()) //Autoeject if power is lost if (src.occupant) src.locked = 0 src.go_out() @@ -302,7 +289,7 @@ if(!usr) return - if (usr.stat != 0) + if(usr.stat || !usr.canmove || usr.restrained()) return src.go_out() add_fingerprint(usr) @@ -361,29 +348,10 @@ if(prob(100/(severity*efficiency))) malfunction() ..() -/obj/machinery/clonepod/ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - qdel(src) - return - if(2.0) - if (prob(50)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - qdel(src) - return - if(3.0) - if (prob(25)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - qdel(src) - return - return +/obj/machinery/clonepod/ex_act(severity, specialty) + ..() + if(!gc_destroyed) + go_out() /* * Diskette Box diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 787f3a867a9..f851aaa7981 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -146,7 +146,7 @@ ..() -/obj/machinery/computer/HolodeckControl/ex_act(severity) +/obj/machinery/computer/HolodeckControl/ex_act(severity, specialty) emergencyShutdown() ..() @@ -281,30 +281,23 @@ // Holographic Items! -/turf/simulated/floor/holofloor/ +/turf/simulated/floor/holofloor + icon_state = "floor" thermal_conductivity = 0 -/turf/simulated/floor/holofloor/grass - gender = PLURAL - name = "lush grass" - icon_state = "grass1" - floor_tile = new/obj/item/stack/tile/grass - - New() - floor_tile.New() //I guess New() isn't run on objects spawned without the definition of a turf to house them, ah well. - icon_state = "grass[pick("1","2","3","4")]" - ..() - spawn(4) - update_icon() - for(var/direction in cardinal) - if(istype(get_step(src,direction),/turf/simulated/floor)) - var/turf/simulated/floor/FF = get_step(src,direction) - FF.update_icon() //so siding get updated properly - /turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob) return // HOLOFLOOR DOES NOT GIVE A FUCK +/turf/simulated/floor/fancy/grass/holo + thermal_conductivity = 0 + gender = PLURAL + name = "lush grass" + +/turf/simulated/floor/fancy/grass/holo/attackby(obj/item/weapon/W as obj, mob/user as mob) + return + // HOLOGRASS DOES NOT GIVE A FUCK + /obj/structure/table/holotable name = "table" diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 959e93bec35..dbb47efeab8 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -233,6 +233,7 @@ That prevents a few funky behaviors. new /obj/structure/AIcore/deactivated(T.loc)//Spawns a deactivated terminal at AI location. T.aiRestorePowerRoutine = 0//So the AI initially has power. T.control_disabled = 1//Can't control things remotely if you're stuck in a card! + T.radio_enabled = 0 //No talking on the built-in radio for you either! T.loc = C//Throw AI into the card. C.name = "inteliCard - [T.name]" if (T.stat == 2) @@ -259,6 +260,7 @@ That prevents a few funky behaviors. new /obj/structure/AIcore/deactivated(T.loc) T.aiRestorePowerRoutine = 0 T.control_disabled = 1 + T.radio_enabled = 0 T.loc = C C.AI = T T.cancel_camera() @@ -273,6 +275,7 @@ That prevents a few funky behaviors. var/mob/living/silicon/ai/A = locate() in C//I love locate(). Best proc ever. if(A)//If AI exists on the card. Else nothing since both are empty. A.control_disabled = 0 + A.radio_enabled = 1 A.loc = T.loc//To replace the terminal. C.icon_state = "aicard" C.name = "inteliCard" @@ -286,6 +289,7 @@ That prevents a few funky behaviors. var/mob/living/silicon/ai/A = C.AI if(A) A.control_disabled = 0 + A.radio_enabled = 1 C.AI = null A.loc = T.loc A.cancel_camera() @@ -307,6 +311,7 @@ That prevents a few funky behaviors. A.loc = T T.occupier = A A.control_disabled = 1 + A.radio_enabled = 0 if (A.stat == 2) T.overlays += image('icons/obj/computer.dmi', "ai-fixer-404") else @@ -347,6 +352,7 @@ That prevents a few funky behaviors. T.occupier = A C.AI = null A.control_disabled = 1 + A.radio_enabled = 0 T.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-empty") A.cancel_camera() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6b5ad607a94..e7d1b3e7c67 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -23,8 +23,11 @@ /obj/item/toy/prize/mauler = 1, /obj/item/toy/prize/odysseus = 1, /obj/item/toy/prize/phazon = 1, + /obj/item/toy/prize/reticence = 1, /obj/item/toy/cards/deck = 2, - /obj/item/toy/nuke = 2 + /obj/item/toy/nuke = 2, + /obj/item/toy/minimeteor = 2, + /obj/item/toy/carpplushie = 2 ) /obj/machinery/computer/arcade/New() diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 2ce3087b2f1..c7622c6344b 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -17,7 +17,8 @@ set_frequency(receive_frequency) /obj/machinery/computer/atmos_alert/Destroy() - radio_controller.remove_object(src, receive_frequency) + if(radio_controller) + radio_controller.remove_object(src, receive_frequency) ..() /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 5140790e6f8..58012daaf90 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -74,6 +74,12 @@ name = "circuit board (Communications)" build_path = /obj/machinery/computer/communications origin_tech = "programming=2;magnets=2" + var/cooldown = 0 +/obj/item/weapon/circuitboard/communications/New() + ..() + processing_objects |= src +/obj/item/weapon/circuitboard/communications/process() + cooldown = max(cooldown - 1, 0) /obj/item/weapon/circuitboard/card name = "circuit board (ID Console)" build_path = /obj/machinery/computer/card @@ -317,7 +323,7 @@ circuit = P user.drop_item() circuit.add_fingerprint(user) - P.loc = src + P.loc = null else user << "This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/screwdriver) && circuit) @@ -387,18 +393,6 @@ if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You connect the monitor." - var/obj/B = new src.circuit.build_path (src.loc) - if(circuit.powernet) B:powernet = circuit.powernet - if(circuit.id) B:id = circuit.id - if(circuit.records) B:records = circuit.records - if(circuit.frequency) B:frequency = circuit.frequency - if(istype(circuit,/obj/item/weapon/circuitboard/supplycomp)) - var/obj/machinery/computer/supplycomp/SC = B - var/obj/item/weapon/circuitboard/supplycomp/C = circuit - SC.can_order_contraband = C.contraband_enabled - else if(istype(circuit,/obj/item/weapon/circuitboard/shuttle)) - var/obj/machinery/computer/shuttle/S = B - var/obj/item/weapon/circuitboard/shuttle/C = circuit - S.id = C.id + var/obj/B = new src.circuit.build_path (src.loc, circuit) transfer_fingerprints_to(B) qdel(src) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 31be4f0c434..0aa6ed942bc 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -20,9 +20,6 @@ /obj/machinery/computer/security/attack_hand(var/mob/user as mob) if(!stat) - if (src.z > 6) - user << "Unable to establish a connection: \black You're too far away from the station!" - return if (!network) ERROR("A computer lacks a network at [x],[y],[z].") @@ -36,6 +33,8 @@ var/list/L = list() for (var/obj/machinery/camera/C in cameranet.cameras) + if((z > 7 || C.z > 7) && (C.z != z))//if on away mission, can only recieve feed from same z_level cameras + continue L.Add(C) camera_sort(L) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6fbba86fd4d..5d49b12a1e5 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -54,12 +54,12 @@ // Try to find a scanner in that direction scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) - // If found, then we break, and return the scanner - if (!isnull(scannerf)) - break + // If found and operational, return the scanner + if (!isnull(scannerf) && scannerf.is_operational()) + return scannerf // If no scanner was found, it will return null - return scannerf + return null /obj/machinery/computer/cloning/proc/findcloner() var/obj/machinery/clonepod/podf = null @@ -68,10 +68,10 @@ podf = locate(/obj/machinery/clonepod, get_step(src, dir)) - if (!isnull(podf)) - break + if (!isnull(podf) && podf.is_operational()) + return podf - return podf + return null /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES @@ -233,25 +233,25 @@ if("stopautoprocess") autoprocess = 0 - else if ((href_list["scan"]) && (!isnull(src.scanner))) + else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational()) scantemp = "" loading = 1 src.updateUsrDialog() spawn(20) - src.scan_mob(src.scanner.occupant) + src.scan_mob(scanner.occupant) loading = 0 src.updateUsrDialog() //No locking an open scanner. - else if ((href_list["lock"]) && (!isnull(src.scanner))) - if ((!src.scanner.locked) && (src.scanner.occupant)) - src.scanner.locked = 1 + else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational()) + if ((!scanner.locked) && (scanner.occupant)) + scanner.locked = 1 else - src.scanner.locked = 0 + scanner.locked = 0 else if(href_list["view_rec"]) src.active_record = find_record("id", href_list["view_rec"], records) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index fd2320b0182..2733f92b123 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -57,6 +57,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(!href_list["operation"]) return + var/obj/item/weapon/circuitboard/communications/CM = circuit switch(href_list["operation"]) // main interface if("main") @@ -199,7 +200,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 // OMG CENTCOM LETTERHEAD if("MessageCentcomm") if(src.authenticated==2) - if(centcom_message_cooldown) + if(CM.cooldown) usr << "Arrays recycling. Please stand by." return var/input = stripped_input(usr, "Please choose a message to transmit to Centcom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") @@ -208,26 +209,22 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 Centcomm_announce(input, usr) usr << "Message transmitted." log_say("[key_name(usr)] has made a Centcom announcement: [input]") - centcom_message_cooldown = 1 - spawn(600)//One minute cooldown - centcom_message_cooldown = 0 + CM.cooldown = 55 // OMG SYNDICATE ...LETTERHEAD if("MessageSyndicate") if((src.authenticated==2) && (src.emagged)) - if(centcom_message_cooldown) + if(CM.cooldown) usr << "Arrays recycling. Please stand by." return - var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") + var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return Syndicate_announce(input, usr) usr << "Message transmitted." log_say("[key_name(usr)] has made a Syndicate announcement: [input]") - centcom_message_cooldown = 1 - spawn(600)//One minute cooldown - centcom_message_cooldown = 0 + CM.cooldown = 55 //about one minute if("RestoreBackup") usr << "Backup routing data restored!" @@ -585,7 +582,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 user << "The emergency shuttle is already on its way." return - call_reason = strip_html_simple(trim(call_reason)) + call_reason = strip_html_properly(trim(call_reason)) if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) user << "You must provide a reason." diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 99c19755b5c..3529f9ce314 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -9,8 +9,13 @@ var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly var/processing = 0 -/obj/machinery/computer/New() - ..() +/obj/machinery/computer/New(location, obj/item/weapon/circuitboard/C) + ..(location) + if(C && istype(C)) + circuit = C + else + if(circuit) + circuit = new circuit(null) power_change() /obj/machinery/computer/initialize() @@ -26,7 +31,7 @@ ..() -/obj/machinery/computer/ex_act(severity) +/obj/machinery/computer/ex_act(severity, specialty) switch(severity) if(1.0) qdel(src) @@ -89,9 +94,9 @@ user << " You start to disconnect the monitor." if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/M = new circuit( A ) - A.circuit = M + A.circuit = circuit A.anchored = 1 + circuit = null for (var/obj/C in src) C.loc = src.loc if (src.stat & BROKEN) @@ -110,7 +115,8 @@ . = ..() return -/obj/machinery/computer/attack_paw(mob/user) +/obj/machinery/computer/attack_paw(mob/living/user) + user.do_attack_animation(src) if(circuit) if(prob(10)) user.visible_message("[user.name] smashes the [src.name] with its paws.",\ @@ -122,7 +128,8 @@ "You smash against the [src.name] with your paws.",\ "You hear a clicking sound.") -/obj/machinery/computer/attack_alien(mob/user) +/obj/machinery/computer/attack_alien(mob/living/user) + user.do_attack_animation(src) if(circuit) if(prob(80)) user.visible_message("[user.name] smashes the [src.name] with its claws.",\ diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index c4e52d403ad..f68c7bf7c36 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -34,6 +34,37 @@ proc/crewmonitor(mob/user,var/atom/source) + var/jobs[0] + jobs["Captain"] = 00 + jobs["Head of Personnel"] = 50 + jobs["Head of Security"] = 10 + jobs["Warden"] = 11 + jobs["Security Officer"] = 12 + jobs["Detective"] = 13 + jobs["Chief Medical Officer"] = 20 + jobs["Chemist"] = 21 + jobs["Geneticist"] = 22 + jobs["Virologist"] = 23 + jobs["Medical Doctor"] = 24 + jobs["Research Director"] = 30 + jobs["Scientist"] = 31 + jobs["Roboticist"] = 32 + jobs["Chief Engineer"] = 40 + jobs["Station Engineer"] = 41 + jobs["Atmospheric Technician"] = 42 + jobs["Quartermaster"] = 51 + jobs["Shaft Miner"] = 52 + jobs["Cargo Technician"] = 53 + jobs["Bartender"] = 61 + jobs["Chef"] = 62 + jobs["Botanist"] = 63 + jobs["Librarian"] = 64 + jobs["Chaplain"] = 65 + jobs["Clown"] = 66 + jobs["Mime"] = 67 + jobs["Janitor"] = 68 + jobs["Assistant"] = 99 //Unknowns/custom jobs should appear after civilians, and before assistants + var/t = "
Name | Vitals | Position |
| [ID.name] | " + if(I) + var/style = null + var/ijob = jobs[I.assignment] + if(ijob % 10 == 0) + style += "font-weight: bold; " //head roles always end in 0 + if(ijob >= 10 && ijob < 20) + style += "color: #E74C3C; " //security + if(ijob >= 20 && ijob < 30) + style += "color: #3498DB; " //medical + if(ijob >= 30 && ijob < 40) + style += "color: #9B59B6; " //science + if(ijob >= 40 && ijob < 50) + style += "color: #F1C40F; " //engineering + if(ijob >= 50 && ijob < 60) + style += "color: #F39C12; " //cargo + log += "[ijob]]||
| [I.registered_name] ([I.assignment]) | " //ijob does not get displayed, nor does it take up space, it's just used for the positioning of an entry else - log += "||
| Unknown | " + log += "80||
| Unknown | " var/damage_report if(U.sensor_mode > 1) @@ -62,13 +106,13 @@ proc/crewmonitor(mob/user,var/atom/source) var/dam2 = round(H.getToxLoss(),1) var/dam3 = round(H.getFireLoss(),1) var/dam4 = round(H.getBruteLoss(),1) - damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" + damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" switch(U.sensor_mode) if(1) - log += "[life_status] | Not Available | [life_status] | Not Available | " if(2) - log += "[life_status] [damage_report] | Not Available | " + log += "[life_status] [damage_report] | Not Available | " if(3) var/area/player_area = get_area(H) log += "[life_status] [damage_report] | [format_text(player_area.name)] ([pos.x], [pos.y]) | " diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index ab3182f0219..a35235d51a1 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -252,13 +252,13 @@ var/type = href_list["vir"] var/datum/disease/Dis = new type(0) var/AfS = "" - for(var/Str in Dis.affected_species) - AfS += " [Str];" + for(var/mob/M in Dis.viable_mobtypes) + AfS += " [initial(M.name)];" src.temp = {"Name: [Dis.name][rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] | "} dat += "
" + dat += "
| X | Channel | Nick | Message |
|---|---|---|---|
| [msg.channel] | [msg.sender] | [msg.message] |
ALERT - Cyborg detonation detected: [R.name]
" R.self_destruct() else usr << "Access Denied." @@ -104,10 +106,12 @@ if(can_control(usr, R)) var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm" && can_control(usr, R) && !..()) - message_admins("[key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") - log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") + message_admins("[key_name(usr, usr.client)](JMP) [R.canmove ? "locked down" : "released"] [key_name(R, R.client)](JMP)!") + log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!") R.SetLockdown(!R.lockcharge) R << "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]" + if(R.connected_ai) + R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
" else usr << "Access Denied." diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index ad296e20065..5fe0b91cc05 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -122,7 +122,7 @@ for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order)) var/crimstat = "" for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"])) + if ((E.fields["name"] == R.fields["name"]) && (E.fields["id"] == R.fields["id"])) crimstat = E.fields["criminal"] var/background switch(crimstat) @@ -413,8 +413,10 @@ What a mess.*/ temp += "No" if ("Purge All Records") + investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records") for(var/datum/data/record/R in data_core.security) del(R) + data_core.security.Cut() temp = "All Security records deleted." if ("Add Entry") @@ -460,6 +462,7 @@ What a mess.*/ screen = 3 if ("New Record (General)") + //General Record var/datum/data/record/G = new /datum/data/record() G.fields["name"] = "New Record" G.fields["id"] = "[num2hex(rand(1, 1.6777215E7), 6)]" @@ -472,6 +475,7 @@ What a mess.*/ data_core.general += G active1 = G + //Security Record var/datum/data/record/R = new /datum/data/record() R.fields["name"] = active1.fields["name"] R.fields["id"] = active1.fields["id"] @@ -483,7 +487,7 @@ What a mess.*/ data_core.security += R active2 = R - //Medical Record + //Medical Record var/datum/data/record/M = new /datum/data/record() M.fields["id"] = active1.fields["id"] M.fields["name"] = active1.fields["name"] @@ -506,13 +510,17 @@ What a mess.*/ if ("Edit Field") var/a1 = active1 var/a2 = active2 + switch(href_list["field"]) if("name") - if (istype(active1, /datum/data/record)) + if (istype(active1, /datum/data/record) || istype(active2, /datum/data/record)) var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null) as text if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1) return - active1.fields["name"] = t1 + if(istype(active1, /datum/data/record)) + active1.fields["name"] = t1 + if(istype(active2, /datum/data/record)) + active2.fields["name"] = t1 if("id") if(istype(active2,/datum/data/record) || istype(active1,/datum/data/record)) var/t1 = copytext(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text),1,MAX_MESSAGE_LEN) @@ -607,6 +615,7 @@ What a mess.*/ if ("Change Criminal Status") if (active2) + var/old_field = active2.fields["criminal"] switch(href_list["criminal2"]) if("none") active2.fields["criminal"] = "None" @@ -618,19 +627,28 @@ What a mess.*/ active2.fields["criminal"] = "Parolled" if("released") active2.fields["criminal"] = "Discharged" - + investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "records") + for(var/mob/living/carbon/human/H in mob_list) //thanks for forcing me to do this, whoever wrote this shitty records system + H.sec_hud_set_security_status() if ("Delete Record (Security) Execute") + investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records") if (active2) + data_core.security -= active2 del(active2) if ("Delete Record (ALL) Execute") if (active1) + investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records") for(var/datum/data/record/R in data_core.medical) if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) + data_core.medical -= R del(R) - else + break + data_core.general -= active1 del(active1) + if (active2) + data_core.security -= active2 del(active2) else temp = "This function does not appear to be working at the moment. Our apologies." diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 099048a567f..71caffa4260 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -51,7 +51,9 @@ return -/obj/machinery/computer/station_alert/proc/triggerAlarm(var/class, area/A, var/O, var/alarmsource) +/obj/machinery/computer/station_alert/proc/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) + if(alarmsource.z != z) + return if(stat & (BROKEN)) return var/list/L = src.alarms[class] @@ -70,7 +72,7 @@ C = CL[1] else if (O && istype(O, /obj/machinery/camera)) C = O - L[A.name] = list(A, (C) ? C : O, list(alarmsource)) + L[A.name] = list(A, (C ? C : O), list(alarmsource)) return 1 diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 4f95efac03d..d7bde33688d 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -22,10 +22,16 @@ req_component_names = new() for(var/tname in req_components) - var/path = text2path(tname) + var/path = tname var/obj/O = new path() req_component_names[tname] = O.name +/obj/machinery/constructable_frame/proc/get_req_components_amt() + var/amt = 0 + for(var/path in req_components) + amt += req_components[path] + return amt + // update description of required components remaining /obj/machinery/constructable_frame/proc/update_req_desc() if(!req_components || !req_component_names) @@ -102,6 +108,7 @@ playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) state = 2 circuit.loc = src.loc + components.Remove(circuit) circuit = null if(components.len == 0) user << "You remove the circuit board." @@ -133,10 +140,38 @@ new_machine.RefreshParts() qdel(src) - if(istype(P, /obj/item)) + if(istype(P, /obj/item/weapon/storage/part_replacer) && P.contents.len && get_req_components_amt()) + var/obj/item/weapon/storage/part_replacer/replacer = P + var/list/added_components = list() + var/list/part_list = list() + + //Assemble a list of current parts, then sort them by their rating! + for(var/obj/item/weapon/stock_parts/co in replacer) + part_list += co + //Sort the parts. This ensures that higher tier items are applied first. + part_list = sortTim(part_list, /proc/cmp_rped_sort) + + for(var/path in req_components) + while(req_components[path] > 0 && (locate(path) in part_list)) + var/obj/item/part = (locate(path) in part_list) + if(!part.crit_fail) + added_components[part] = path + replacer.remove_from_storage(part, src) + req_components[path]-- + part_list -= part + + for(var/obj/item/weapon/stock_parts/part in added_components) + components += part + user << "[part.name] applied." + replacer.play_rped_sound() + + update_req_desc() + return + + if(istype(P, /obj/item) && get_req_components_amt()) var/success for(var/I in req_components) - if(istype(P, text2path(I)) && (req_components[I] > 0)) + if(istype(P, I) && (req_components[I] > 0)) success=1 if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CP = P @@ -173,13 +208,13 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=1" req_components = list( - "/obj/item/weapon/vending_refill/boozeomat" = 3) + /obj/item/weapon/vending_refill/boozeomat = 3) var/list/names_paths = list(/obj/machinery/vending/boozeomat = "Booze-O-Mat", - /obj/machinery/vending/coffee = "Hot Drinks", + /obj/machinery/vending/coffee = "Solar's Best Hot Drinks", /obj/machinery/vending/snack = "Getmore Chocolate Corp", /obj/machinery/vending/cola = "Robust Softdrinks", - /obj/machinery/vending/cigarette = "Cigarette", + /obj/machinery/vending/cigarette = "ShadyCigs Deluxe", /obj/machinery/vending/autodrobe = "AutoDrobe") /obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user) @@ -191,7 +226,7 @@ to destroy them and players will be able to make replacements. build_path = typepath name = "circuit board ([names_paths[build_path]] Vendor)" user << "You set the board to [names_paths[build_path]]." - req_components = list("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]" = 3) //Never before has i used a method as horrible as this one, im so sorry + req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3) //Never before has i used a method as horrible as this one, im so sorry /obj/item/weapon/circuitboard/smes name = "circuit board (SMES)" @@ -199,9 +234,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;powerstorage=5;engineering=5" req_components = list( - "/obj/item/stack/cable_coil" = 5, - "/obj/item/weapon/stock_parts/cell" = 5, - "/obj/item/weapon/stock_parts/capacitor" = 1) + /obj/item/stack/cable_coil = 5, + /obj/item/weapon/stock_parts/cell = 5, + /obj/item/weapon/stock_parts/capacitor = 1) /obj/item/weapon/circuitboard/power_compressor name = "circuit board (Power Compressor)" @@ -209,8 +244,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;powerstorage=5;engineering=4" req_components = list( - "/obj/item/stack/cable_coil" = 5, - "/obj/item/weapon/stock_parts/manipulator" = 6) + /obj/item/stack/cable_coil = 5, + /obj/item/weapon/stock_parts/manipulator = 6) /obj/item/weapon/circuitboard/power_turbine name = "circuit board (Power Turbine)" @@ -218,8 +253,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;powerstorage=4;engineering=5" req_components = list( - "/obj/item/stack/cable_coil" = 5, - "/obj/item/weapon/stock_parts/capacitor" = 6) + /obj/item/stack/cable_coil = 5, + /obj/item/weapon/stock_parts/capacitor = 6) /obj/item/weapon/circuitboard/mech_recharger name = "circuit board (Mechbay Recharger)" @@ -227,8 +262,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;powerstorage=4;engineering=4" req_components = list( - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/capacitor" = 5) + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/capacitor = 5) /obj/item/weapon/circuitboard/teleporter_hub name = "circuit board (Teleporter Hub)" @@ -236,8 +271,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;engineering=5;bluespace=5;materials=4" req_components = list( - "/obj/item/bluespace_crystal" = 3, - "/obj/item/weapon/stock_parts/matter_bin" = 1) + /obj/item/bluespace_crystal = 3, + /obj/item/weapon/stock_parts/matter_bin = 1) /obj/item/weapon/circuitboard/teleporter_station name = "circuit board (Teleporter Station)" @@ -245,9 +280,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;engineering=4;bluespace=4" req_components = list( - "/obj/item/bluespace_crystal" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/bluespace_crystal = 2, + /obj/item/weapon/stock_parts/capacitor = 2, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/telesci_pad name = "circuit board (Telepad)" @@ -255,10 +290,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;engineering=3;materials=3;bluespace=4" req_components = list( - "/obj/item/bluespace_crystal" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 1, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/bluespace_crystal = 2, + /obj/item/weapon/stock_parts/capacitor = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/sleeper name = "circuit board (Sleeper)" @@ -266,10 +301,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;biotech=2;engineering=3;materials=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 2) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 2) /obj/item/weapon/circuitboard/cryo_tube name = "circuit board (Cryotube)" @@ -277,9 +312,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=4;biotech=3;engineering=4" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 4) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 4) /obj/item/weapon/circuitboard/thermomachine name = "circuit board (Freezer)" @@ -288,10 +323,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;plasmatech=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/micro_laser" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/micro_laser = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/thermomachine/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/weapon/screwdriver)) @@ -310,10 +345,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;biotech=2;materials=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/hydroponics name = "circuit board (Hydroponics Tray)" @@ -321,8 +356,8 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=1;biotech=1" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/microwave name = "circuit board (Microwave)" @@ -330,9 +365,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=1" req_components = list( - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/chem_dispenser name = "circuit board (Portable Chem Dispenser)" @@ -340,11 +375,11 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "materials=4;engineering=4;programming=4;plasmatech=3;biotech=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/stock_parts/cell" = 1) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/capacitor = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/weapon/stock_parts/cell = 1) /obj/item/weapon/circuitboard/destructive_analyzer @@ -353,9 +388,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "magnets=2;engineering=2;programming=2" req_components = list( - "/obj/item/weapon/stock_parts/scanning_module" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1) + /obj/item/weapon/stock_parts/scanning_module = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/micro_laser = 1) /obj/item/weapon/circuitboard/autolathe name = "circuit board (Autolathe)" @@ -363,9 +398,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 3, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 3, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/protolathe name = "circuit board (Protolathe)" @@ -373,9 +408,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/reagent_containers/glass/beaker" = 2) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/weapon/reagent_containers/glass/beaker = 2) /obj/item/weapon/circuitboard/circuit_imprinter @@ -384,9 +419,9 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "engineering=2;programming=2" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/reagent_containers/glass/beaker" = 2) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/reagent_containers/glass/beaker = 2) /obj/item/weapon/circuitboard/pacman name = "circuit board (PACMAN-type Generator)" @@ -394,10 +429,10 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=3;powerstorage=3;plasmatech=3;engineering=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 1) + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/capacitor = 1) /obj/item/weapon/circuitboard/pacman/super name = "circuit board (SUPERPACMAN-type Generator)" @@ -415,8 +450,8 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3" req_components = list( - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/scanning_module" = 1) + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/scanning_module = 1) /obj/item/weapon/circuitboard/mechfab name = "circuit board (Exosuit Fabricator)" @@ -424,10 +459,10 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3;engineering=3" req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/clonepod name = "circuit board (Clone Pod)" @@ -435,10 +470,10 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3;biotech=3" req_components = list( - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/scanning_module" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/scanning_module = 2, + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/clonescanner name = "circuit board (Cloning Scanner)" @@ -446,11 +481,11 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;biotech=2" req_components = list( - "/obj/item/weapon/stock_parts/scanning_module" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/stack/cable_coil" = 2,) + /obj/item/weapon/stock_parts/scanning_module = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 2,) /obj/item/weapon/circuitboard/cyborgrecharger name = "circuit board (Cyborg Recharger)" @@ -458,9 +493,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "powerstorage=3;engineering=3" req_components = list( - "/obj/item/weapon/stock_parts/capacitor" = 2, - "/obj/item/weapon/stock_parts/cell" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1,) + /obj/item/weapon/stock_parts/capacitor = 2, + /obj/item/weapon/stock_parts/cell = 1, + /obj/item/weapon/stock_parts/manipulator = 1,) // Telecomms circuit boards: @@ -470,10 +505,10 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=1" req_components = list( - "/obj/item/weapon/stock_parts/subspace/ansible" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/stock_parts/micro_laser" = 1) + /obj/item/weapon/stock_parts/subspace/ansible = 1, + /obj/item/weapon/stock_parts/subspace/filter = 1, + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/weapon/stock_parts/micro_laser = 1) /obj/item/weapon/circuitboard/telecomms/hub name = "circuit board (Hub Mainframe)" @@ -481,9 +516,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/filter" = 2) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/subspace/filter = 2) /obj/item/weapon/circuitboard/telecomms/relay name = "circuit board (Relay Mainframe)" @@ -491,9 +526,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/filter" = 2) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/subspace/filter = 2) /obj/item/weapon/circuitboard/telecomms/bus name = "circuit board (Bus Mainframe)" @@ -501,9 +536,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/subspace/filter = 1) /obj/item/weapon/circuitboard/telecomms/processor name = "circuit board (Processor Unit)" @@ -511,12 +546,12 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 3, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/subspace/treatment" = 2, - "/obj/item/weapon/stock_parts/subspace/analyzer" = 1, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/amplifier" = 1) + /obj/item/weapon/stock_parts/manipulator = 3, + /obj/item/weapon/stock_parts/subspace/filter = 1, + /obj/item/weapon/stock_parts/subspace/treatment = 2, + /obj/item/weapon/stock_parts/subspace/analyzer = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/weapon/stock_parts/subspace/amplifier = 1) /obj/item/weapon/circuitboard/telecomms/server name = "circuit board (Telecommunication Server)" @@ -524,9 +559,9 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/subspace/filter = 1) /obj/item/weapon/circuitboard/telecomms/broadcaster name = "circuit board (Subspace Broadcaster)" @@ -534,20 +569,20 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=1" req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/subspace/crystal" = 1, - "/obj/item/weapon/stock_parts/micro_laser/high" = 2) + /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/stock_parts/subspace/filter = 1, + /obj/item/weapon/stock_parts/subspace/crystal = 1, + /obj/item/weapon/stock_parts/micro_laser/high = 2) /obj/item/weapon/circuitboard/ore_redemption name = "circuit board (Ore Redemption)" build_path = /obj/machinery/mineral/ore_redemption board_type = "machine" origin_tech = "programming=1;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/device/assembly/igniter" = 1) + /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/device/assembly/igniter = 1) /obj/item/weapon/circuitboard/mining_equipment_vendor name = "circuit board (Mining Equipment Vendor)" @@ -555,5 +590,5 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=1;engineering=2" req_components = list( - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/stock_parts/matter_bin" = 3) \ No newline at end of file + /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/weapon/stock_parts/matter_bin = 3) \ No newline at end of file diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index e5acc1ea5af..eb5faffcafd 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -4,6 +4,7 @@ icon_state = "cell-off" density = 1 anchored = 1.0 + interact_offline = 1 layer = 4 var/on = 0 @@ -45,7 +46,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/process() ..() - if(!node) + if(!node || !is_operational()) return if(!on) updateDialog() @@ -61,7 +62,7 @@ process_occupant() if(abs(temperature_archived-air_contents.temperature) > 1) - network.update = 1 + parent.update = 1 updateDialog() return 1 @@ -97,11 +98,17 @@ user << "Seems empty." /obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user) - if(stat & (NOPOWER|BROKEN)) - if(state_open == 1) + if(..()) + return + + //powerless interaction + if(!is_operational()) + user.unset_machine()//essential to prevent infinite loops of opening/closing the machine + if(state_open) close_machine() else open_machine() + else ui_interact(user) @@ -258,7 +265,7 @@ if(state_open) icon_state = "cell-open" return - if(on) + if(on && is_operational()) if(occupant) icon_state = "cell-occupied" else @@ -266,6 +273,9 @@ else icon_state = "cell-off" +/obj/machinery/atmospherics/unary/cryo_cell/power_change() + ..() + update_icon() /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() if(air_contents.total_moles() < 10) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index a5ca16a2368..3989ee35d2c 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -91,7 +91,7 @@ for reference: qdel(src) ..() -/obj/structure/barricade/wooden/ex_act(severity) +/obj/structure/barricade/wooden/ex_act(severity, specialty) switch(severity) if(1.0) visible_message("The barricade is blown apart!") @@ -210,7 +210,7 @@ for reference: src.explode() ..() -/obj/machinery/deployable/barrier/ex_act(severity) +/obj/machinery/deployable/barrier/ex_act(severity, specialty) switch(severity) if(1.0) src.explode() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 0a642258374..cea529f563e 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -245,7 +245,7 @@ name = "bananium airlock" desc = "Honkhonkhonk" icon = 'icons/obj/doors/Doorbananium.dmi' - var/mineral = "clown" + var/mineral = "bananium" doortype = /obj/structure/door_assembly/door_assembly_clown /obj/machinery/door/airlock/sandstone @@ -1033,8 +1033,6 @@ About the new airlock wires panel: autoclose() return - crush() - if(forced < 2) if(emagged) return @@ -1053,7 +1051,13 @@ About the new airlock wires panel: killthis.ex_act(2)//Smashin windows ..() - + if(locate(/mob/living) in get_turf(src)) + if(!safe) + crush() + else + open() + return + return /obj/machinery/door/airlock/New() ..() @@ -1179,4 +1183,6 @@ About the new airlock wires panel: heat_proof = 0 update_icon() - +/obj/machinery/door/airlock/CanAStarPass(var/obj/item/weapon/card/id/ID) +//Airlock is passable if it is open (!density), bot has access, and is not bolted shut) + return !density || (check_access(ID) && !locked) \ No newline at end of file diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index aef1c2a08d3..5db76850d2d 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -14,13 +14,17 @@ ..() air_connection = new +/obj/machinery/door/airlock/alarmlock/Destroy() + if(radio_controller) + radio_controller.remove_object(src,air_frequency) + ..() + /obj/machinery/door/airlock/alarmlock/initialize() ..() radio_controller.remove_object(src, air_frequency) air_connection = radio_controller.add_object(src, air_frequency, RADIO_TO_AIRALARM) open() - /obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal) ..() if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 8061ba7f4d2..f3bee16d85f 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -24,9 +24,10 @@ var/id = null // id of door it controls. var/releasetime = 0 // when world.time reaches it - release the prisoneer var/timelength = 0 // the length of time this door will be set for - var/timing = 1 // boolean, true/1 timer is on, false/0 means it's not timing + var/timing = 0 // boolean, true/1 timer is on, false/0 means it's not timing var/picture_state // icon_state of alert picture, if not displaying text/numbers var/list/obj/machinery/targets = list() + var/obj/item/device/radio/Radio //needed to send messages to sec radio maptext_height = 26 maptext_width = 32 @@ -34,6 +35,9 @@ /obj/machinery/door_timer/New() ..() + Radio = new/obj/item/device/radio(src) + Radio.listening = 0 + pixel_x = ((src.dir & 3)? (0) : (src.dir == 4 ? 32 : -32)) pixel_y = ((src.dir & 3)? (src.dir ==1 ? 24 : -32) : (0)) @@ -64,7 +68,8 @@ if(stat & (NOPOWER|BROKEN)) return if(timing) if(world.time > src.releasetime) - broadcast_hud_message("[src]'s timer has expired. Releasing prisoner.", src) + Radio.set_frequency(SEC_FREQ) + Radio.talk_into(src, "Timer has expired. Releasing prisoner.", SEC_FREQ) src.timer_end() // open doors, reset timer, clear status screen timing = 0 timeset(0) diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index 9005a7fda49..cbccae2035c 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -2,7 +2,7 @@ if(!src.loc) return 0 for(var/obj/machinery/door/D in src.loc) - if(!istype(D, /obj/machinery/door/window) && D.density) + if(!istype(D, /obj/machinery/door/window) && D.density && D != src) return 0 return 1 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 91890d4b665..d994c0aba9e 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -22,10 +22,8 @@ ..() if(density) layer = 3.1 //Above most items if closed - explosion_resistance = initial(explosion_resistance) else layer = 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 - explosion_resistance = 0 update_freelook_sight() air_update_turf(1) airlocks += src @@ -85,7 +83,7 @@ //used in the AStar algorithm to determinate if the turf the door is on is passable /obj/machinery/door/proc/CanAStarPass(var/obj/item/weapon/card/id/ID) - return !density || check_access(ID) + return !density /obj/machinery/door/proc/bumpopen(mob/user as mob) if(operating) @@ -171,20 +169,14 @@ ..() -/obj/machinery/door/ex_act(severity) - switch(severity) - if(1.0) - qdel(src) - if(2.0) - if(prob(25)) - qdel(src) - if(3.0) - if(prob(80)) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(2, 1, src) - s.start() - return - +/obj/machinery/door/ex_act(severity, specialty) + if(severity == 3) + if(prob(80)) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, src) + s.start() + return + ..() /obj/machinery/door/update_icon() if(density) @@ -223,7 +215,6 @@ sleep(10) src.layer = 2.7 src.density = 0 - explosion_resistance = 0 update_icon() SetOpacity(0) air_update_turf(1) @@ -240,10 +231,9 @@ operating = 1 do_animate("closing") - src.density = 1 - explosion_resistance = initial(explosion_resistance) src.layer = 3.1 sleep(10) + src.density = 1 update_icon() if(visible && !glass) SetOpacity(1) //caaaaarn! diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 4f3c30e26bf..ae4d161a869 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -3,11 +3,13 @@ /obj/machinery/door/firedoor name = "firelock" - desc = "Apply crowbar" - icon = 'icons/obj/doors/Doorfire.dmi' + desc = "Apply crowbar." + icon = 'icons/obj/doors/Doorfireglass.dmi' icon_state = "door_open" opacity = 0 density = 0 + heat_proof = 1 + glass = 1 var/blocked = 0 var/nextstate = null @@ -104,10 +106,6 @@ /obj/machinery/door/firedoor/border_only icon = 'icons/obj/doors/edge_Doorfire.dmi' - glass = 1 //There is a glass window so you can see through the door - //This is needed due to BYOND limitations in controlling visibility - heat_proof = 1 - flags = ON_BORDER /obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0) @@ -132,6 +130,10 @@ else return 1 -//used in the AStar algorithm to determinate if the turf the door is on is passable -/obj/machinery/door/firedoor/CanAStarPass() - return !density \ No newline at end of file + +/obj/machinery/door/firedoor/heavy + name = "heavy firelock" + icon = 'icons/obj/doors/Doorfire.dmi' + glass = 0 + + diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 3695c80ef45..07c94eed7cc 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -3,7 +3,6 @@ desc = "A heavy duty blast door that opens mechanically." icon = 'icons/obj/doors/blastdoor.dmi' icon_state = "closed" - explosion_resistance = 25 var/id = 1 var/auto_close = 0 // Time in seconds to automatically close when opened, 0 if it doesn't. @@ -49,7 +48,6 @@ sleep(10) density = 0 - explosion_resistance = 0 air_update_turf(1) update_freelook_sight() operating = 0 @@ -72,14 +70,13 @@ operating = 1 flick("closing", src) - crush() icon_state = "closed" - density = 1 - explosion_resistance = initial(explosion_resistance) SetOpacity(1) air_update_turf(1) update_freelook_sight() sleep(10) + crush() + density = 1 operating = 0 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index fa3d6098f00..05caa8ff585 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -9,7 +9,6 @@ flags = ON_BORDER opacity = 0 var/obj/item/weapon/airlock_electronics/electronics = null - explosion_resistance = 5 /obj/machinery/door/window/New() ..() @@ -43,13 +42,13 @@ if(src.check_access(bot.botcard)) open_and_close() else - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) else if(istype(AM, /obj/mecha)) var/obj/mecha/mecha = AM if(mecha.occupant && src.allowed(mecha.occupant)) open_and_close() else - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) return if (!( ticker )) return @@ -68,7 +67,7 @@ if(allowed(user)) open_and_close() else - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) return /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0) @@ -110,12 +109,11 @@ return 0 if(!src.operating) //in case of emag src.operating = 1 - flick(text("[]opening", src.base_state), src) + flick("[src.base_state]opening", src) playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) - src.icon_state = text("[]open", src.base_state) + src.icon_state ="[src.base_state]open" sleep(10) - explosion_resistance = 0 src.density = 0 // src.sd_SetOpacity(0) //TODO: why is this here? Opaque windoors? ~Carn air_update_turf(1) @@ -135,12 +133,11 @@ if(emagged) return 0 src.operating = 1 - flick(text("[]closing", src.base_state), src) + flick("[src.base_state]closing", src) playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) src.icon_state = src.base_state src.density = 1 - explosion_resistance = initial(explosion_resistance) // if(src.visible) // SetOpacity(1) //TODO: why is this here? Opaque windoors? ~Carn air_update_turf(1) @@ -165,6 +162,19 @@ qdel(src) return +/obj/machinery/door/window/ex_act(severity, specialty) + switch(severity) + if(1.0) + qdel(src) + if(2.0) + if(prob(25)) + qdel(src) + else + take_damage(120) + if(3.0) + take_damage(60) + + /obj/machinery/door/window/bullet_act(var/obj/item/projectile/Proj) if(Proj.damage) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) @@ -187,6 +197,15 @@ return +/obj/machinery/door/window/mech_melee_attack(obj/mecha/M) + if(M.damtype == "brute") + playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + M.occupant_message("You hit [src].") + visible_message("[src] has been hit by [M.name].") + take_damage(M.force) + return + + /obj/machinery/door/window/attack_ai(mob/user as mob) return src.attack_hand(user) @@ -199,21 +218,24 @@ "[user] smashes against the [src.name].") take_damage(damage) -/obj/machinery/door/window/attack_alien(mob/user as mob) +/obj/machinery/door/window/attack_alien(mob/living/user as mob) + user.do_attack_animation(src) if(islarva(user)) return attack_generic(user, 25) -/obj/machinery/door/window/attack_animal(mob/user as mob) +/obj/machinery/door/window/attack_animal(mob/living/user as mob) if(!isanimal(user)) return var/mob/living/simple_animal/M = user + M.do_attack_animation(src) if(M.melee_damage_upper <= 0) return attack_generic(M, M.melee_damage_upper) /obj/machinery/door/window/attack_slime(mob/living/carbon/slime/user as mob) + user.do_attack_animation(src) if(!user.is_adult) return attack_generic(user, 25) @@ -224,7 +246,7 @@ /obj/machinery/door/window/attack_hand(mob/user as mob) return src.attackby(user, user) -/obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/user as mob) +/obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/living/user as mob) //If it's in the process of opening/closing, ignore the click if (src.operating) @@ -323,6 +345,7 @@ //If it's a weapon, smash windoor. Unless it's an id card, agent card, ect.. then ignore it (Cards really shouldnt damage a door anyway) if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card) ) user.changeNext_move(CLICK_CD_MELEE) + user.do_attack_animation(src) if( (I.flags&NOBLUDGEON) || !I.force ) return var/aforce = I.force @@ -343,7 +366,7 @@ close() else if (src.density) - flick(text("[]deny", src.base_state), src) + flick("[src.base_state]deny", src) return diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 910feb64a41..7e3d588f5f5 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -38,7 +38,7 @@ var/list/doppler_arrays = list() if(!usr || !isturf(usr.loc)) return - if(usr.stat || usr.restrained()) + if(usr.stat || usr.restrained() || !usr.canmove) return src.dir = turn(src.dir, 90) return diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index f5f4ed67fcd..b7645d58a2b 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -74,15 +74,20 @@ obj/machinery/embedded_controller/radio var/frequency var/datum/radio_frequency/radio_connection - initialize() - set_frequency(frequency) +obj/machinery/embedded_controller/radio/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + ..() - post_signal(datum/signal/signal) - signal.transmission_method = TRANSMISSION_RADIO - if(radio_connection) - return radio_connection.post_signal(src, signal) - else - signal = null +obj/machinery/embedded_controller/radio/initialize() + set_frequency(frequency) + +obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal) + signal.transmission_method = TRANSMISSION_RADIO + if(radio_connection) + return radio_connection.post_signal(src, signal) + else + signal = null obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 8e7bf8d9cfd..5e52de0bb9a 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -40,11 +40,13 @@ /obj/machinery/flasher/attackby(obj/item/weapon/W, mob/user) if (istype(W, /obj/item/weapon/wirecutters)) if (bulb) + user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb.") playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") - bulb.loc = src.loc - bulb = null - power_change() + if(do_after(user, 30) && bulb) + user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") + bulb.loc = src.loc + bulb = null + power_change() else if (istype(W, /obj/item/device/flash/handheld)) if (!bulb) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index a3468565a36..bb2cab0a197 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -84,13 +84,12 @@ var/const/HOLOPAD_MODE = RANGE_BASED For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/holopad/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq) if(speaker && masters.len && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios. - for (var/mob/living/silicon/ai/master in masters) + for(var/mob/living/silicon/ai/master in masters) if(masters[master] && speaker != master) raw_message = master.lang_treat(speaker, message_langs, raw_message) var/name_used = speaker.GetVoice() - var/rendered = "Holopad received, [name_used] " + var/rendered = "Holopad received, [name_used] " master.show_message(rendered, 2) - return /obj/machinery/hologram/holopad/proc/create_holo(mob/living/silicon/ai/A, turf/T = loc) var/obj/effect/overlay/h = new(T)//Spawn a blank effect at the location. @@ -163,7 +162,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ stat |= ~NOPOWER //Destruction procs. -/obj/machinery/hologram/ex_act(severity) +/obj/machinery/hologram/ex_act(severity, specialty) switch(severity) if(1.0) qdel(src) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 44be02fadac..5104069e662 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -84,6 +84,8 @@ Class Procs: process() 'game/machinery/machine.dm' Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. + is_operational() + Returns 0 if the machine is unpowered, broken or undergoing maintenance, 1 if not Compiled by Aygar */ @@ -113,6 +115,7 @@ Class Procs: /obj/machinery/New() ..() machines += src + auto_use_power() /obj/machinery/Destroy() machines.Remove(src) @@ -139,19 +142,21 @@ Class Procs: ..() /obj/machinery/proc/open_machine() - var/turf/T = get_turf(src) - if(T) - state_open = 1 - density = 0 - T.contents += contents - if(occupant) - if(occupant.client) - occupant.client.eye = occupant - occupant.client.perspective = MOB_PERSPECTIVE - occupant = null + state_open = 1 + density = 0 + dropContents() update_icon() updateUsrDialog() +/obj/machinery/proc/dropContents() + var/turf/T = get_turf(src) + T.contents += contents + if(occupant) + if(occupant.client) + occupant.client.eye = occupant + occupant.client.perspective = MOB_PERSPECTIVE + occupant = null + /obj/machinery/proc/close_machine(mob/living/target = null) state_open = 0 density = 1 @@ -171,22 +176,6 @@ Class Procs: updateUsrDialog() update_icon() -/obj/machinery/ex_act(severity) - switch(severity) - if(1.0) - qdel(src) - return - if(2.0) - if (prob(50)) - qdel(src) - return - if(3.0) - if (prob(25)) - qdel(src) - return - else - return - /obj/machinery/blob_act() if(prob(50)) qdel(src) @@ -202,13 +191,23 @@ Class Procs: /obj/machinery/Topic(href, href_list) ..() - if(!interact_offline && stat & (NOPOWER|BROKEN)) - return 1 - if(!usr.canUseTopic(src)) + if(!can_be_used_by(usr)) return 1 add_fingerprint(usr) return 0 +/obj/machinery/proc/can_be_used_by(mob/user) + if(!interact_offline && stat & (NOPOWER|BROKEN)) + return 0 + if(!user.canUseTopic(src)) + return 0 + return 1 + +/obj/machinery/proc/is_operational() + return !(stat & (NOPOWER|BROKEN|MAINT)) + +//////////////////////////////////////////////////////////////////////////////////////////// + /mob/proc/canUseTopic() //TODO: once finished, place these procs on the respective mob files return @@ -224,10 +223,13 @@ Class Procs: src << "You don't have the dexterity to do this!" return -/mob/living/carbon/human/canUseTopic(atom/movable/M) +/mob/living/carbon/human/canUseTopic(atom/movable/M, be_close = 0) if(restrained() || lying || stat || stunned || weakened) return if(!in_range(M, src)) + if((be_close == 0) && (TK in mutations)) + if(tkMaxRangeCheck(src, M)) + return 1 return if(!isturf(M.loc) && M.loc != src) return @@ -259,8 +261,10 @@ Class Procs: /obj/machinery/attack_paw(mob/user as mob) return src.attack_hand(user) -/obj/machinery/attack_hand(mob/user as mob) - if(!interact_offline && stat & (NOPOWER|BROKEN|MAINT)) +/obj/machinery/attack_hand(mob/user as mob, var/check_power = 1) + if(check_power && stat & NOPOWER) + return 1 + if(!interact_offline && stat & (BROKEN|MAINT)) return 1 if(user.lying || user.stat) return 1 @@ -297,12 +301,13 @@ Class Procs: gl_uid++ /obj/machinery/proc/default_deconstruction_crowbar(var/obj/item/weapon/crowbar/C, var/ignore_panel = 0) - if(istype(C) && (panel_open || ignore_panel)) + . = istype(C) && (panel_open || ignore_panel) + if(.) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) M.state = 2 M.icon_state = "box_1" - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc @@ -342,14 +347,15 @@ Class Procs: return 0 /obj/machinery/proc/exchange_parts(mob/user, obj/item/weapon/storage/part_replacer/W) + var/shouldplaysound = 0 if(istype(W) && component_parts) if(panel_open) var/obj/item/weapon/circuitboard/CB = locate(/obj/item/weapon/circuitboard) in component_parts var/P for(var/obj/item/weapon/stock_parts/A in component_parts) for(var/D in CB.req_components) - if(ispath(A.type, text2path(D))) - P = text2path(D) + if(ispath(A.type, D)) + P = D break for(var/obj/item/weapon/stock_parts/B in W.contents) if(istype(B, P) && istype(A, P)) @@ -360,11 +366,14 @@ Class Procs: component_parts += B B.loc = null user << "[A.name] replaced with [B.name]." + shouldplaysound = 1 //Only play the sound when parts are actually replaced! break RefreshParts() else user << "Following parts detected in the machine:" for(var/var/obj/item/C in component_parts) user << " [C.name]" + if(shouldplaysound) + W.play_rped_sound() return 1 return 0 diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index cbc0b08d818..490280f4edc 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -42,6 +42,11 @@ spawn() magnetic_process() +/obj/machinery/magnetic_module/Destroy() + if(radio_controller) + radio_controller.remove_object(src, freq) + ..() + // update the invisibility and icon /obj/machinery/magnetic_module/hide(var/intact) invisibility = intact ? 101 : 0 @@ -235,6 +240,10 @@ if(path) // check for default path filter_path() // renders rpath +/obj/machinery/magnetic_controller/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + ..() /obj/machinery/magnetic_controller/process() if(magnets.len == 0 && autolink) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 1aed8927d45..b2ee6d682c3 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -32,7 +32,12 @@ if(radio_controller) radio_controller.add_object(src, freq, RADIO_NAVBEACONS) - // set the transponder codes assoc list from codes_txt +/obj/machinery/navbeacon/Destroy() + if(radio_controller) + radio_controller.remove_object(src, freq) + ..() + +// set the transponder codes assoc list from codes_txt /obj/machinery/navbeacon/proc/set_codes() if(!codes_txt) return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 9e1bd0616fa..f933cb9366e 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -2,6 +2,11 @@ //################### NEWSCASTERS BE HERE! #### //###-Agouri################################### +/datum/feed_comment + var/author = "" + var/body = "" + var/time_stamp = "" + /datum/feed_message var/author ="" var/body ="" @@ -11,6 +16,9 @@ var/is_admin_message = 0 var/icon/img = null var/time_stamp = "" + var/list/datum/feed_comment/comments = list() + var/locked = 0 + var/caption = "" /datum/feed_channel var/channel_name="" @@ -29,6 +37,7 @@ src.backup_body = "" src.backup_author = "" src.img = null + src.locked = 0 /datum/feed_channel/proc/clear() src.channel_name = "" @@ -54,14 +63,16 @@ newChannel.is_admin_channel = adminChannel network_channels += newChannel -/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0) +/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/allow_comments = 1) var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = author newMsg.body = msg newMsg.time_stamp = "[worldtime2text()]" newMsg.is_admin_message = adminMessage + newMsg.locked = !allow_comments if(photo) newMsg.img = photo.img + newMsg.caption = photo.scribble for(var/datum/feed_channel/FC in network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg //Adding message to the network's appropriate feed_channel @@ -151,6 +162,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/c_locked=0; //Will our new channel be locked to public submissions? var/hitstaken = 0 //Death at 3 hits from an item with force>=15 var/datum/feed_channel/viewing_channel = null + var/allow_comments = 1 luminosity = 0 anchored = 1 @@ -208,7 +220,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.update_icon() -/obj/machinery/newscaster/ex_act(severity) +/obj/machinery/newscaster/ex_act(severity, specialty) switch(severity) if(1.0) qdel(src) @@ -293,6 +305,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="Message Author: [src.scanned_user]
" dat+="Message Body: [src.msg]
" dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].
" @@ -362,8 +375,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="-[MESSAGE.body]
" if(MESSAGE.img) usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") - dat+="
" + dat+="
" + if(MESSAGE.caption) + dat+="[MESSAGE.caption]
" + dat+="
" dat+="\[Story by [MESSAGE.author] \] - ([MESSAGE.time_stamp])
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body]
[comment.author] [comment.time_stamp]
" + if(MESSAGE.locked) + dat+="Comments locked
" + else + dat+="Comment
" dat+="
Refresh" dat+="
Back" if(10) @@ -400,6 +423,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" @@ -492,7 +518,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) usr.set_machine(src) if(href_list["set_channel_name"]) - src.channel_name = strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")) + src.channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN) while (findtext(src.channel_name," ") == 1) src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1) src.updateUsrDialog() @@ -537,9 +563,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.updateUsrDialog() else if(href_list["set_new_message"]) - src.msg = strip_html(input(usr, "Write your Feed story", "Network Channel Handler", "")) - while (findtext(src.msg," ") == 1) - src.msg = copytext(src.msg,2,lentext(src.msg)+1) + src.msg = trim(stripped_input(usr, "Write your Feed story", "Network Channel Handler")) src.updateUsrDialog() else if(href_list["set_attachment"]) @@ -550,7 +574,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) src.screen=6 else - news_network.SubmitArticle(msg, scanned_user, channel_name, photo) + news_network.SubmitArticle(msg, scanned_user, channel_name, photo, allow_comments) feedback_inc("newscaster_stories",1) src.screen=4 src.updateUsrDialog() @@ -594,15 +618,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.updateUsrDialog() else if(href_list["set_wanted_name"]) - src.channel_name = strip_html(input(usr, "Provide the name of the Wanted person", "Network Security Handler", "")) - while (findtext(src.channel_name," ") == 1) - src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1) + src.channel_name = trim(stripped_input(usr, "Provide the name of the Wanted person", "Network Security Handler")) src.updateUsrDialog() else if(href_list["set_wanted_desc"]) - src.msg = strip_html(input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler", "")) - while (findtext(src.msg," ") == 1) - src.msg = copytext(src.msg,2,lentext(src.msg)+1) + src.msg = trim(stripped_input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler")) src.updateUsrDialog() else if(href_list["submit_wanted"]) @@ -728,11 +748,39 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.screen = 12 src.updateUsrDialog() + else if(href_list["new_comment"]) + var/datum/feed_message/FM = locate(href_list["new_comment"]) + var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141) + if(cominput) + var/datum/feed_comment/FC = new/datum/feed_comment + FC.author = scanned_user + FC.body = cominput + FC.time_stamp = worldtime2text() + FM.comments += FC + log_comment("[usr]/([usr.ckey]) as [scanned_user] commented on message [FM.body] -- [FC.body]") + updateUsrDialog() + + else if(href_list["del_comment"]) + var/datum/feed_comment/FC = locate(href_list["del_comment"]) + var/datum/feed_message/FM = locate(href_list["del_comment_msg"]) + FM.comments -= FC + qdel(FC) + updateUsrDialog() + + else if(href_list["lock_comment"]) + var/datum/feed_message/FM = locate(href_list["lock_comment"]) + FM.locked ^= 1 + updateUsrDialog() + + else if(href_list["set_comment"]) + allow_comments ^= 1 + updateUsrDialog() + else if(href_list["refresh"]) src.updateUsrDialog() -/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/user as mob) +/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob) /* if (istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda) ) //Name verification for channels or messages if(src.screen == 4 || src.screen == 5) @@ -758,24 +806,25 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if (src.isbroken) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] further abuses the shattered [src.name].") + O.show_message("[user.name] further abuses the shattered [src.name].") else if(istype(I, /obj/item/weapon) ) + user.do_attack_animation(src) var/obj/item/weapon/W = I if(W.force <15) for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." ) + O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." ) playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else src.hitstaken++ if(src.hitstaken==3) for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] smashes the [src.name]!" ) + O.show_message("[user.name] smashes the [src.name]!" ) src.isbroken=1 playsound(src.loc, 'sound/effects/Glassbr3.ogg', 100, 1) else for (var/mob/O in hearers(5, src.loc)) - O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" ) + O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" ) playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else user << "This does nothing." @@ -972,10 +1021,9 @@ obj/item/weapon/newspaper/Topic(href, href_list) obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/pen)) if(src.scribble_page == src.curr_page) - user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?" + user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?" else - var/s = strip_html( input(user, "Write something", "Newspaper", "") ) - s = copytext(sanitize(s), 1, MAX_MESSAGE_LEN) + var/s = stripped_input(user, "Write something", "Newspaper") if (!s) return if (!in_range(src, usr) && src.loc != usr) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 7120b1d1550..d36763e98e8 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -27,7 +27,6 @@ Buildable meters name = "pipe" desc = "A pipe" var/pipe_type = 0 - //var/pipe_dir = 0 var/pipename force = 7 icon = 'icons/obj/pipe-item.dmi' @@ -37,7 +36,7 @@ Buildable meters level = 2 var/flipped = 0 -/obj/item/pipe/New(var/loc, var/pipe_type as num, var/dir as num, var/obj/machinery/atmospherics/make_from = null) +/obj/item/pipe/New(loc, pipe_type, dir, obj/machinery/atmospherics/make_from) ..() if (make_from) src.dir = make_from.dir @@ -55,7 +54,7 @@ Buildable meters src.pipe_type = PIPE_INSULATED_STRAIGHT + is_bent else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple)) src.pipe_type = PIPE_SIMPLE_STRAIGHT + is_bent - else if(istype(make_from, /obj/machinery/atmospherics/portables_connector)) + else if(istype(make_from, /obj/machinery/atmospherics/unary/portables_connector)) src.pipe_type = PIPE_CONNECTOR else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold)) src.pipe_type = PIPE_MANIFOLD @@ -63,7 +62,7 @@ Buildable meters src.pipe_type = PIPE_UVENT else if(istype(make_from, /obj/machinery/atmospherics/valve/digital)) src.pipe_type = PIPE_DVALVE - else if(istype(make_from, /obj/machinery/atmospherics/valve)) + else if(istype(make_from, /obj/machinery/atmospherics/binary/valve)) src.pipe_type = PIPE_MVALVE else if(istype(make_from, /obj/machinery/atmospherics/binary/pump)) src.pipe_type = PIPE_PUMP @@ -155,7 +154,7 @@ Buildable meters set name = "Rotate Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return src.dir = turn(src.dir, -90) @@ -169,7 +168,7 @@ Buildable meters set name = "Flip Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return if (pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) @@ -305,275 +304,90 @@ Buildable meters switch(pipe_type) if(PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT) var/obj/machinery/atmospherics/pipe/simple/P = new( src.loc ) - P.dir = src.dir - P.initialize_directions = pipe_dir - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - if (P.node1) - P.node1.initialize() - P.node1.addMember(P) - if (P.node2) - P.node2.initialize() - P.node2.addMember(P) - P.build_network() + P.construction(dir, pipe_dir) if(PIPE_HE_STRAIGHT, PIPE_HE_BENT) var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/P = new ( src.loc ) - P.dir = src.dir - P.initialize_directions = pipe_dir P.initialize_directions_he = pipe_dir - //var/turf/T = P.loc - //P.level = T.intact ? 2 : 1 - P.initialize() - if (P.node1) - P.node1.initialize() - P.node1.addMember(P) - if (P.node2) - P.node2.initialize() - P.node2.addMember(P) - P.build_network() + P.construction(dir, pipe_dir) - if(PIPE_CONNECTOR) // connector - var/obj/machinery/atmospherics/portables_connector/C = new( src.loc ) - C.dir = dir - C.initialize_directions = pipe_dir + if(PIPE_CONNECTOR) + var/obj/machinery/atmospherics/unary/portables_connector/C = new( src.loc ) if (pipename) C.name = pipename - var/turf/T = C.loc - C.level = T.intact ? 2 : 1 - C.initialize() - C.build_network() - if (C.node) - C.node.initialize() - C.node.build_network() + C.construction(dir, pipe_dir) - - if(PIPE_MANIFOLD) //manifold + if(PIPE_MANIFOLD) var/obj/machinery/atmospherics/pipe/manifold/M = new(loc) - M.dir = dir - M.initialize_directions = pipe_dir - var/turf/T = M.loc - M.level = T.intact ? 2 : 1 - M.initialize() - if (M.node1) - M.node1.initialize() - M.node1.addMember(M) - if (M.node2) - M.node2.initialize() - M.node2.addMember(M) - if (M.node3) - M.node3.initialize() - M.node3.addMember(M) - M.build_network() + M.construction(dir, pipe_dir) - if(PIPE_4WAYMANIFOLD) //manifold + if(PIPE_4WAYMANIFOLD) var/obj/machinery/atmospherics/pipe/manifold4w/M = new( src.loc ) - - var/turf/T = M.loc - M.level = T.intact ? 2 : 1 - M.initialize() - if (M.node1) - M.node1.initialize() - M.node1.addMember(M) - if (M.node2) - M.node2.initialize() - M.node2.addMember(M) - if (M.node3) - M.node3.initialize() - M.node3.addMember(M) - if (M.node4) - M.node4.initialize() - M.node4.addMember(M) - M.build_network() + M.construction(dir, pipe_dir) if(PIPE_JUNCTION) var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/P = new ( src.loc ) - P.dir = src.dir - P.initialize_directions = src.get_pdir() P.initialize_directions_he = src.get_hdir() - //var/turf/T = P.loc - //P.level = T.intact ? 2 : 1 - P.initialize() - if (P.node1) - P.node1.initialize() - P.node1.addMember(P) - if (P.node2) - P.node2.initialize() - P.node2.addMember(P) - P.build_network() + P.construction(dir, get_pdir()) - if(PIPE_UVENT) //unary vent + if(PIPE_UVENT) var/obj/machinery/atmospherics/unary/vent_pump/V = new( src.loc ) - V.dir = dir - V.initialize_directions = pipe_dir + V.construction(dir, pipe_dir) + + if(PIPE_MVALVE) + var/obj/machinery/atmospherics/binary/valve/V = new(src.loc) if (pipename) V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node) - V.node.initialize() - V.node.build_network() + V.construction(dir, get_pdir()) - - if(PIPE_MVALVE) //manual valve - var/obj/machinery/atmospherics/valve/V = new(src.loc) - V.dir = dir - V.initialize_directions = pipe_dir - if (pipename) - V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node1) -// world << "[V.node1.name] is connected to valve, forcing it to update its nodes." - V.node1.initialize() - V.node1.build_network() - if (V.node2) -// world << "[V.node2.name] is connected to valve, forcing it to update its nodes." - V.node2.initialize() - V.node2.build_network() - - if(PIPE_DVALVE) //Digital valves. Shameless copypaste from manual valves because I don't into atmos code. + if(PIPE_DVALVE) var/obj/machinery/atmospherics/valve/digital/V = new(src.loc) - V.dir = dir - V.initialize_directions = pipe_dir if (pipename) V.name = pipename - var/turf/T = V.loc - V.level = T.intact ? 2 : 1 - V.initialize() - V.build_network() - if (V.node1) - V.node1.initialize() - V.node1.build_network() - if (V.node2) - V.node2.initialize() - V.node2.build_network() + V.construction(dir, get_pdir()) - if(PIPE_PUMP) //gas pump + if(PIPE_PUMP) var/obj/machinery/atmospherics/binary/pump/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir - if (pipename) - P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - - if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) //Trinary stuff + P.construction(dir, pipe_dir) + if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) var/obj/machinery/atmospherics/trinary/P if(pipe_type == PIPE_GAS_FILTER) P = new /obj/machinery/atmospherics/trinary/filter(src.loc) else if(pipe_type == PIPE_GAS_MIXER) P = new /obj/machinery/atmospherics/trinary/mixer(src.loc) - P.flipped = flipped - P.dir = unflip(dir) - P.initialize_directions = pipe_dir if (pipename) P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - if (P.node3) - P.node3.initialize() - P.node3.build_network() + P.construction(unflip(dir), pipe_dir) - if(PIPE_SCRUBBER) //scrubber + if(PIPE_SCRUBBER) var/obj/machinery/atmospherics/unary/vent_scrubber/S = new(src.loc) - S.dir = dir - S.initialize_directions = pipe_dir if (pipename) S.name = pipename - var/turf/T = S.loc - S.level = T.intact ? 2 : 1 - S.initialize() - S.build_network() - if (S.node) - S.node.initialize() - S.node.build_network() + S.construction(dir, pipe_dir) if(PIPE_INSULATED_STRAIGHT, PIPE_INSULATED_BENT) var/obj/machinery/atmospherics/pipe/simple/insulated/P = new( src.loc ) - P.dir = src.dir - P.initialize_directions = pipe_dir - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - if (P.node1) - P.node1.initialize() - P.node1.addMember(P) - if (P.node2) - P.node2.initialize() - P.node2.addMember(P) - P.build_network() + P.construction(dir, pipe_dir) - if(PIPE_PASSIVE_GATE) //passive gate + if(PIPE_PASSIVE_GATE) var/obj/machinery/atmospherics/binary/passive_gate/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir if (pipename) P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() + P.construction(dir, pipe_dir) - if(PIPE_VOLUME_PUMP) //volume pump + if(PIPE_VOLUME_PUMP) var/obj/machinery/atmospherics/binary/volume_pump/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir if (pipename) P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() + P.construction(dir, pipe_dir) - if(PIPE_HEAT_EXCHANGE) // heat exchanger + if(PIPE_HEAT_EXCHANGE) var/obj/machinery/atmospherics/unary/heat_exchanger/C = new( src.loc ) - C.dir = dir - C.initialize_directions = pipe_dir if (pipename) C.name = pipename - var/turf/T = C.loc - C.level = T.intact ? 2 : 1 - C.initialize() - C.build_network() - if (C.node) - C.node.initialize() - C.node.build_network() + C.construction(dir, pipe_dir) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user.visible_message( \ diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index ddc44cc8610..2ee4138a9ab 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -142,7 +142,7 @@ Nah /obj/machinery/pipedispenser/disposal/attack_hand(user as mob) if(..()) - return + return 1 var/dat = {"Disposal Pipes
Pipe
@@ -164,7 +164,7 @@ Nah /obj/machinery/pipedispenser/disposal/Topic(href, href_list) if(..()) - return + return 1 usr.set_machine(src) src.add_fingerprint(usr) if(href_list["dmake"]) @@ -211,7 +211,7 @@ Nah /obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(user as mob) if(..()) - return + return 1 var/dat = {"Transit Tubes:
Straight Tube
@@ -230,9 +230,9 @@ Nah return -/obj/machinery/pipedispenser/disposal/Topic(href, href_list) +/obj/machinery/pipedispenser/disposal/transit_tube/Topic(href, href_list) if(..()) - return + return 1 usr.set_machine(src) src.add_fingerprint(usr) if(!wait) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index d1892e8f628..42c627dbd0d 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -370,7 +370,7 @@ ..() -/obj/machinery/porta_turret/ex_act(severity) +/obj/machinery/porta_turret/ex_act(severity, specialty) if(severity >= 3) //turret dies if an explosion touches it! qdel(src) else @@ -459,31 +459,18 @@ targets += C //if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee - if(targets.len > 0) //if there are targets to shoot - - var/atom/t = pick(targets) //pick a perp from the list of targets. Targets go first because they are the most important - - if(istype(t, /mob/living)) //if a mob - var/mob/living/M = t //simple typecasting - if(M.stat != DEAD) //if the target is not dead - spawn() - popUp() //pop the turret up if it's not already up. - dir = get_dir(src, M) //even if you can't shoot, follow the target - spawn() - shootAt(M) //shoot the target, finally - - else - if(secondarytargets.len > 0) //if there are no primary targets, go for secondary targets - var/mob/t = pick(secondarytargets) - if(istype(t, /mob/living)) - if(t.stat != DEAD) - spawn() - popUp() - dir=get_dir(src, t) - shootAt(t) - else + if(!tryToShootAt(targets)) + if(!tryToShootAt(secondarytargets)) // if no valid targets, go for secondary targets spawn() - popDown() + popDown() // no valid targets, close the cover + + +/obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets) + while(targets.len > 0) + var/mob/living/M = pick(targets) + targets -= M + if(target(M)) + return 1 /obj/machinery/porta_turret/proc/popUp() //pops the turret up @@ -573,15 +560,19 @@ return threatcount -/obj/machinery/porta_turret/proc/shootAt(atom/movable/target) //shoots at a target +/obj/machinery/porta_turret/proc/target(var/mob/living/target) if(disabled) return + if(target && (target.stat != DEAD) && (!(target.lying) || emagged)) + spawn() + popUp() //pop the turret up if it's not already up. + dir = get_dir(src, target) //even if you can't shoot, follow the target + spawn() + shootAt(target) + return 1 + return - if(lasercolor && istype(target,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = target - if(H.lying) - return - +/obj/machinery/porta_turret/proc/shootAt(var/mob/living/target) if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate if(last_fired || !raised) //prevents rapid-fire shooting, unless it's been emagged return @@ -619,8 +610,7 @@ A.current = T A.yo = U.y - T.y A.xo = U.x - T.x - spawn( 1 ) - A.process() + A.fire() /obj/machinery/porta_turret/proc/setState(var/on, var/emagged) if(controllock) @@ -1133,13 +1123,19 @@ Status: []
"}, usr << "Control panel is locked!" return if (href_list["toggleOn"]) - src.enabled = !src.enabled - src.updateTurrets() + toggle_on() else if (href_list["toggleLethal"]) - src.lethal = !src.lethal - src.updateTurrets() + toggle_lethal() src.attack_hand(usr) +/obj/machinery/turretid/proc/toggle_lethal() + lethal = !lethal + updateTurrets() + +/obj/machinery/turretid/proc/toggle_on() + enabled = !enabled + updateTurrets() + /obj/machinery/turretid/proc/updateTurrets() if(control_area) for (var/obj/machinery/porta_turret/aTurret in get_area_all_atoms(control_area)) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 522483a63be..aabb4e0dc20 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -66,10 +66,10 @@ open_machine() ..(severity) -/obj/machinery/recharge_station/ex_act(severity) +/obj/machinery/recharge_station/ex_act(severity, specialty) if(occupier) open_machine() - ..(severity) + ..() /obj/machinery/recharge_station/attack_paw(user as mob) return attack_hand(user) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index a5006803963..87c62079b33 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -46,7 +46,7 @@ if (src.health <= 0) - visible_message("The [src] dissapates.") + visible_message("[src] dissipates.") qdel(src) return @@ -58,13 +58,13 @@ health -= Proj.damage ..() if(health <=0) - visible_message("The [src] dissapates.") + visible_message("The [src] dissipates.") qdel(src) return opacity = 1 spawn(20) if(src) opacity = 0 -/obj/machinery/shield/ex_act(severity) +/obj/machinery/shield/ex_act(severity, specialty) switch(severity) if(1.0) if (prob(75)) @@ -107,7 +107,7 @@ //Handle the destruction of the shield if (src.health <= 0) - visible_message("The [src] dissapates.") + visible_message("[src] dissipates.") qdel(src) return @@ -181,7 +181,7 @@ update_icon() return -/obj/machinery/shieldgen/ex_act(severity) +/obj/machinery/shieldgen/ex_act(severity, specialty) switch(severity) if(1.0) src.health -= 75 @@ -475,8 +475,8 @@ user << "Access denied." else - src.add_fingerprint(user) - visible_message("The [src.name] has been hit with the [W.name] by [user.name]!") + add_fingerprint(user) + ..() /obj/machinery/shieldwallgen/proc/cleanup(var/NSEW) var/obj/machinery/shieldwall/F @@ -567,7 +567,7 @@ return -/obj/machinery/shieldwall/ex_act(severity) +/obj/machinery/shieldwall/ex_act(severity, specialty) if(needs_power) var/obj/machinery/shieldwallgen/G switch(severity) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 5ef5602e803..cda18f4b731 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -41,12 +41,17 @@ // new display // register for radio system + /obj/machinery/status_display/New() ..() spawn(5) // must wait for map loading to finish if(radio_controller) radio_controller.add_object(src, frequency) +/obj/machinery/status_display/Destroy() + if(radio_controller) + radio_controller.remove_object(src,frequency) + ..() // timed process diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 2cacd1b075e..47782404352 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -124,7 +124,7 @@ dump_everything() update_icon() -/obj/machinery/suit_storage_unit/ex_act(severity) +/obj/machinery/suit_storage_unit/ex_act(severity, specialty) switch(severity) if(1.0) if(prob(50)) @@ -428,7 +428,7 @@ var/mob/living/user = usr if(islocked) user.changeNext_move(CLICK_CD_BREAKOUT) - user.last_special = world.time + CLICK_CD_BREAKOUT + user.last_special = world.time + CLICK_CD_BREAKOUT var/breakout_time = 2 user << "You start kicking against the doors to escape! (This will take about [breakout_time] minutes.)" visible_message("You see [user] kicking against the doors of the [src]!") diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 205886991aa..ecf707cc2e8 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -100,7 +100,101 @@ selfdestructing = 1 spawn() explosion(src.loc, rand(3,8), rand(1,3), 1, 10) +//////////////////////////////////////// +//Singularity beacon +//////////////////////////////////////// +/obj/machinery/power/singularity_beacon + name = "ominous beacon" + desc = "This looks suspicious..." + icon = 'icons/obj/singularity.dmi' + icon_state = "beacon" + anchored = 0 + density = 1 + layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS + stat = 0 + + var/active = 0 + var/icontype = "beacon" + + +/obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null) + if(surplus() < 1500) + if(user) user << "The connected wire doesn't have enough current." + return + for(var/obj/machinery/singularity/singulo in world) + if(singulo.z == z) + singulo.target = src + icon_state = "[icontype]1" + active = 1 + machines |= src + if(user) + user << "You activate the beacon." + + +/obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) + for(var/obj/machinery/singularity/singulo in world) + if(singulo.target == src) + singulo.target = null + icon_state = "[icontype]0" + active = 0 + if(user) + user << "You deactivate the beacon." + + +/obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob) + return + + +/obj/machinery/power/singularity_beacon/attack_hand(var/mob/user as mob) + if(anchored) + return active ? Deactivate(user) : Activate(user) + else + user << "You need to screw the beacon to the floor first!" + return + + +/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/screwdriver)) + if(active) + user << "You need to deactivate the beacon first!" + return + + if(anchored) + anchored = 0 + user << "You unscrew the beacon from the floor." + disconnect_from_network() + return + else + if(!connect_to_network()) + user << "This device must be placed over an exposed cable." + return + anchored = 1 + user << "You screw the beacon to the floor and attach the cable." + return + ..() + return + + +/obj/machinery/power/singularity_beacon/Destroy() + if(active) + Deactivate() + ..() + +//stealth direct power usage +/obj/machinery/power/singularity_beacon/process() + if(!active) + return PROCESS_KILL + else + if(surplus() > 1500) + add_load(1500) + else + Deactivate() + + +/obj/machinery/power/singularity_beacon/syndicate + icontype = "beaconsynd" + icon_state = "beaconsynd0" // SINGULO BEACON SPAWNER /obj/item/device/sbeacondrop @@ -110,7 +204,7 @@ desc = "A label on it reads: Warning: Activating this device will send a special beacon to your location." origin_tech = "bluespace=1;syndicate=7" w_class = 2 - var/droptype = /obj/machinery/singularity_beacon/syndicate + var/droptype = /obj/machinery/power/singularity_beacon/syndicate /obj/item/device/sbeacondrop/attack_self(mob/user as mob) @@ -124,119 +218,3 @@ /obj/item/device/sbeacondrop/bomb desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location." droptype = /obj/machinery/syndicatebomb - -#define SCREWED 32 - -/obj/machinery/singularity_beacon //not the best place for it but it's a hack job anyway -- Urist - name = "ominous beacon" - desc = "This looks suspicious..." - icon = 'icons/obj/singularity.dmi' - icon_state = "beacon" - - anchored = 0 - density = 1 - layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS - stat = 0 - - var/active = 0 //It doesn't use up power, so use_power wouldn't really suit it - var/icontype = "beacon" - var/obj/structure/cable/attached = null - - -/obj/machinery/singularity_beacon/proc/Activate(mob/user = null) - if(!checkWirePower()) - if(user) user << "The connected wire doesn't have enough current." - return - for(var/obj/machinery/singularity/singulo in world) - if(singulo.z == z) - singulo.target = src - icon_state = "[icontype]1" - active = 1 - if(user) user << "You activate the beacon." - - -/obj/machinery/singularity_beacon/proc/Deactivate(mob/user = null) - for(var/obj/machinery/singularity/singulo in world) - if(singulo.target == src) - singulo.target = null - icon_state = "[icontype]0" - active = 0 - if(user) user << "You deactivate the beacon." - - -/obj/machinery/singularity_beacon/attack_ai(mob/user as mob) - return - - -/obj/machinery/singularity_beacon/attack_hand(var/mob/user as mob) - if(stat & SCREWED) - return active ? Deactivate(user) : Activate(user) - else - user << "You need to screw the beacon to the floor first!" - return - - -/obj/machinery/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/screwdriver)) - if(active) - user << "You need to deactivate the beacon first!" - return - - if(stat & SCREWED) - stat &= ~SCREWED - anchored = 0 - user << "You unscrew the beacon from the floor." - attached = null - return - else - var/turf/T = loc - if(isturf(T) && !T.intact) - attached = locate() in T - if(!attached) - user << "This device must be placed over an exposed cable." - return - stat |= SCREWED - anchored = 1 - user << "You screw the beacon to the floor and attach the cable." - return - ..() - return - - -/obj/machinery/singularity_beacon/Destroy() - if(active) Deactivate() - ..() - - /* - * Added for a simple way to check power. Verifies that the beacon - * is connected to a wire, the wire is part of a powernet (that part's - * sort of redundant, since all wires either join or create one when placed) - * and that the powernet has at least 1500 power units available for use. - * Doesn't use them, though, just makes sure they're there. - * - QualityVan, Aug 11 2012 - */ -/obj/machinery/singularity_beacon/proc/checkWirePower() - if(!attached) - return 0 - var/datum/powernet/PN = attached.get_powernet() - if(!PN) - return 0 - if(PN.avail < 1500) - return 0 - return 1 - -/obj/machinery/singularity_beacon/process() - if(!active) - return - else - if(!checkWirePower()) - Deactivate() - return - - -/obj/machinery/singularity_beacon/syndicate - icontype = "beaconsynd" - icon_state = "beaconsynd0" - -#undef SCREWED - diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 668f94b2327..7459017d183 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -180,7 +180,7 @@ origin_tech = "syndicate=6;combat=5" var/adminlog = null -/obj/item/weapon/bombcore/ex_act(severity) //Little boom can chain a big boom +/obj/item/weapon/bombcore/ex_act(severity, specialty) //Little boom can chain a big boom src.detonate() /obj/item/weapon/bombcore/proc/detonate() diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index f3d1796d3a2..bfb60668ac4 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -65,7 +65,7 @@ // Drop all the component stuff if(component_parts) - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 17cfec9e569..d6e177569c5 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -386,6 +386,7 @@ else user << "This station cant hold more information, try to use better parts." if(default_deconstruction_screwdriver(user, "controller-o", "controller", W)) + update_icon() return if(exchange_parts(user, W)) @@ -430,10 +431,9 @@ /obj/machinery/teleport/station/power_change() ..() - if(stat & NOPOWER) - update_icon() - if(teleporter_hub) - teleporter_hub.update_icon() + update_icon() + if(teleporter_hub) + teleporter_hub.update_icon() /obj/machinery/teleport/station/update_icon() if(panel_open) diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index f178b810d39..3cb48b9984e 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -235,8 +235,7 @@ A.current = T A.yo = U.y - T.y A.xo = U.x - T.x - spawn( 0 ) - A.process() + A.fire() return @@ -292,7 +291,7 @@ power_change() ..() -/obj/machinery/turret/ex_act(severity) +/obj/machinery/turret/ex_act(severity, specialty) if(severity < 3) src.die() @@ -311,6 +310,7 @@ /obj/machinery/turret/attack_animal(mob/living/simple_animal/M as mob) M.changeNext_move(CLICK_CD_MELEE) + M.do_attack_animation(src) if(M.melee_damage_upper == 0) return if(!(stat & BROKEN)) visible_message("[M] [M.attacktext] [src]!") @@ -328,9 +328,10 @@ /obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob) M.changeNext_move(CLICK_CD_MELEE) + M.do_attack_animation(src) if(!(stat & BROKEN)) playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("[] has slashed at []!", M, src) + visible_message("[M] has slashed at [src]!") src.health -= 15 if (src.health <= 0) src.die() @@ -360,7 +361,7 @@ ..() take_damage(0) //check your health -/obj/machinery/gun_turret/ex_act(severity) +/obj/machinery/gun_turret/ex_act(severity, specialty) switch(severity) if(1) die() @@ -411,9 +412,10 @@ return attack_hand(user) -/obj/machinery/gun_turret/attack_alien(mob/user as mob) +/obj/machinery/gun_turret/attack_alien(mob/living/user as mob) user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] slashes at [src]", "You slash at [src]") + user.do_attack_animation(src) + user.visible_message("[user] slashes at [src]", "You slash at [src]") take_damage(15) return @@ -482,8 +484,7 @@ A.current = curloc A.yo = targloc.y - curloc.y A.xo = targloc.x - curloc.x - spawn(0) - A.process() + A.fire() return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 70058da3def..71536af209e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -77,19 +77,11 @@ for(var/obj/item/weapon/vending_refill/VR in component_parts) refill_inventory(VR, product_records) -/obj/machinery/vending/ex_act(severity) - switch(severity) - if(1.0) - qdel(src) - return - if(2.0) - if(prob(50)) - qdel(src) - return - if(3.0) - if(prob(25)) - malfunction() - +/obj/machinery/vending/ex_act(severity, specialty) + ..() + if(!gc_destroyed) + if(prob(25)) + malfunction() /obj/machinery/vending/blob_act() if(prob(75)) @@ -216,24 +208,15 @@ /obj/machinery/vending/attack_hand(mob/user) - if(stat & (BROKEN|NOPOWER)) - return - user.set_machine(src) - - if(seconds_electrified != 0) - if(shock(user, 100)) + var/dat = "" + if(panel_open) + dat += wires() + if(product_slogans != "") + dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle" + else + if(stat & (BROKEN|NOPOWER)) return - var/dat = "" - - if(premium.len > 0) - dat += "Coin slot: " - if (coin) - dat += "[coin] Remove" - else - dat += "No coin Remove" - - if(!panel_open)//Vending machines do not dispense items when they are unscrewed dat += "
Select an item
" dat += ""
if(product_records.len == 0)
@@ -258,12 +241,16 @@
dat += ""
dat += ""
dat += "
"
-
- if(panel_open)
- dat += wires()
-
- if(product_slogans != "")
- dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle"
+ if(premium.len > 0)
+ dat += "Coin slot: "
+ if (coin)
+ dat += "[coin] Remove"
+ else
+ dat += "No coin Remove"
+ user.set_machine(src)
+ if(seconds_electrified && !(stat & NOPOWER))
+ if(shock(user, 100))
+ return
//user << browse(dat, "window=vending")
//onclose(user, "")
@@ -549,7 +536,7 @@
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
/obj/machinery/vending/coffee
- name = "hot drinks machine"
+ name = "\improper Solar's Best Hot Drinks"
desc = "A vending machine which dispenses hot drinks."
product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
icon_state = "coffee"
@@ -642,15 +629,22 @@
/obj/machinery/vending/cigarette
- name = "cigarette machine" //OCD had to be uppercase to look nice with the new formating
+ name = "\improper ShadyCigs Deluxe"
desc = "If you want to get cancer, might as well do it in style"
product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!"
product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
vend_delay = 34
icon_state = "cigs"
- products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/storage/fancy/rollingpapers = 5)
+ products = list(/obj/item/weapon/storage/fancy/cigarettes = 5,
+ /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3,
+ /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2,
+ /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3,
+ /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1,
+ /obj/item/weapon/storage/box/matches = 10,
+ /obj/item/weapon/lighter/random = 4,
+ /obj/item/weapon/storage/fancy/rollingpapers = 5)
contraband = list(/obj/item/weapon/lighter/zippo = 4)
- premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2)
+ premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 1)
refill_canister = /obj/item/weapon/vending_refill/cigarette
@@ -773,10 +767,9 @@
/obj/item/clothing/head/helmet/gladiator = 1,/obj/item/clothing/under/gimmick/rank/captain/suit = 1,/obj/item/clothing/head/flatcap = 1,
/obj/item/clothing/suit/labcoat/mad = 1,/obj/item/clothing/glasses/gglasses = 1,/obj/item/clothing/shoes/jackboots = 1,
/obj/item/clothing/under/schoolgirl = 1,/obj/item/clothing/head/kitty = 1,/obj/item/clothing/under/blackskirt = 1,/obj/item/clothing/head/beret = 1,
- /obj/item/clothing/tie/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/head/cueball = 1,
- /obj/item/clothing/under/scratch = 1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/tie/waistcoat = 1,
+ /obj/item/clothing/tie/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/tie/waistcoat = 1,
/obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowler = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1,
- /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,
+ /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,/obj/item/clothing/mask/gas/plaguedoctor = 1,
/obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,/obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1,
/obj/item/clothing/under/pirate = 1,/obj/item/clothing/suit/pirate = 1,/obj/item/clothing/head/pirate = 1,/obj/item/clothing/head/bandana = 1,
/obj/item/clothing/head/bandana = 1,/obj/item/clothing/under/soviet = 1,/obj/item/clothing/head/ushanka = 1,/obj/item/clothing/suit/imperium_monk = 1,
@@ -785,8 +778,8 @@
/obj/item/clothing/suit/wizrobe/fake = 1,/obj/item/clothing/head/wizard/fake = 1,/obj/item/weapon/staff = 3,/obj/item/clothing/mask/gas/sexyclown = 1,
/obj/item/clothing/under/sexyclown = 1,/obj/item/clothing/mask/gas/sexymime = 1,/obj/item/clothing/under/sexymime = 1,/obj/item/clothing/suit/apron/overalls = 1,
/obj/item/clothing/head/rabbitears =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/head/sombrero/green = 1, /obj/item/clothing/suit/poncho = 1,
- /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1) //Pretty much everything that had a chance to spawn.
- contraband = list(/obj/item/clothing/suit/cardborg = 1,/obj/item/clothing/head/cardborg = 1, /obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1)
+ /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, /obj/item/clothing/tie/blue = 1, /obj/item/clothing/tie/red = 1, /obj/item/clothing/tie/black = 1, /obj/item/clothing/tie/horrible = 1)
+ contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1)
premium = list(/obj/item/clothing/suit/hgpirate = 1, /obj/item/clothing/head/hgpiratecap = 1, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1)
refill_canister = /obj/item/weapon/vending_refill/autodrobe
@@ -801,7 +794,7 @@
component_parts += new /obj/item/weapon/vending_refill/autodrobe(0)
/obj/machinery/vending/dinnerware
- name = "dinnerware"
+ name = "\improper Plasteel Chef's Dinnerware Vendor"
desc = "A kitchen and restaurant equipment vendor"
product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
icon_state = "dinnerware"
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index fcd17eea035..1a45add5d88 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -28,6 +28,9 @@
set category = "Object"
set src in oview(1)
+ if(usr.stat || usr.restrained() || !usr.canmove)
+ return
+
if( state != 4 )
usr << "The washing machine cannot run in this state."
return
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index 65b49cca717..843ff80a7c9 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -1,98 +1,9 @@
/obj/mecha/combat
force = 30
- var/melee_cooldown = 10
- var/melee_can_hit = 1
- var/list/destroyable_obj = list(/obj/mecha, /obj/structure/window, /obj/structure/grille, /turf/simulated/wall)
internal_damage_threshold = 50
- maint_access = 0
damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8)
var/am = "d3c2fbcadca903a41161ccc9df9cf948"
-/obj/mecha/combat/melee_action(target as obj|mob|turf)
- if(internal_damage&MECHA_INT_CONTROL_LOST)
- target = safepick(oview(1,src))
- if(!melee_can_hit || !istype(target, /atom)) return
- if(istype(target, /mob/living))
- var/mob/living/M = target
- if(src.occupant.a_intent == "harm")
- if(damtype == "brute")
- step_away(M,src,15)
- if(istype(target, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = target
- var/obj/item/organ/limb/temp = H.get_organ(pick("chest", "chest", "chest", "head"))
- if(temp)
- var/update = 0
- switch(damtype)
- if("brute")
- H.Paralyse(1)
- update |= temp.take_damage(rand(force/2, force), 0)
- playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
- if("fire")
- update |= temp.take_damage(0, rand(force/2, force))
- playsound(src, 'sound/items/Welder.ogg', 50, 1)
- if("tox")
- playsound(src, 'sound/effects/spray2.ogg', 50, 1)
- if(H.reagents)
- if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
- H.reagents.add_reagent("cryptobiolin", force/2)
- if(H.reagents.get_reagent_amount("toxin") + force < force*2)
- H.reagents.add_reagent("toxin", force/2.5)
- else
- return
- if(update) H.update_damage_overlays(0)
- H.updatehealth()
-
- else
- switch(damtype)
- if("brute")
- M.Paralyse(1)
- M.take_overall_damage(rand(force/2, force))
- playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
- if("fire")
- M.take_overall_damage(0, rand(force/2, force))
- playsound(src, 'sound/items/Welder.ogg', 50, 1)
- if("tox")
- playsound(src, 'sound/effects/spray2.ogg', 50, 1)
- if(M.reagents)
- if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
- M.reagents.add_reagent("cryptobiolin", force/2)
- if(M.reagents.get_reagent_amount("toxin") + force < force*2)
- M.reagents.add_reagent("toxin", force/2.5)
- else
- return
- M.updatehealth()
- src.occupant_message("You hit [target].")
- src.visible_message("[src.name] hits [target].")
- add_logs(occupant, M, "attacked", object=src, addition="(INTENT: [uppertext(occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
- else
- step_away(M,src)
- src.occupant_message("You push [target] out of the way.")
- src.visible_message("[src] pushes [target] out of the way.")
-
- melee_can_hit = 0
- if(do_after(melee_cooldown))
- melee_can_hit = 1
- return
-
- else
- if(damtype == "brute")
- for(var/target_type in src.destroyable_obj)
- if(istype(target, target_type) && hascall(target, "attackby"))
- src.occupant_message("You hit [target].")
- src.visible_message("[src.name] hits [target]")
- if(!istype(target, /turf/simulated/wall))
- target:attackby(src,src.occupant)
- else if(prob(5))
- target:dismantle_wall(1)
- src.occupant_message("You smash through the wall.")
- src.visible_message("[src.name] smashes through the wall")
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
- melee_can_hit = 0
- if(do_after(melee_cooldown))
- melee_can_hit = 1
- break
- return
-
/obj/mecha/combat/moved_inside(var/mob/living/carbon/human/H as mob)
if(..())
if(H.client)
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index 66a5036a9a7..3a49c11433a 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -38,7 +38,7 @@
set name = "Toggle defence mode"
set src = usr.loc
set popup_menu = 0
- if(usr!=src.occupant)
+ if(!can_use(usr))
return
defence = !defence
if(defence)
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 79ae3333d63..722b576f134 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -56,7 +56,7 @@
set name = "Toggle leg actuators overload"
set src = usr.loc
set popup_menu = 0
- if(usr!=src.occupant)
+ if(!can_use(usr))
return
if(overload)
overload = 0
diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm
index 85ba2351add..7c3e0130a29 100644
--- a/code/game/mecha/combat/honker.dm
+++ b/code/game/mecha/combat/honker.dm
@@ -26,14 +26,6 @@
return
*/
-
-/obj/mecha/combat/honker/melee_action(target)
- if(!melee_can_hit)
- return
- else if(istype(target, /mob))
- step_away(target,src,15)
- return
-
/obj/mecha/combat/honker/get_stats_part()
var/integrity = health/initial(health)*100
var/cell_charge = get_charge()
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index a0010e1a893..52818f4c72a 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -94,50 +94,21 @@
return
/obj/mecha/combat/marauder/relaymove(mob/user,direction)
- if(user != src.occupant) //While not "realistic", this piece is player friendly.
- user.loc = get_turf(src)
- user << "You climb out from [src]"
- return 0
- if(!can_move)
- return 0
if(zoom)
if(world.time - last_message > 20)
src.occupant_message("Unable to move while in zoom mode.")
last_message = world.time
return 0
- if(connected_port)
- if(world.time - last_message > 20)
- src.occupant_message("Unable to move while connected to the air system port")
- last_message = world.time
- return 0
- if(!thrusters && pr_inertial_movement && src.pr_inertial_movement.active())
- return 0
- if(state || !has_charge(step_energy_drain))
- return 0
- var/tmp_step_in = step_in
- var/tmp_step_energy_drain = step_energy_drain
- var/move_result = 0
- if(internal_damage&MECHA_INT_CONTROL_LOST)
- move_result = mechsteprand()
- else if(src.dir!=direction)
- move_result = mechturn(direction)
- else
- move_result = mechstep(direction)
- if(move_result)
- if(istype(src.loc, /turf/space))
- if(!src.check_for_support() && pr_inertial_movement)
- src.pr_inertial_movement.start(list(src,direction))
- if(thrusters)
- src.pr_inertial_movement.set_process_args(list(src,direction))
- tmp_step_energy_drain = step_energy_drain*2
+ return ..()
- can_move = 0
- spawn(tmp_step_in) can_move = 1
- use_power(tmp_step_energy_drain)
+
+/obj/mecha/combat/marauder/Process_Spacemove(var/movement_dir = 0)
+ if(..())
+ return 1
+ if(thrusters && movement_dir && use_power(step_energy_drain))
return 1
return 0
-
/obj/mecha/combat/marauder/verb/toggle_thrusters()
set category = "Exosuit Interface"
set name = "Toggle thrusters"
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 4e9b8583277..22f43c9d934 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -22,7 +22,7 @@
/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(target=1)
sleep(equip_cooldown)
set_ready_state(1)
- if(target && chassis)
+ if(target && chassis && chassis.occupant)
return 1
return 0
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index ec759eae359..e646edb306d 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -488,9 +488,9 @@
/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(var/turf/new_turf)
if(istype(new_turf, /turf/simulated/floor))
var/turf/simulated/floor/T = new_turf
- if(!T.is_plating())
+ if(!istype(T, /turf/simulated/floor/plating))
if(!T.broken && !T.burnt)
- new T.floor_tile.type(T)
+ new T.floor_tile(T)
T.make_plating()
return !new_turf.intact
diff --git a/code/game/mecha/equipment/tools/unused_tools.dm b/code/game/mecha/equipment/tools/unused_tools.dm
deleted file mode 100644
index 441fbac0e5f..00000000000
--- a/code/game/mecha/equipment/tools/unused_tools.dm
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
-
-/****** Do not tick this file in without looking over this code first ******/
-
-
-
-
-
-//NEEDS SPRITE! (When this gets ticked in search for 'TODO MECHA JETPACK SPRITE MISSING' through code to uncomment the place where it's missing.)
-/obj/item/mecha_parts/mecha_equipment/jetpack
- name = "jetpack"
- desc = "Using directed ion bursts and cunning solar wind reflection technique, this device enables controlled space flight."
- icon_state = "mecha_equip"
- equip_cooldown = 5
- energy_drain = 50
- var/wait = 0
- var/datum/effect/effect/system/ion_trail_follow/ion_trail
-
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/can_attach(obj/mecha/M as obj)
- if(!(locate(src.type) in M.equipment) && !M.proc_res["dyndomove"])
- return ..()
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/detach()
- ..()
- chassis.proc_res["dyndomove"] = null
- return
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/attach(obj/mecha/M as obj)
- ..()
- if(!ion_trail)
- ion_trail = new
- ion_trail.set_up(chassis)
- return
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/proc/toggle()
- if(!chassis)
- return
- !equip_ready? turn_off() : turn_on()
- return equip_ready
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/proc/turn_on()
- set_ready_state(0)
- chassis.proc_res["dyndomove"] = src
- ion_trail.start()
- occupant_message("Activated")
- log_message("Activated")
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/proc/turn_off()
- set_ready_state(1)
- chassis.proc_res["dyndomove"] = null
- ion_trail.stop()
- occupant_message("Deactivated")
- log_message("Deactivated")
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/proc/dyndomove(direction)
- if(!action_checks())
- return chassis.dyndomove(direction)
- var/move_result = 0
- if(chassis.hasInternalDamage(MECHA_INT_CONTROL_LOST))
- move_result = step_rand(chassis)
- else if(chassis.dir!=direction)
- chassis.dir = direction
- move_result = 1
- else
- move_result = step(chassis,direction)
- if(chassis.occupant)
- for(var/obj/effect/speech_bubble/B in range(1, chassis))
- if(B.parent == chassis.occupant)
- B.loc = chassis.loc
- if(move_result)
- wait = 1
- chassis.use_power(energy_drain)
- if(!chassis.pr_inertial_movement.active())
- chassis.pr_inertial_movement.start(list(chassis,direction))
- else
- chassis.pr_inertial_movement.set_process_args(list(chassis,direction))
- do_after_cooldown()
- return 1
- return 0
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/action_checks()
- if(equip_ready || wait)
- return 0
- if(energy_drain && !chassis.has_charge(energy_drain))
- return 0
- if(crit_fail)
- return 0
- if(chassis.check_for_support())
- return 0
- return 1
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/get_equip_info()
- if(!chassis) return
- return "* [src.name] \[Toggle\]"
-
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/Topic(href,href_list)
- ..()
- if(href_list["toggle"])
- toggle()
-
-/obj/item/mecha_parts/mecha_equipment/jetpack/do_after_cooldown()
- sleep(equip_cooldown)
- wait = 0
- return 1
-
-
-/obj/item/mecha_parts/mecha_equipment/defence_shocker
- name = "exosuit defence shocker"
- desc = ""
- icon_state = "mecha_teleport"
- equip_cooldown = 10
- energy_drain = 100
- range = RANGED
- var/shock_damage = 15
- var/active
-
-/obj/item/mecha_parts/mecha_equipment/defence_shocker/can_attach(obj/mecha/M as obj)
- if(..())
- if(!istype(M, /obj/mecha/combat/honker))
- if(!M.proc_res["dynattackby"] && !M.proc_res["dynattackhand"] && !M.proc_res["dynattackalien"])
- return 1
- return 0
-
-/obj/item/mecha_parts/mecha_equipment/defence_shocker/attach(obj/mecha/M as obj)
- ..()
- chassis.proc_res["dynattackby"] = src
- return
-
-/obj/item/mecha_parts/mecha_equipment/defence_shocker/proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob)
- if(!action_checks(user) || !active)
- return
- user.electrocute_act(shock_damage, src)
- return chassis.dynattackby(W,user)
-
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index d7a893a37b3..3d7a27852a7 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -27,7 +27,7 @@
A.current = curloc
A.yo = targloc.y - curloc.y
A.xo = targloc.x - curloc.x
- A.process()
+ A.fire()
chassis.log_message("Fired from [src.name], targeting [target].")
do_after_cooldown()
return 1
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 23417f8f67b..53e3d9ed383 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -3,6 +3,8 @@
icon = 'icons/turf/floors.dmi' // That are set in stone to check the west turf for recharge port
icon_state = "recharge_floor" // Some people just want to watch the world burn i guess
+/turf/simulated/floor/mech_bay_recharge_floor/break_tile()
+ src.ChangeTurf(/turf/simulated/floor/plating)
/turf/simulated/floor/mech_bay_recharge_floor/airless
icon_state = "recharge_floor_asteroid"
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 48222dd1db1..51124e20590 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -1,7 +1,3 @@
-/////////////////////////////
-///// Part Fabricator ///////
-/////////////////////////////
-
/obj/machinery/mecha_part_fabricator
icon = 'icons/obj/robotics.dmi'
icon_state = "fab-idle"
@@ -18,129 +14,37 @@
var/time_coeff_tech = 1
var/resource_coeff_tech = 1
var/list/resources = list(
- "metal"=0,
- "glass"=0,
- "bananium"=0,
- "diamond"=0,
- "gold"=0,
- "plasma"=0,
- "silver"=0,
- "uranium"=0
- )
+ "$metal"=0,
+ "$glass"=0,
+ "$bananium"=0,
+ "$diamond"=0,
+ "$gold"=0,
+ "$plasma"=0,
+ "$silver"=0,
+ "$uranium"=0
+ )
var/res_max_amount = 200000
var/datum/research/files
var/id
var/sync = 0
var/part_set
- var/obj/being_built
+ var/datum/design/being_built
var/list/queue = list()
var/processing_queue = 0
var/screen = "main"
var/temp
- var/list/part_sets = list( //set names must be unique
- "Cyborg"=list(
- /obj/item/robot_parts/robot_suit,
- /obj/item/robot_parts/chest,
- /obj/item/robot_parts/head,
- /obj/item/robot_parts/l_arm,
- /obj/item/robot_parts/r_arm,
- /obj/item/robot_parts/l_leg,
- /obj/item/robot_parts/r_leg
- ),
- "Ripley"=list(
- /obj/item/mecha_parts/chassis/ripley,
- /obj/item/mecha_parts/chassis/firefighter,
- /obj/item/mecha_parts/part/ripley_torso,
- /obj/item/mecha_parts/part/ripley_left_arm,
- /obj/item/mecha_parts/part/ripley_right_arm,
- /obj/item/mecha_parts/part/ripley_left_leg,
- /obj/item/mecha_parts/part/ripley_right_leg
- ),
- "Odysseus"=list(
- /obj/item/mecha_parts/chassis/odysseus,
- /obj/item/mecha_parts/part/odysseus_torso,
- /obj/item/mecha_parts/part/odysseus_head,
- /obj/item/mecha_parts/part/odysseus_left_arm,
- /obj/item/mecha_parts/part/odysseus_right_arm,
- /obj/item/mecha_parts/part/odysseus_left_leg,
- /obj/item/mecha_parts/part/odysseus_right_leg
- ),
-
- "Gygax"=list(
- /obj/item/mecha_parts/chassis/gygax,
- /obj/item/mecha_parts/part/gygax_torso,
- /obj/item/mecha_parts/part/gygax_head,
- /obj/item/mecha_parts/part/gygax_left_arm,
- /obj/item/mecha_parts/part/gygax_right_arm,
- /obj/item/mecha_parts/part/gygax_left_leg,
- /obj/item/mecha_parts/part/gygax_right_leg,
- /obj/item/mecha_parts/part/gygax_armor
- ),
- "Durand"=list(
- /obj/item/mecha_parts/chassis/durand,
- /obj/item/mecha_parts/part/durand_torso,
- /obj/item/mecha_parts/part/durand_head,
- /obj/item/mecha_parts/part/durand_left_arm,
- /obj/item/mecha_parts/part/durand_right_arm,
- /obj/item/mecha_parts/part/durand_left_leg,
- /obj/item/mecha_parts/part/durand_right_leg,
- /obj/item/mecha_parts/part/durand_armor
- ),
- "H.O.N.K"=list(
- /obj/item/mecha_parts/chassis/honker,
- /obj/item/mecha_parts/part/honker_torso,
- /obj/item/mecha_parts/part/honker_head,
- /obj/item/mecha_parts/part/honker_left_arm,
- /obj/item/mecha_parts/part/honker_right_arm,
- /obj/item/mecha_parts/part/honker_left_leg,
- /obj/item/mecha_parts/part/honker_right_leg
- ),
- "Phazon"=list(
- /obj/item/mecha_parts/chassis/phazon,
- /obj/item/mecha_parts/part/phazon_torso,
- /obj/item/mecha_parts/part/phazon_head,
- /obj/item/mecha_parts/part/phazon_left_arm,
- /obj/item/mecha_parts/part/phazon_right_arm,
- /obj/item/mecha_parts/part/phazon_left_leg,
- /obj/item/mecha_parts/part/phazon_right_leg,
- /obj/item/mecha_parts/part/phazon_armor
- ),
- "Exosuit Equipment"=list(
- /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,
- /obj/item/mecha_parts/mecha_equipment/tool/drill,
- /obj/item/mecha_parts/mecha_equipment/tool/extinguisher,
- /obj/item/mecha_parts/mecha_equipment/tool/cable_layer,
- /obj/item/mecha_parts/mecha_equipment/tool/sleeper,
- /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,
- /obj/item/mecha_parts/mecha_equipment/repair_droid,
- /obj/item/mecha_parts/mecha_equipment/generator,
- ///obj/item/mecha_parts/mecha_equipment/jetpack, //TODO MECHA JETPACK SPRITE MISSING
- /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
- /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg,
- /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar,
- /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar,
- /obj/item/mecha_parts/mecha_equipment/weapon/honker
- ),
-
- "Cyborg Upgrade Modules" = list(
- /obj/item/borg/upgrade/reset,
- /obj/item/borg/upgrade/rename,
- /obj/item/borg/upgrade/restart,
- /obj/item/borg/upgrade/vtec,
- /obj/item/borg/upgrade/tasercooler,
- /obj/item/borg/upgrade/jetpack
- ),
-
-
-
-
-
-
- "Misc"=list(/obj/item/mecha_parts/mecha_tracking)
- )
-
-
-
+ var/list/part_sets = list(
+ "Cyborg",
+ "Ripley",
+ "Odysseus",
+ "Gygax",
+ "Durand",
+ "H.O.N.K",
+ "Phazon",
+ "Exosuit Equipment",
+ "Cyborg Upgrade Modules",
+ "Misc"
+ )
/obj/machinery/mecha_part_fabricator/New()
..()
@@ -152,19 +56,7 @@
component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
RefreshParts()
-
- // part_sets["Cyborg Upgrade Modules"] = typesof(/obj/item/borg/upgrade/) - /obj/item/borg/upgrade/ // Eh. This does it dymaically, but to support having the items referenced otherwhere in the code but not being constructable, going to do it manaully.
-
- for(var/part_set in part_sets)
- convert_part_set(part_set)
files = new /datum/research(src) //Setup the research data holder.
- /*
- if(!id)
- for(var/obj/machinery/r_n_d/server/centcom/S in world)
- S.initialize()
- break
- */
- return
/obj/machinery/mecha_part_fabricator/RefreshParts()
var/T = 0
@@ -187,25 +79,6 @@
if(time_coeff!=diff)
time_coeff = diff
-/obj/machinery/mecha_part_fabricator/Destroy()
- for(var/atom/A in src)
- qdel(A)
- ..()
- return
-
-/obj/machinery/mecha_part_fabricator/proc/operation_allowed(mob/M)
- if(isrobot(M) || isAI(M))
- return 1
- if(!istype(req_access) || !req_access.len)
- return 1
- else if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- for(var/ID in list(H.get_active_hand(), H.wear_id, H.belt))
- if(src.check_access(ID))
- return 1
- M << "You don't have the required permissions to use \the [src]!"
- return 0
-
/obj/machinery/mecha_part_fabricator/check_access(obj/item/weapon/card/id/I)
if(istype(I, /obj/item/device/pda))
var/obj/item/device/pda/pda = I
@@ -218,119 +91,55 @@
return 1
/obj/machinery/mecha_part_fabricator/proc/emag()
- sleep()
switch(emagged)
if(0)
emagged = 0.5
- src.visible_message("\icon[src] \The [src] beeps: \"DB error \[Code 0x00F1\]\"")
+ visible_message("\icon[src] \The [src] beeps: \"DB error \[Code 0x00F1\]\"")
sleep(10)
- src.visible_message("\icon[src] \The [src] beeps: \"Attempting auto-repair\"")
+ visible_message("\icon[src] \The [src] beeps: \"Attempting auto-repair\"")
sleep(15)
- src.visible_message("\icon[src] \The [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"")
+ visible_message("\icon[src] \The [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"")
sleep(30)
- src.visible_message("\icon[src] \The [src] beeps: \"User DB truncated. Please contact your Nanotrasen system operator for future assistance.\"")
+ visible_message("\icon[src] \The [src] beeps: \"User DB truncated. Please contact your Nanotrasen system operator for future assistance.\"")
req_access = null
emagged = 1
if(0.5)
- src.visible_message("\icon[src] \The [src] beeps: \"DB not responding \[Code 0x0003\]...\"")
+ visible_message("\icon[src] \The [src] beeps: \"DB not responding \[Code 0x0003\]...\"")
if(1)
- src.visible_message("\icon[src] \The [src] beeps: \"No records in User DB\"")
+ visible_message("\icon[src] \The [src] beeps: \"No records in User DB\"")
return
-
-/obj/machinery/mecha_part_fabricator/proc/convert_part_set(set_name as text)
- var/list/parts = part_sets[set_name]
- if(istype(parts, /list))
- for(var/i=1;i<=parts.len;i++)
- var/path = parts[i]
- var/part = new path(src)
- if(part)
- parts[i] = part
- //debug below
- if(!istype(parts[i],/obj/item)) return 0
- return
-
-
-/obj/machinery/mecha_part_fabricator/proc/add_part_set(set_name as text,parts=null)
- if(set_name in part_sets)//attempt to create duplicate set
+/*
+/obj/machinery/mecha_part_fabricator/proc/add_part_to_set(set_name, part)
+ if(!part)
return 0
- if(isnull(parts))
+ if(!set_name in part_sets)//attempt to create duplicate set
part_sets[set_name] = list()
- else
- part_sets[set_name] = parts
- convert_part_set(set_name)
+ part_sets[set_name] += part
return 1
-
-/obj/machinery/mecha_part_fabricator/proc/add_part_to_set(set_name as text,part)
- if(!part) return 0
- src.add_part_set(set_name)//if no "set_name" set exists, create
- var/list/part_set = part_sets[set_name]
- var/atom/apart
- if(ispath(part))
- apart = new part(src)
- else
- apart = part
- if(!istype(apart)) return 0
- for(var/obj/O in part_set)
- if(O.type == apart.type)
- qdel(apart)
- return 0
- part_set[++part_set.len] = apart
- return 1
-
-/obj/machinery/mecha_part_fabricator/proc/remove_part_set(set_name as text)
- for(var/i=1,i<=part_sets.len,i++)
- if(part_sets[i]==set_name)
- part_sets.Cut(i,++i)
- return
-/*
- proc/sanity_check()
- for(var/p in resources)
- var/index = resources.Find(p)
- index = resources.Find(p, ++index)
- if(index) //duplicate resource
- world << "Duplicate resource definition for [src](\ref[src])"
- return 0
- for(var/set_name in part_sets)
- var/index = part_sets.Find(set_name)
- index = part_sets.Find(set_name, ++index)
- if(index) //duplicate part set
- world << "Duplicate part set definition for [src](\ref[src])"
- return 0
- return 1
*/
-/*
- New()
- ..()
- src.add_part_to_set("Test",list("result"="/obj/item/mecha_parts/part/gygax_armor","time"=600,"metal"=75000,"diamond"=10000))
- src.add_part_to_set("Test",list("result"="/obj/item/mecha_parts/part/ripley_left_arm","time"=200,"metal"=25000))
- src.remove_part_set("Gygax")
- return
-*/
-
/obj/machinery/mecha_part_fabricator/proc/output_parts_list(set_name)
var/output = ""
- var/list/part_set = listgetindex(part_sets, set_name)
- if(istype(part_set))
- for(var/obj/item/part in part_set)
- var/resources_available = check_resources(part)
- output += ""
+ for(var/datum/design/D in files.known_designs)
+ if(D.build_type&16)
+ if(D.category != set_name)
+ continue
+ var/resources_available = check_resources(D)
+ output += ""
return output
-/obj/machinery/mecha_part_fabricator/proc/output_part_info(var/obj/item/part)
- var/output = "[part.name] (Cost: [output_part_cost(part)]) [get_construction_time_w_coeff(part)/10]sec"
+/obj/machinery/mecha_part_fabricator/proc/output_part_info(datum/design/D)
+ var/obj/part = D.build_path
+ var/output = "[initial(part.name)] (Cost: [output_part_cost(D)]) [get_construction_time_w_coeff(part)/10]sec"
return output
-/obj/machinery/mecha_part_fabricator/proc/output_part_cost(var/obj/item/part)
+/obj/machinery/mecha_part_fabricator/proc/output_part_cost(datum/design/D)
var/i = 0
var/output
- if(hasvar(part, "construction_time") && hasvar(part, "construction_cost"))//The most efficient way to go about this. Not all objects have these vars, but if they don't then they CANNOT be made by the mech fab. Doing it this way reduces a major amount of typecasting and switches, while cutting down maintenece for them as well -Sieve
- for(var/c in part:construction_cost)//The check should ensure that anything without the var doesn't make it to this point
- if(c in resources)
- output += "[i?" | ":null][get_resource_cost_w_coeff(part,c)] [c]"
- i++
- return output
- else
- return 0
+ for(var/c in D.materials)
+ if(c in resources)
+ output += "[i?" | ":null][get_resource_cost_w_coeff(D,c)] [c]"
+ i++
+ return output
/obj/machinery/mecha_part_fabricator/proc/output_available_resources()
var/output
@@ -342,70 +151,62 @@
output += "" return output -/obj/machinery/mecha_part_fabricator/proc/remove_resources(var/obj/item/part) -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(hasvar(part, "construction_time") && hasvar(part, "construction_cost")) - for(var/resource in part:construction_cost) - if(resource in src.resources) - src.resources[resource] -= get_resource_cost_w_coeff(part,resource) - else - return +/obj/machinery/mecha_part_fabricator/proc/remove_resources(datum/design/D) + for(var/resource in D.materials) + if(resource in resources) + resources[resource] -= get_resource_cost_w_coeff(D,resource) -/obj/machinery/mecha_part_fabricator/proc/check_resources(var/obj/item/part) -// if(istype(part, /obj/item/robot_parts) || istype(part, /obj/item/mecha_parts) || istype(part,/obj/item/borg/upgrade)) -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(hasvar(part, "construction_time") && hasvar(part, "construction_cost")) - for(var/resource in part:construction_cost) - if(resource in src.resources) - if(src.resources[resource] < get_resource_cost_w_coeff(part,resource)) - return 0 - return 1 - else - return 0 +/obj/item/mechavars //until these values are extracted from the design datum (most objects on the mech fabricators don't have these), this is necessary, to make the initial() work. + var/construction_time -/obj/machinery/mecha_part_fabricator/proc/build_part(var/obj/item/part) - if(!part) return +/obj/machinery/mecha_part_fabricator/proc/check_resources(datum/design/D) + for(var/R in D.materials) + if(R in resources) + if(resources[R] < get_resource_cost_w_coeff(D, R)) + return 0 + else + return 0 + return 1 - // critical exploit prevention, do not remove unless you replace it - if( (part.loc != src) || !(hasvar(part, "construction_time")) || !(hasvar(part, "construction_cost")) ) // these 3 are the current requirements for an object being buildable by the mech_fabricator - return - - src.being_built = new part.type(src) - src.desc = "It's building \a [src.being_built]." - src.remove_resources(part) - part.m_amt = get_resource_cost_w_coeff(part,"metal") - part.g_amt = get_resource_cost_w_coeff(part,"glass") - src.overlays += "fab-active" - src.use_power = 2 - src.updateUsrDialog() +/obj/machinery/mecha_part_fabricator/proc/build_part(datum/design/D) + var/obj/part = D.build_path + being_built = D + desc = "It's building \a [initial(part.name)]." + remove_resources(D) + overlays += "fab-active" + use_power = 2 + updateUsrDialog() sleep(get_construction_time_w_coeff(part)) - src.use_power = 1 - src.overlays -= "fab-active" - src.desc = initial(src.desc) - if(being_built) - src.being_built.loc = get_step(src,SOUTH) - src.visible_message("\icon[src] \The [src] beeps, \"\The [src.being_built] is complete.\"") - src.being_built = null - src.updateUsrDialog() + use_power = 1 + overlays -= "fab-active" + desc = initial(desc) + + var/obj/item/I = new D.build_path + I.loc = get_step(src,SOUTH) + I.m_amt = get_resource_cost_w_coeff(D,"$metal") + I.g_amt = get_resource_cost_w_coeff(D,"$glass") + visible_message("\icon[src] \The [src] beeps, \"\The [I] is complete.\"") + being_built = null + + updateUsrDialog() return 1 /obj/machinery/mecha_part_fabricator/proc/update_queue_on_page() - send_byjax(usr,"mecha_fabricator.browser","queue",src.list_queue()) + send_byjax(usr,"mecha_fabricator.browser","queue",list_queue()) return /obj/machinery/mecha_part_fabricator/proc/add_part_set_to_queue(set_name) if(set_name in part_sets) - var/list/part_set = part_sets[set_name] - if(islist(part_set)) - for(var/obj/item/part in part_set) - add_to_queue(part) - return + for(var/datum/design/D in files.known_designs) + if(D.build_type&16) + if(D.category == set_name) + add_to_queue(D) -/obj/machinery/mecha_part_fabricator/proc/add_to_queue(part) +/obj/machinery/mecha_part_fabricator/proc/add_to_queue(D) if(!istype(queue)) queue = list() - if(part) - queue[++queue.len] = part + if(D) + queue[++queue.len] = D return queue.len /obj/machinery/mecha_part_fabricator/proc/remove_from_queue(index) @@ -415,30 +216,26 @@ return 1 /obj/machinery/mecha_part_fabricator/proc/process_queue() - var/obj/item/part = listgetindex(src.queue, 1) - if(!part) + var/datum/design/D = queue[1] + if(!D) remove_from_queue(1) - if(src.queue.len) + if(queue.len) return process_queue() else return - if(!(hasvar(part, "construction_time")) || !(hasvar(part, "construction_cost")))//If it shouldn't be printed - remove_from_queue(1)//Take it out of the quene - return process_queue()//Then reprocess it temp = null - while(part) + while(D) if(stat&(NOPOWER|BROKEN)) return 0 - if(!check_resources(part)) - src.visible_message("\icon[src] \The [src] beeps, \"Not enough resources. Queue processing stopped.\"") + if(!check_resources(D)) + visible_message("\icon[src] \The [src] beeps, \"Not enough resources. Queue processing stopped.\"") temp = {"Not enough resources to build next part.
Try again | Return"} return 0 remove_from_queue(1) - build_part(part) - part = listgetindex(src.queue, 1) - src.visible_message("\icon[src] \The [src] beeps, \"Queue processing finished successfully.\"") - return 1 + build_part(D) + D = listgetindex(queue, 1) + visible_message("\icon[src] \The [src] beeps, \"Queue processing finished successfully.\"") /obj/machinery/mecha_part_fabricator/proc/list_queue() var/output = "Queue contains:" @@ -446,31 +243,29 @@ output += "
Nothing" else output += "
- "
- for(var/i=1;i<=queue.len;i++)
- var/obj/item/part = listgetindex(src.queue, i)
- if(istype(part))
- if(hasvar(part, "construction_time") && hasvar(part, "construction_cost"))
- output += "
" - temp += tech_output - temp += "Return" - src.updateUsrDialog() - if(i || tech_output) - src.visible_message("\icon[src] \The [src] beeps, \"Successfully synchronized with R&D server. New data processed.\"") - if(!silent && !found) + //var/i = convert_designs() aran + //var/tech_output = update_tech() + temp = "Processed equipment designs.
" + //temp += tech_output + temp += "Return" + updateUsrDialog() + //if(i || tech_output) + visible_message("\icon[src] \The [src] beeps, \"Successfully synchronized with R&D server.\"") + if(!found) temp = "Unable to connect to local R&D Database.
Please check your connections and try again.
Return" - src.updateUsrDialog() + updateUsrDialog() return -/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(var/obj/item/part as obj,var/resource as text, var/roundto=1) -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(hasvar(part, "construction_time") && hasvar(part, "construction_cost")) - var/list/L = part_sets["Misc"] - if(L.Find(part.type)) - return round(part:construction_cost[resource]*(resource_coeff/2)*resource_coeff_tech, roundto) //hacky scary skeletons send shivers down your spine - return round(part:construction_cost[resource]*resource_coeff*resource_coeff_tech, roundto) - else - return 0 +/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(datum/design/D, resource, roundto = 1) + return round(D.materials[resource]*resource_coeff*resource_coeff_tech, roundto) -/obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(var/obj/item/part as obj, var/roundto=1) -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(hasvar(part, "construction_time") && hasvar(part, "construction_cost")) - return round(part:construction_time*time_coeff*time_coeff_tech, roundto) - else - return 0 +/obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(P, roundto = 1) //aran + var/obj/item/mechavars/part = P + return round(initial(part.construction_time)*time_coeff*time_coeff_tech, roundto) /obj/machinery/mecha_part_fabricator/attack_hand(mob/user) if(!(..())) @@ -562,17 +339,16 @@ var/dat, left_part if (..()) return - if(!operation_allowed(user)) - return user.set_machine(src) var/turf/exit = get_step(src,SOUTH) if(exit.density) - src.visible_message("\icon[src] \The [src] beeps, \"Error! Part outlet is obstructed.\"") + visible_message("\icon[src] \The [src] beeps, \"Error! Part outlet is obstructed.\"") return if(temp) left_part = temp - else if(src.being_built) - left_part = {"Building [src.being_built.name].
+ else if(being_built) + var/obj/I = being_built.build_path + left_part = {"Building [initial(I.name)].
Please wait until completion..."} else switch(screen) @@ -586,7 +362,7 @@ left_part += "
Return" dat = {" -