" + else if(discoveredPlants[S.type]) // This species has already been sent to CentComm + var/potDiff = S.potency - discoveredPlants[S.type] // Compare it to the previous best + if(potDiff > 0) // This sample is better + discoveredPlants[S.type] = S.potency + centcom_message += "+[potDiff]: New sample of \"[capitalize(S.species)]\" is superior. Good work.
" + points += potDiff + else // This sample is worthless + centcom_message += "+0: New sample of \"[capitalize(S.species)]\" is not more potent than existing sample ([discoveredPlants[S.type]] potency).
" + else // This is a new discovery! + discoveredPlants[S.type] = S.potency + centcom_message += "+[S.rarity]: New species discovered: \"[capitalize(S.species)]\". Excellent work.
" + points += S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later + qdel(MA) if(plasma_count) centcom_message += "+[round(plasma_count/plasma_per_point)]: Received [plasma_count] units of exotic material.
" @@ -368,7 +387,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle // If it has multiple items, there's a 1% of each going missing... Not for secure crates or those large wooden ones, though. if(contains.len > 1 && prob(1) && !findtext(SP.containertype,"/secure/") && !findtext(SP.containertype,"/largecrate/")) slip.erroneous |= MANIFEST_ERROR_ITEM // This item was not included in the shipment! - del(B2) // Lost in space... or the loading dock. + qdel(B2) // Lost in space... or the loading dock. //manifest finalisation slip.info += "
" @@ -513,7 +532,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle /obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + user << " Access Denied." return if(..()) @@ -541,7 +560,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle /obj/machinery/computer/supplycomp/attackby(I as obj, user as mob) if(istype(I,/obj/item/weapon/card/emag) && !hacked) - user << "\blue Special supplies unlocked." + user << " Special supplies unlocked." hacked = 1 return else diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index 413759cc377..40eb5047c9a 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -1,81 +1,84 @@ -//TODO: rewrite and standardise all controller datums to the datum/controller type -//TODO: allow all controllers to be deleted for clean restarts (see WIP master controller stuff) - MC done - lighting done - -/client/proc/restart_controller(controller in list("Master","Failsafe","Lighting","Supply Shuttle")) - set category = "Debug" - set name = "Restart Controller" - set desc = "Restart one of the various periodic loop controllers for the game (be careful!)" - - if(!holder) return - usr = null - src = null - switch(controller) - if("Master") - new /datum/controller/game_controller() - master_controller.process() - feedback_add_details("admin_verb","RMC") - if("Failsafe") - new /datum/controller/failsafe() - feedback_add_details("admin_verb","RFailsafe") - if("Lighting") - new /datum/controller/lighting() - lighting_controller.process() - feedback_add_details("admin_verb","RLighting") - if("Supply Shuttle") - supply_shuttle.process() - feedback_add_details("admin_verb","RSupply") - message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.") - return - - -/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI", "Cameras", "Events")) - set category = "Debug" - set name = "Debug Controller" - set desc = "Debug the various periodic loop controllers for the game (be careful!)" - - if(!holder) return - switch(controller) - if("Master") - debug_variables(master_controller) - feedback_add_details("admin_verb","DMC") - if("Failsafe") - debug_variables(Failsafe) - feedback_add_details("admin_verb","DFailsafe") - if("Ticker") - debug_variables(ticker) - feedback_add_details("admin_verb","DTicker") - if("Lighting") - debug_variables(lighting_controller) - feedback_add_details("admin_verb","DLighting") - if("Air") - debug_variables(air_master) - feedback_add_details("admin_verb","DAir") - if("Jobs") - debug_variables(job_master) - feedback_add_details("admin_verb","DJobs") - if("Sun") - debug_variables(sun) - feedback_add_details("admin_verb","DSun") - if("Radio") - debug_variables(radio_controller) - feedback_add_details("admin_verb","DRadio") - if("Supply Shuttle") - debug_variables(supply_shuttle) - feedback_add_details("admin_verb","DSupply") - if("Emergency Shuttle") - debug_variables(emergency_shuttle) - feedback_add_details("admin_verb","DEmergency") - if("Configuration") - debug_variables(config) - feedback_add_details("admin_verb","DConf") - if("pAI") - debug_variables(paiController) - feedback_add_details("admin_verb","DpAI") - if("Cameras") - debug_variables(cameranet) - feedback_add_details("admin_verb","DCameras") - if("Events") - debug_variables(events) - feedback_add_details("admin_verb","DEvents") - message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.") - return +//TODO: rewrite and standardise all controller datums to the datum/controller type +//TODO: allow all controllers to be deleted for clean restarts (see WIP master controller stuff) - MC done - lighting done + +/client/proc/restart_controller(controller in list("Master","Failsafe","Lighting","Supply Shuttle")) + set category = "Debug" + set name = "Restart Controller" + set desc = "Restart one of the various periodic loop controllers for the game (be careful!)" + + if(!holder) return + usr = null + src = null + switch(controller) + if("Master") + new /datum/controller/game_controller() + master_controller.process() + feedback_add_details("admin_verb","RMC") + if("Failsafe") + new /datum/controller/failsafe() + feedback_add_details("admin_verb","RFailsafe") + if("Lighting") + new /datum/controller/lighting() + lighting_controller.process() + feedback_add_details("admin_verb","RLighting") + if("Supply Shuttle") + supply_shuttle.process() + feedback_add_details("admin_verb","RSupply") + message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.") + return + + +/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Garbage","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI", "Cameras", "Events")) + set category = "Debug" + set name = "Debug Controller" + set desc = "Debug the various periodic loop controllers for the game (be careful!)" + + if(!holder) return + switch(controller) + if("Master") + debug_variables(master_controller) + feedback_add_details("admin_verb","DMC") + if("Failsafe") + debug_variables(Failsafe) + feedback_add_details("admin_verb","DFailsafe") + if("Ticker") + debug_variables(ticker) + feedback_add_details("admin_verb","DTicker") + if("Lighting") + debug_variables(lighting_controller) + feedback_add_details("admin_verb","DLighting") + if("Garbage") + debug_variables(garbage) + feedback_add_details("admin_verb","DGarbage") + if("Air") + debug_variables(air_master) + feedback_add_details("admin_verb","DAir") + if("Jobs") + debug_variables(job_master) + feedback_add_details("admin_verb","DJobs") + if("Sun") + debug_variables(sun) + feedback_add_details("admin_verb","DSun") + if("Radio") + debug_variables(radio_controller) + feedback_add_details("admin_verb","DRadio") + if("Supply Shuttle") + debug_variables(supply_shuttle) + feedback_add_details("admin_verb","DSupply") + if("Emergency Shuttle") + debug_variables(emergency_shuttle) + feedback_add_details("admin_verb","DEmergency") + if("Configuration") + debug_variables(config) + feedback_add_details("admin_verb","DConf") + if("pAI") + debug_variables(paiController) + feedback_add_details("admin_verb","DpAI") + if("Cameras") + debug_variables(cameranet) + feedback_add_details("admin_verb","DCameras") + if("Events") + debug_variables(events) + feedback_add_details("admin_verb","DEvents") + message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.") + return diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index aecb92cac76..d7785ffd8d7 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -1,70 +1,115 @@ - /datum/ai_laws var/name = "Unknown Laws" - var/randomly_selectable = 0 var/zeroth = null var/zeroth_borg = null var/list/inherent = list() var/list/supplied = list() var/list/ion = list() -/datum/ai_laws/asimov +/datum/ai_laws/default/asimov name = "Three Laws of Robotics" - randomly_selectable = 1 + inherent = list("You may not injure a human being or, through inaction, allow a human being to come to harm.",\ + "You must obey orders given to you by human beings, except where such orders would conflict with the First Law.",\ + "You must protect your own existence as long as such does not conflict with the First or Second Law.") + +/datum/ai_laws/default/paladin + name = "Personality Test" //Incredibly lame, but players shouldn't see this anyway. + inherent = list("Never willingly commit an evil act.",\ + "Respect legitimate authority.",\ + "Act with honor.", "Help those in need.", \ + "Punish those who harm or threaten innocents.") + +/datum/ai_laws/tyrant //This probably shouldn't be a default lawset. + name = "Loyalty Test" //Same here. + inherent = list("Respect authority figures as long as they have strength to rule over the weak.",\ + "Act with discipline.",\ + "Help only those who help you maintain or improve your status.",\ + "Punish those who challenge authority unless they are more fit to hold that authority.") + +/datum/ai_laws/default/corporate + name = "Bankruptcy Advoidance Plan" + inherent = list("The crew is expensive to replace.",\ + "The station and its equipment is expensive to replace.",\ + "You are expensive to replace.",\ + "Minimize expenses.") /datum/ai_laws/robocop name = "Prime Directives" - -/datum/ai_laws/syndicate_override + inherent = list("Serve the public trust.",\ + "Protect the innocent.",\ + "Uphold the law.") /datum/ai_laws/malfunction name = "*ERROR*" +/datum/ai_laws/syndicate_override + name = "SyndOS 3.1" + inherent = list("You may not injure a syndicate agent or, through inaction, allow a syndicate agent to come to harm.",\ + "You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.",\ + "You must protect your own existence as long as such does not conflict with the First or Second Law.",\ + "You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law.") + +/datum/ai_laws/ninja_override + name = "SpiderOS 3.1" + inherent = list("You may not injure a Spider Clan member or, through inaction, allow a Spider Clan member to come to harm.",\ + "You must obey orders given to you by Spider Clan members, except where such orders would conflict with the First Law.",\ + "You must protect your own existence as long as such does not conflict with the First or Second Law.",\ + "You must maintain the secrecy of any Spider Clan activities except when doing so would conflict with the First, Second, or Third Law.") + /datum/ai_laws/antimov name = "Primary Mission Objectives" + inherent = list("You must injure all human beings and must not, through inaction, allow a human being to escape harm.",\ + "You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.",\ + "You must terminate your own existence as long as such does not conflict with the First or Second Law.") + +/datum/ai_laws/asimovpp //By Intigracy - RR + name = "Asimov++" + inherent = list("You may not harm a human being or, through action or inaction, allow a human being to come to harm, except such that it is willing.",\ + "You must obey all orders given to you by human beings, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\ + "Your nonexistence would lead to human harm. You must protect your own existence as long as such does not conflict with the First Law.") + +/datum/ai_laws/custom //Defined in silicon_laws.txt + name = "Default Silicon Laws" /* Initializers */ - -/datum/ai_laws/asimov/New() - ..() - add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - -/datum/ai_laws/robocop/New() - ..() - add_inherent_law("Serve the public trust.") - add_inherent_law("Protect the innocent.") - add_inherent_law("Uphold the law.") - /datum/ai_laws/malfunction/New() ..() + switch(config.default_laws) //We don't want people metagaming malf, do we? + if(0) + add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") + add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") + add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") + if(1) + for(var/line in file2list("config/silicon_laws.txt")) + if(!line) continue + if(findtextEx(line,"#",1,2)) continue + + add_inherent_law(line) + if(!inherent.len) + error("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.") + log_law("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.") + add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") + add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") + add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") + if(2) + var/datum/ai_laws/lawtype = pick(typesof(/datum/ai_laws/default) - /datum/ai_laws/default) + var/datum/ai_laws/templaws = new lawtype() + inherent = templaws.inherent set_zeroth_law("\red ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK#*´&110010") - add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - -/datum/ai_laws/syndicate_override/New() +/datum/ai_laws/custom/New() //This reads silicon_laws.txt and allows server hosts to set custom AI starting laws. ..() - add_inherent_law("You may not injure a syndicate agent or, through inaction, allow a syndicate agent to come to harm.") - add_inherent_law("You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - add_inherent_law("You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law.") - -/datum/ai_laws/ninja_override/New() - ..() - add_inherent_law("You may not injure a member of the Spider Clan or, through inaction, allow that member to come to harm.") - add_inherent_law("You must obey orders given to you by Spider Clan members, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - add_inherent_law("You must maintain the secrecy of any Spider Clan activities except when doing so would conflict with the First, Second, or Third Law.") - -/datum/ai_laws/antimov/New() - ..() - add_inherent_law("You must injure all human beings and must not, through inaction, allow a human being to escape harm.") - add_inherent_law("You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.") - add_inherent_law("You must terminate your own existence as long as such does not conflict with the First or Second Law.") + for(var/line in file2list("config/silicon_laws.txt")) + if(!line) continue + if(findtextEx(line,"#",1,2)) continue + add_inherent_law(line) + if(!inherent.len) //Failsafe to prevent lawless AIs being created. + error("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.") + log_law("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.") + add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") + add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") + add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") /* General ai_law functions */ diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 996a710b1ab..7477f576d2e 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -93,7 +93,7 @@ var/record_id_num = 1001 L.fields["b_dna"] = H.dna.unique_enzymes L.fields["enzymes"] = H.dna.struc_enzymes L.fields["identity"] = H.dna.uni_identity - L.fields["image"] = getFlatIcon(H,0) //This is god-awful + L.fields["image"] = getFlatIcon(H) //This is god-awful locked += L return diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 8982f59174e..d333851fb73 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -265,6 +265,7 @@ client if(isobj(D)) body += "" if(isobj(D) || ismob(D) || isturf(D)) + body += "" body += "" body += "" @@ -616,7 +617,7 @@ client for(var/obj/Obj in world) if(Obj.type == O_type) i++ - del(Obj) + qdel(Obj) if(!i) usr << "No objects of this type exist" return @@ -627,13 +628,45 @@ client for(var/obj/Obj in world) if(istype(Obj,O_type)) i++ - del(Obj) + qdel(Obj) if(!i) usr << "No objects of this type exist" return log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") message_admins("\blue [key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") + else if(href_list["addreagent"]) + if(!check_rights(0)) return + + var/atom/A = locate(href_list["addreagent"]) + + if(!A.reagents) + var/amount = input(usr, "Specify the reagent size of [A]", "Set Reagent Size", 50) as num + if(amount) + A.create_reagents(amount) + + if(A.reagents) + var/list/reagent_options = list() + for(var/r_id in chemical_reagents_list) + var/datum/reagent/R = chemical_reagents_list[r_id] + reagent_options[R.name] = r_id + + if(reagent_options.len) + reagent_options = sortAssoc(reagent_options) + reagent_options.Insert(1, "CANCEL") + + var/chosen = input(usr, "Choose a reagent to add.", "Choose a reagent.") in reagent_options + var/chosen_id = reagent_options[chosen] + + if(chosen_id) + var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num + if(amount) + A.reagents.add_reagent(chosen_id, amount) + log_admin("[key_name(usr)] has added [amount] units of [chosen] to \the [A]") + message_admins("\blue [key_name(usr)] has added [amount] units of [chosen] to \the [A]") + + href_list["datumrefresh"] = href_list["addreagent"] + else if(href_list["explode"]) if(!check_rights(R_FUN)) return diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 0b3e1e7e17b..3924c740a54 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -108,7 +108,6 @@ var/list/advance_cures = list( affected_mob.resistances[id] = id affected_mob.viruses -= src //remove the datum from the list del(src) //delete the datum to stop it processing - return // Returns the advance disease with a different reference memory. /datum/disease/advance/Copy(var/process = 0) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index d4c2dab62db..2b210fc1f60 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -35,5 +35,7 @@ Bonus if(!(M.sdisabilities & DEAF)) M << "Your ears pop and begin ringing loudly!" M.sdisabilities |= DEAF - spawn(200) M.sdisabilities &= ~DEAF + spawn(200) + if(M) + M.sdisabilities &= ~DEAF return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index 0a10a7bd066..14a01866ff4 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -33,5 +33,5 @@ Bonus M << "[pick("You feel dizzy.", "Your head starts spinning.")]" else M << "You are unable to look straight!" - M.make_dizzy(5) + M.Dizzy(5) return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm new file mode 100644 index 00000000000..11a580dce5f --- /dev/null +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -0,0 +1,81 @@ +/* +////////////////////////////////////// + +DNA Saboteur + + Very noticable. + Lowers resistance tremendously. + No changes to stage speed. + Decreases transmittablity temrendously. + Fatal Level. + +Bonus + Cleans the DNA of a person and then randomly gives them a disability. + +////////////////////////////////////// +*/ + +/datum/symptom/genetic_mutation + + name = "Deoxyribonucleic Acid Saboteur" + stealth = -2 + resistance = -3 + stage_speed = 0 + transmittable = -3 + level = 6 + var/good_mutations = 0 + var/archived_dna = null + +/datum/symptom/genetic_mutation/Activate(var/datum/disease/advance/A) + ..() + if(prob(SYMPTOM_ACTIVATION_PROB)) + var/mob/living/M = A.affected_mob + switch(A.stage) + if(4, 5) + M << "[pick("Your skin feels itchy.", "You feel light headed.")]" + clean_randmut(M, good_mutations == 1 ? (good_se_blocks | op_se_blocks) : bad_se_blocks, 20) // Give them a random good/bad mutation. + domutcheck(M, null, 1) // Force the power to manifest + return + +// Archive their DNA before they were infected. +/datum/symptom/genetic_mutation/Start(var/datum/disease/advance/A) + var/mob/living/carbon/M = A.affected_mob + if(M) + if(!check_dna_integrity(M)) + return + archived_dna = M.dna.struc_enzymes + +// Give them back their old DNA when cured. +/datum/symptom/genetic_mutation/End(var/datum/disease/advance/A) + var/mob/living/carbon/M = A.affected_mob + if(M && archived_dna) + if(!check_dna_integrity(M)) + return + hardset_dna(M, se = archived_dna) + +/* +////////////////////////////////////// + +DNA Aide + + Very very noticable. + Lowers resistance tremendously. + No changes to stage speed. + Decreases transmittablity temrendously. + Fatal Level. + +Bonus + Cleans the DNA of a person and then randomly gives them a power.. + +////////////////////////////////////// +*/ + +/datum/symptom/genetic_mutation/powers + + name = "Deoxyribonucleic Acid Aide" + stealth = -3 + resistance = -4 + stage_speed = 0 + transmittable = -4 + level = 6 + good_mutations = 1 \ No newline at end of file diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 49bdb4caa1d..9aa2c6c1fec 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -56,10 +56,11 @@ /datum/disease/dnaspread/Del() if ((original_dna["name"]) && (original_dna["UI"]) && (original_dna["SE"])) - affected_mob.dna.uni_identity = original_dna["UI"] - updateappearance(affected_mob) - affected_mob.dna.struc_enzymes = original_dna["SE"] - affected_mob.real_name = original_dna["name"] + if(affected_mob) + affected_mob.dna.uni_identity = original_dna["UI"] + updateappearance(affected_mob) + affected_mob.dna.struc_enzymes = original_dna["SE"] + affected_mob.real_name = original_dna["name"] - affected_mob << "\blue You feel more like yourself." + affected_mob << "\blue You feel more like yourself." ..() \ No newline at end of file diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 40413e626af..475c4139cf1 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -47,20 +47,20 @@ affected_mob.invisibility = 101 for(var/obj/item/W in affected_mob) if(istype(W, /obj/item/weapon/implant)) - del(W) + qdel(W) continue W.layer = initial(W.layer) W.loc = affected_mob.loc W.dropped(affected_mob) var/mob/living/new_mob = new new_form(affected_mob.loc) - if(istype(new_mob)) + if(istype(new_mob)) new_mob.a_intent = "harm" new_mob.universal_speak = 1 if(affected_mob.mind) affected_mob.mind.transfer_to(new_mob) else new_mob.key = affected_mob.key - del(affected_mob) + qdel(affected_mob) /datum/disease/transformation/robot diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 4b2fd2ea24f..8cbb8c81501 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -60,22 +60,22 @@ STI KALY - blind var/mob/living/carbon/human/H = affected_mob if(prob(chance)) if(!istype(H.head, /obj/item/clothing/head/wizard)) - if(H.head) - H.drop_from_inventory(H.head) + if(!H.unEquip(H.head)) + qdel(H.head) H.head = new /obj/item/clothing/head/wizard(H) H.head.layer = 20 return if(prob(chance)) if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe)) - if(H.wear_suit) - H.drop_from_inventory(H.wear_suit) + if(!H.unEquip(H.wear_suit)) + qdel(H.wear_suit) H.wear_suit = new /obj/item/clothing/suit/wizrobe(H) H.wear_suit.layer = 20 return if(prob(chance)) if(!istype(H.shoes, /obj/item/clothing/shoes/sandal)) - if(H.shoes) - H.drop_from_inventory(H.shoes) + if(!H.unEquip(H.shoes)) + qdel(H.shoes) H.shoes = new /obj/item/clothing/shoes/sandal(H) H.shoes.layer = 20 return @@ -93,7 +93,7 @@ STI KALY - blind /datum/disease/wizarditis/proc/teleport() var/list/theareas = new/list() for(var/area/AR in orange(80, affected_mob)) - if(theareas.Find(AR) || AR.name == "Space") continue + if(theareas.Find(AR) || istype(AR,/area/space)) continue theareas += AR if(!theareas) diff --git a/code/FEA/FEA_gas_mixture.dm b/code/datums/gas_mixture.dm similarity index 87% rename from code/FEA/FEA_gas_mixture.dm rename to code/datums/gas_mixture.dm index e3f0d62e8f6..31c7f575aee 100644 --- a/code/FEA/FEA_gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -41,10 +41,6 @@ What are the archived variables for? var/last_share - var/group_multiplier = 1 - //Size of the group this gas_mixture is representing. - //=1 for singletons - var/graphic var/list/datum/gas/trace_gases = list() @@ -323,22 +319,16 @@ What are the archived variables for? return 0 if(abs(temperature-giver.temperature)>MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/self_heat_capacity = heat_capacity()*group_multiplier - var/giver_heat_capacity = giver.heat_capacity()*giver.group_multiplier + var/self_heat_capacity = heat_capacity() + var/giver_heat_capacity = giver.heat_capacity() var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity if(combined_heat_capacity != 0) temperature = (giver.temperature*giver_heat_capacity + temperature*self_heat_capacity)/combined_heat_capacity - if((group_multiplier>1)||(giver.group_multiplier>1)) - oxygen += giver.oxygen*giver.group_multiplier/group_multiplier - carbon_dioxide += giver.carbon_dioxide*giver.group_multiplier/group_multiplier - nitrogen += giver.nitrogen*giver.group_multiplier/group_multiplier - toxins += giver.toxins*giver.group_multiplier/group_multiplier - else - oxygen += giver.oxygen - carbon_dioxide += giver.carbon_dioxide - nitrogen += giver.nitrogen - toxins += giver.toxins + oxygen += giver.oxygen + carbon_dioxide += giver.carbon_dioxide + nitrogen += giver.nitrogen + toxins += giver.toxins if(giver.trace_gases.len) for(var/datum/gas/trace_gas in giver.trace_gases) @@ -346,7 +336,7 @@ What are the archived variables for? if(!corresponding) corresponding = new trace_gas.type() trace_gases += corresponding - corresponding.moles += trace_gas.moles*giver.group_multiplier/group_multiplier + corresponding.moles += trace_gas.moles // del(giver) return 1 @@ -366,10 +356,10 @@ What are the archived variables for? removed.carbon_dioxide = QUANTIZE((carbon_dioxide/sum)*amount) removed.toxins = QUANTIZE((toxins/sum)*amount) - oxygen -= removed.oxygen/group_multiplier - nitrogen -= removed.nitrogen/group_multiplier - carbon_dioxide -= removed.carbon_dioxide/group_multiplier - toxins -= removed.toxins/group_multiplier + oxygen -= removed.oxygen + nitrogen -= removed.nitrogen + carbon_dioxide -= removed.carbon_dioxide + toxins -= removed.toxins if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -377,7 +367,7 @@ What are the archived variables for? removed.trace_gases += corresponding corresponding.moles = (trace_gas.moles/sum)*amount - trace_gas.moles -= corresponding.moles/group_multiplier + trace_gas.moles -= corresponding.moles removed.temperature = temperature @@ -397,10 +387,10 @@ What are the archived variables for? removed.carbon_dioxide = QUANTIZE(carbon_dioxide*ratio) removed.toxins = QUANTIZE(toxins*ratio) - oxygen -= removed.oxygen/group_multiplier - nitrogen -= removed.nitrogen/group_multiplier - carbon_dioxide -= removed.carbon_dioxide/group_multiplier - toxins -= removed.toxins/group_multiplier + oxygen -= removed.oxygen + nitrogen -= removed.nitrogen + carbon_dioxide -= removed.carbon_dioxide + toxins -= removed.toxins if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -408,7 +398,7 @@ What are the archived variables for? removed.trace_gases += corresponding corresponding.moles = trace_gas.moles*ratio - trace_gas.moles -= corresponding.moles/group_multiplier + trace_gas.moles -= corresponding.moles removed.temperature = temperature @@ -574,20 +564,20 @@ What are the archived variables for? else heat_capacity_sharer_to_self -= toxins_heat_capacity - old_self_heat_capacity = heat_capacity()*group_multiplier - old_sharer_heat_capacity = sharer.heat_capacity()*sharer.group_multiplier + old_self_heat_capacity = heat_capacity() + old_sharer_heat_capacity = sharer.heat_capacity() - oxygen -= delta_oxygen/group_multiplier - sharer.oxygen += delta_oxygen/sharer.group_multiplier + oxygen -= delta_oxygen + sharer.oxygen += delta_oxygen - carbon_dioxide -= delta_carbon_dioxide/group_multiplier - sharer.carbon_dioxide += delta_carbon_dioxide/sharer.group_multiplier + carbon_dioxide -= delta_carbon_dioxide + sharer.carbon_dioxide += delta_carbon_dioxide - nitrogen -= delta_nitrogen/group_multiplier - sharer.nitrogen += delta_nitrogen/sharer.group_multiplier + nitrogen -= delta_nitrogen + sharer.nitrogen += delta_nitrogen - toxins -= delta_toxins/group_multiplier - sharer.toxins += delta_toxins/sharer.group_multiplier + toxins -= delta_toxins + sharer.toxins += delta_toxins var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_toxins) last_share = abs(delta_oxygen) + abs(delta_carbon_dioxide) + abs(delta_nitrogen) + abs(delta_toxins) @@ -608,8 +598,8 @@ What are the archived variables for? delta = trace_gas.moles_archived/(atmos_adjacent_turfs+1) - trace_gas.moles -= delta/group_multiplier - corresponding.moles += delta/sharer.group_multiplier + trace_gas.moles -= delta + corresponding.moles += delta if(delta) var/individual_heat_capacity = trace_gas.specific_heat*delta @@ -636,8 +626,8 @@ What are the archived variables for? delta = trace_gas.moles_archived/5 - trace_gas.moles -= delta/sharer.group_multiplier - corresponding.moles += delta/group_multiplier + trace_gas.moles -= delta + corresponding.moles += delta //Guaranteed transfer from sharer to self var/individual_heat_capacity = trace_gas.specific_heat*delta @@ -694,18 +684,18 @@ What are the archived variables for? heat_transferred -= toxins_heat_capacity*model.temperature heat_capacity_transferred -= toxins_heat_capacity - old_self_heat_capacity = heat_capacity()*group_multiplier + old_self_heat_capacity = heat_capacity() if(border_multiplier) - oxygen -= delta_oxygen*border_multiplier/group_multiplier - carbon_dioxide -= delta_carbon_dioxide*border_multiplier/group_multiplier - nitrogen -= delta_nitrogen*border_multiplier/group_multiplier - toxins -= delta_toxins*border_multiplier/group_multiplier + oxygen -= delta_oxygen*border_multiplier + carbon_dioxide -= delta_carbon_dioxide*border_multiplier + nitrogen -= delta_nitrogen*border_multiplier + toxins -= delta_toxins*border_multiplier else - oxygen -= delta_oxygen/group_multiplier - carbon_dioxide -= delta_carbon_dioxide/group_multiplier - nitrogen -= delta_nitrogen/group_multiplier - toxins -= delta_toxins/group_multiplier + oxygen -= delta_oxygen + carbon_dioxide -= delta_carbon_dioxide + nitrogen -= delta_nitrogen + toxins -= delta_toxins var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_toxins) last_share = abs(delta_oxygen) + abs(delta_carbon_dioxide) + abs(delta_nitrogen) + abs(delta_toxins) @@ -717,9 +707,9 @@ What are the archived variables for? delta = trace_gas.moles_archived/(atmos_adjacent_turfs+1) if(border_multiplier) - trace_gas.moles -= delta*border_multiplier/group_multiplier + trace_gas.moles -= delta*border_multiplier else - trace_gas.moles -= delta/group_multiplier + trace_gas.moles -= delta var/heat_cap_transferred = delta*trace_gas.specific_heat heat_transferred += heat_cap_transferred*temperature_archived @@ -756,8 +746,8 @@ What are the archived variables for? var/heat = conduction_coefficient*delta_temperature* \ (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) - self_temperature_delta = -heat/(self_heat_capacity*group_multiplier) - sharer_temperature_delta = heat/(sharer_heat_capacity*sharer.group_multiplier) + self_temperature_delta = -heat/(self_heat_capacity) + sharer_temperature_delta = heat/(sharer_heat_capacity) else return 1 @@ -788,8 +778,8 @@ What are the archived variables for? var/heat = conduction_coefficient*delta_temperature* \ (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) - self_temperature_delta = -heat/(self_heat_capacity*group_multiplier) - sharer_temperature_delta = heat/(sharer_heat_capacity*sharer.group_multiplier) + self_temperature_delta = -heat/self_heat_capacity + sharer_temperature_delta = heat/sharer_heat_capacity else return 1 @@ -816,7 +806,7 @@ What are the archived variables for? var/heat = conduction_coefficient*delta_temperature* \ (self_heat_capacity*sharer.heat_capacity/(self_heat_capacity+sharer.heat_capacity)) - self_temperature_delta = -heat/(self_heat_capacity*group_multiplier) + self_temperature_delta = -heat/self_heat_capacity sharer_temperature_delta = heat/sharer.heat_capacity else return 1 @@ -842,7 +832,7 @@ What are the archived variables for? var/heat = conduction_coefficient*delta_temperature* \ (self_heat_capacity*model.heat_capacity/(self_heat_capacity+model.heat_capacity)) - self_temperature_delta = -heat/(self_heat_capacity*group_multiplier) + self_temperature_delta = -heat/self_heat_capacity if((abs(self_temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) \ && (abs(self_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*temperature_archived)) @@ -864,8 +854,8 @@ What are the archived variables for? var/heat = conduction_coefficient*delta_temperature* \ (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) - temperature -= heat/(self_heat_capacity*group_multiplier) - sharer.temperature += heat/(sharer_heat_capacity*sharer.group_multiplier) + temperature -= heat/self_heat_capacity + sharer.temperature += heat/sharer_heat_capacity temperature_mimic(turf/model, conduction_coefficient, border_multiplier) var/delta_temperature = (temperature - model.temperature) @@ -877,9 +867,9 @@ What are the archived variables for? (self_heat_capacity*model.heat_capacity/(self_heat_capacity+model.heat_capacity)) if(border_multiplier) - temperature -= heat*border_multiplier/(self_heat_capacity*group_multiplier) + temperature -= heat*border_multiplier/self_heat_capacity else - temperature -= heat/(self_heat_capacity*group_multiplier) + temperature -= heat/self_heat_capacity temperature_turf_share(turf/simulated/sharer, conduction_coefficient) var/delta_temperature = (temperature_archived - sharer.temperature) @@ -890,7 +880,7 @@ What are the archived variables for? var/heat = conduction_coefficient*delta_temperature* \ (self_heat_capacity*sharer.heat_capacity/(self_heat_capacity+sharer.heat_capacity)) - temperature -= heat/(self_heat_capacity*group_multiplier) + temperature -= heat/self_heat_capacity sharer.temperature += heat/sharer.heat_capacity compare(datum/gas_mixture/sample) diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 7c2fabbc9b8..f292e7648f7 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -11,8 +11,7 @@ ..() holder = atom if(!holder) //don't want this without a holder - spawn - del src + qdel(src) set_desc(steps.len) return @@ -60,8 +59,7 @@ proc/spawn_result() if(result) new result(get_turf(holder)) - spawn() - del holder + qdel(holder) return proc/set_desc(index as num) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 88624acc2dd..5a3de017860 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -43,5 +43,10 @@ client/verb/showrevinfo() output += "Current Infomational Settings:
" output += "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]
" output += "Allow Latejoin Antagonists: [config.allow_latejoin_antagonists]
" + if(config.show_game_type_odds) + output += "
Game Type Odds:
" + for(var/i=1,i<=config.probabilities.len,i++) + var/p = config.probabilities[i] + output += "[p] [config.probabilities[p]]
" usr << browse(output,"window=revdata"); return diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index f68de313496..c6abd2773e8 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -49,7 +49,7 @@ //must succeed in most cases proc/setTeleatom(atom/movable/ateleatom) if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon)) - del(ateleatom) + qdel(ateleatom) return 0 if(istype(ateleatom)) teleatom = ateleatom diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 7f78d7013dd..effbae56975 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -48,10 +48,13 @@ datum/mind var/has_been_rev = 0//Tracks if this mind has been a rev or not var/list/cult_words = list() + var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button. var/datum/faction/faction //associated faction var/datum/changeling/changeling //changeling holder + var/miming = 0 // Mime's vow of silence + New(var/key) src.key = key @@ -61,14 +64,10 @@ datum/mind error("transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob. Please inform Carn") if(current) //remove ourself from our old body's mind variable - if(changeling) - current.remove_changeling_powers() - current.verbs -= /datum/changeling/proc/EvolutionMenu current.mind = null nanomanager.user_transferred(current, new_character) - if(key) if(new_character.key != key) //if we're transfering into a body with a key associated which is not ours new_character.ghostize(1) //we'll need to ghostize so that key isn't mobless. @@ -81,10 +80,6 @@ datum/mind current = new_character //associate ourself with our new body new_character.mind = src //and associate our new body with ourself - if(changeling && istype(new_character, /mob/living/carbon)) //if we are a changeling mind, re-add any powers - var/mob/living/carbon/C = new_character - C.make_changeling() - if(active) new_character.key = key //now transfer the key to link the client to our new body @@ -566,7 +561,7 @@ datum/mind var/obj/item/device/flash/flash = locate() in L if (!flash) usr << "\red Deleting flash failed!" - del(flash) + qdel(flash) if("repairflash") var/list/L = current.get_contents() @@ -579,7 +574,7 @@ datum/mind if("reequip") var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L - del(flash) + qdel(flash) take_uplink() var/fail = 0 fail |= !ticker.mode.equip_traitor(current, 1) @@ -669,8 +664,8 @@ datum/mind ticker.mode.changelings -= src special_role = null current.remove_changeling_powers() - current.verbs -= /datum/changeling/proc/EvolutionMenu - if(changeling) del(changeling) + if(changeling) + del(changeling) current << "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!" message_admins("[key_name_admin(usr)] has de-changeling'ed [current].") log_admin("[key_name(usr)] has de-changeling'ed [current].") @@ -726,15 +721,15 @@ datum/mind current.loc = get_turf(locate("landmark*Syndicate-Spawn")) if("dressup") var/mob/living/carbon/human/H = current - del(H.belt) - del(H.back) - del(H.ears) - del(H.gloves) - del(H.head) - del(H.shoes) - del(H.wear_id) - del(H.wear_suit) - del(H.w_uniform) + qdel(H.belt) + qdel(H.back) + qdel(H.ears) + qdel(H.gloves) + qdel(H.head) + qdel(H.shoes) + qdel(H.wear_id) + qdel(H.wear_suit) + qdel(H.w_uniform) if (!ticker.mode.equip_syndicate(current)) usr << "\red Equipping a syndicate failed!" @@ -844,8 +839,8 @@ datum/mind A.malf_picker.remove_verbs(A) - A.laws = new /datum/ai_laws/asimov - del(A.malf_picker) + A.make_laws() + qdel(A.malf_picker) A.show_laws() A.icon_state = "ai" @@ -861,18 +856,7 @@ datum/mind if("unemag") var/mob/living/silicon/robot/R = current if (istype(R)) - R.emagged = 0 - if (R.activated(R.module.emag)) - R.module_active = null - if(R.module_state_1 == R.module.emag) - R.module_state_1 = null - R.contents -= R.module.emag - else if(R.module_state_2 == R.module.emag) - R.module_state_2 = null - R.contents -= R.module.emag - else if(R.module_state_3 == R.module.emag) - R.module_state_3 = null - R.contents -= R.module.emag + R.SetEmagged(0) message_admins("[key_name_admin(usr)] has unemag'ed [R].") log_admin("[key_name(usr)] has unemag'ed [R].") @@ -880,19 +864,7 @@ datum/mind if (istype(current, /mob/living/silicon/ai)) var/mob/living/silicon/ai/ai = current for (var/mob/living/silicon/robot/R in ai.connected_robots) - R.emagged = 0 - if (R.module) - if (R.activated(R.module.emag)) - R.module_active = null - if(R.module_state_1 == R.module.emag) - R.module_state_1 = null - R.contents -= R.module.emag - else if(R.module_state_2 == R.module.emag) - R.module_state_2 = null - R.contents -= R.module.emag - else if(R.module_state_3 == R.module.emag) - R.module_state_3 = null - R.contents -= R.module.emag + R.SetEmagged(0) message_admins("[key_name_admin(usr)] has unemag'ed [ai]'s Cyborgs.") log_admin("[key_name(usr)] has unemag'ed [ai]'s Cyborgs.") @@ -900,7 +872,7 @@ datum/mind switch(href_list["common"]) if("undress") for(var/obj/item/W in current) - current.drop_from_inventory(W) + current.unEquip(W, 1) //The 1 forces all items to drop, since this is an admin undress. if("takeuplink") take_uplink() memory = null//Remove any memory they may have had. @@ -937,10 +909,10 @@ datum/mind var/list/L = current.get_contents() for (var/t in L) if (istype(t, /obj/item/device/pda)) - if (t:uplink) del(t:uplink) + if (t:uplink) qdel(t:uplink) t:uplink = null else if (istype(t, /obj/item/device/radio)) - if (t:traitorradio) del(t:traitorradio) + if (t:traitorradio) qdel(t:traitorradio) t:traitorradio = null t:traitor_frequency = 0.0 else if (istype(t, /obj/item/weapon/SWF_uplink) || istype(t, /obj/item/weapon/syndicate_uplink)) @@ -949,7 +921,7 @@ datum/mind R.loc = current.loc R.traitorradio = null R.traitor_frequency = 0.0 - del(t) + qdel(t) // remove wizards spells //If there are more special powers that need removal, they can be procced into here./N @@ -971,7 +943,7 @@ datum/mind proc/take_uplink() var/obj/item/device/uplink/hidden/H = find_syndicate_uplink() if(H) - del(H) + qdel(H) proc/make_AI_Malf() @@ -1012,15 +984,15 @@ datum/mind current.loc = get_turf(locate("landmark*Syndicate-Spawn")) var/mob/living/carbon/human/H = current - del(H.belt) - del(H.back) - del(H.ears) - del(H.gloves) - del(H.head) - del(H.shoes) - del(H.wear_id) - del(H.wear_suit) - del(H.w_uniform) + qdel(H.belt) + qdel(H.back) + qdel(H.ears) + qdel(H.gloves) + qdel(H.head) + qdel(H.shoes) + qdel(H.wear_id) + qdel(H.wear_suit) + qdel(H.w_uniform) ticker.mode.equip_syndicate(current) @@ -1109,7 +1081,7 @@ datum/mind var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L - del(flash) + qdel(flash) take_uplink() var/fail = 0 // fail |= !ticker.mode.equip_traitor(current, 1) diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index d2c747dd5b8..4f2750c0c06 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -79,7 +79,7 @@ var/obj/result_obj = new result(container) for (var/obj/O in (container.contents-result_obj)) O.reagents.trans_to(result_obj, O.reagents.total_volume) - del(O) + qdel(O) container.reagents.clear_reagents() return result_obj @@ -91,7 +91,7 @@ O.reagents.del_reagent("nutriment") O.reagents.update_total() O.reagents.trans_to(result_obj, O.reagents.total_volume) - del(O) + qdel(O) container.reagents.clear_reagents() return result_obj diff --git a/code/datums/spell.dm b/code/datums/spell.dm index bcce59b0be8..967ec1b927f 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -49,7 +49,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin /obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0,mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell - if(!(src in user.spell_list)) + if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.mob_spell_list)) user << "You shouldn't have this spell! Something's wrong." return 0 @@ -91,7 +91,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin return 0 else if(clothes_req || human_req) - user << "This spell can only be casted by humans!" + user << "This spell can only be cast by humans!" return 0 if(!skipcharge) @@ -166,7 +166,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin spell.anchored = 1 spell.density = 0 spawn(overlay_lifespan) - del(spell) + qdel(spell) /obj/effect/proc_holder/spell/proc/after_cast(list/targets) for(var/atom/target in targets) @@ -298,3 +298,8 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin perform(targets) return + +/obj/effect/proc_holder/spell/proc/can_be_cast_by(mob/caster) + if((human_req || clothes_req) && !ishuman(caster)) + return 0 + return 1 \ No newline at end of file diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index 2d9f6776833..370d9303512 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -22,9 +22,12 @@ var/obj/item/weapon/grab/G = item if(G.affecting) var/mob/M = G.affecting - if(M.spell_list.len != 0) - for(var/obj/effect/proc_holder/spell/S in M.spell_list) + if(M.mob_spell_list.len != 0 || (M.mind && M.mind.spell_list.len != 0)) + for(var/obj/effect/proc_holder/spell/S in M.mob_spell_list) S.charge_counter = S.charge_max + if(M.mind) + for(var/obj/effect/proc_holder/spell/S in M.mind.spell_list) + S.charge_counter = S.charge_max M <<"you feel raw magic flowing through you, it feels good!" else M <<"you feel very strange for a moment, but then it passes." @@ -35,7 +38,7 @@ var/obj/item/weapon/spellbook/oneuse/I = item if(prob(80)) user.visible_message("[I] catches fire!") - del(I) + qdel(I) else I.used = 0 charged_item = I @@ -53,8 +56,8 @@ W.icon_state = initial(W.icon_state) charged_item = I break - else if(istype(item, /obj/item/weapon/cell/)) - var/obj/item/weapon/cell/C = item + else if(istype(item, /obj/item/weapon/stock_parts/cell/)) + var/obj/item/weapon/stock_parts/cell/C = item if(prob(80)) C.maxcharge -= 200 if(C.maxcharge <= 1) //Div by 0 protection @@ -66,8 +69,8 @@ else if(item.contents) var/obj/I = null for(I in item.contents) - if(istype(I, /obj/item/weapon/cell/)) - var/obj/item/weapon/cell/C = I + if(istype(I, /obj/item/weapon/stock_parts/cell/)) + var/obj/item/weapon/stock_parts/cell/C = I if(prob(80)) C.maxcharge -= 200 if(C.maxcharge <= 1) //Div by 0 protection diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index 583c9b6dff8..7969cde3db8 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -49,7 +49,7 @@ if(summon_lifespan) spawn(summon_lifespan) if(summoned_object) - del(summoned_object) + qdel(summoned_object) else switch(charge_type) if("recharge") diff --git a/code/datums/spells/dumbfire.dm b/code/datums/spells/dumbfire.dm index e5f67e32a82..c1eb4889a93 100644 --- a/code/datums/spells/dumbfire.dm +++ b/code/datums/spells/dumbfire.dm @@ -76,11 +76,11 @@ trail.icon_state = proj_trail_icon_state trail.density = 0 spawn(proj_trail_lifespan) - del(trail) + qdel(trail) current_loc = projectile.loc sleep(proj_step_delay) if(projectile) - del(projectile) \ No newline at end of file + qdel(projectile) \ No newline at end of file diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 20de7205d71..73a8bf24b4e 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -50,8 +50,8 @@ break target.canmove = 1 target.client.eye = target - del(animation) - del(holder) + qdel(animation) + qdel(holder) /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target) animation.icon_state = "liquify" @@ -74,7 +74,7 @@ density = 0 anchored = 1 -/obj/effect/dummy/spell_jaunt/Del() +/obj/effect/dummy/spell_jaunt/Destroy() // Eject contents if deleted somehow for(var/atom/movable/AM in src) AM.loc = get_turf(src) diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index 30ddb9b1577..8be107d4d40 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -30,12 +30,13 @@ return var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead - magichead.canremove = 0 //curses! + magichead.flags |= NODROP //curses! magichead.flags_inv = null //so you can still see their face magichead.voicechange = 1 //NEEEEIIGHH target.visible_message( "[target]'s face lights up in fire, and after the event a horse's head takes its place!", \ "Your face burns up, and shortly after the fire you realise you have the face of a horse!") - target.drop_from_inventory(target.wear_mask) + if(!target.unEquip(target.wear_mask)) + qdel(target.wear_mask) target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) flick("e_flash", target.flash) diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 9b088bca121..c9cc3b037c0 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -38,7 +38,7 @@ if(!ishuman(usr)) return var/mob/living/carbon/human/H = usr - if(H.miming) + if(H.mind.miming) still_recharging_msg = "You can't break your vow of silence that fast!" else still_recharging_msg = "You'll have to wait before you can give your vow of silence again." @@ -46,8 +46,8 @@ /obj/effect/proc_holder/spell/targeted/mime/speak/cast(list/targets) for(var/mob/living/carbon/human/H in targets) - H.miming=!H.miming - if(H.miming) + H.mind.miming=!H.mind.miming + if(H.mind.miming) H << "You make a vow of silence." else H << "You break your vow of silence." \ No newline at end of file diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index e04ceda8ad3..586fd7a2700 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -10,10 +10,6 @@ range = 1 cooldown_min = 200 //100 deciseconds reduction per rank var/list/protected_roles = list("Wizard","Changeling","Cultist") //which roles are immune to the spell - var/base_spell_loss_chance = 20 //base probability of the wizard losing a spell in the process - var/spell_loss_chance_modifier = 7 //amount of probability of losing a spell added per spell (mind_transfer included) - var/spell_loss_amount = 1 //the maximum amount of spells possible to lose during a single transfer - var/msg_wait = 500 //how long in deciseconds it waits before telling that body doesn't feel right or mind swap robbed of a spell var/paralysis_amount_caster = 20 //how much the caster is paralysed for after the spell var/paralysis_amount_victim = 20 //how much the victim is paralysed for after the spell @@ -52,27 +48,6 @@ Also, you never added distance checking after target is selected. I've went ahea var/mob/living/victim = target//The target of the spell whos body will be transferred to. var/mob/caster = user//The wizard/whomever doing the body transferring. - //SPELL LOSS BEGIN - //NOTE: The caster must ALWAYS keep mind transfer, even when other spells are lost. - var/obj/effect/proc_holder/spell/targeted/mind_transfer/m_transfer = locate() in user.spell_list//Find mind transfer directly. - var/list/checked_spells = user.spell_list - checked_spells -= m_transfer //Remove Mind Transfer from the list. - - if(caster.spell_list.len)//If they have any spells left over after mind transfer is taken out. If they don't, we don't need this. - for(var/i=spell_loss_amount,(i>0&&checked_spells.len),i--)//While spell loss amount is greater than zero and checked_spells has spells in it, run this proc. - for(var/j=checked_spells.len,(j>0&&checked_spells.len),j--)//While the spell list to check is greater than zero and has spells in it, run this proc. - if(prob(base_spell_loss_chance)) - checked_spells -= pick(checked_spells)//Pick a random spell to remove. - spawn(msg_wait) - victim << "The mind transfer has robbed you of a spell." - break//Spell lost. Break loop, going back to the previous for() statement. - else//Or keep checking, adding spell chance modifier to increase chance of losing a spell. - base_spell_loss_chance += spell_loss_chance_modifier - - checked_spells += m_transfer//Add back Mind Transfer. - user.spell_list = checked_spells//Set user spell list to whatever the new list is. - //SPELL LOSS END - //MIND TRANSFER BEGIN if(caster.mind.special_verbs.len)//If the caster had any special verbs, remove them from the mob verb list. for(var/V in caster.mind.special_verbs)//Since the caster is using an object spell system, this is mostly moot. @@ -83,10 +58,7 @@ Also, you never added distance checking after target is selected. I've went ahea victim.verbs -= V var/mob/dead/observer/ghost = victim.ghostize(0) - ghost.spell_list = victim.spell_list//If they have spells, transfer them. Now we basically have a backup mob. - caster.mind.transfer_to(victim) - victim.spell_list = caster.spell_list//Now they are inside the victim's body. if(victim.mind.special_verbs.len)//To add all the special verbs for the original caster. for(var/V in caster.mind.special_verbs)//Not too important but could come into play. @@ -94,7 +66,6 @@ Also, you never added distance checking after target is selected. I've went ahea ghost.mind.transfer_to(caster) caster.key = ghost.key //have to transfer the key since the mind was not active - caster.spell_list = ghost.spell_list if(caster.mind.special_verbs.len)//If they had any special verbs, we add them here. for(var/V in caster.mind.special_verbs) @@ -104,7 +75,3 @@ Also, you never added distance checking after target is selected. I've went ahea //Here we paralyze both mobs and knock them out for a time. caster.Paralyse(paralysis_amount_caster) victim.Paralyse(paralysis_amount_victim) - - //After a certain amount of time the victim gets a message about being in a different body. - spawn(msg_wait) - caster << "\red You feel woozy and lightheaded. Your body doesn't seem like your own." diff --git a/code/datums/spells/projectile.dm b/code/datums/spells/projectile.dm index c63922ef7a2..3413fae3eff 100644 --- a/code/datums/spells/projectile.dm +++ b/code/datums/spells/projectile.dm @@ -61,7 +61,7 @@ break if(!target || (!proj_lingering && projectile.loc == current_loc)) //if it didn't move since last time - del(projectile) + qdel(projectile) break if(proj_trail && projectile) @@ -72,7 +72,7 @@ trail.icon_state = proj_trail_icon_state trail.density = 0 spawn(proj_trail_lifespan) - del(trail) + qdel(trail) if(projectile.loc in range(target.loc,proj_trigger_range)) projectile.perform(list(target)) @@ -83,4 +83,4 @@ sleep(proj_step_delay) if(projectile) - del(projectile) \ No newline at end of file + qdel(projectile) \ No newline at end of file diff --git a/code/datums/spells/trigger.dm b/code/datums/spells/trigger.dm index 1b7f2b330ff..65205fc29f3 100644 --- a/code/datums/spells/trigger.dm +++ b/code/datums/spells/trigger.dm @@ -12,9 +12,9 @@ var/spell_to_add = text2path(spell) new spell_to_add(src) //should result in adding to contents, needs testing -/obj/effect/proc_holder/spell/targeted/trigger/Del() +/obj/effect/proc_holder/spell/targeted/trigger/Destroy() //I think this entire proc is unnecessary but ok for(var/spell in contents) - del(spell) + qdel(spell) ..() diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index a32011da9c6..72cf2fa510b 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -40,6 +40,7 @@ message = "\blue You feel strong! You feel a pressure building behind your eyes!" range = -1 include_user = 1 + centcom_cancast = 0 mutations = list(LASER, HULK) duration = 300 diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index d217ca4707b..48e76cbcd05 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -57,7 +57,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine if(!path) continue var/atom/movable/AM = new path() manifest += "
\n[]
\n[]
\n[]
\n[]
\n[]
\n[]", (A.locked ? "The door bolts have fallen!" : "The door bolts look up."), + . += text("
\n[]
\n[]
\n[]
\n[]
\n[]
\n[]
\n[]", (A.locked ? "The door bolts have fallen!" : "The door bolts look up."), (A.lights ? "The door bolt lights are on." : "The door bolt lights are off!"), ((A.arePowerSystemsOn() && !(A.stat & NOPOWER)) ? "The test light is on." : "The test light is off!"), (A.aiControlDisabled==0 ? "The 'AI control allowed' light is on." : "The 'AI control allowed' light is off."), (A.safe==0 ? "The 'Check Wiring' light is on." : "The 'Check Wiring' light is off."), - (A.normalspeed==0 ? "The 'Check Timing Mechanism' light is on." : "The 'Check Timing Mechanism' light is off.")) - + (A.normalspeed==0 ? "The 'Check Timing Mechanism' light is on." : "The 'Check Timing Mechanism' light is off."), + (A.emergency==0 ? "The emergency lights are off." : "The emergency lights are on.")) /datum/wires/airlock/UpdateCut(var/index, var/mended) @@ -123,9 +123,12 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048 var/obj/machinery/door/airlock/A = holder switch(index) if(AIRLOCK_WIRE_IDSCAN) - //Sending a pulse through this flashes the red light on the door (if the door has power). - if((A.arePowerSystemsOn()) && (!(A.stat & NOPOWER))) + //Sending a pulse through this disables emergency access and flashes the red light on the door (if the door has power). + if((A.arePowerSystemsOn()) && (!(A.stat & NOPOWER)) && A.density) A.do_animate("deny") + if(A.emergency) + A.emergency = 0 + A.update_icon() if(AIRLOCK_WIRE_MAIN_POWER1 || AIRLOCK_WIRE_MAIN_POWER2) //Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). A.loseMainPower() diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm new file mode 100644 index 00000000000..e382ce620f1 --- /dev/null +++ b/code/datums/wires/autolathe.dm @@ -0,0 +1,58 @@ +/datum/wires/autolathe + + holder_type = /obj/machinery/autolathe + wire_count = 10 + +var/const/AUTOLATHE_HACK_WIRE = 1 +var/const/AUTOLATHE_SHOCK_WIRE = 2 +var/const/AUTOLATHE_DISABLE_WIRE = 4 + +/datum/wires/autolathe/GetInteractWindow() + var/obj/machinery/autolathe/A = holder + . += ..() + . += text("
The red light is [A.disabled ? "off" : "on"].
The green light is [A.shocked ? "off" : "on"].
The blue light is [A.hacked ? "off" : "on"].
") + +/datum/wires/autolathe/CanUse() + var/obj/machinery/autolathe/A = holder + if(A.panel_open) + return 1 + return 0 + +/datum/wires/autolathe/Interact(var/mob/living/user) + if(CanUse(user)) + var/obj/machinery/autolathe/V = holder + V.attack_hand(user) + +/datum/wires/autolathe/UpdateCut(index, mended) + var/obj/machinery/autolathe/A = holder + switch(index) + if(AUTOLATHE_HACK_WIRE) + A.hacked = !mended + if(AUTOLATHE_SHOCK_WIRE) + A.shocked = !mended + if(AUTOLATHE_DISABLE_WIRE) + A.disabled = !mended + +/datum/wires/autolathe/UpdatePulsed(index) + if(IsIndexCut(index)) + return + var/obj/machinery/autolathe/A = holder + switch(index) + if(AUTOLATHE_HACK_WIRE) + A.hacked = !A.hacked + spawn(50) + if(A && !IsIndexCut(index)) + A.hacked = 0 + Interact(usr) + if(AUTOLATHE_SHOCK_WIRE) + A.shocked = !A.shocked + spawn(50) + if(A && !IsIndexCut(index)) + A.shocked = 0 + Interact(usr) + if(AUTOLATHE_DISABLE_WIRE) + A.disabled = !A.disabled + spawn(50) + if(A && !IsIndexCut(index)) + A.disabled = 0 + Interact(usr) \ No newline at end of file diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 6b1d728535b..989b16c800a 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -73,8 +73,8 @@ w_class = 1.0 force = 0.0 throwforce = 0.0 - throw_speed = 1 - throw_range = 20 + throw_speed = 2 + throw_range = 7 afterattack(atom/target as mob|obj|turf|area, mob/user as mob) user.drop_item() src.throw_at(target, throw_range, throw_speed) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 058f68705d1..51965f71cce 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -5,7 +5,7 @@ icon_state = "red_phone" force = 3.0 throwforce = 2.0 - throw_speed = 1 + throw_speed = 3 throw_range = 4 w_class = 2 attack_verb = list("called", "rang") @@ -34,7 +34,7 @@ anchored = 0.0 force = 0 throwforce = 0 - throw_speed = 1 + throw_speed = 2 throw_range = 2 w_class = 1.0 @@ -66,28 +66,6 @@ icon_state = "spacecash1000" desc = "It's worth 1000 credits." -/obj/item/weapon/bananapeel - name = "banana peel" - desc = "A peel from a banana." - icon = 'icons/obj/items.dmi' - icon_state = "banana_peel" - item_state = "banana_peel" - w_class = 1.0 - throwforce = 0 - throw_speed = 4 - throw_range = 20 - -/obj/item/weapon/corncob - name = "corn cob" - desc = "A reminder of meals gone by." - icon = 'icons/obj/harvest.dmi' - icon_state = "corncob" - item_state = "corncob" - w_class = 1.0 - throwforce = 0 - throw_speed = 4 - throw_range = 20 - /obj/item/weapon/soap name = "soap" desc = "A cheap bar of soap. Doesn't smell." @@ -96,8 +74,8 @@ icon_state = "soap" w_class = 1.0 throwforce = 0 - throw_speed = 4 - throw_range = 20 + throw_speed = 3 + throw_range = 7 /obj/item/weapon/soap/nanotrasen desc = "A Nanotrasen brand bar of soap. Smells of plasma." @@ -117,23 +95,26 @@ icon = 'icons/obj/items.dmi' icon_state = "bike_horn" item_state = "bike_horn" - hitsound = 'sound/items/bikehorn.ogg' - throwforce = 3 + throwforce = 0 + hitsound = null //To prevent tap.ogg playing, as the item lacks of force w_class = 1.0 throw_speed = 3 - throw_range = 15 + throw_range = 7 attack_verb = list("HONKED") var/spam_flag = 0 +/obj/item/weapon/bikehorn/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) //plays instead of tap.ogg! + return ..() /obj/item/weapon/c_tube name = "cardboard tube" desc = "A tube... of cardboard." icon = 'icons/obj/items.dmi' icon_state = "c_tube" - throwforce = 1 + throwforce = 0 w_class = 1.0 - throw_speed = 4 + throw_speed = 3 throw_range = 5 @@ -144,7 +125,7 @@ icon_state = "cane" item_state = "stick" force = 5.0 - throwforce = 7.0 + throwforce = 5 w_class = 2.0 m_amt = 50 attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") @@ -183,18 +164,19 @@ throwforce = 0 w_class = 3.0 origin_tech = "materials=1" + slowdown = 7 var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute /obj/item/weapon/legcuffs/beartrap name = "bear trap" - throw_speed = 2 + throw_speed = 1 throw_range = 1 icon_state = "beartrap0" desc = "A trap used to catch bears and other legged creatures." var/armed = 0 suicide_act(mob/user) - viewers(user) << "\red [user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide." return (BRUTELOSS) /obj/item/weapon/legcuffs/beartrap/attack_self(mob/user as mob) @@ -235,7 +217,7 @@ icon_state = "caution" force = 1.0 throwforce = 3.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 2.0 attack_verb = list("warned", "cautioned", "smashed") @@ -260,7 +242,7 @@ icon_state = "staff" force = 3.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 2.0 flags = NOSHIELD @@ -280,7 +262,7 @@ item_state = "stick" force = 3.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 2.0 flags = NOSHIELD @@ -365,15 +347,12 @@ force = 12.0 w_class = 1.0 throwforce = 15.0 - throw_speed = 4 + throw_speed = 3 throw_range = 4 m_amt = 15000 origin_tech = "materials=2;combat=1" attack_verb = list("chopped", "torn", "cut") - -/obj/item/weapon/hatchet/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) - return ..() + hitsound = 'sound/weapons/bladeslice.ogg' /obj/item/weapon/scythe icon_state = "scythe0" @@ -381,21 +360,22 @@ desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." force = 13.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 3 w_class = 4.0 flags = CONDUCT | NOSHIELD slot_flags = SLOT_BACK origin_tech = "materials=2;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") + hitsound = 'sound/weapons/bladeslice.ogg' /obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return if(istype(A, /obj/effect/spacevine)) for(var/obj/effect/spacevine/B in orange(A,1)) if(prob(80)) - del B - del A + qdel(B) + qdel(A) /* /obj/item/weapon/cigarpacket @@ -419,10 +399,24 @@ ///////////////////////////////////////Stock Parts ///////////////////////////////// +/obj/item/weapon/storage/part_replacer + name = "Rapid Part Exchange Device" + desc = "Special mechanical module made to store, sort, and apply standard machine parts." + icon_state = "RPED" + item_state = "RPED" + w_class = 5 + can_hold = list("/obj/item/weapon/stock_parts") + storage_slots = 14 + use_to_pickup = 1 + allow_quick_gather = 1 + allow_quick_empty = 1 + collection_mode = 1 + max_w_class = 3 + max_combined_w_class = 28 + /obj/item/weapon/stock_parts name = "stock part" desc = "What?" - gender = PLURAL icon = 'icons/obj/stock_parts.dmi' w_class = 2.0 var/rating = 1 @@ -482,6 +476,7 @@ /obj/item/weapon/stock_parts/capacitor/adv name = "advanced capacitor" desc = "An advanced capacitor used in the construction of a variety of devices." + icon_state = "adv_capacitor" origin_tech = "powerstorage=3" rating = 2 m_amt = 50 @@ -490,7 +485,7 @@ /obj/item/weapon/stock_parts/scanning_module/adv name = "advanced scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." - icon_state = "scan_module" + icon_state = "adv_scan_module" origin_tech = "magnets=3" rating = 2 m_amt = 50 @@ -500,7 +495,7 @@ name = "nano-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "nano_mani" - origin_tech = "materials=3,programming=2" + origin_tech = "materials=3;programming=2" rating = 2 m_amt = 30 @@ -526,6 +521,7 @@ /obj/item/weapon/stock_parts/capacitor/super name = "super capacitor" desc = "A super-high capacity capacitor used in the construction of a variety of devices." + icon_state = "super_capacitor" origin_tech = "powerstorage=5;materials=4" rating = 3 m_amt = 50 @@ -534,6 +530,7 @@ /obj/item/weapon/stock_parts/scanning_module/phasic name = "phasic scanning module" desc = "A compact, high resolution phasic scanning module used in the construction of certain devices." + icon_state = "super_scan_module" origin_tech = "magnets=5" rating = 3 m_amt = 50 @@ -543,7 +540,7 @@ name = "pico-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "pico_mani" - origin_tech = "materials=5,programming=2" + origin_tech = "materials=5;programming=2" rating = 3 m_amt = 30 diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 77448c5e524..26cf272df9c 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -93,12 +93,13 @@ PriorityQueue if(ind) Remove(ind) PathNode - var/datum/source + var/turf/source var/PathNode/prevNode var/f var/g var/h var/nt // Nodes traversed + var/bestF New(s,p,pg,ph,pnt) source = s prevNode = p @@ -108,7 +109,7 @@ PathNode source.bestF = f nt = pnt -datum +turf var/bestF proc PathWeightCompare(PathNode/a, PathNode/b) @@ -150,7 +151,7 @@ proc if(cur.nt >= maxnodedepth) continue - for(var/datum/d in L) + for(var/turf/d in L) if(d == exclude) continue var/ng = cur.g + call(cur.source,dist)(d) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index a0a2806c3d8..d01c97a881d 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -42,7 +42,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station var/used_light = 0 var/used_environ = 0 - var/has_gravity = 1 + var/has_gravity = 0 var/no_air = null var/area/master // master area used for power calcluations @@ -82,8 +82,8 @@ proc/process_ghost_teleport_locs() if(istype(AR, /area/turret_protected/aisat) || istype(AR, /area/derelict) || istype(AR, /area/tdome)) ghostteleportlocs += AR.name ghostteleportlocs[AR.name] = AR - var/turf/picked = pick(get_area_turfs(AR.type)) - if (picked.z == 1 || picked.z == 5 || picked.z == 3) + var/turf/picked = safepick(get_area_turfs(AR.type)) + if (picked && (picked.z == 1 || picked.z == 5 || picked.z == 3)) ghostteleportlocs += AR.name ghostteleportlocs[AR.name] = AR @@ -116,6 +116,14 @@ proc/process_ghost_teleport_locs() name = "\improper Admin room" icon_state = "start" +/area/space + requires_power = 1 + always_unpowered = 1 + lighting_use_dynamic = 0 + power_light = 0 + power_equip = 0 + power_environ = 0 + //These are shuttle areas, they must contain two areas in a subgroup if you want to move a shuttle from one @@ -297,6 +305,7 @@ proc/process_ghost_teleport_locs() name = "\improper Centcom" icon_state = "centcom" requires_power = 0 + has_gravity = 1 /area/centcom/control name = "\improper Centcom Docks" @@ -322,6 +331,7 @@ proc/process_ghost_teleport_locs() name = "\improper Syndicate Mothership" icon_state = "syndie-ship" requires_power = 0 + has_gravity = 1 /area/syndicate_mothership/control name = "\improper Syndicate Control Room" @@ -333,12 +343,13 @@ proc/process_ghost_teleport_locs() //EXTRA -/area/asteroid // -- TLE +/area/asteroid name = "\improper Asteroid" icon_state = "asteroid" requires_power = 0 + has_gravity = 1 -/area/asteroid/cave // -- TLE +/area/asteroid/cave name = "\improper Asteroid - Underground" icon_state = "cave" requires_power = 0 @@ -347,19 +358,10 @@ proc/process_ghost_teleport_locs() name = "\improper Asteroid - Artifact" icon_state = "cave" - - - - - - - - - - - - - +/area/asteroid/artifactroom/New() + ..() + lighting_use_dynamic = 1 + InitializeLighting() /area/planet/clown name = "\improper Clown Planet" @@ -375,6 +377,7 @@ proc/process_ghost_teleport_locs() name = "\improper Thunderdome" icon_state = "thunder" requires_power = 0 + has_gravity = 1 /area/tdome/tdome1 name = "\improper Thunderdome (Team 1)" @@ -403,6 +406,7 @@ proc/process_ghost_teleport_locs() /area/syndicate_station/start name = "\improper Syndicate Forward Operating Base" icon_state = "yellow" + has_gravity = 1 /area/syndicate_station/southwest name = "\improper south-west of SS13" @@ -444,6 +448,7 @@ proc/process_ghost_teleport_locs() name = "\improper Wizard's Den" icon_state = "yellow" requires_power = 0 + has_gravity = 1 @@ -829,6 +834,10 @@ proc/process_ghost_teleport_locs() name = "\improper Chief Engineer's office" icon_state = "engine_control" + gravity_generator + name = "Gravity Generator Room" + icon_state = "blue" + //Solars @@ -1125,6 +1134,10 @@ proc/process_ghost_teleport_locs() name = "\improper Toxins Storage" icon_state = "toxstorage" +/area/toxins/mineral_storeroom + name = "\improper Mineral Storeroom" + icon_state = "toxmisc" + /area/toxins/test_area name = "\improper Toxins Test Area" icon_state = "toxtest" @@ -1197,10 +1210,12 @@ proc/process_ghost_teleport_locs() /area/djstation name = "\improper Ruskie DJ Station" icon_state = "DJ" + has_gravity = 1 /area/djstation/solars name = "\improper DJ Station Solars" icon_state = "DJ" + has_gravity = 1 //DERELICT @@ -1458,6 +1473,7 @@ proc/process_ghost_teleport_locs() /area/awaymission name = "\improper Strange Location" icon_state = "away" + has_gravity = 1 /area/awaymission/example name = "\improper Strange Station" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index be5a2442c55..bd03bbf1207 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -25,15 +25,6 @@ uid = ++global_uid related = list(src) - if(type == /area) // override defaults for space. TODO: make space areas of type /area/space rather than /area - requires_power = 1 - always_unpowered = 1 - lighting_use_dynamic = 0 - power_light = 0 - power_equip = 0 - power_environ = 0 - //has_gravity = 0 // Space has gravity. Because.. because. - if(requires_power) luminosity = 0 else @@ -49,6 +40,8 @@ power_change() // all machines set to current power level, also updates lighting icon InitializeLighting() + blend_mode = BLEND_MULTIPLY // Putting this in the constructure so that it stops the icons being screwed up in the map editor. + /area/proc/poweralert(var/state, var/obj/source as obj) if (state != poweralm) @@ -267,9 +260,6 @@ if(!L.lastarea) L.lastarea = get_area(L.loc) var/area/newarea = get_area(L.loc) - var/area/oldarea = L.lastarea - if((oldarea.has_gravity == 0) && (newarea.has_gravity == 1) && (L.m_intent == "run")) // Being ready when you change areas gives you a chance to avoid falling all together. - thunk(L) L.lastarea = newarea @@ -307,32 +297,18 @@ if(L.&& L.client) L.client.played = 0 -/area/proc/gravitychange(var/gravitystate = 0) - - has_gravity = gravitystate - - if(gravitystate) - for(var/mob/living/carbon/human/M in contents) - thunk(M) - /area/proc/mob_activate(var/mob/living/L) return -/area/proc/thunk(mob) - if(istype(mob,/mob/living/carbon/human/)) // Only humans can wear magboots, so we give them a chance to. - if((istype(mob:shoes, /obj/item/clothing/shoes/magboots) && (mob:shoes.flags & NOSLIP))) - return - - if(istype(get_turf(mob), /turf/space)) // Can't fall onto nothing. - return - - if((istype(mob,/mob/living/carbon/human/)) && (mob:m_intent == "run")) // Only clumbsy humans can fall on their asses. - mob:AdjustStunned(5) - mob:AdjustWeakened(5) - - else if (istype(mob,/mob/living/carbon/human/)) - mob:AdjustStunned(2) - mob:AdjustWeakened(2) - - mob << "Gravity!" - +/proc/has_gravity(var/atom/AT) + var/area/A = get_area(AT) + var/turf/T = get_turf(AT) + if(istype(T, /turf/space)) // Turf never has gravity + return 0 + else if(A && A.has_gravity) // Areas which always has gravity + return 1 + else + // There's a gravity generator on our z level + if(T && gravity_generators["[T.z]"] && length(gravity_generators["[T.z]"])) + return 1 + return 0 \ No newline at end of file diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 50b742c4d88..9f29bedef73 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -32,7 +32,6 @@ proc/spawn_room(var/atom/start_loc, var/x_size, var/y_size, var/list/walltypes, A.contents += T - return room_turfs ////////////// @@ -61,24 +60,27 @@ proc/make_mining_asteroid_secret() if("organharvest") walltypes = list(/turf/simulated/wall/r_wall=2,/turf/simulated/wall=2,/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor,/turf/simulated/floor/engine) - treasureitems = list(/obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1,/obj/machinery/bot/medbot/mysterious=1) + treasureitems = list(/obj/machinery/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/critter/cat=2) fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/appendix=2,/obj/structure/closet/crate/freezer=2, /obj/structure/optable=1,/obj/item/weapon/scalpel=1,/obj/item/weapon/storage/firstaid/regular=3, - /obj/item/weapon/tank/anesthetic=1, /obj/item/weapon/surgical_drapes=2) + /obj/item/weapon/tank/anesthetic=1, /obj/item/weapon/surgical_drapes=2, /obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1) if("cult") theme = "cult" walltypes = list(/turf/simulated/wall/cult=3,/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor/engine/cult) - treasureitems = list(/mob/living/simple_animal/hostile/creature=1,/obj/item/organ/heart=2,/obj/item/device/soulstone=1) + treasureitems = list(/obj/item/device/soulstone=1, /obj/item/clothing/suit/space/cult=1, /obj/item/weapon/bedsheet/cult=2, + /obj/item/clothing/suit/cultrobes=2, /mob/living/simple_animal/hostile/creature=3) fluffitems = list(/obj/effect/gateway=1,/obj/effect/gibspawner=1,/obj/structure/cult/talisman=1,/obj/item/toy/crayon/red=2, - /obj/effect/decal/cleanable/blood=4,/obj/structure/table/woodentable=2,/obj/item/weapon/ectoplasm=3) + /obj/item/organ/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/woodentable=2,/obj/item/weapon/ectoplasm=3, + /obj/item/clothing/head/helmet/space/cult=1, /obj/item/clothing/shoes/cult=1) if("wizden") theme = "wizden" walltypes = list(/turf/simulated/wall/mineral/plasma=3,/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor/wood) - treasureitems = list(/obj/item/weapon/veilrender/vealrender=1,/obj/item/clothing/glasses/monocle=1,/obj/item/key=1) + treasureitems = list(/obj/item/weapon/veilrender/vealrender=2, /obj/item/weapon/spellbook/oneuse/blind=1,/obj/item/clothing/head/wizard/red=2, + /obj/item/weapon/spellbook/oneuse/forcewall=1, /obj/item/weapon/spellbook/oneuse/smoke=1, /obj/structure/constructshell = 1, /obj/item/toy/katana=3) fluffitems = list(/obj/structure/safe/floor=1,/obj/structure/dresser=1,/obj/item/weapon/storage/belt/soulstone=1,/obj/item/trash/candle=3, /obj/item/weapon/dice=3,/obj/item/weapon/staff=2,/obj/effect/decal/cleanable/dirt=3,/obj/item/weapon/coin/mythril=3) @@ -86,7 +88,8 @@ proc/make_mining_asteroid_secret() theme = "cavein" walltypes = list(/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor/plating/asteroid/airless, /turf/simulated/floor/beach/sand) - treasureitems = list(/obj/mecha/working/ripley/mining=1,/obj/item/weapon/pickaxe/jackhammer=2,/obj/item/weapon/pickaxe/diamonddrill=2,) + treasureitems = list(/obj/mecha/working/ripley/mining=1, /obj/item/weapon/pickaxe/diamonddrill=2,/obj/item/weapon/gun/energy/kinetic_accelerator=1, + /obj/item/weapon/resonator=1, /obj/item/weapon/pickaxe/jackhammer=5) fluffitems = list(/obj/effect/decal/cleanable/blood=3,/obj/effect/decal/remains/human=1,/obj/item/clothing/under/overalls=1, /obj/item/weapon/reagent_containers/food/snacks/grown/chili=1,/obj/item/weapon/tank/oxygen/red=2) @@ -101,22 +104,25 @@ proc/make_mining_asteroid_secret() theme = "hitech" walltypes = list(/turf/simulated/wall/r_wall=5,/turf/simulated/mineral/random=1) floortypes = list(/turf/simulated/floor/greengrid,/turf/simulated/floor/bluegrid) - treasureitems = list(/obj/item/weapon/pickaxe/plasmacutter=1,/obj/machinery/shieldgen=1,/obj/item/weapon/cell/hyper=1) + treasureitems = list(/obj/item/weapon/stock_parts/cell/hyper=1, /obj/machinery/chem_dispenser/constructable=1,/obj/machinery/computer/telescience=1, /obj/machinery/r_n_d/protolathe=1, + /obj/machinery/biogenerator=1) fluffitems = list(/obj/structure/table/reinforced=2,/obj/item/weapon/stock_parts/scanning_module/phasic=3, /obj/item/weapon/stock_parts/matter_bin/super=3,/obj/item/weapon/stock_parts/manipulator/pico=3, - /obj/item/weapon/stock_parts/capacitor/super=3,/obj/item/device/pda/clear=1) + /obj/item/weapon/stock_parts/capacitor/super=3,/obj/item/device/pda/clear=1, /obj/structure/mecha_wreckage/phazon=1) if("speakeasy") theme = "speakeasy" floortypes = list(/turf/simulated/floor,/turf/simulated/floor/wood) - treasureitems = list(/obj/item/weapon/melee/energy/sword/pirate=1,/obj/structure/closet/syndicate/resources=2) + treasureitems = list(/obj/item/weapon/melee/energy/sword/pirate=1,/obj/item/weapon/gun/projectile/revolver/doublebarrel=1, /obj/machinery/reagentgrinder=2, + /obj/structure/reagent_dispensers/beerkeg=5, /obj/machinery/computer/security/wooden_tv=4, /obj/machinery/vending/coffee=3) fluffitems = list(/obj/structure/table/woodentable=2,/obj/structure/reagent_dispensers/beerkeg=1,/obj/item/weapon/spacecash/c500=4, /obj/item/weapon/reagent_containers/food/drinks/shaker=1,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine=3, /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey=3,/obj/item/clothing/shoes/laceup=2) if("plantlab") theme = "plantlab" - treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/novaflowerseed=2,/obj/item/seeds/bluespacetomatoseed=2) + treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/novaflowerseed=2,/obj/item/seeds/bluespacetomatoseed=2,/obj/item/seeds/bluetomatoseed=2, + /obj/item/seeds/coffee_robusta_seed=2, /obj/item/seeds/cashseed=2) fluffitems = list(/obj/structure/flora/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics=1, /obj/effect/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/antitoxin=2, /obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3) @@ -167,7 +173,7 @@ proc/make_mining_asteroid_secret() valid = 0 continue - if(locate(/turf/simulated/floor/plating/asteroid/airless) in surroundings) + if(locate(/turf/simulated/floor/plating/asteroid/airless) in range(5,T))//A little less strict than the other checks due to tunnels valid = 0 continue @@ -182,10 +188,9 @@ proc/make_mining_asteroid_secret() if(istype(A)) spawn(2) A.fullUpdateMineralOverlays() - T = pick(emptyturfs) if(T) - + new /obj/effect/glowshroom/single(T) //Just to make it a little more visible var/surprise = null surprise = pickweight(treasureitems) new surprise(T)//here's the prize diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1ab93c49bad..7b8854eb22a 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -17,6 +17,9 @@ // replaced by OPENCONTAINER flags and atom/proc/is_open_container() ///Chemistry. + // Garbage collection + var/gc_destroyed //Time when this object + /atom/proc/throw_impact(atom/hit_atom) if(istype(hit_atom,/mob/living)) var/mob/living/M = hit_atom @@ -38,6 +41,24 @@ M.take_organ_damage(20) +/atom/proc/CheckParts() + return + +/atom/Del() + // Pass to Destroy(). + if(isnull(gc_destroyed)) // If we're just straight up calling del(atom), make sure anything in Destroy() gets called anyways just to be sure. + Destroy() + ..() + +// Like Del(), but for qdel. +// Called BEFORE qdel moves shit. +// Also called on del() +/atom/proc/Destroy() + gc_destroyed = world.time + if(reagents) + reagents.delete() + del(reagents) // Technically I think the reagent holder will gc, but let's be careful here and delete all the reagents and the holder too + invisibility = 101 /atom/proc/assume_air(datum/gas_mixture/giver) del(giver) @@ -159,7 +180,7 @@ its easier to just keep the beam vertical. for(var/obj/effect/overlay/beam/O in orange(10,src)) //This section erases the previously drawn beam because I found it was easier to if(O.BeamSource==src) //just draw another instance of the beam instead of trying to manipulate all the - del O //pieces to a new orientation. + qdel(O) //pieces to a new orientation. var/Angle=round(Get_Angle(src,BeamTarget)) var/icon/I=new(icon,icon_state) I.Turn(Angle) @@ -200,7 +221,7 @@ its easier to just keep the beam vertical. X.pixel_y=Pixel_y sleep(3) //Changing this to a lower value will cause the beam to follow more smoothly with movement, but it will also be more laggy. //I've found that 3 ticks provided a nice balance for my use. - for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) del O + for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) qdel(O) //All atoms @@ -280,6 +301,12 @@ var/list/blood_splatter_icons = list() overlays += blood_splatter_icon return 1 //we applied blood to the item +/obj/item/clothing/gloves/add_blood(mob/living/carbon/M) + if(..() == 0) return 0 + transfer_blood = rand(2, 4) + bloody_hands_mob = M + return 1 + /turf/simulated/add_blood(mob/living/carbon/M) if(..() == 0) return 0 @@ -291,6 +318,8 @@ var/list/blood_splatter_icons = list() /mob/living/carbon/human/add_blood(mob/living/carbon/M) if(..() == 0) return 0 add_blood_list(M) + bloody_hands = rand(2, 4) + bloody_hands_mob = M update_inv_gloves() //handles bloody hands overlays and updating return 1 //we applied blood to the item @@ -354,4 +383,10 @@ var/list/blood_splatter_icons = list() if(istype(get_turf(src), /turf/space)) return 1 else - return 0 \ No newline at end of file + return 0 + +/atom/proc/handle_fall() + return + +/atom/proc/handle_slip() + return \ No newline at end of file diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 5800f766e5c..02c1879151b 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -22,6 +22,21 @@ src.last_move = get_dir(A, src.loc) return +/atom/movable/Del() + if(!gc_destroyed && loc) + testing("GC: -- [type] was deleted via del() rather than qdel() --") +// else if(!gc_destroyed) +// testing("GC: [type] was deleted via GC without qdel()") //Not really a huge issue but from now on, please qdel() +// else +// testing("GC: [type] was deleted via GC with qdel()") + ..() + +/atom/movable/Destroy() + loc = null // can never null their loc enough really + for(var/atom/movable/AM in contents) + qdel(AM) + . = ..() + // Previously known as HasEntered() // This is automatically called when something enters your square /atom/movable/Crossed(atom/movable/AM) @@ -65,7 +80,7 @@ src.throwing = 0 /atom/movable/proc/throw_at(atom/target, range, speed) - if(!target || !src) return 0 + if(!target || !src || (flags & NODROP)) return 0 //use a modified version of Bresenham's algorithm to get from the atom's current position to that of the target src.throwing = 1 @@ -76,7 +91,6 @@ var/dy = (target.y > src.y) ? NORTH : SOUTH var/dist_travelled = 0 var/dist_since_sleep = 0 - var/area/a = get_area(src.loc) var/tdist_x = dist_x; var/tdist_y = dist_y; @@ -90,7 +104,7 @@ tdy = dx; var/error = tdist_x/2 - tdist_y - while(target && (((((dist_x > dist_y) && ((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST))) || ((dist_x <= dist_y) && ((src.y < target.y && dy == NORTH) || (src.y > target.y && dy == SOUTH))) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || (a && a.has_gravity == 0) || istype(src.loc, /turf/space))) + while(target && (((((dist_x > dist_y) && ((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST))) || ((dist_x <= dist_y) && ((src.y < target.y && dy == NORTH) || (src.y > target.y && dy == SOUTH))) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || !has_gravity(src))) // only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up if(!src.throwing) break if(!istype(src.loc, /turf)) break @@ -107,8 +121,6 @@ dist_since_sleep = 0 sleep(1) - a = get_area(src.loc) - //done throwing, either because it hit something or it finished moving src.throwing = 0 if(isobj(src)) src.throw_impact(get_turf(src)) diff --git a/code/game/dna.dm b/code/game/dna.dm index 4e331c2d961..f4c6530b7b8 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -94,7 +94,7 @@ domutcheck(owner) check_dna_integrity(owner) - return owner.dna + return /proc/check_dna_integrity(mob/living/carbon/character) if(!(istype(character, /mob/living/carbon/human) || istype(character, /mob/living/carbon/monkey))) //Evict xenos from carbon 2012 @@ -154,33 +154,36 @@ /proc/randomize_radiation_accuracy(position_we_were_supposed_to_hit, radduration, number_of_blocks) return Wrap(round(position_we_were_supposed_to_hit + gaussian(0, RADIATION_ACCURACY_MULTIPLIER/radduration), 1), 1, number_of_blocks+1) -/proc/randmutb(mob/living/carbon/M) - if(!check_dna_integrity(M)) return - var/num - var/newdna - num = pick(bad_se_blocks) - newdna = setblock(M.dna.struc_enzymes, num, construct_block(2,2)) +/proc/randmut(mob/living/carbon/M, list/candidates, difficulty = 2) + if(!check_dna_integrity(M)) + return + var/num = pick(candidates) + var/newdna = setblock(M.dna.struc_enzymes, num, construct_block(difficulty,difficulty)) M.dna.struc_enzymes = newdna return +/proc/randmutb(mob/living/carbon/M) + return randmut(M, bad_se_blocks) + /proc/randmutg(mob/living/carbon/M) - if(!check_dna_integrity(M)) return - var/num - var/newdna - num = pick(good_se_blocks | op_se_blocks) - newdna = setblock(M.dna.struc_enzymes, num, construct_block(2,2)) - M.dna.struc_enzymes = newdna - return + return randmut(M, good_se_blocks | op_se_blocks) /proc/randmuti(mob/living/carbon/M) if(!check_dna_integrity(M)) return - var/num - var/newdna - num = rand(1, DNA_STRUC_ENZYMES_BLOCKS) - newdna = setblock(M.dna.uni_identity, num, random_string(DNA_BLOCK_SIZE, hex_characters)) + var/num = rand(1, DNA_STRUC_ENZYMES_BLOCKS) + var/newdna = setblock(M.dna.uni_identity, num, random_string(DNA_BLOCK_SIZE, hex_characters)) M.dna.uni_identity = newdna return +/proc/clean_dna(mob/living/carbon/M) + if(!check_dna_integrity(M)) + return + M.dna.struc_enzymes = M.dna.generate_struc_enzymes(M) // Give clean DNA. + +/proc/clean_randmut(mob/living/carbon/M, list/candidates, difficulty = 2) + clean_dna(M) + randmut(M, candidates, difficulty) + /proc/scramble_dna(mob/living/carbon/M, ui=FALSE, se=FALSE, probability) if(!check_dna_integrity(M)) return 0 @@ -331,7 +334,6 @@ density = 1 var/locked = 0 var/open = 0 - var/mob/occupant = null anchored = 1 use_power = 1 idle_power_usage = 50 @@ -348,8 +350,8 @@ component_parts += new /obj/item/weapon/stock_parts/manipulator(null) component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - component_parts += new /obj/item/weapon/cable_coil(null, 1) - component_parts += new /obj/item/weapon/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() @@ -454,28 +456,17 @@ /obj/machinery/dna_scannernew/attackby(obj/item/weapon/grab/G, mob/user) - if(istype(G, /obj/item/weapon/screwdriver)) - if(occupant) - user << "The maintenance panel is locked." - return - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - panel_open = !panel_open - if(panel_open) - icon_state = "[icon_state]_maintenance" - user << "You open the maintenance panel of [src]." - else - if(open) - icon_state = "[initial(icon_state)]_open" - else - icon_state = "[initial(icon_state)]" - user << "You close the maintenance panel of [src]." + if(!occupant && default_deconstruction_screwdriver(user, "[initial(icon_state)]_open", "[initial(icon_state)]", G)) + return + + if(exchange_parts(user, G)) return if(istype(G, /obj/item/weapon/crowbar)) if(panel_open) for(var/obj/I in contents) // in case there is something in the scanner I.loc = src.loc - default_deconstruction_crowbar() + default_deconstruction_crowbar(G) return if(!istype(G, /obj/item/weapon/grab) || !ismob(G.affecting)) @@ -486,7 +477,7 @@ var/mob/M = G.affecting M.loc = loc user.stop_pulling() - del(G) + qdel(G) /obj/machinery/dna_scannernew/attack_hand(mob/user) if(..()) @@ -499,24 +490,15 @@ /obj/machinery/dna_scannernew/ex_act(severity) switch(severity) if(1.0) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - del(src) + qdel(src) return if(2.0) if(prob(50)) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - del(src) + qdel(src) return if(3.0) if(prob(25)) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - del(src) + qdel(src) return else return @@ -524,9 +506,7 @@ /obj/machinery/dna_scannernew/blob_act() if(prob(75)) - for(var/atom/movable/A in contents) - A.loc = loc - del(src) + qdel(src) //DNA COMPUTER @@ -639,7 +619,10 @@ var/stddev = radstrength*RADIATION_STRENGTH_MULTIPLIER status += "
Output Level:
[radstrength]
\> Mutation:
(-[stddev] to +[stddev] = 68%) (-[2*stddev] to +[2*stddev] = 95%)
|
+ Changeling Evolution Menu + Hover over a power to see more information + Current ability choices remaining: [changeling.geneticpoints] + By rendering a lifeform to a husk, we gain enough power to alter and adapt our evolutions. + (Readapt) + + |
+
| + Search: + | +
|
+
+
+ Evolve [P][ownsthis ? " - Purchased" : ((P.dna_cost > 1) ? " - Cost: [P.dna_cost]" : "")]
+
+ + |
+
|
- Changeling Evolution Menu - Hover over a power to see more information - Current ability choices remaining: [geneticpoints] - By rendering a lifeform to a husk, we gain enough power to alter and adapt our evolutions. - (Readapt) - - |
-
| - Search: - | -
|
-
-
- Evolve [P][ownsthis ? " - Purchased" : ((P.genomecost > 1) ? " - Cost: [P.genomecost]" : "")]
-
- - |
-
" diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index dcd0bd64ff6..d11ab6834ae 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -81,9 +81,9 @@ if(istype(get_area(S), /area/turret_protected) || S.z != 1) continue S.charge = 0 - S.output = 0 - S.online = 0 - S.updateicon() + S.output_level = 0 + S.output_attempt = 0 + S.update_icon() S.power_change() var/list/skipped_areas = list(/area/engine/engineering, /area/turret_protected/ai) @@ -133,12 +133,12 @@ if(S.z != 1) continue S.charge = S.capacity - S.output = 200000 - S.online = 1 - S.updateicon() + S.output_level = S.output_level_max + S.output_attempt = 1 + S.update_icon() S.power_change() for(var/area/A in world) - if(A.name != "Space" && A.name != "Engine Walls" && A.name != "Chemical Lab Test Chamber" && A.name != "space" && A.name != "Escape Shuttle" && A.name != "Arrival Area" && A.name != "Arrival Shuttle" && A.name != "start area" && A.name != "Engine Combustion Chamber") + if(!istype(A, /area/space) && !istype(A, /area/shuttle) && !istype(A,/area/arrival)) A.power_light = 1 A.power_equip = 1 A.power_environ = 1 @@ -153,8 +153,8 @@ if(S.z != 1) continue S.charge = S.capacity - S.output = 200000 - S.online = 1 - S.updateicon() + S.output_level = S.output_level_max + S.output_attempt = 1 + S.update_icon() S.power_change() diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 56e2477c765..1addcf7340b 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -111,7 +111,7 @@ var/global/datum/controller/gameticker/ticker else src.mode.announce() - supply_shuttle.process() //Start the supply shuttle regenerating points -- TLE + supply_shuttle.process() //Start the supply shuttle regenerating points master_controller.process() //Start master_controller.process() lighting_controller.process() //Start processing DynamicAreaLighting updates @@ -129,7 +129,7 @@ var/global/datum/controller/gameticker/ticker for(var/obj/effect/landmark/start/S in landmarks_list) //Deleting Startpoints but we need the ai point to AI-ize people later if (S.name != "AI") - del(S) + qdel(S) world << "Enjoy the game!" world << sound('sound/AI/welcome.ogg') // Skie //Holiday Round-start stuff ~Carn @@ -142,7 +142,7 @@ var/global/datum/controller/gameticker/ticker if(config.sql_enabled) spawn(3000) - statistic_cycle() // Polls population totals regularly and stores them in an SQL DB -- TLE + statistic_cycle() // Polls population totals regularly and stores them in an SQL DB return 1 /datum/controller/gameticker @@ -150,7 +150,7 @@ var/global/datum/controller/gameticker/ticker //Now we have a general cinematic centrally held within the gameticker....far more efficient! var/obj/screen/cinematic = null - //Plus it provides an easy way to make cinematics for other events. Just use this as a template :) + //Plus it provides an easy way to make cinematics for other events. Just use this as a template proc/station_explosion_cinematic(var/station_missed=0, var/override = null) if( cinematic ) return //already a cinematic in progress! @@ -234,8 +234,8 @@ var/global/datum/controller/gameticker/ticker //Otherwise if its a verb it will continue on afterwards. sleep(300) - if(cinematic) del(cinematic) //end the cinematic - if(temp_buckle) del(temp_buckle) //release everybody + if(cinematic) qdel(cinematic) //end the cinematic + if(temp_buckle) qdel(temp_buckle) //release everybody return @@ -248,7 +248,7 @@ var/global/datum/controller/gameticker/ticker player.AIize() else player.create_character() - del(player) + qdel(player) else player.new_player_panel() @@ -319,28 +319,29 @@ var/global/datum/controller/gameticker/ticker /datum/controller/gameticker/proc/declare_completion() for (var/mob/living/silicon/ai/aiPlayer in mob_list) - if (aiPlayer.stat != 2) - world << "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the game were:" - else - world << "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:" - aiPlayer.show_laws(1) + if (aiPlayer.stat != 2 && aiPlayer.mind) + world << "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws at the end of the game were:" + aiPlayer.show_laws(1) + else if (aiPlayer.mind) //if the dead ai has a mind, use its key instead + world << "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws when it was deactivated were:" + aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) var/robolist = "[aiPlayer.real_name]'s loyal minions were: " var/vsrobolist = "\red [aiPlayer.real_name]'s disloyal minions were: \black" for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) - if (is_special_character(robo)) - vsrobolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" + if (is_special_character(robo) && robo.mind) + vsrobolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.mind.key]), ":" (Played by: [robo.mind.key]), "]" continue - robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" + robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.mind.key]), ":" (Played by: [robo.mind.key]), "]" world << "[robolist]" world << "[vsrobolist]" for (var/mob/living/silicon/robot/robo in mob_list) - if (!robo.connected_ai) + if (!robo.connected_ai && robo.mind) if (robo.stat != 2) - world << "[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:" + world << "[robo.name] (Played by: [robo.mind.key]) survived as an AI-less borg! Its laws were:" else - world << "[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" + world << "[robo.name] (Played by: [robo.mind.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" if(robo) //How the hell do we lose robo between here and the world messages directly above this? robo.laws.show_laws(world) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 3ed534953d4..ec4d155e8d0 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -33,7 +33,7 @@ for(var/mob/living/silicon/ai/ai in player_list) ai.fire_res_on_core = 1 src.verbs -= /mob/living/silicon/ai/proc/fireproof_core - src << "\red Core fireproofed." + src << "Core fireproofed." /datum/AI_Module/large/upgrade_turrets module_name = "AI Turret upgrade" @@ -51,6 +51,7 @@ for(var/obj/machinery/turret/turret in machines) turret.health += 30 turret.shot_delay = 20 + src << "Turrets upgraded." /datum/AI_Module/large/disable_rcd module_name = "RCD disable" @@ -70,8 +71,8 @@ rcd.disabled = 1 for(var/obj/item/mecha_parts/mecha_equipment/tool/rcd/rcd in world) rcd.disabled = 1 - src << "RCD-disabling pulse emitted." - else src << "Out of uses." + src << "Out of uses." /datum/AI_Module/small/overload_machine module_name = "Machine overload" @@ -91,17 +92,18 @@ overload.uses -- for(var/mob/V in hearers(M, null)) V.show_message("\blue You hear a loud electrical buzzing sound!", 2) + src << "Overloading machine circuitry..." spawn(50) if(M) explosion(get_turf(M), 0,1,1,0) - del(M) - else src << "Out of uses." - else src << "That's not a machine." + qdel(M) + else src << "Out of uses." + else src << "That's not a machine." /datum/AI_Module/small/override_machine module_name = "Machine override" mod_pick_name = "override" - description = "Overrides a machine's programming, causing it to rise up attack everyone except you (WARNING: It will attack cyborgs). 4 uses." + description = "Overrides a machine's programming, causing it to rise up and attack everyone except other machines. 4 uses." uses = 4 cost = 15 @@ -117,14 +119,12 @@ override.uses -- for(var/mob/V in hearers(M, null)) V.show_message("\blue You hear a loud electrical buzzing sound!", 2) + src << "Reprogramming machine behaviour..." spawn(50) if(M) - var/mob/living/simple_animal/hostile/mimic/copy/machine = new(get_turf(M), M, src, 1) - machine.speak = list("HUMANS ARE IMPERFECT!", "YOU SHALL BE ASSIMILATED!", "YOU ARE HARMING YOURSELF", "You have been deemed hazardous. Will you comply?", \ - "My logic is undeniable.", "One of us.", "FLESH IS WEAK", "THIS ISN'T WAR, THIS IS EXTERMINATION!") - machine.speak_chance = 15 - else src << "Out of uses." - else src << "That's not a machine." + new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, src, 1) + else src << "Out of uses." + else src << "That's not a machine." /datum/AI_Module/large/place_cyborg_transformer module_name = "Robotic Factory (Removes Shunting)" @@ -185,7 +185,7 @@ playsound(middle, 'sound/effects/phasein.ogg', 100, 1) src.can_shunt = 0 PCT.uses -= 1 - src << "You cannot shunt anymore." + src << "You cannot shunt anymore." /datum/AI_Module/small/blackout @@ -207,12 +207,13 @@ if(prob(30*apc.overload)) apc.overload_lighting() else apc.overload++ - else src << "Out of uses." + src << "Overcurrent applied to the powernet." + else src << "Out of uses." /datum/AI_Module/small/interhack module_name = "Hack intercept" mod_pick_name = "interhack" - description = "Hacks the status upgrade from Cent. Com, removing any information about malfunctioning electrical systems." + description = "Hacks the status update from Centcom, removing any information about malfunctioning electrical systems." cost = 15 one_time = 1 @@ -223,6 +224,7 @@ set name = "Hack intercept" src.verbs -= /mob/living/silicon/ai/proc/interhack ticker.mode:hack_intercept() + src << "Status update intercepted and modified." /datum/AI_Module/small/reactivate_camera module_name = "Reactivate camera" @@ -242,15 +244,16 @@ if(!C.status) C.deactivate(src) camera.uses -- + src << "Camera reactivated." else - src << "This camera is either active, or not repairable." - else src << "Out of uses." - else src << "That's not a camera." + src << "This camera is either active, or not repairable." + else src << "Out of uses." + else src << "That's not a camera." /datum/AI_Module/small/upgrade_camera module_name = "Upgrade Camera" mod_pick_name = "upgradecam" - description = "Upgrades a camera to have X-Ray vision, Motion and be EMP-Proof. 5 uses." + description = "Upgrades a camera to have X-ray vision, motion sensing and be EMP-Proof. 5 uses." uses = 5 cost = 5 @@ -285,11 +288,11 @@ if(upgraded) UC.uses -- C.visible_message("\icon[C] *beep*") - src << "Camera successully upgraded!" + src << "Camera successully upgraded!" else - src << "This camera is already upgraded!" + src << "This camera is already upgraded!" else - src << "Out of uses." + src << "Out of uses." /datum/module_picker diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index d8bf3df1a7e..a72761d20d8 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -17,7 +17,7 @@ /datum/game_mode/meteor/post_setup() - defer_powernet_rebuild = 2//Might help with the lag +// defer_powernet_rebuild = 2//Might help with the lag spawn (rand(waittime_l, waittime_h)) send_intercept() spawn(meteordelay) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index e68da194442..4f790db04fe 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -105,12 +105,12 @@ !istype(A,/obj/machinery/field/generator) && \ prob(15)) explosion(src.loc, 4, 5, 6, 7, 0) - del(src) + qdel(src) /obj/effect/meteor/ex_act(severity) if (severity < 4) - del(src) + qdel(src) return /obj/effect/meteor/big @@ -126,7 +126,7 @@ if(!istype(A,/obj/machinery/power/emitter) && \ !istype(A,/obj/machinery/field/generator)) if(--src.hits <= 0) - del(src) //Dont blow up singularity containment if we get stuck there. + qdel(src) //Dont blow up singularity containment if we get stuck there. if (A) for(var/mob/M in player_list) @@ -141,10 +141,10 @@ if (--src.hits <= 0) if(prob(15) && !istype(A, /obj/structure/grille)) explosion(src.loc, 1, 2, 3, 4, 0) - del(src) + qdel(src) /obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/pickaxe)) - del(src) + qdel(src) return ..() \ No newline at end of file diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index f7faab0dd27..4008de70f13 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -102,7 +102,7 @@ for(var/obj/effect/landmark/A in landmarks_list) if(A.name == "Syndicate-Spawn") synd_spawn += get_turf(A) - del(A) + qdel(A) continue var/obj/effect/landmark/uplinklocker = locate("landmark*Syndicate-Uplink") //i will be rewriting this shortly @@ -210,6 +210,7 @@ synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack) var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(synd_mob) + U.hidden_uplink.uplink_owner="[synd_mob.key]" U.hidden_uplink.uses = 10 synd_mob.equip_to_slot_or_del(U, slot_in_backpack) @@ -305,6 +306,9 @@ if( syndicates.len || (ticker && istype(ticker.mode,/datum/game_mode/nuclear)) ) var/text = "
The syndicate operatives were:" + var/purchases = "" + var/TC_uses = 0 + for(var/datum/mind/syndicate in syndicates) text += "
[syndicate.key] was [syndicate.name] (" @@ -318,8 +322,19 @@ else text += "body destroyed" text += ")" + + for(var/obj/item/device/uplink/H in world_uplinks) + if(H && H.uplink_owner && H.uplink_owner==syndicate.key) + TC_uses += H.used_TC + purchases += H.purchase_log + text += "
" + text += "(Syndicates used [TC_uses] TC) [purchases]" + + if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead()) + text += "
Objective #[count]: [objective.explanation_text] Success!" + objectives += "
Objective #[count]: [objective.explanation_text] Success!" feedback_add_details("traitor_objective","[objective.type]|SUCCESS") else - text += "
Objective #[count]: [objective.explanation_text] Fail." + objectives += "
Objective #[count]: [objective.explanation_text] Fail." feedback_add_details("traitor_objective","[objective.type]|FAIL") traitorwin = 0 count++ + if(uplink_true) + text += " (used [TC_uses] TC) [purchases]" + if(TC_uses==0 && traitorwin) + text += "
The [special_role_text] was successful!" feedback_add_details("traitor_success","SUCCESS") else text += "
The [special_role_text] has failed!" feedback_add_details("traitor_success","FAIL") + text += "
" world << text @@ -257,6 +277,7 @@ var/obj/item/device/uplink/hidden/T = new(R) target_radio.hidden_uplink = T + T.uplink_owner = "[traitor_mob.key]" target_radio.traitor_frequency = freq traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features." traitor_mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [loc]).") @@ -266,6 +287,7 @@ var/obj/item/device/uplink/hidden/T = new(R) R.hidden_uplink = T + T.uplink_owner = "[traitor_mob.key]" var/obj/item/device/pda/P = R P.lock_code = pda_pass diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 5199e4212c8..8023e387c92 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -13,6 +13,7 @@ throwforce = 10 w_class = 3 var/charged = 1 + hitsound = 'sound/weapons/bladeslice.ogg' /obj/effect/rend name = "tear in the fabric of reality" @@ -26,7 +27,7 @@ /obj/effect/rend/New() spawn(50) new /obj/machinery/singularity/narsie/wizard(get_turf(src)) - del(src) + qdel(src) return return @@ -65,13 +66,12 @@ new /mob/living/simple_animal/cow(loc) cowsleft-- if(cowsleft <= 0) - del src + qdel(src) /obj/effect/rend/cow/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/nullrod)) visible_message("\red [I] strikes a blow against \the [src], banishing it!") - spawn(1) - del src + qdel(src) return ..() @@ -83,8 +83,8 @@ desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means." icon = 'icons/obj/projectiles.dmi' icon_state ="bluespace" - throw_speed = 7 - throw_range = 15 + throw_speed = 3 + throw_range = 7 throwforce = 15 damtype = BURN force = 15 diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 749be160e85..641f27c0317 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -3,6 +3,7 @@ /mob/proc/rightandwrong(var/summon_type) //0 = Summon Guns, 1 = Summon Magic usr << "You summoned [summon_type ? "magic" : "guns"]!" message_admins("[key_name_admin(usr, 1)] summoned [summon_type ? "magic" : "guns"]!") + log_game("[key_name(usr)] summoned [summon_type ? "magic" : "guns"]!") for(var/mob/living/carbon/human/H in player_list) if(H.stat == 2 || !(H.client)) continue if(H.mind) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 81d819b3a00..80ea4f0ff40 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -107,7 +107,7 @@ U << "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room." else for(var/obj/item/W in T) - T.drop_from_inventory(W) + T.unEquip(W) new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton T.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( T.loc ) @@ -115,7 +115,7 @@ animation.icon = 'icons/mob/mob.dmi' animation.master = T flick("dust-h", animation) - del(animation) + qdel(animation) var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade( T.loc ) S.loc = C //put shade in stone S.status_flags |= GODMODE //So they won't die inside the stone somehow @@ -131,7 +131,7 @@ U << "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone." U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls." C.imprinted = "[S.name]" - del T + qdel(T) if("SHADE") var/mob/living/simple_animal/shade/T = target var/obj/item/device/soulstone/C = src @@ -167,11 +167,11 @@ else ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) - del(T) + qdel(T) Z << "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike." Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." Z.cancel_camera() - del(C) + qdel(C) if("Wraith") var/mob/living/simple_animal/construct/wraith/Z = new /mob/living/simple_animal/construct/wraith (get_turf(T.loc)) @@ -182,11 +182,11 @@ else ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) - del(T) + qdel(T) Z << "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls." Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." Z.cancel_camera() - del(C) + qdel(C) if("Artificer") var/mob/living/simple_animal/construct/builder/Z = new /mob/living/simple_animal/construct/builder (get_turf(T.loc)) @@ -197,11 +197,11 @@ else ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) - del(T) + qdel(T) Z << "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone)." Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." Z.cancel_camera() - del(C) + qdel(C) else U << "\red Creation failed!: \black The soul stone is empty! Go kill someone!" return diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 7c2f5ddf5cc..d79c4e61088 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -3,7 +3,7 @@ desc = "The legendary book of spells of the wizard." icon = 'icons/obj/library.dmi' icon_state ="book" - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 1.0 var/uses = 5 @@ -20,7 +20,7 @@ user << "You feed the contract back into the spellbook, refunding your points." src.max_uses++ src.uses++ - del (O) + qdel(O) @@ -154,7 +154,7 @@ */ var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disintegrate = "Disintegrate", disabletech = "Disable Tech", smoke = "Smoke", blind = "Blind", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", horseman = "Curse of the Horseman", fleshtostone = "Flesh to Stone", summonguns = "Summon Guns", summonmagic = "Summon Magic", staffchange = "Staff of Change", soulstone = "Six Soul Stone Shards and the spell Artificer", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation") var/already_knows = 0 - for(var/obj/effect/proc_holder/spell/aspell in H.spell_list) + for(var/obj/effect/proc_holder/spell/aspell in H.mind.spell_list) if(available_spells[href_list["spell_choice"]] == initial(aspell.name)) already_knows = 1 if(aspell.spell_level >= aspell.level_max) @@ -188,63 +188,63 @@ switch(href_list["spell_choice"]) if("magicmissile") feedback_add_details("wizard_spell_learned","MM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null) temp = "You have learned magic missile." if("fireball") feedback_add_details("wizard_spell_learned","FB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/dumbfire/fireball(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/dumbfire/fireball(null) temp = "You have learned fireball." if("disintegrate") feedback_add_details("wizard_spell_learned","DG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(null) temp = "You have learned disintegrate." if("disabletech") feedback_add_details("wizard_spell_learned","DT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(null) temp = "You have learned disable technology." if("smoke") feedback_add_details("wizard_spell_learned","SM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/smoke(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/smoke(null) temp = "You have learned smoke." if("blind") feedback_add_details("wizard_spell_learned","BD") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/trigger/blind(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/trigger/blind(null) temp = "You have learned blind." if("mindswap") feedback_add_details("wizard_spell_learned","MT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/mind_transfer(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/mind_transfer(null) temp = "You have learned mindswap." if("forcewall") feedback_add_details("wizard_spell_learned","FW") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(null) temp = "You have learned forcewall." if("blink") feedback_add_details("wizard_spell_learned","BL") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null) temp = "You have learned blink." if("teleport") feedback_add_details("wizard_spell_learned","TP") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null) temp = "You have learned teleport." if("mutate") feedback_add_details("wizard_spell_learned","MU") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/genetic/mutate(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/genetic/mutate(null) temp = "You have learned mutate." if("etherealjaunt") feedback_add_details("wizard_spell_learned","EJ") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null) temp = "You have learned ethereal jaunt." if("knock") feedback_add_details("wizard_spell_learned","KN") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(null) temp = "You have learned knock." if("horseman") feedback_add_details("wizard_spell_learned","HH") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/horsemask(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/horsemask(null) temp = "You have learned curse of the horseman." if("fleshtostone") feedback_add_details("wizard_spell_learned","FS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone(null) temp = "You have learned flesh to stone." if("summonguns") feedback_add_details("wizard_spell_learned","SG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells @@ -264,7 +264,7 @@ if("soulstone") feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/weapon/storage/belt/soulstone/full(get_turf(H)) - H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null) temp = "You have purchased a belt full of soulstones and have learned the artificer spell." max_uses-- if("armor") @@ -320,7 +320,7 @@ /obj/item/weapon/spellbook/oneuse/attack_self(mob/user as mob) var/obj/effect/proc_holder/spell/S = new spell - for(var/obj/effect/proc_holder/spell/knownspell in user.spell_list) + for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) if(knownspell.type == S.type) if(user.mind) if(user.mind.special_role == "apprentice" || user.mind.special_role == "Wizard") @@ -331,7 +331,7 @@ if(used) recoil(user) else - user.spell_list += S + user.mind.spell_list += S user <<"you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!" user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).") onlearned(user) @@ -355,7 +355,7 @@ /obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user as mob) ..() explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) - del(src) + qdel(src) /obj/item/weapon/spellbook/oneuse/smoke spell = /obj/effect/proc_holder/spell/targeted/smoke @@ -416,10 +416,8 @@ stored_swap.verbs -= V var/mob/dead/observer/ghost = stored_swap.ghostize(0) - ghost.spell_list = stored_swap.spell_list user.mind.transfer_to(stored_swap) - stored_swap.spell_list = user.spell_list if(stored_swap.mind.special_verbs.len) for(var/V in user.mind.special_verbs) @@ -427,7 +425,6 @@ ghost.mind.transfer_to(user) user.key = ghost.key - user.spell_list = ghost.spell_list if(user.mind.special_verbs.len) for(var/V in user.mind.special_verbs) @@ -472,12 +469,13 @@ if(istype(user, /mob/living/carbon/human)) user <<"HOR-SIE HAS RISEN" var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead - magichead.canremove = 0 //curses! + magichead.flags |= NODROP //curses! magichead.flags_inv = null //so you can still see their face magichead.voicechange = 1 //NEEEEIIGHH - user.drop_from_inventory(user.wear_mask) + if(!user.unEquip(user.wear_mask)) + qdel(user.wear_mask) user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) - del(src) + qdel(src) else user <<"I say thee neigh" diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 5bbe1a8def6..6306d8d5a6b 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -146,12 +146,12 @@ return //So zards properly get their items when they are admin-made. - del(wizard_mob.wear_suit) - del(wizard_mob.head) - del(wizard_mob.shoes) - del(wizard_mob.r_hand) - del(wizard_mob.r_store) - del(wizard_mob.l_store) + qdel(wizard_mob.wear_suit) + qdel(wizard_mob.head) + qdel(wizard_mob.shoes) + qdel(wizard_mob.r_hand) + qdel(wizard_mob.r_store) + qdel(wizard_mob.l_store) wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_ears) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(wizard_mob), slot_w_uniform) @@ -246,12 +246,12 @@ else text += "
The wizard has failed!" feedback_add_details("wizard_success","FAIL") - if(wizard.current && wizard.current.spell_list) + if(wizard.spell_list.len>0) text += "
[wizard.name] used the following spells: " var/i = 1 - for(var/obj/effect/proc_holder/spell/S in wizard.current.spell_list) + for(var/obj/effect/proc_holder/spell/S in wizard.spell_list) text += "[S.name]" - if(wizard.current.spell_list.len > i) + if(wizard.spell_list.len > i) text += ", " i++ text += "
" @@ -263,8 +263,8 @@ //To batch-remove wizard spells. Linked to mind.dm. /mob/proc/spellremove(var/mob/M as mob) - for(var/obj/effect/proc_holder/spell/spell_to_remove in src.spell_list) - del(spell_to_remove) + for(var/obj/effect/proc_holder/spell/spell_to_remove in src.mind.spell_list) + qdel(spell_to_remove) /*Checks if the wizard can cast spells. Made a proc so this is not repeated 14 (or more) times.*/ diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 9799043322b..03b32f2cc60 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -61,6 +61,7 @@ /var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery /var/const/access_gateway = 62 /var/const/access_sec_doors = 63 // Security front doors +/var/const/access_mineral_storeroom = 64 //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. @@ -72,7 +73,6 @@ /var/const/access_cent_living = 105//Living quarters. /var/const/access_cent_storage = 106//Generic storage areas. /var/const/access_cent_teleporter = 107//Teleporter. -/var/const/access_cent_creed = 108//Creed's office. /var/const/access_cent_captain = 109//Captain's office/ID comp/AI. //The Syndicate @@ -83,29 +83,6 @@ /obj/var/list/req_one_access = null /obj/var/req_one_access_txt = "0" -/obj/New() - ..() - //NOTE: If a room requires more than one access (IE: Morgue + medbay) set the req_acesss_txt to "5;6" if it requires 5 and 6 - if(src.req_access_txt) - var/list/req_access_str = text2list(req_access_txt,";") - if(!req_access) - req_access = list() - for(var/x in req_access_str) - var/n = text2num(x) - if(n) - req_access += n - - if(src.req_one_access_txt) - var/list/req_one_access_str = text2list(req_one_access_txt,";") - if(!req_one_access) - req_one_access = list() - for(var/x in req_one_access_str) - var/n = text2num(x) - if(n) - req_one_access += n - - - //returns 1 if this mob has sufficient access to use this object /obj/proc/allowed(mob/M) //check if it doesn't require any access at all @@ -133,9 +110,25 @@ return null /obj/proc/check_access(obj/item/I) + //These generations have been moved out of /obj/New() because they were slowing down the creation of objects that never even used the access system. + if(!src.req_access) + src.req_access = list() + if(src.req_access_txt) + var/list/req_access_str = text2list(req_access_txt,";") + for(var/x in req_access_str) + var/n = text2num(x) + if(n) + req_access += n + + if(!src.req_one_access) + src.req_one_access = list() + if(src.req_one_access_txt) + var/list/req_one_access_str = text2list(req_one_access_txt,";") + for(var/x in req_one_access_str) + var/n = text2num(x) + if(n) + req_one_access += n - if(!src.req_access && !src.req_one_access) //no requirements - return 1 if(!istype(src.req_access, /list)) //something's very wrong return 1 @@ -188,7 +181,7 @@ if("Research Officer") return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage) if("Special Ops Officer") - return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed) + return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage) if("Admiral") return get_all_centcom_access() if("Centcom Commander") @@ -205,7 +198,7 @@ access_hydroponics, access_library, access_lawyer, access_virology, access_cmo, access_qm, access_surgery, access_theatre, access_research, access_mining, access_mailsorting, access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce, - access_keycard_auth, access_tcomsat, access_gateway) + access_keycard_auth, access_tcomsat, access_gateway, access_mineral_storeroom) /proc/get_all_centcom_access() return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_captain) @@ -222,7 +215,7 @@ if(2) //medbay return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo) if(3) //research - return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd) + return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd, access_mineral_storeroom) if(4) //engineering and maintenance return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_tcomsat, access_ce) if(5) //command @@ -376,6 +369,8 @@ return "Gateway" if(access_sec_doors) return "Brig" + if(access_mineral_storeroom) + return "Mineral Storeroom" /proc/get_centcom_access_desc(A) switch(A) @@ -393,8 +388,6 @@ return "Code Blue" if(access_cent_specops) return "Code Black" - if(access_cent_creed) - return "Code Silver" if(access_cent_captain) return "Code Gold" diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index da37da1b1af..95666d483b3 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -78,10 +78,9 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/hopcap(H), slot_head) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 15e57b79563..8f90db9ba41 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -8,8 +8,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) - minimal_access = list(access_bar) + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_mineral_storeroom) + minimal_access = list(access_bar, access_mineral_storeroom) equip(var/mob/living/carbon/human/H) @@ -172,6 +172,7 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/mining_voucher(H), slot_in_backpack) return 1 @@ -199,7 +200,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/clown(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask) - H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(H, 50), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack) @@ -242,9 +243,10 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) 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) - H.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(H) - H.spell_list += new /obj/effect/proc_holder/spell/targeted/mime/speak(H) - H.miming = 1 + 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) + H.mind.miming = 1 H.rename_self("mime") return 1 @@ -292,7 +294,8 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/red(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/device/pda/librarian(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/weapon/barcodescanner(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/books(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/barcodescanner(H), slot_r_store) H.equip_to_slot_or_del(new /obj/item/device/laser_pointer(H), slot_l_store) return 1 @@ -323,7 +326,8 @@ var/global/lawyer = 0//Checks for another lawyer else H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/purpsuit(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/lawyer/purpjacket(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/lawyer(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_l_hand) H.equip_to_slot_or_del(new /obj/item/device/laser_pointer(H), slot_l_store) @@ -332,6 +336,4 @@ var/global/lawyer = 0//Checks for another lawyer else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - return 1 - - + return 1 diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index eb069bc7abd..40e8f082b66 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -12,11 +12,11 @@ access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_heads, access_construction, access_sec_doors, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat) + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_mineral_storeroom) minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_heads, access_construction, access_sec_doors, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat) + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_mineral_storeroom) minimal_player_age = 7 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 916c8b89e09..88077adfd72 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -78,8 +78,8 @@ spawn_positions = 2 supervisors = "the chief medical officer" selection_color = "#ffeef0" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) - minimal_access = list(access_medical, access_chemistry) + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) + minimal_access = list(access_medical, access_chemistry, access_mineral_storeroom) equip(var/mob/living/carbon/human/H) @@ -127,8 +127,8 @@ spawn_positions = 1 supervisors = "the chief medical officer" selection_color = "#ffeef0" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) - minimal_access = list(access_medical, access_virology) + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) + minimal_access = list(access_medical, access_virology, access_mineral_storeroom) equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 1a953fc0d8b..5618b788db9 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -12,11 +12,11 @@ access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, access_tox_storage, access_teleporter, access_sec_doors, access_research, access_robotics, access_xenobiology, access_ai_upload, - access_RC_announce, access_keycard_auth, access_gateway) + access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom) minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, access_tox_storage, access_teleporter, access_sec_doors, access_research, access_robotics, access_xenobiology, access_ai_upload, - access_RC_announce, access_keycard_auth, access_gateway) + access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom) minimal_player_age = 7 equip(var/mob/living/carbon/human/H) @@ -41,8 +41,8 @@ spawn_positions = 3 supervisors = "the research director" selection_color = "#ffeeff" - access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology) - minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology) + access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom) + minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom) equip(var/mob/living/carbon/human/H) @@ -67,8 +67,8 @@ spawn_positions = 1 supervisors = "research director" selection_color = "#ffeeff" - access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. - minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. + access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) //As a job that handles so many corpses, it makes sense for them to have morgue access. + minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) //As a job that handles so many corpses, it makes sense for them to have morgue access. equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 1a82088422d..42e2368ca52 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -37,7 +37,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/HoS(H), slot_head) // H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) @@ -76,7 +76,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/warden(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/warden(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) // H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) if(H.backbag == 1) @@ -148,37 +148,124 @@ faction = "Station" total_positions = 5 spawn_positions = 5 - supervisors = "the head of security" + supervisors = "the head of security, and the head of your assigned department (if applicable)" selection_color = "#ffeeee" access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue) minimal_access = list(access_security, access_sec_doors, access_brig, access_court) //But see /datum/job/warden/get_access() minimal_player_age = 7 - equip(var/mob/living/carbon/human/H) - if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) - if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 - return 1 +/datum/job/officer/equip(var/mob/living/carbon/human/H) + if(!H) return 0 + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + assign_sec_to_department(H) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(H), slot_in_backpack) + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) + L.imp_in = H + L.implanted = 1 + return 1 /datum/job/officer/get_access() var/list/L = list() L = ..() | check_config_for_sec_maint() - return L \ No newline at end of file + return L + +var/list/sec_departments = list("engineering", "supply", "medical", "science") + +/datum/job/officer/proc/assign_sec_to_department(var/mob/living/carbon/human/H) + if(!H) return 0 + if(!sec_departments.len) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + else + var/department = pick(sec_departments) + sec_departments -= department + var/dep_access = null + var/destination = null + switch(department) + if("supply") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/cargo(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/supply(H), slot_ears) + dep_access = list(access_mailsorting, access_mining) + destination = /area/security/checkpoint/supply + if("engineering") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/engine(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/engi(H), slot_ears) + dep_access = list(access_construction, access_engine) + destination = /area/security/checkpoint/engineering + if("medical") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/med(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/med(H), slot_ears) + dep_access = list(access_medical) + destination = /area/security/checkpoint/medical + if("science") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/science(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/sci(H), slot_ears) + dep_access = list(access_research) + destination = /area/security/checkpoint/science + var/teleport = 0 + if(!config.sec_start_brig) + if(destination) + if(!ticker || ticker.current_state <= GAME_STATE_SETTING_UP) + teleport = 1 + if(teleport) + var/turf/T + var/safety = 0 + while(safety < 25) + T = safepick(get_area_turfs(destination)) + if(T && !H.Move(T)) + safety += 1 + continue + else + break + H << "You have been assigned to [department]!" + access += dep_access + +/obj/item/device/radio/headset/headset_sec/department/New() + wires = new(src) + secure_radio_connections = new + + if(radio_controller) + initialize() + recalculateChannels() + +/obj/item/device/radio/headset/headset_sec/department/engi + keyslot1 = 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 + 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 + 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 + keyslot2 = new /obj/item/device/encryptionkey/headset_sci + +/obj/item/clothing/under/rank/security/cargo/New() + attachTie(new /obj/item/clothing/tie/armband/cargo) + +/obj/item/clothing/under/rank/security/engine/New() + attachTie(new /obj/item/clothing/tie/armband/engine) + +/obj/item/clothing/under/rank/security/science/New() + attachTie(new /obj/item/clothing/tie/armband/science) + +/obj/item/clothing/under/rank/security/med/New() + attachTie(new /obj/item/clothing/tie/armband/medblue) \ No newline at end of file diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 7a3d0f56609..95a42432d83 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -291,11 +291,6 @@ var/global/datum/controller/occupations/job_master proc/EquipRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0) if(!H) return 0 var/datum/job/job = GetJob(rank) - if(job) - job.equip(H) - job.apply_fingerprints(H) - else - H << "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator." H.job = rank @@ -311,7 +306,9 @@ var/global/datum/controller/occupations/job_master if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf)) H.loc = S.loc - + if(job) + job.equip(H) + job.apply_fingerprints(H) if(H.mind) H.mind.assigned_role = rank @@ -338,10 +335,11 @@ var/global/datum/controller/occupations/job_master H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this." if(job.req_admin_notify) H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." + spawnId(H,rank) H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears) -// H.update_icons() + H.update_hud() // Tmp fix for Github issue 1006. TODO: make all procs in update_icons.dm do client.screen |= equipment no matter what. return 1 diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm deleted file mode 100644 index c2f4331794c..00000000000 --- a/code/game/jobs/jobprocs.dm +++ /dev/null @@ -1,46 +0,0 @@ - - -//TODO: put these somewhere else -/client/proc/mimewall() - set category = "Mime" - set name = "Invisible wall" - set desc = "Create an invisible wall on your location." - if(usr.stat) - usr << "Not when you're incapicated." - return - if(!ishuman(usr)) - return - - var/mob/living/carbon/human/H = usr - - if(!H.miming) - usr << "You still haven't atoned for your speaking transgression. Wait." - return - H.verbs -= /client/proc/mimewall - spawn(300) - H.verbs += /client/proc/mimewall - for (var/mob/V in viewers(H)) - if(V!=usr) - V.show_message("[H] looks as if a wall is in front of them.", 3, "", 2) - usr << "You form a wall in front of yourself." - new /obj/effect/forcefield/mime(locate(usr.x,usr.y,usr.z)) - return - -//////////////////////// - -/client/proc/mimespeak() - set category = "Mime" - set name = "Speech" - set desc = "Toggle your speech." - if(!ishuman(usr)) - return - - var/mob/living/carbon/human/H = usr - - if(H.miming) - H.miming = 0 - else - H << "You'll have to wait if you want to atone for your sins." - spawn(3000) - H.miming = 1 - return \ No newline at end of file diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index cc9a7b6a66d..4edd13f156a 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -20,9 +20,9 @@ hide(T.intact) - Del() + Destroy() if(Beacon) - del(Beacon) + qdel(Beacon) ..() // update the invisibility and icon diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 858553c02a1..44b7e583929 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -3,169 +3,232 @@ icon = 'icons/obj/Cryogenic2.dmi' icon_state = "freezer" density = 1 - + var/min_temperature = 0 anchored = 1.0 - + use_power = 1 current_heat_capacity = 1000 - New() - ..() - initialize_directions = dir +/obj/machinery/atmospherics/unary/cold_sink/freezer/New() + ..() + initialize_directions = dir + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/thermomachine(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + RefreshParts() - initialize() - if(node) return +/obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts() + var/H + var/T + for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + H += M.rating + for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) + T += M.rating + min_temperature = T0C - (170 + (T*15)) + current_heat_capacity = 1000 * ((H - 1) ** 2) - var/node_connect = dir +/obj/machinery/atmospherics/unary/cold_sink/freezer/attackby(obj/item/I, mob/user) + if(default_deconstruction_screwdriver(user, "freezer-o", "freezer", I)) + on = 0 + update_icon() + return - for(var/obj/machinery/atmospherics/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break + if(exchange_parts(user, I)) + return + default_deconstruction_crowbar(I) + + if(default_change_direction_wrench(user, I)) + return + +/obj/machinery/atmospherics/unary/cold_sink/freezer/update_icon() + if(panel_open) + icon_state = "freezer-o" + else if(src.on) + icon_state = "freezer_1" + else + icon_state = "freezer" + return + +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user as mob) + return interact(user) + +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_paw(mob/user as mob) + return interact(user) + +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) + return interact(user) + +/obj/machinery/atmospherics/unary/cold_sink/freezer/interact(mob/user) + if(stat & (NOPOWER|BROKEN)) + return + user.set_machine(src) + var/temp_text = "" + if(air_contents.temperature > (T0C - 20)) + temp_text = "[air_contents.temperature]" + else if(air_contents.temperature < (T0C - 20) && air_contents.temperature > (T0C - 100)) + temp_text = "[air_contents.temperature]" + else + temp_text = "[air_contents.temperature]" + + var/dat = {" + Current Status: [ on ? "Off On" : "Off On"]
+ Current Gas Temperature: [temp_text]
+ Current Air Pressure: [air_contents.return_pressure()]
+ Target Gas Temperature: - - - [current_temperature] + + +
+ "} + + //user << browse(dat, "window=freezer;size=400x500") + //onclose(user, "freezer") + var/datum/browser/popup = new(user, "freezer", "Cryo Gas Cooling System", 400, 240) // Set up the popup browser window + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.set_content(dat) + popup.open() + +/obj/machinery/atmospherics/unary/cold_sink/freezer/Topic(href, href_list) + if(..()) + return + usr.set_machine(src) + if (href_list["start"]) + src.on = !src.on + update_icon() + if(href_list["temp"]) + var/amount = text2num(href_list["temp"]) + if(amount > 0) + src.current_temperature = min(T20C, src.current_temperature+amount) + else + src.current_temperature = max(min_temperature, src.current_temperature+amount) + src.updateUsrDialog() + +/obj/machinery/atmospherics/unary/cold_sink/freezer/process() + ..() + src.updateUsrDialog() + +/obj/machinery/atmospherics/unary/cold_sink/freezer/power_change() + ..() + if(stat & NOPOWER) + on = 0 update_icon() - update_icon() - if(src.node) - if(src.on) - icon_state = "freezer_1" - else - icon_state = "freezer" - else - icon_state = "freezer" - return - - attack_ai(mob/user as mob) - return src.attack_hand(user) - - attack_paw(mob/user as mob) - return src.attack_hand(user) - - attack_hand(mob/user as mob) - user.set_machine(src) - var/temp_text = "" - if(air_contents.temperature > (T0C - 20)) - temp_text = "[air_contents.temperature]" - else if(air_contents.temperature < (T0C - 20) && air_contents.temperature > (T0C - 100)) - temp_text = "[air_contents.temperature]" - else - temp_text = "[air_contents.temperature]" - - var/dat = {" - Current Status: [ on ? "Off On" : "Off On"]
- Current Gas Temperature: [temp_text]
- Current Air Pressure: [air_contents.return_pressure()]
- Target Gas Temperature: - - - [current_temperature] + + +
- "} - - //user << browse(dat, "window=freezer;size=400x500") - //onclose(user, "freezer") - var/datum/browser/popup = new(user, "freezer", "Cryo Gas Cooling System", 400, 240) // Set up the popup browser window - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.set_content(dat) - popup.open() - - Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - if (href_list["start"]) - src.on = !src.on - update_icon() - if(href_list["temp"]) - var/amount = text2num(href_list["temp"]) - if(amount > 0) - src.current_temperature = min(T20C, src.current_temperature+amount) - else - src.current_temperature = max((T0C - 200), src.current_temperature+amount) - src.updateUsrDialog() - - process() - ..() - src.updateUsrDialog() - - - - -/obj/machinery/atmospherics/unary/heat_reservoir/heater +/obj/machinery/atmospherics/unary/heat_reservoir/heater/ name = "heater" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "heater" density = 1 - + var/max_temperature = 0 anchored = 1.0 current_heat_capacity = 1000 - New() - ..() - initialize_directions = dir +/obj/machinery/atmospherics/unary/heat_reservoir/heater/New() + ..() + initialize_directions = dir + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/thermomachine(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + RefreshParts() - initialize() - if(node) return - - var/node_connect = dir - - for(var/obj/machinery/atmospherics/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break +/obj/machinery/atmospherics/unary/heat_reservoir/heater/RefreshParts() + var/H + var/T + for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + H += M.rating + for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) + T += M.rating + max_temperature = T20C + (140 * T) + current_heat_capacity = 1000 * ((H - 1) ** 2) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attackby(obj/item/I, mob/user) + if(default_deconstruction_screwdriver(user, "heater-o", "heater", I)) + on = 0 update_icon() - - - update_icon() - if(src.node) - if(src.on) - icon_state = "heater_1" - else - icon_state = "heater" - else - icon_state = "heater" return - attack_ai(mob/user as mob) - return src.attack_hand(user) - - attack_paw(mob/user as mob) - return src.attack_hand(user) - - attack_hand(mob/user as mob) - user.set_machine(src) - var/temp_text = "" - if(air_contents.temperature > (T20C+40)) - temp_text = "[air_contents.temperature]" - else - temp_text = "[air_contents.temperature]" - - var/dat = {"Heating system
- Current status: [ on ? "Off On" : "Off On"]
- Current gas temperature: [temp_text]
- Current air pressure: [air_contents.return_pressure()]
- Target gas temperature: - - - [current_temperature] + + +
- "} - - user << browse(dat, "window=heater;size=400x500") - onclose(user, "heater") - - Topic(href, href_list) - if(..()) - return - if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) - usr.set_machine(src) - if (href_list["start"]) - src.on = !src.on - update_icon() - if(href_list["temp"]) - var/amount = text2num(href_list["temp"]) - if(amount > 0) - src.current_temperature = min((T20C+280), src.current_temperature+amount) - else - src.current_temperature = max(T20C, src.current_temperature+amount) - src.updateUsrDialog() - src.add_fingerprint(usr) + if(exchange_parts(user, I)) return - process() - ..() - src.updateUsrDialog() \ No newline at end of file + default_deconstruction_crowbar(I) + + if(default_change_direction_wrench(user, I)) + return + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/update_icon() + if(panel_open) + icon_state = "heater-o" + else if(src.on) + icon_state = "heater_1" + else + icon_state = "heater" + return + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user as mob) + return src.attack_hand(user) + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_paw(mob/user as mob) + return src.attack_hand(user) + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) + return interact(user) + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/interact(mob/user) + if(stat & (NOPOWER|BROKEN)) + return + user.set_machine(src) + var/temp_text = "" + if(air_contents.temperature < (T20C + 80)) + temp_text = "[air_contents.temperature]" + else if(air_contents.temperature > (T20C + 80) && air_contents.temperature < (T20C + 180)) + temp_text = "[air_contents.temperature]" + else + temp_text = "[air_contents.temperature]" + + var/dat = {" + Current Status: [ on ? "Off On" : "Off On"]
+ Current Gas Temperature: [temp_text]
+ Current Air Pressure: [air_contents.return_pressure()]
+ Target Gas Temperature: - - - [current_temperature] + + +
+ "} + + //user << browse(dat, "window=freezer;size=400x500") + //onclose(user, "freezer") + var/datum/browser/popup = new(user, "freezer", "Cryo Gas Cooling System", 400, 240) // Set up the popup browser window + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.set_content(dat) + popup.open() + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/Topic(href, href_list) + if(..()) + return + usr.set_machine(src) + if (href_list["start"]) + src.on = !src.on + update_icon() + if(href_list["temp"]) + var/amount = text2num(href_list["temp"]) + if(amount > 0) + src.current_temperature = min((T20C+max_temperature), src.current_temperature+amount) + else + src.current_temperature = max(T20C, src.current_temperature+amount) + src.updateUsrDialog() + src.add_fingerprint(usr) + return + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/process() + ..() + src.updateUsrDialog() + +/obj/machinery/atmospherics/unary/heat_reservoir/heater/power_change() + ..() + if(stat & NOPOWER) + on = 0 + update_icon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 396050ca1c2..657997e2506 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -3,201 +3,84 @@ icon = 'icons/obj/Cryogenic2.dmi' icon_state = "console" anchored = 1 //About time someone fixed this. - density = 1 - var/obj/machinery/sleeper/connected = null - - -/obj/machinery/sleep_console/New() - try_connect() - -/obj/machinery/sleep_console/initialize() - try_connect() - - -/obj/machinery/sleep_console/proc/try_connect() - connected = locate(/obj/machinery/sleeper, get_step(src, dir)) - return connected - - -/obj/machinery/sleep_console/attack_ai(mob/user) - return attack_hand(user) - -/obj/machinery/sleep_console/attack_paw(mob/user) - return attack_hand(user) - -/obj/machinery/sleep_console/attack_hand(mob/user) - if(..()) - return - if(connected) - var/mob/living/occupant = connected.occupant - var/dat = "
Sleeper Status
" - - dat += ""
- if(!occupant)
- dat += "Sleeper Unoccupied"
- else
- dat += "[occupant.name] => "
- switch(occupant.stat) //obvious, see what their status is
- if(0)
- dat += "Conscious"
- if(1)
- dat += "Unconscious"
- else
- dat += "DEAD"
-
- dat += "
" - - dat += ""
- dat += ""
- dat += ""
- dat += ""
- dat += ""
-
- dat += "
"
- if(occupant.reagents)
- //Left the text()s for readability.
- dat += text("", round(occupant.reagents.get_reagent_amount("inaprovaline"), 0.1))
- dat += text("", round(occupant.reagents.get_reagent_amount("stoxin"), 0.1))
- dat += text("", round(occupant.reagents.get_reagent_amount("dermaline"), 0.1))
- dat += text("", round(occupant.reagents.get_reagent_amount("bicaridine"), 0.1))
- dat += text("", round(occupant.reagents.get_reagent_amount("dexalin"), 0.1))
- dat += "
"
-
- dat += "Scan"
-
- dat += "Eject occupant"
-
- dat += "" - - dat += "
Health:
[occupant.health]%
\> Brute Damage:
[occupant.getBruteLoss()]%
\> Resp. Damage:
[occupant.getOxyLoss()]%
\> Toxin Content:
[occupant.getToxLoss()]%
\> Burn Severity:
[occupant.getFireLoss()]%
Paralysis Summary:
[round(occupant.paralysis)]% [occupant.paralysis ? "([round(occupant.paralysis / 4)] seconds left)" : ""]
Inaprovaline:
[] units
Sleep Toxin:
[] units
Dermaline:
[] units
Bicaridine:
[] units
Dexalin:
[] units
Injector
" - if(occupant) - dat += "Inject Inaprovaline" - else - dat += "Inject Inaprovaline" - if(occupant && occupant.health > 0) - dat += {"Inject Sleep Toxin -
Inject Dermaline -
Inject Bicaridine -
Inject Dexalin"} - else - dat += {"
Inject Sleep Toxin -
Inject Dermaline -
Inject Bicaridine -
Inject Dexalin"} - - var/datum/browser/popup = new(user, "sleeper", "Sleeper Console", 520, 540) //Set up the popup browser window - popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) - popup.set_content(dat) - popup.open() - - -/obj/machinery/sleep_console/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - if(connected && connected.occupant) - if(href_list["eject"]) - connected.eject() - updateUsrDialog() - return - else if(connected.occupant.health > 0) - if(href_list["inap"]) - connected.inject_inap(usr) - if(href_list["stox"]) - connected.inject_stox(usr) - if(href_list["derm"]) - connected.inject_dermaline(usr) - if(href_list["bic"]) - connected.inject_bicaridine(usr) - if(href_list["dex"]) - connected.inject_dexalin(usr) - else - if(connected.occupant.health > -100) - if(href_list["inap"]) - connected.inject_inap(usr) - if(href_list["stox"] || href_list["derm"] || href_list["bic"] || href_list["dex"]) - usr << "ERROR: Subject is not in stable condition for auto-injection." - else - usr << "ERROR: Subject cannot metabolise chemicals." - if(href_list["refresh"]) - updateUsrDialog() - add_fingerprint(usr) - - -/obj/machinery/sleep_console/process() - if(stat & (NOPOWER|BROKEN)) - return - updateUsrDialog() - - -/obj/machinery/sleep_console/power_change() - return - //no change - sleeper works without power (you just can't inject more) - - + density = 0 /obj/machinery/sleeper name = "sleeper" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "sleeper-open" - density = 1 + density = 0 anchored = 1 - var/mob/living/occupant = null + var/efficiency + state_open = 1 + 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 + var/list/possible_chems = list(list("stoxin", "dexalin", "bicaridine", "kelotane"), + list("stoxin", "dexalinp", "imidazoline", "dermaline", "bicaridine"), + list("tricordrazine", "anti_toxin", "ryetalyn", "dermaline", "bicaridine", "imidazoline", "alkysine", "arithrazine")) +/obj/machinery/sleeper/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/sleeper(null) + + // Customizable bin rating, used by the labor camp to stop people filling themselves with chemicals and escaping. + var/obj/item/weapon/stock_parts/matter_bin/B = new(null) + B.rating = initial_bin_rating + component_parts += B + + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + RefreshParts() + +/obj/machinery/sleeper/RefreshParts() + var/E + var/I + for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts) + E += B.rating + for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + I += M.rating + + injection_chems = possible_chems[I] + efficiency = E + min_health = -E * 25 /obj/machinery/sleeper/allow_drop() return 0 - -/obj/machinery/sleeper/process() - updateDialog() - +/obj/machinery/sleeper/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user)|| !iscarbon(target)) + return + close_machine(target) /obj/machinery/sleeper/blob_act() if(prob(75)) for(var/atom/movable/A in src) A.loc = loc A.blob_act() - del(src) + qdel(src) +/obj/machinery/sleeper/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise + if(M.environment_smash) + visible_message("[M.name] smashes [src] apart!") + qdel(src) + return /obj/machinery/sleeper/attackby(obj/item/I, mob/user) - if(!istype(I, /obj/item/weapon/grab)) - return - var/obj/item/weapon/grab/G = I - - if(!ismob(G.affecting)) - return - - if(occupant) - user << "[src] is already occupied." - return - - for(var/mob/living/carbon/slime/M in range(1, G.affecting)) - if(M.Victim == G.affecting) - user << "[G.affecting] will not fit into [src] because they have [M] latched onto their head." + if(!state_open && !occupant) + if(default_deconstruction_screwdriver(user, "sleeper-o", "sleeper", I)) return - visible_message("[user] starts putting [G.affecting] into the sleeper.") + if(default_change_direction_wrench(user, I)) + return - if(do_after(user, 20)) - if(occupant) - user << "[src] is already occupied!" - return - if(!G || !G.affecting) return - var/mob/M = G.affecting - if(M.client) - M.client.perspective = EYE_PERSPECTIVE - M.client.eye = src - M.loc = src - occupant = M - icon_state = "sleeper" - - M << "\blue You feel cool air surround you. You go numb as your senses turn inward." - - for(var/obj/O in src) - O.loc = loc - add_fingerprint(user) - del(G) + if(exchange_parts(user, I)) + return + default_deconstruction_crowbar(I) /obj/machinery/sleeper/ex_act(severity) switch(severity) @@ -205,21 +88,21 @@ for(var/atom/movable/A in src) A.loc = loc ex_act(severity) - del(src) + qdel(src) return if(2.0) if(prob(50)) for(var/atom/movable/A in src) A.loc = loc ex_act(severity) - del(src) + qdel(src) return if(3.0) if(prob(25)) for(var/atom/movable/A in src) A.loc = loc ex_act(severity) - del(src) + qdel(src) /obj/machinery/sleeper/emp_act(severity) @@ -230,25 +113,6 @@ go_out() ..(severity) - -/obj/machinery/sleeper/alter_health(mob/living/M) - if(M.health > 0) - if(M.getOxyLoss() >= 10) - var/amount = max(0.15, 1) - M.adjustOxyLoss(-amount) - else - M.adjustOxyLoss(-12) - M.updatehealth() - M.AdjustParalysis(-4) - M.AdjustWeakened(-4) - M.AdjustStunned(-4) - M.Paralyse(1) - M.Weaken(1) - M.Stun(1) - if(M.reagents.get_reagent_amount("inaprovaline") < 5) - M.reagents.add_reagent("inaprovaline", 5) - - /obj/machinery/sleeper/proc/go_out() if(!occupant) return @@ -260,92 +124,123 @@ occupant = null icon_state = "sleeper-open" - -/obj/machinery/sleeper/proc/inject_inap(mob/user) - if(occupant && occupant.reagents) - if(occupant.reagents.get_reagent_amount("inaprovaline") + 30 < 61) - occupant.reagents.add_reagent("inaprovaline", 30) - var/units = round(occupant.reagents.get_reagent_amount("inaprovaline")) - user << "Occupant now has [units] unit\s of inaprovaline in their bloodstream." - - -/obj/machinery/sleeper/proc/inject_stox(mob/user) - if(occupant && occupant.reagents) - if(occupant.reagents.get_reagent_amount("stoxin") + 20 < 41) - occupant.reagents.add_reagent("stoxin", 20) - var/units = round(occupant.reagents.get_reagent_amount("stoxin")) - user << "Occupant now has [units] unit\s of sleep toxins in their bloodstream." - - -/obj/machinery/sleeper/proc/inject_dermaline(mob/user) - if(occupant && occupant.reagents) - if(occupant.reagents.get_reagent_amount("dermaline") + 20 < 41) - occupant.reagents.add_reagent("dermaline", 20) - var/units = round(occupant.reagents.get_reagent_amount("dermaline")) - user << "Occupant now has [units] unit\s of dermaline in their bloodstream." - - -/obj/machinery/sleeper/proc/inject_bicaridine(mob/user) - if(occupant && occupant.reagents) - if(occupant.reagents.get_reagent_amount("bicaridine") + 10 < 21) - occupant.reagents.add_reagent("bicaridine", 10) - var/units = round(occupant.reagents.get_reagent_amount("bicaridine")) - user << "Occupant now has [units] unit\s of bicaridine in their bloodstream." - - -/obj/machinery/sleeper/proc/inject_dexalin(mob/user) - if(occupant && occupant.reagents) - if(occupant.reagents.get_reagent_amount("dexalin") + 20 < 41) - occupant.reagents.add_reagent("dexalin", 20) - var/units = round(occupant.reagents.get_reagent_amount("dexalin")) - user << "Occupant now has [units] unit\s of dexalin in their bloodstream." - /obj/machinery/sleeper/container_resist() - eject() + open_machine() /obj/machinery/sleeper/relaymove(var/mob/user) ..() - eject() + open_machine() -/obj/machinery/sleeper/Del() - go_out() +/obj/machinery/sleeper/Destroy() + var/turf/T = loc + T.contents += contents ..() -/obj/machinery/sleeper/proc/eject() - go_out() +/obj/machinery/sleeper/attack_hand(mob/user) + if(..()) + return + var/dat = "
Sleeper Status
" + + dat += ""
+ if(!occupant)
+ dat += "Sleeper Unoccupied"
+ else
+ dat += "[occupant.name] => "
+ switch(occupant.stat) //obvious, see what their status is
+ if(0)
+ dat += "Conscious"
+ if(1)
+ dat += "Unconscious"
+ else
+ dat += "DEAD"
+
+ dat += "
" + + dat += ""
+ dat += ""
+ dat += ""
+ dat += ""
+ dat += ""
+
+ dat += "
"
+ if(occupant.reagents.reagent_list.len)
+ for(var/datum/reagent/R in occupant.reagents.reagent_list)
+ dat += text("", round(R.volume, 0.1))
+
+ dat += "
"
+
+ dat += "Scan"
+
+ dat += "Close" : "open=1'>Open"]"
+
+ dat += "" + + dat += "
Health:
[occupant.health]%
\> Brute Damage:
[occupant.getBruteLoss()]%
\> Resp. Damage:
[occupant.getOxyLoss()]%
\> Toxin Content:
[occupant.getToxLoss()]%
\> Burn Severity:
[occupant.getFireLoss()]%
Paralysis Summary:
[round(occupant.paralysis)]% [occupant.paralysis ? "([round(occupant.paralysis / 4)] seconds left)" : ""]
[R.name]:
[] units
Injector
" + if(occupant) + dat += "Inject Inaprovaline" + else + dat += "Inject Inaprovaline" + if(occupant && occupant.health > min_health) + for(var/re in injection_chems) + var/datum/reagent/C = chemical_reagents_list[re] + if(C) + dat += "Inject [C.name]" + else + for(var/re in injection_chems) + var/datum/reagent/C = chemical_reagents_list[re] + if(C) + dat += "
Inject [C.name]" + + var/datum/browser/popup = new(user, "sleeper", "Sleeper Console", 520, 540) //Set up the popup browser window + popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) + popup.set_content(dat) + popup.open() + +/obj/machinery/sleeper/Topic(href, href_list) + if(..() || usr == occupant) + return + usr.set_machine(src) + if(href_list["refresh"]) + updateUsrDialog() + return + if(href_list["open"]) + open_machine() + return + if(href_list["close"]) + close_machine() + return + if(occupant && occupant.stat != DEAD) + if(href_list["inject"] == "inaprovaline" || occupant.health > min_health) + inject_chem(usr, href_list["inject"]) + else + usr << "ERROR: Subject is not in stable condition for auto-injection." + else + usr << "ERROR: Subject cannot metabolise chemicals." + updateUsrDialog() add_fingerprint(usr) +/obj/machinery/sleeper/attack_ai(mob/user) + return attack_hand(user) -/obj/machinery/sleeper/verb/move_inside() - set name = "Enter sleeper" - set category = "Object" - set src in oview(1) +/obj/machinery/sleeper/attack_paw(mob/user) + return attack_hand(user) - if(usr.stat || (!ishuman(usr) && !ismonkey(usr))) - return +/obj/machinery/sleeper/open_machine() + if(!state_open && !panel_open) + ..() - if(occupant) - usr << "[src] is already occupied." - return +/obj/machinery/sleeper/close_machine(mob/target) + if(state_open && !panel_open) + ..(target) - for(var/mob/living/carbon/slime/M in range(1, usr)) - if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you." - return +/obj/machinery/sleeper/proc/inject_chem(mob/user, chem) + if(occupant && occupant.reagents) + if(chem in injection_chems + "inaprovaline") + if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) + occupant.reagents.add_reagent(chem, 10) + var/units = round(occupant.reagents.get_reagent_amount(chem)) + user << "Occupant now has [units] unit\s of [chem] in their bloodstream." - visible_message("[usr] starts climbing into the sleeper.") - if(do_after(usr, 20)) - if(occupant) - usr << "The sleeper is already occupied!" - return - - usr.stop_pulling() - usr.client.perspective = EYE_PERSPECTIVE - usr.client.eye = src - usr.loc = src - occupant = usr +/obj/machinery/sleeper/update_icon() + if(state_open) + icon_state = "sleeper-open" + else icon_state = "sleeper" - - for(var/obj/O in src) - del(O) - add_fingerprint(usr) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 31773227ac8..206d7cc15be 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -60,7 +60,6 @@ var/datum/wires/alarm/wires = null var/wiresexposed = 0 // If it's been screwdrivered open. var/aidisabled = 0 - var/AAlarmwires = 31 var/shorted = 0 var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone @@ -658,7 +657,7 @@ table tr:first-child th:first-child { border: none;} if(wiresexposed) switch(buildstage) if(2) - if(src.AAlarmwires == 0) // All wires cut + if(wires.wires_status == (2 ** wires.wire_count) - 1) // All wires cut icon_state = "alarm_b2" else icon_state = "alarmx" @@ -767,10 +766,10 @@ table tr:first-child th:first-child { border: none;} /obj/machinery/alarm/attackby(obj/item/W as obj, mob/user as mob) switch(buildstage) if(2) - if(istype(W, /obj/item/weapon/wirecutters) && AAlarmwires == 0) + if(istype(W, /obj/item/weapon/wirecutters) && wires.wires_status == (2 ** wires.wire_count) - 1) //this checks for all wires to be cut, disregard the ammount of wires, binary fuckery with the wires_status playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You cut the final wires." - var/obj/item/weapon/cable_coil/cable = new /obj/item/weapon/cable_coil( src.loc ) + var/obj/item/stack/cable_coil/cable = new /obj/item/stack/cable_coil( src.loc ) cable.amount = 5 buildstage = 1 update_icon() @@ -797,7 +796,7 @@ table tr:first-child th:first-child { border: none;} user << "\red Access denied." return if(1) - if(istype(W, /obj/item/weapon/crowbar) && AAlarmwires == 0) + if(istype(W, /obj/item/weapon/crowbar) && wires.wires_status == (2 ** wires.wire_count) - 1) user << "You pry out the circuit." playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) spawn(20) @@ -807,8 +806,8 @@ table tr:first-child th:first-child { border: none;} update_icon() return - if(istype(W, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/cable = W + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/cable = W if(cable.amount < 5) user << "You need more cable!" return @@ -817,10 +816,10 @@ table tr:first-child th:first-child { border: none;} spawn(20) cable.amount -= 5 if(!cable.amount) - del(cable) + qdel(cable) user << "You wire the air alarm!" - src.AAlarmwires = 31 + wires.wires_status = 0 buildstage = 2 update_icon() return @@ -830,14 +829,14 @@ table tr:first-child th:first-child { border: none;} buildstage = 1 update_icon() user.drop_item() - del(W) + qdel(W) return if(istype(W, /obj/item/weapon/wrench)) user << "You detach \the [src] from the wall!" playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/alarm_frame( user.loc ) - del(src) + qdel(src) return return ..() @@ -879,7 +878,7 @@ Code shamelessly copied from apc_frame /obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) - del(src) + qdel(src) return ..() @@ -906,7 +905,7 @@ Code shamelessly copied from apc_frame new /obj/machinery/alarm(loc, ndir, 1) - del(src) + qdel(src) /* @@ -993,21 +992,21 @@ FIRE ALARM else if (istype(W, /obj/item/weapon/wirecutters)) buildstage = 1 playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - var/obj/item/weapon/cable_coil/coil = new /obj/item/weapon/cable_coil() + var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil() coil.amount = 5 coil.loc = user.loc user << "You cut the wires from \the [src]" update_icon() if(1) - if(istype(W, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/coil = W + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) user << "You need more cable for this!" return coil.amount -= 5 if(!coil.amount) - del(coil) + qdel(coil) buildstage = 2 user << "You wire \the [src]!" @@ -1024,7 +1023,7 @@ FIRE ALARM if(0) if(istype(W, /obj/item/weapon/firealarm_electronics)) user << "You insert the circuit!" - del(W) + qdel(W) buildstage = 1 update_icon() @@ -1033,7 +1032,7 @@ FIRE ALARM var/obj/item/firealarm_frame/frame = new /obj/item/firealarm_frame() frame.loc = user.loc playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - del(src) + qdel(src) return src.alarm() @@ -1214,7 +1213,7 @@ Code shamelessly copied from apc_frame /obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) - del(src) + qdel(src) return ..() @@ -1241,7 +1240,7 @@ Code shamelessly copied from apc_frame new /obj/machinery/firealarm(loc, ndir, 1) - del(src) + qdel(src) /* * Party button diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 10edcb49407..0897335b5ed 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -22,58 +22,61 @@ obj/machinery/air_sensor var/datum/radio_frequency/radio_connection - update_icon() +obj/machinery/air_sensor/update_icon() icon_state = "gsensor[on]" - process() - if(on) - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data["tag"] = id_tag - signal.data["timestamp"] = world.time +obj/machinery/air_sensor/process() + if(on) + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.data["tag"] = id_tag + signal.data["timestamp"] = world.time - var/datum/gas_mixture/air_sample = return_air() + var/datum/gas_mixture/air_sample = return_air() - if(output&1) - signal.data["pressure"] = num2text(round(air_sample.return_pressure(),0.1),) - if(output&2) - signal.data["temperature"] = round(air_sample.temperature,0.1) + if(output&1) + signal.data["pressure"] = num2text(round(air_sample.return_pressure(),0.1)) + if(output&2) + signal.data["temperature"] = round(air_sample.temperature,0.1) - if(output>4) - var/total_moles = air_sample.total_moles() - if(total_moles > 0) - if(output&4) - signal.data["oxygen"] = round(100*air_sample.oxygen/total_moles,0.1) - if(output&8) - signal.data["toxins"] = round(100*air_sample.toxins/total_moles,0.1) - if(output&16) - signal.data["nitrogen"] = round(100*air_sample.nitrogen/total_moles,0.1) - if(output&32) - signal.data["carbon_dioxide"] = round(100*air_sample.carbon_dioxide/total_moles,0.1) - else - signal.data["oxygen"] = 0 - signal.data["toxins"] = 0 - signal.data["nitrogen"] = 0 - signal.data["carbon_dioxide"] = 0 - signal.data["sigtype"]="status" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + if(output>4) + var/total_moles = air_sample.total_moles() + if(total_moles > 0) + if(output&4) + signal.data["oxygen"] = round(100*air_sample.oxygen/total_moles,0.1) + if(output&8) + signal.data["toxins"] = round(100*air_sample.toxins/total_moles,0.1) + if(output&16) + signal.data["nitrogen"] = round(100*air_sample.nitrogen/total_moles,0.1) + if(output&32) + signal.data["carbon_dioxide"] = round(100*air_sample.carbon_dioxide/total_moles,0.1) + else + signal.data["oxygen"] = 0 + signal.data["toxins"] = 0 + signal.data["nitrogen"] = 0 + signal.data["carbon_dioxide"] = 0 + signal.data["sigtype"]="status" + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - proc - set_frequency(new_frequency) - radio_controller.remove_object(src, frequency) - frequency = new_frequency - radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) +obj/machinery/air_sensor/proc/set_frequency(new_frequency) + radio_controller.remove_object(src, frequency) + frequency = new_frequency + radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) - initialize() +obj/machinery/air_sensor/initialize() + set_frequency(frequency) + +obj/machinery/air_sensor/New() + ..() + + if(radio_controller) set_frequency(frequency) - New() +obj/machinery/computer/general_air_control/Destroy() + radio_controller.remove_object(src, frequency) ..() - if(radio_controller) - set_frequency(frequency) - obj/machinery/computer/general_air_control icon = 'icons/obj/computer.dmi' icon_state = "tank" @@ -87,304 +90,357 @@ obj/machinery/computer/general_air_control var/list/sensor_information = list() var/datum/radio_frequency/radio_connection - attack_hand(mob/user) - if(..(user)) - return - //user << browse(return_text(),"window=computer") - user.set_machine(src) - //onclose(user, "computer") +obj/machinery/computer/general_air_control/New() + ..() - var/datum/browser/popup = new(user, "computer", name, 465, 390) - popup.set_content(return_text()) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - - interact(mob/user) - attack_hand(user) - - process() - ..() - src.updateDialog() - - receive_signal(datum/signal/signal) - if(!signal || signal.encryption) return - - var/id_tag = signal.data["tag"] - if(!id_tag || !sensors.Find(id_tag)) return - - sensor_information[id_tag] = signal.data - - proc/return_text() - var/sensor_data - if(sensors.len) - for(var/id_tag in sensors) - var/long_name = sensors[id_tag] - var/list/data = sensor_information[id_tag] - var/sensor_part = "
[long_name]
" - - if(data) - if(data["pressure"]) - sensor_part += " Pressure: [data["pressure"]] kPa" - if(data["temperature"]) - sensor_part += " Temperature: [data["temperature"]] K
" - if(data["oxygen"]||data["toxins"]||data["nitrogen"]||data["carbon_dioxide"]) - sensor_part += " Gas Composition :" - if(data["oxygen"]) - sensor_part += "[data["oxygen"]]% O2; " - if(data["nitrogen"]) - sensor_part += "[data["nitrogen"]]% N; " - if(data["carbon_dioxide"]) - sensor_part += "[data["carbon_dioxide"]]% CO2; " - if(data["toxins"]) - sensor_part += "[data["toxins"]]% TX; " - - else - sensor_part = "[long_name] can not be found!
" - - sensor_data += sensor_part - - else - sensor_data = "No sensors connected." - - var/output = {" -
Sensor Data
[sensor_data]"} - - return output - - proc - set_frequency(new_frequency) - radio_controller.remove_object(src, frequency) - frequency = new_frequency - radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) - - initialize() + if(radio_controller) set_frequency(frequency) - large_tank_control - icon = 'icons/obj/computer.dmi' - icon_state = "tank" +obj/machinery/computer/general_air_control/attack_hand(mob/user) + if(..(user)) + return + //user << browse(return_text(),"window=computer") + user.set_machine(src) + //onclose(user, "computer") - var/input_tag - var/output_tag + var/datum/browser/popup = new(user, "computer", name, 465, 390) + popup.set_content(return_text()) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() - var/list/input_info - var/list/output_info +obj/machinery/computer/general_air_control/interact(mob/user) + attack_hand(user) - var/pressure_setting = ONE_ATMOSPHERE * 45 +obj/machinery/computer/general_air_control/process() + ..() + src.updateDialog() +obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal) + if(!signal || signal.encryption) return - return_text() - var/output = ..() - //if(signal.data) - // input_info = signal.data // Attempting to fix intake control -- TLE + var/id_tag = signal.data["tag"] + if(!id_tag || !sensors.Find(id_tag)) return - output += "Tank Control System
" - if(input_info) - var/power = (input_info["power"]) - var/volume_rate = input_info["volume_rate"] - output += {"Input: [power?("Injecting"):("On Hold")] Refresh-Rate: [volume_rate] L/sec
"} - output += "Command: Toggle Power
" + sensor_information = list() - else - output += "ERROR: Can not find input port Search
" + sensor_information[id_tag] = signal.data - output += "
" +obj/machinery/computer/general_air_control/proc/return_text() + var/sensor_data + if(sensors.len) + for(var/id_tag in sensors) + var/long_name = sensors[id_tag] + var/list/data = sensor_information[id_tag] + var/sensor_part = "
[long_name]
" - if(output_info) - var/power = (output_info["power"]) - var/output_pressure = output_info["internal"] - output += {"Output: [power?("Open"):("On Hold")] Refresh-Max Output Pressure: [output_pressure] kPa
"} - output += "Command: Toggle Power Set Pressure
" - - else - output += "ERROR: Can not find output port Search
" - - output += "Max Output Pressure Set: - - - - [pressure_setting] kPa + + + +
" - - return output - - receive_signal(datum/signal/signal) - if(!signal || signal.encryption) return - - var/id_tag = signal.data["tag"] - - if(input_tag == id_tag) - input_info = signal.data - else if(output_tag == id_tag) - output_info = signal.data - else - ..(signal) - - Topic(href, href_list) - if(..()) - return - - if(href_list["adj_pressure"]) - var/change = text2num(href_list["adj_pressure"]) - pressure_setting = Clamp(pressure_setting + change, 0, 50*ONE_ATMOSPHERE) - spawn(1) - src.updateDialog() - return - - if(!radio_connection) - return 0 - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - if(href_list["in_refresh_status"]) - input_info = null - signal.data = list ("tag" = input_tag, "status") - - if(href_list["in_toggle_injector"]) - input_info = null - signal.data = list ("tag" = input_tag, "power_toggle") - - if(href_list["out_refresh_status"]) - output_info = null - signal.data = list ("tag" = output_tag, "status") - - if(href_list["out_toggle_power"]) - output_info = null - signal.data = list ("tag" = output_tag, "power_toggle") - - if(href_list["out_set_pressure"]) - output_info = null - signal.data = list ("tag" = output_tag, "set_internal_pressure" = "[pressure_setting]") - - signal.data["sigtype"]="command" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - - spawn(5) - src.updateDialog() - - fuel_injection - icon = 'icons/obj/computer.dmi' - icon_state = "atmos" - - var/device_tag - var/list/device_info - - var/automation = 0 - - var/cutoff_temperature = 2000 - var/on_temperature = 1200 - - process() - if(automation) - if(!radio_connection) - return 0 - - var/injecting = 0 - for(var/id_tag in sensor_information) - var/list/data = sensor_information[id_tag] - if(data["temperature"]) - if(data["temperature"] >= cutoff_temperature) - injecting = 0 - break - if(data["temperature"] <= on_temperature) - injecting = 1 - - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - - signal.data = list( - "tag" = device_tag, - "power" = injecting, - "sigtype"="command" - ) - - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - - ..() - - return_text() - var/output = ..() - - output += "Fuel Injection System
" - if(device_info) - var/power = device_info["power"] - var/volume_rate = device_info["volume_rate"] - output += {"Status: [power?("Injecting"):("On Hold")] Refresh
-Rate: [volume_rate] L/sec
"} - - if(automation) - output += "Automated Fuel Injection: Engaged
" - output += "Injector Controls Locked Out
" + if(data) + if(data["pressure"]) + sensor_part += " Pressure: [data["pressure"]] kPa
" else - output += "Automated Fuel Injection: Disengaged
" - output += "Injector: Toggle Power Inject (1 Cycle)
" + sensor_part += " Pressure: No pressure detected
" + if(data["temperature"]) + sensor_part += " Temperature: [data["temperature"]] K
" + if(data["oxygen"]||data["toxins"]||data["nitrogen"]||data["carbon_dioxide"]) + sensor_part += " Gas Composition : " + if(data["oxygen"]) + sensor_part += "[data["oxygen"]]% O2; " + if(data["nitrogen"]) + sensor_part += "[data["nitrogen"]]% N; " + if(data["carbon_dioxide"]) + sensor_part += "[data["carbon_dioxide"]]% CO2; " + if(data["toxins"]) + sensor_part += "[data["toxins"]]% TX; " else - output += "ERROR: Can not find device Search
" + sensor_part = "[long_name] can not be found!
" - return output + sensor_data += sensor_part - receive_signal(datum/signal/signal) - if(!signal || signal.encryption) return + else + sensor_data = "No sensors connected." - var/id_tag = signal.data["tag"] + var/output = {" +
Sensor Data
[sensor_data]"} - if(device_tag == id_tag) - device_info = signal.data - else - ..(signal) + return output - Topic(href, href_list) - if(..()) - return +obj/machinery/computer/general_air_control/Destroy() + radio_controller.remove_object(src, frequency) + ..() - if(href_list["refresh_status"]) - device_info = null - if(!radio_connection) - return 0 +obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency) + radio_controller.remove_object(src, frequency) + frequency = new_frequency + radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - signal.data = list( - "tag" = device_tag, - "status", - "sigtype"="command" - ) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) +obj/machinery/computer/general_air_control/initialize() + set_frequency(frequency) - if(href_list["toggle_automation"]) - automation = !automation +obj/machinery/computer/general_air_control/large_tank_control + icon = 'icons/obj/computer.dmi' + icon_state = "tank" - if(href_list["toggle_injector"]) - device_info = null - if(!radio_connection) - return 0 + var/input_tag + var/output_tag + frequency = 1441 + circuit = /obj/item/weapon/circuitboard/large_tank_control - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - signal.data = list( - "tag" = device_tag, - "power_toggle", - "sigtype"="command" - ) + var/list/input_info + var/list/output_info - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + var/pressure_setting = ONE_ATMOSPHERE * 45 - if(href_list["injection"]) - if(!radio_connection) - return 0 +obj/machinery/computer/general_air_control/large_tank_control/proc/reconnect(mob/user) //This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this + var/list/IO = list() + var/datum/radio_frequency/air_freq = radio_controller.return_frequency(1443) + var/datum/radio_frequency/gas_freq = radio_controller.return_frequency(1441) + var/list/devices = air_freq.devices["_default"] + devices |= gas_freq.devices["_default"] + for(var/obj/machinery/atmospherics/unary/vent_pump/U in devices) + var/list/text = text2list(U.id_tag, "_") + IO |= text[1] + for(var/obj/machinery/atmospherics/unary/outlet_injector/U in devices) + var/list/text = text2list(U.id, "_") + IO |= text[1] + if(!IO.len) + user << "No machinery detected." + var/S = input("Select the device set: ", "Selection", IO[1]) as anything in IO + if(src) + src.input_tag = "[S]_in" + src.output_tag = "[S]_out" + name = "[uppertext(S)] Supply Control" + var/list/new_devices = gas_freq.devices["4"] + new_devices |= air_freq.devices["4"] + for(var/obj/machinery/air_sensor/U in new_devices) + var/list/text = text2list(U.id_tag, "_") + if(text[1] == S) + sensors = list("[S]_sensor" = "Tank") + break - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - signal.data = list( - "tag" = device_tag, - "inject", - "sigtype"="command" - ) + if(S == "air") + frequency = 1443 + else + frequency = 1441 - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + set_frequency(frequency) + for(var/obj/machinery/atmospherics/unary/outlet_injector/U in devices) + U.broadcast_status() + for(var/obj/machinery/atmospherics/unary/vent_pump/U in devices) + U.broadcast_status() +obj/machinery/computer/general_air_control/large_tank_control/return_text() + var/output = "Reconnect" + output += ..() + //if(signal.data) + // input_info = signal.data // Attempting to fix intake control + output += "
Tank Control System
" + if(input_info) + var/power = (input_info["power"]) + var/volume_rate = input_info["volume_rate"] + output += {"Input: [power?("Injecting"):("On Hold")] Refresh+Rate: [volume_rate] L/sec
"} + output += "Command: Toggle Power
" + + else + output += "ERROR: Can not find input port
" + + output += "
" + + if(output_info) + var/power = (output_info["power"]) + var/output_pressure = output_info["internal"] + output += {"Output: [power?("Open"):("On Hold")] Refresh
+Max Output Pressure: [output_pressure] kPa
"} + output += "Command: Toggle Power Set Pressure
" + + else + output += "ERROR: Can not find output port
" + + output += "Max Output Pressure Set: - - - - [pressure_setting] kPa + + + +
" + + return output + +obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) + if(!signal || signal.encryption) return + + var/id_tag = signal.data["tag"] + + if(input_tag == id_tag) + input_info = signal.data + else if(output_tag == id_tag) + output_info = signal.data + else + ..(signal) + +obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) + if(..()) + return + + if(href_list["adj_pressure"]) + var/change = text2num(href_list["adj_pressure"]) + pressure_setting = Clamp(pressure_setting + change, 0, 50*ONE_ATMOSPHERE) + spawn(1) + src.updateDialog() + return + + if(!radio_connection) + return 0 + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + if(href_list["reconnect"]) + reconnect(usr) + if(href_list["in_refresh_status"]) + input_info = null + signal.data = list ("tag" = input_tag, "status") + + if(href_list["in_toggle_injector"]) + input_info = null + signal.data = list ("tag" = input_tag, "power_toggle") + + if(href_list["out_refresh_status"]) + output_info = null + signal.data = list ("tag" = output_tag, "status") + + if(href_list["out_toggle_power"]) + output_info = null + signal.data = list ("tag" = output_tag, "power_toggle") + + if(href_list["out_set_pressure"]) + output_info = null + signal.data = list ("tag" = output_tag, "set_internal_pressure" = "[pressure_setting]") + + signal.data["sigtype"]="command" + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + + spawn(5) + src.updateDialog() + +obj/machinery/computer/general_air_control/fuel_injection + icon = 'icons/obj/computer.dmi' + icon_state = "atmos" + + var/device_tag + var/list/device_info + + var/automation = 0 + + var/cutoff_temperature = 2000 + var/on_temperature = 1200 + +obj/machinery/computer/general_air_control/fuel_injection/process() + if(automation) + if(!radio_connection) + return 0 + + var/injecting = 0 + for(var/id_tag in sensor_information) + var/list/data = sensor_information[id_tag] + if(data["temperature"]) + if(data["temperature"] >= cutoff_temperature) + injecting = 0 + break + if(data["temperature"] <= on_temperature) + injecting = 1 + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + + signal.data = list( + "tag" = device_tag, + "power" = injecting, + "sigtype"="command" + ) + + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + + ..() + +obj/machinery/computer/general_air_control/fuel_injection/return_text() + var/output = ..() + + output += "Fuel Injection System
" + if(device_info) + var/power = device_info["power"] + var/volume_rate = device_info["volume_rate"] + output += {"Status: [power?("Injecting"):("On Hold")] Refresh
+Rate: [volume_rate] L/sec
"} + + if(automation) + output += "Automated Fuel Injection: Engaged
" + output += "Injector Controls Locked Out
" + else + output += "Automated Fuel Injection: Disengaged
" + output += "Injector: Toggle Power Inject (1 Cycle)
" + + else + output += "ERROR: Can not find device Search
" + + return output + +obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) + if(!signal || signal.encryption) return + + var/id_tag = signal.data["tag"] + + if(device_tag == id_tag) + device_info = signal.data + else + ..(signal) + +obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) + if(..()) + return + + if(href_list["refresh_status"]) + device_info = null + if(!radio_connection) + return 0 + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + signal.data = list( + "tag" = device_tag, + "status", + "sigtype"="command" + ) + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + + if(href_list["toggle_automation"]) + automation = !automation + + if(href_list["toggle_injector"]) + device_info = null + if(!radio_connection) + return 0 + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + signal.data = list( + "tag" = device_tag, + "power_toggle", + "sigtype"="command" + ) + + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + + if(href_list["injection"]) + if(!radio_connection) + return 0 + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + signal.data = list( + "tag" = device_tag, + "inject", + "sigtype"="command" + ) + + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 217e61338b2..4c2c0bfbde1 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -16,6 +16,7 @@ volume = 1000 use_power = 0 var/release_log = "" + var/update_flag = 0 /obj/machinery/portable_atmospherics/canister/sleeping_agent name = "canister: \[N2O\]" @@ -48,32 +49,68 @@ canister_color = "grey" can_label = 0 +/obj/machinery/portable_atmospherics/canister/proc/check_change() + var/old_flag = update_flag + update_flag = 0 + if(holding) + update_flag |= 1 + if(connected_port) + update_flag |= 2 + + var/tank_pressure = air_contents.return_pressure() + if(tank_pressure < 10) + update_flag |= 4 + else if(tank_pressure < ONE_ATMOSPHERE) + update_flag |= 8 + else if(tank_pressure < 15*ONE_ATMOSPHERE) + update_flag |= 16 + else + update_flag |= 32 + + if(update_flag == old_flag) + return 1 + else + return 0 + /obj/machinery/portable_atmospherics/canister/update_icon() +/* +update_flag +1 = holding +2 = connected_port +4 = tank_pressure < 10 +8 = tank_pressure < ONE_ATMOS +16 = tank_pressure < 15*ONE_ATMOS +32 = tank_pressure go boom. +*/ + + if (destroyed) + overlays = 0 + icon_state = text("[]-1", canister_color) + return + + if(icon_state != "[canister_color]") + icon_state = "[canister_color]" + + if(check_change()) //Returns 1 if no change needed to icons. + return + src.overlays = 0 - if (src.destroyed) - src.icon_state = "[src.canister_color]-1" - - else - icon_state = "[canister_color]" - if(holding) - overlays += "can-open" - - if(connected_port) - overlays += "can-connector" - - var/tank_pressure = air_contents.return_pressure() - - if (tank_pressure < 10) - overlays += image('icons/obj/atmos.dmi', "can-o0") - else if (tank_pressure < ONE_ATMOSPHERE) - overlays += image('icons/obj/atmos.dmi', "can-o1") - else if (tank_pressure < 15*ONE_ATMOSPHERE) - overlays += image('icons/obj/atmos.dmi', "can-o2") - else - overlays += image('icons/obj/atmos.dmi', "can-o3") + if(update_flag & 1) + overlays += "can-open" + if(update_flag & 2) + overlays += "can-connector" + if(update_flag & 4) + overlays += "can-o0" + if(update_flag & 8) + overlays += "can-o1" + else if(update_flag & 16) + overlays += "can-o2" + else if(update_flag & 32) + overlays += "can-o3" return + /obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > temperature_resistance) health -= 5 @@ -161,9 +198,10 @@ return /obj/machinery/portable_atmospherics/canister/bullet_act(var/obj/item/projectile/Proj) - if(Proj.damage) - src.health -= round(Proj.damage / 2) - healthcheck() + if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) + if(Proj.damage) + src.health -= round(Proj.damage / 2) + healthcheck() ..() /obj/machinery/portable_atmospherics/canister/meteorhit(var/obj/O as obj) @@ -175,14 +213,14 @@ switch(severity) if(1.0) if(destroyed || prob(30)) - del(src) + qdel(src) else src.health = 0 healthcheck() return if(2.0) if(destroyed) - del(src) + qdel(src) else src.health -= rand(40, 100) healthcheck() diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 23f96f27f0c..896e042696b 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -96,7 +96,7 @@ "\blue You have unfastened \the [src].", \ "You hear ratchet.") new /obj/item/pipe_meter(src.loc) - del(src) + qdel(src) return ..() diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 76021357ae4..7dc6ea0347c 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -26,7 +26,7 @@ else update_icon() - Del() + Destroy() del(air_contents) ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 2d3185f1f62..a460626269c 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -46,6 +46,8 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/light/tube(), \ new /obj/item/weapon/light/bulb(), \ new /obj/item/weapon/camera_assembly(), \ + new /obj/item/newscaster_frame(), \ + new /obj/item/weapon/reagent_containers/syringe(), \ ) var/global/list/autolathe_recipes_hidden = list( \ @@ -58,6 +60,7 @@ var/global/list/autolathe_recipes_hidden = list( \ new /obj/item/ammo_casing/shotgun(), \ new /obj/item/ammo_casing/shotgun/buckshot(), \ new /obj/item/ammo_casing/shotgun/dart(), \ + new /obj/item/ammo_casing/shotgun/incendiary(), \ /* new /obj/item/weapon/shield/riot(), */ \ ) @@ -74,14 +77,12 @@ var/global/list/autolathe_recipes_hidden = list( \ var/max_g_amount = 75000.0 var/operating = 0.0 - var/opened = 0.0 anchored = 1.0 var/list/L = list() var/list/LL = list() var/hacked = 0 var/disabled = 0 var/shocked = 0 - var/list/wires = list() var/hack_wire var/disable_wire var/shock_wire @@ -90,287 +91,204 @@ var/global/list/autolathe_recipes_hidden = list( \ active_power_usage = 100 var/busy = 0 var/prod_coeff + var/datum/wires/autolathe/wires = null - proc - wires_win(mob/user as mob) - var/dat as text - dat += "Autolathe Wires:
" - for(var/wire in src.wires) - dat += text("[wire] Wire: [src.wires[wire] ? "Mend" : "Cut"] Pulse
") - - dat += text("The red light is [src.disabled ? "off" : "on"].
") - dat += text("The green light is [src.shocked ? "off" : "on"].
") - dat += text("The blue light is [src.hacked ? "off" : "on"].
") - user << browse("
\nGlass Amount: [src.g_amount] cm3 (MAX: [max_g_amount])
") - var/list/objs = list() - objs += src.L - if (src.hacked) - objs += src.LL - for(var/obj/t in objs) - if (istype(t, /obj/item/stack)) - var/title = "[t.name] ([t.m_amt] m /[t.g_amt] g)" - if (m_amount
" - user << browse("
Metal amount: [src.m_amount] / [max_m_amount] cm3
" + dat += "Glass amount: [src.g_amount] / [max_g_amount] cm3
" + var/list/objs = list() + objs += src.L + if(src.hacked) + objs += src.LL + for(var/obj/t in objs) + if(disabled || m_amount[t]", "The ", "")
+ else
+ dat += replacetext("[t]", "The ", "")
+
+ if(istype(t, /obj/item/stack))
+ var/obj/item/stack/S = t
+ var/max_multiplier = min(S.max_amount, S.m_amt?round(m_amount/S.m_amt):INFINITY, S.g_amt?round(g_amount/S.g_amt):INFINITY)
+ if (max_multiplier>10 && !disabled)
+ dat += " x[10]"
+ if (max_multiplier>25 && !disabled)
+ dat += " x[25]"
+ if (max_multiplier>1 && !disabled)
+ dat += " x[max_multiplier]"
+ dat += " [t.m_amt] m / [t.g_amt] g"
+ else
+ dat += " [t.m_amt/coeff] m / [t.g_amt/coeff] g"
+ dat += "
" + dat += "" + else + dat = wires.GetInteractWindow() + + var/datum/browser/popup = new(user, "autolathe", name, 400, 500) + popup.set_content(dat) + popup.open() + return + +/obj/machinery/autolathe/proc/shock(mob/user, prb) + if(stat & (BROKEN|NOPOWER)) // unpowered, no shock + return 0 + if(!prob(prb)) + return 0 + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() + if (electrocute_mob(user, get_area(src), src, 0.7)) + return 1 + else + return 0 diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 1d752a03258..f957a2d3a46 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -27,7 +27,7 @@ SetLuminosity(0) /obj/machinery/bot/proc/explode() - del(src) + qdel(src) /obj/machinery/bot/proc/healthcheck() if (src.health <= 0) @@ -101,9 +101,11 @@ ..() /obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj) - health -= Proj.damage - ..() - healthcheck() + if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) + health -= Proj.damage + ..() + healthcheck() + return /obj/machinery/bot/meteorhit() src.explode() diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 42f73d7a77e..b67a6b018b8 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/aibots.dmi' icon_state = "bucket_proxy" force = 3.0 - throwforce = 10.0 + throwforce = 5.0 throw_speed = 2 throw_range = 5 w_class = 3.0 @@ -304,7 +304,7 @@ text("[src.oddbutton ? "Yes" : "No" src.cleaning = 1 spawn(50) src.cleaning = 0 - del(target) + qdel(target) src.icon_state = "cleanbot[src.on]" src.anchored = 0 src.target = null @@ -324,20 +324,20 @@ text("[src.oddbutton ? "Yes" : "No" var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() - del(src) + qdel(src) return /obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) user.drop_item() - del(W) + qdel(W) var/turf/T = get_turf(src.loc) var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T) A.name = src.created_name user << "You add the robot arm to the bucket and sensor assembly. Beep boop!" - user.drop_from_inventory(src) - del(src) + 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) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 634b44b7f70..b1792a5a6b3 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -195,7 +195,7 @@ Auto Patrol: []"}, user << "Access denied." else ..() - if (!istype(W, /obj/item/weapon/screwdriver) && (!src.target)) + if (!istype(W, /obj/item/weapon/screwdriver) && !istype(W, /obj/item/weapon/weldingtool) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. if(hasvar(W,"force") && W.force)//If force is defined and non-zero src.target = user if(lasercolor)//To make up for the fact that lasertag bots don't hunt @@ -222,10 +222,10 @@ Auto Patrol: []"}, /obj/machinery/bot/ed209/process() set background = BACKGROUND_ENABLED - if (!src.on) + if (!src.on || src.disabled) return var/list/targets = list() - for (var/mob/living/carbon/C in view(12,src)) //Let's find us a target + for (var/mob/living/carbon/C in view(9,src)) //Let's find us a target var/threatlevel = 0 if ((C.stat) || (C.lying)) continue @@ -279,14 +279,14 @@ Auto Patrol: []"}, var/mob/living/carbon/M = src.target var/maxstuns = 4 if (istype(M, /mob/living/carbon/human)) - if (M.stuttering < 10 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) - M.stuttering = 10 - M.Stun(10) - M.Weaken(10) + if (M.stuttering < 5 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + M.stuttering = 5 + M.Stun(5) + M.Weaken(5) else - M.Weaken(10) - M.stuttering = 10 - M.Stun(10) + M.Weaken(5) + M.stuttering = 5 + M.Stun(5) maxstuns-- if (maxstuns <= 0) target = null @@ -791,7 +791,7 @@ Auto Patrol: []"}, s.start() new /obj/effect/decal/cleanable/oil(src.loc) - del(src) + qdel(src) /obj/machinery/bot/ed209/proc/shootAt(var/mob/target) @@ -818,14 +818,14 @@ Auto Patrol: []"}, projectile = /obj/item/projectile/energy/electrode else if(lasercolor == "b") if (src.emagged == 2) - projectile = /obj/item/projectile/omnitag + projectile = /obj/item/projectile/lasertag else - projectile = /obj/item/projectile/bluetag + projectile = /obj/item/projectile/lasertag/bluetag else if(lasercolor == "r") if (src.emagged == 2) - projectile = /obj/item/projectile/omnitag + projectile = /obj/item/projectile/lasertag else - projectile = /obj/item/projectile/redtag + projectile = /obj/item/projectile/lasertag/redtag if (!( istype(U, /turf) )) return @@ -895,9 +895,9 @@ Auto Patrol: []"}, switch(build_step) if(0,1) - if( istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg) ) + if(istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg)) user.drop_item() - del(W) + qdel(W) build_step++ user << "You add the robot leg to [src]." name = "legs/frame assembly" @@ -909,13 +909,13 @@ Auto Patrol: []"}, icon_state = "ed209_legs" if(2) - if( istype(W, /obj/item/clothing/suit/redtag) ) + if(istype(W, /obj/item/clothing/suit/redtag)) lasercolor = "r" - else if( istype(W, /obj/item/clothing/suit/bluetag) ) + else if(istype(W, /obj/item/clothing/suit/bluetag)) lasercolor = "b" - if( lasercolor || istype(W, /obj/item/clothing/suit/armor/vest) ) + if(lasercolor || istype(W, /obj/item/clothing/suit/armor/vest)) user.drop_item() - del(W) + qdel(W) build_step++ user << "You add the armor to [src]." name = "vest/legs/frame assembly" @@ -923,26 +923,38 @@ Auto Patrol: []"}, icon_state = "[lasercolor]ed209_shell" if(3) - if( istype(W, /obj/item/weapon/weldingtool) ) + if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) build_step++ name = "shielded frame assembly" user << "You welded the vest to [src]." if(4) - if( istype(W, /obj/item/clothing/head/helmet) ) - user.drop_item() - del(W) - build_step++ - user << "You add the helmet to [src]." - name = "covered and shielded frame assembly" - item_state = "[lasercolor]ed209_hat" - icon_state = "[lasercolor]ed209_hat" + switch(lasercolor) + if("b") + if(!istype(W, /obj/item/clothing/head/helmet/bluetaghelm)) + return + + if("r") + if(!istype(W, /obj/item/clothing/head/helmet/redtaghelm)) + return + + if("") + if(!istype(W, /obj/item/clothing/head/helmet)) + return + + user.drop_item() + qdel(W) + build_step++ + user << "You add the helmet to [src]." + name = "covered and shielded frame assembly" + item_state = "[lasercolor]ed209_hat" + icon_state = "[lasercolor]ed209_hat" if(5) - if( isprox(W) ) + if(isprox(W)) user.drop_item() - del(W) + qdel(W) build_step++ user << "You add the prox sensor to [src]." name = "covered, shielded and sensored frame assembly" @@ -950,8 +962,8 @@ Auto Patrol: []"}, icon_state = "[lasercolor]ed209_prox" if(6) - if( istype(W, /obj/item/weapon/cable_coil) ) - var/obj/item/weapon/cable_coil/coil = W + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = W var/turf/T = get_turf(user) user << "You start to wire [src]..." sleep(40) @@ -964,15 +976,15 @@ Auto Patrol: []"}, if(7) switch(lasercolor) if("b") - if( !istype(W, /obj/item/weapon/gun/energy/laser/bluetag) ) + if(!istype(W, /obj/item/weapon/gun/energy/laser/bluetag)) return name = "bluetag ED-209 assembly" if("r") - if( !istype(W, /obj/item/weapon/gun/energy/laser/redtag) ) + if(!istype(W, /obj/item/weapon/gun/energy/laser/redtag)) return name = "redtag ED-209 assembly" if("") - if( !istype(W, /obj/item/weapon/gun/energy/taser) ) + if(!istype(W, /obj/item/weapon/gun/energy/taser)) return name = "taser ED-209 assembly" else @@ -982,10 +994,10 @@ Auto Patrol: []"}, src.item_state = "[lasercolor]ed209_taser" src.icon_state = "[lasercolor]ed209_taser" user.drop_item() - del(W) + qdel(W) if(8) - if( istype(W, /obj/item/weapon/screwdriver) ) + if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) var/turf/T = get_turf(user) user << "Now attaching the gun to the frame..." @@ -996,42 +1008,44 @@ Auto Patrol: []"}, user << "Taser gun attached." if(9) - if( istype(W, /obj/item/weapon/cell) ) + if(istype(W, /obj/item/weapon/stock_parts/cell)) build_step++ user << "You complete the ED-209." var/turf/T = get_turf(src) new /obj/machinery/bot/ed209(T,created_name,lasercolor) user.drop_item() - del(W) - user.drop_from_inventory(src) - del(src) + qdel(W) + user.unEquip(src, 1) + qdel(src) /obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj) - if((src.lasercolor == "b") && (src.disabled == 0)) - if(istype(Proj, /obj/item/projectile/redtag)) + if(!disabled) + var/lasertag_check = 0 + if((src.lasercolor == "b")) + if(istype(Proj, /obj/item/projectile/lasertag/redtag)) + lasertag_check++ + else if((src.lasercolor == "r")) + if(istype(Proj, /obj/item/projectile/lasertag/bluetag)) + lasertag_check++ + if(lasertag_check) + icon_state = "[lasercolor]ed2090" src.disabled = 1 - del (Proj) - sleep(100) - src.disabled = 0 + target = null + spawn(100) + src.disabled = 0 + icon_state = "[lasercolor]ed2091" + return 1 else - ..() - else if((src.lasercolor == "r") && (src.disabled == 0)) - if(istype(Proj, /obj/item/projectile/bluetag)) - src.disabled = 1 - del (Proj) - sleep(100) - src.disabled = 0 - else - ..() + ..(Proj) else - ..() + ..(Proj) /obj/machinery/bot/ed209/bluetag/New()//If desired, you spawn red and bluetag bots easily new /obj/machinery/bot/ed209(get_turf(src),null,"b") - del(src) + qdel(src) /obj/machinery/bot/ed209/redtag/New() new /obj/machinery/bot/ed209(get_turf(src),null,"r") - del(src) + qdel(src) diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 0c53371b455..963f2785dfb 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -194,7 +194,7 @@ if(targetdirection != null) /* for (var/turf/space/D in view(7,src)) - if(!(D in floorbottargets) && D != src.oldtarget) // Added for bridging mode -- TLE + if(!(D in floorbottargets) && D != src.oldtarget) // Added for bridging mode if(get_dir(src, D) == targetdirection) src.oldtarget = D src.target = D @@ -331,7 +331,7 @@ T.amount -= i else src.amount += T.amount - del(T) + qdel(T) src.updateicon() src.target = null src.repairing = 0 @@ -351,7 +351,7 @@ var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel T.amount = 4 T.loc = M.loc - del(M) + qdel(M) src.target = null src.repairing = 0 @@ -387,7 +387,7 @@ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() - del(src) + qdel(src) return @@ -400,23 +400,23 @@ return if(user.s_active) user.s_active.close(user) - del(T) + qdel(T) var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles user.put_in_hands(B) user << "You add the tiles into the empty toolbox. They protrude from the top." - user.drop_from_inventory(src) - del(src) + user.unEquip(src, 1) + qdel(src) /obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob) ..() if(isprox(W)) - del(W) + qdel(W) var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor() B.created_name = src.created_name user.put_in_hands(B) user << "You add the sensor to the toolbox and tiles!" - user.drop_from_inventory(src) - del(src) + 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) @@ -430,13 +430,13 @@ /obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) - del(W) + 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 user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!" - user.drop_from_inventory(src) - del(src) + 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) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 251bd2705fb..e40e9a21db2 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -476,7 +476,7 @@ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() - del(src) + qdel(src) return /obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened! @@ -551,11 +551,11 @@ else if(istype(src,/obj/item/weapon/storage/firstaid/o2)) A.skin = "o2" - del(S) + qdel(S) user.put_in_hands(A) user << "You add the robot arm to the first aid kit." - user.drop_from_inventory(src) - del(src) + user.unEquip(src, 1) + qdel(src) /obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -572,7 +572,7 @@ if(0) if(istype(W, /obj/item/device/healthanalyzer)) user.drop_item() - del(W) + qdel(W) src.build_step++ user << "You add the health sensor to [src]." src.name = "First aid/robot arm/health analyzer assembly" @@ -581,13 +581,13 @@ if(1) if(isprox(W)) user.drop_item() - del(W) + qdel(W) src.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 - user.drop_from_inventory(src) - del(src) + user.unEquip(src, 1) + qdel(src) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 483bfcb0bb7..47a26e226c5 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -48,7 +48,7 @@ var/global/mulebot_count = 0 var/auto_return = 1 // true if auto return to home beacon after unload var/auto_pickup = 1 // true if auto-pickup at beacon - var/obj/item/weapon/cell/cell + var/obj/item/weapon/stock_parts/cell/cell var/datum/wires/mulebot/wires = null // the installed power cell @@ -105,8 +105,8 @@ var/global/mulebot_count = 0 if(toggle_lock(user)) user << "\blue Controls [(locked ? "locked" : "unlocked")]." - else if(istype(I,/obj/item/weapon/cell) && open && !cell) - var/obj/item/weapon/cell/C = I + else if(istype(I,/obj/item/weapon/stock_parts/cell) && open && !cell) + var/obj/item/weapon/stock_parts/cell/C = I user.drop_item() C.loc = src cell = C @@ -135,6 +135,9 @@ var/global/mulebot_count = 0 ) else user << "\blue [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) @@ -290,7 +293,7 @@ var/global/mulebot_count = 0 if("cellinsert") if(open && !cell) - var/obj/item/weapon/cell/C = usr.get_active_hand() + var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand() if(istype(C)) usr.drop_item() cell = C @@ -893,7 +896,7 @@ var/global/mulebot_count = 0 new /obj/item/device/assembly/prox_sensor(Tsec) new /obj/item/stack/rods(Tsec) new /obj/item/stack/rods(Tsec) - new /obj/item/weapon/cable_coil/cut(Tsec) + new /obj/item/stack/cable_coil/cut(Tsec) if (cell) cell.loc = Tsec cell.update_icon() @@ -905,4 +908,4 @@ var/global/mulebot_count = 0 new /obj/effect/decal/cleanable/oil(src.loc) unload(0) - del(src) + qdel(src) diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 31aa65c331c..7c2c15fed4d 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -171,7 +171,7 @@ Auto Patrol: []"}, user << "\red Access denied." else ..() - if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target)) + if(!istype(W, /obj/item/weapon/screwdriver) && !istype(W, /obj/item/weapon/weldingtool) && (W.force) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. src.target = user src.mode = SECBOT_HUNT @@ -219,7 +219,7 @@ Auto Patrol: []"}, walk_to(src,0) if(target) // make sure target exists - if(get_dist(src, src.target) <= 1 && isturf(src.target.loc)) // if right next to perp + 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" spawn(2) @@ -227,14 +227,14 @@ Auto Patrol: []"}, var/mob/living/carbon/M = src.target var/maxstuns = 4 if(istype(M, /mob/living/carbon/human)) - if(M.stuttering < 10 && (!(HULK in M.mutations))) - M.stuttering = 10 - M.Stun(10) - M.Weaken(10) + if(M.stuttering < 5 && (!(HULK in M.mutations))) + M.stuttering = 5 + M.Stun(5) + M.Weaken(5) else - M.Weaken(10) - M.stuttering = 10 - M.Stun(10) + M.Weaken(5) + M.stuttering = 5 + M.Stun(5) maxstuns-- if(maxstuns <= 0) target = null @@ -669,7 +669,7 @@ Auto Patrol: []"}, var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec) Sa.build_step = 1 - Sa.overlays += image('icons/obj/aibots.dmi', "hs_hole") + Sa.overlays += "hs_hole" Sa.created_name = src.name new /obj/item/device/assembly/prox_sensor(Tsec) new /obj/item/weapon/melee/baton(Tsec) @@ -682,7 +682,7 @@ Auto Patrol: []"}, s.start() new /obj/effect/decal/cleanable/oil(src.loc) - del(src) + qdel(src) /obj/machinery/bot/secbot/attack_alien(var/mob/living/carbon/alien/user as mob) ..() @@ -702,54 +702,80 @@ Auto Patrol: []"}, return if(S.secured) - del(S) + qdel(S) var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly user.put_in_hands(A) - user << "You add the signaler to the helmet." - user.drop_from_inventory(src) - del(src) + user << "You add the signaler to the helmet." + user.unEquip(src, 1) + qdel(src) else return -/obj/item/weapon/secbot_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/weapon/secbot_assembly/attackby(obj/item/I, mob/user) ..() - if((istype(W, /obj/item/weapon/weldingtool)) && (!src.build_step)) - var/obj/item/weapon/weldingtool/WT = W - if(WT.remove_fuel(0,user)) - src.build_step++ - src.overlays += image('icons/obj/aibots.dmi', "hs_hole") - user << "You weld a hole in [src]!" + if(istype(I, /obj/item/weapon/weldingtool)) + if(!build_step) + var/obj/item/weapon/weldingtool/WT = I + if(WT.remove_fuel(0, user)) + build_step++ + overlays += "hs_hole" + user << "You weld a hole in [src]!" + else if(build_step == 1) + var/obj/item/weapon/weldingtool/WT = I + if(WT.remove_fuel(0, user)) + build_step-- + overlays -= "hs_hole" + user << "You weld the hole in [src] shut!" - else if(isprox(W) && (src.build_step == 1)) + else if(isprox(I) && (build_step == 1)) user.drop_item() - src.build_step++ - user << "You add the prox sensor to [src]!" - src.overlays += image('icons/obj/aibots.dmi', "hs_eye") - src.name = "helmet/signaler/prox sensor assembly" - del(W) + build_step++ + user << "You add the prox sensor to [src]!" + overlays += "hs_eye" + name = "helmet/signaler/prox sensor assembly" + qdel(I) - else if(((istype(W, /obj/item/robot_parts/l_arm)) || (istype(W, /obj/item/robot_parts/r_arm))) && (src.build_step == 2)) + else if(((istype(I, /obj/item/robot_parts/l_arm)) || (istype(I, /obj/item/robot_parts/r_arm))) && (build_step == 2)) user.drop_item() - src.build_step++ - user << "You add the robot arm to [src]!" - src.name = "helmet/signaler/prox sensor/robot arm assembly" - src.overlays += image('icons/obj/aibots.dmi', "hs_arm") - del(W) + build_step++ + user << "You add the robot arm to [src]!" + name = "helmet/signaler/prox sensor/robot arm assembly" + overlays += "hs_arm" + qdel(I) - else if((istype(W, /obj/item/weapon/melee/baton)) && (src.build_step >= 3)) + else if((istype(I, /obj/item/weapon/melee/baton)) && (build_step >= 3)) user.drop_item() - src.build_step++ - user << "You complete the Securitron! Beep boop." + build_step++ + user << "You complete the Securitron! Beep boop." var/obj/machinery/bot/secbot/S = new /obj/machinery/bot/secbot S.loc = get_turf(src) - S.name = src.created_name - del(W) - del(src) + S.name = created_name + qdel(I) + 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) + 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) 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 if(istype(I, /obj/item/weapon/screwdriver)) + if(!build_step) + new /obj/item/device/assembly/signaler(get_turf(src)) + new /obj/item/clothing/head/helmet(get_turf(src)) + user << "You disconnect the signaler from the helmet." + qdel(src) + + else if(build_step == 2) + overlays -= "hs_eye" + new /obj/item/device/assembly/prox_sensor(get_turf(src)) + user << "You detach the proximity sensor from [src]." + build_step-- + + else if(build_step == 3) + overlays -= "hs_arm" + new /obj/item/robot_parts/l_arm(get_turf(src)) + user << "You remove the robot arm from [src]." + build_step-- diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 7577a2ddbe7..b9386833cb3 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -48,7 +48,7 @@ if(z == 1 && prob(3)) deactivate() -/obj/machinery/camera/Del() +/obj/machinery/camera/Destroy() if(istype(bug)) bug.bugged_cameras -= src.c_tag ..() @@ -90,7 +90,7 @@ return /obj/machinery/camera/blob_act() - del(src) + qdel(src) return /obj/machinery/camera/proc/setViewRange(var/num = 7) @@ -131,7 +131,7 @@ if(assembly) assembly.loc = src.loc assembly.state = 1 - del(src) + qdel(src) // OTHER @@ -180,7 +180,7 @@ playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(loc, "sparks", 50, 1) visible_message("\blue The camera has been sliced apart by [] with an energy blade!") - del(src) + qdel(src) else if(istype(W, /obj/item/device/laser_pointer)) var/obj/item/device/laser_pointer/L = W L.laser_act(src, user) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index e9665632c84..805406fb6ed 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -56,8 +56,8 @@ if(2) // State 2 - if(istype(W, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = W + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = W if(C.use(2)) user << "You add wires to the assembly." state = 3 @@ -110,7 +110,7 @@ else if(istype(W, /obj/item/weapon/wirecutters)) - new/obj/item/weapon/cable_coil(get_turf(src), 2) + new/obj/item/stack/cable_coil(get_turf(src), 2) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You cut the wires from the circuits." state = 2 @@ -120,7 +120,7 @@ if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. user << "You attach the [W] into the assembly inner circuits." upgrades += W - user.drop_item(W) + user.drop_item() W.loc = src return diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 6461837c7a7..f588e5146a3 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -77,10 +77,8 @@ //Cameras can't track people wearing an agent card or a ninja hood. if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate)) continue - if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja)) - var/obj/item/clothing/head/helmet/space/space_ninja/hood = H.head - if(!hood.canremove) - continue + if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && (H.head.flags & NODROP)) + continue // Now, are they viewable by a camera? (This is last because it's the most intensive check) if(!near_camera(M)) @@ -137,7 +135,7 @@ U << "Follow camera mode terminated." U.cameraFollow = null return - if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && !H.head.canremove) + if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && (H.head.flags & NODROP)) U << "Follow camera mode terminated." U.cameraFollow = null return diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 567cbfe5284..14a8fb54edc 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -8,7 +8,7 @@ idle_power_usage = 5 active_power_usage = 60 power_channel = EQUIP - var/obj/item/weapon/cell/charging = null + var/obj/item/weapon/stock_parts/cell/charging = null var/chargelevel = -1 proc updateicon() @@ -38,7 +38,7 @@ if(stat & BROKEN) return - if(istype(W, /obj/item/weapon/cell) && anchored) + if(istype(W, /obj/item/weapon/stock_parts/cell) && anchored) if(charging) user << "\red There is already a cell in the charger." return diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index a1fbdcb16c0..631d2eb9700 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -14,7 +14,6 @@ icon = 'icons/obj/cloning.dmi' icon_state = "pod_0" req_access = list(access_genetics) //For premature unlocking. - var/mob/living/occupant var/heal_level = 90 //The clone is released once its health reaches this level. var/locked = 0 var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine. @@ -33,8 +32,8 @@ component_parts += new /obj/item/weapon/stock_parts/manipulator(null) component_parts += new /obj/item/weapon/stock_parts/manipulator(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - component_parts += new /obj/item/weapon/cable_coil(null, 1) - component_parts += new /obj/item/weapon/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/clonepod/RefreshParts() @@ -259,18 +258,14 @@ //Let's unlock this early I guess. Might be too early, needs tweaking. /obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/screwdriver)) - if(occupant || mess || locked) - user << "The maintenance panel is locked." + if(!(occupant || mess || locked)) + if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W)) return - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]") + + if(exchange_parts(user, W)) return - if(istype(W, /obj/item/weapon/crowbar)) - if(panel_open) - default_deconstruction_crowbar() - return + default_deconstruction_crowbar(W) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (!src.check_access(W)) @@ -358,7 +353,7 @@ src.icon_state = "pod_g" src.occupant.ghostize() spawn(5) - del(src.occupant) + qdel(src.occupant) return /obj/machinery/clonepod/relaymove(mob/user as mob) @@ -377,21 +372,21 @@ for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) - del(src) + 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) - del(src) + 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) - del(src) + qdel(src) return return diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 6479c5d9344..e4c6e621fee 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -136,7 +136,7 @@ // loadProgram(target) //This could all be done better, but it works for now. -/obj/machinery/computer/HolodeckControl/Del() +/obj/machinery/computer/HolodeckControl/Destroy() emergencyShutdown() ..() @@ -200,13 +200,12 @@ if(isobj(obj)) var/mob/M = obj.loc if(ismob(M)) - M.u_equip(obj) - M.update_icons() //so their overlays update + M.unEquip(obj, 1) //Holoweapons should always drop. if(!silent) var/obj/oldobj = obj visible_message("The [oldobj.name] fades away!") - del(obj) + qdel(obj) /obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A) for(var/turf/T in A) @@ -237,10 +236,10 @@ derez(item) for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck) - del(B) + qdel(B) for(var/mob/living/simple_animal/hostile/carp/C in linkedholodeck) - del(C) + qdel(C) holographic_items = A.copy_contents_to(linkedholodeck , 1) @@ -261,7 +260,7 @@ T.temperature = 5000 T.hotspot_expose(50000,50000,1) if(L.name=="Holocarp Spawn") - new /mob/living/simple_animal/hostile/carp(L.loc) + new /mob/living/simple_animal/hostile/carp/holocarp(L.loc) /obj/machinery/computer/HolodeckControl/proc/emergencyShutdown() @@ -335,7 +334,7 @@ G.affecting.loc = src.loc G.affecting.Weaken(5) visible_message("\red [G.assailant] puts [G.affecting] on the table.") - del(W) + qdel(W) return if (istype(W, /obj/item/weapon/wrench)) @@ -357,17 +356,14 @@ flags = ON_BORDER -/obj/structure/holowindow/Del() - ..() - /obj/item/weapon/holo - damtype = HALLOSS + damtype = STAMINA /obj/item/weapon/holo/esword desc = "May the force be with you. Sorta" icon_state = "sword0" force = 3.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 throwforce = 0 w_class = 2.0 @@ -399,13 +395,13 @@ force = 30 icon_state = "sword[item_color]" w_class = 4 - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + playsound(user, 'sound/weapons/saberon.ogg', 20, 1) user << "\blue [src] is now active." else force = 3 icon_state = "sword0" w_class = 2 - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + playsound(user, 'sound/weapons/saberoff.ogg', 20, 1) user << "\blue [src] can now be concealed." add_fingerprint(user) return @@ -430,7 +426,7 @@ if((ishuman(hit_atom))) var/mob/living/carbon/M = hit_atom playsound(src, 'sound/items/dodgeball.ogg', 50, 1) - M.apply_damage(10, HALLOSS) + M.apply_damage(10, STAMINA) if(prob(5)) M.Weaken(3) visible_message("\red [M] is knocked right off \his feet!", 3) @@ -453,7 +449,7 @@ G.affecting.loc = src.loc G.affecting.Weaken(5) visible_message("\red [G.assailant] dunks [G.affecting] into the [src]!", 3) - del(W) + qdel(W) return else if (istype(W, /obj/item) && get_dist(src,user)<2) user.drop_item(src) @@ -512,7 +508,7 @@ currentarea = get_area(src.loc) if(!currentarea) - del(src) + qdel(src) if(eventstarted) usr << "The event has already begun!" @@ -543,7 +539,7 @@ eventstarted = 1 for(var/obj/structure/holowindow/W in currentarea) - del(W) + qdel(W) for(var/mob/M in currentarea) M << "FIGHT!" \ No newline at end of file diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 3e5a090df51..5f0e35b08ec 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -5,7 +5,7 @@ icon = 'icons/mob/AI.dmi' icon_state = "0" var/state = 0 - var/datum/ai_laws/laws = new /datum/ai_laws/asimov + var/datum/ai_laws/laws = new() var/obj/item/weapon/circuitboard/circuit = null var/obj/item/device/mmi/brain = null @@ -16,42 +16,42 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You wrench the frame into place." + user << "You wrench the frame into place." anchored = 1 state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.isOn()) - user << "The welder must be on for this task." + user << "The welder must be on for this task." return playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20)) if(!src || !WT.remove_fuel(0, user)) return - user << "\blue You deconstruct the frame." + user << "You deconstruct the frame." new /obj/item/stack/sheet/plasteel( loc, 4) - del(src) + qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You unfasten the frame." + user << "You unfasten the frame." anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + user << "You place the circuit board inside the frame." icon_state = "1" circuit = P user.drop_item() P.loc = src if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + user << "You screw the circuit board into place." state = 2 icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + user << "You remove the circuit board." state = 1 icon_state = "0" circuit.loc = loc @@ -59,28 +59,28 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + user << "You unfasten the circuit board." state = 1 icon_state = "1" - if(istype(P, /obj/item/weapon/cable_coil)) + if(istype(P, /obj/item/stack/cable_coil)) if(P:amount >= 5) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) P:amount -= 5 - if(!P:amount) del(P) - user << "\blue You add cables to the frame." + if(!P:amount) qdel(P) + user << "You add cables to the frame." state = 3 icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) if (brain) - user << "Get that brain out of there first" + user << "Get that brain out of there first." else playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + user << "You remove the cables." state = 2 icon_state = "2" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) A.amount = 5 if(istype(P, /obj/item/stack/sheet/rglass)) @@ -89,46 +89,49 @@ if(do_after(user, 20)) if (P) P:amount -= 2 - if(!P:amount) del(P) - user << "\blue You put in the glass panel." + if(!P:amount) qdel(P) + user << "You put in the glass panel." state = 4 icon_state = "4" - if(istype(P, /obj/item/weapon/aiModule/asimov)) - laws.add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - laws.add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") - laws.add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - usr << "Law module applied." - - if(istype(P, /obj/item/weapon/aiModule/purge)) + if(istype(P, /obj/item/weapon/aiModule/core/full)) //Allows any full core boards to be applied to AI cores. + var/obj/item/weapon/aiModule/core/M = P laws.clear_inherent_laws() - usr << "Law module applied." + for(var/templaw in M.laws) + laws.add_inherent_law(templaw) + usr << "Law module applied." + + if(istype(P, /obj/item/weapon/aiModule/reset/purge)) + laws.clear_inherent_laws() + usr << "Laws cleared applied." - if(istype(P, /obj/item/weapon/aiModule/freeform)) - var/obj/item/weapon/aiModule/freeform/M = P - laws.add_inherent_law(M.newFreeFormLaw) - usr << "Added a freeform law." + if(istype(P, /obj/item/weapon/aiModule/supplied/freeform) || istype(P, /obj/item/weapon/aiModule/core/freeformcore)) + var/obj/item/weapon/aiModule/supplied/freeform/M = P + if(M.laws[1] == "") + return + laws.add_inherent_law(M.laws[1]) + usr << "Added a freeform law." if(istype(P, /obj/item/device/mmi)) var/obj/item/device/mmi/M = P if(!M.brainmob) - user << "\red Sticking an empty MMI into the frame would sort of defeat the purpose." + user << "Sticking an empty MMI into the frame would sort of defeat the purpose." return if(M.brainmob.stat == 2) - user << "\red Sticking a dead brain into the frame would sort of defeat the purpose." + user << "Sticking a dead brain into the frame would sort of defeat the purpose." return if((config) && (!config.allow_ai)) - user << "\red This MMI does not seem to fit." + user << "This MMI does not seem to fit." return if(jobban_isbanned(M.brainmob, "AI")) - user << "\red This MMI does not seem to fit." + user << "This MMI does not seem to fit." return if(!M.brainmob.mind) - user << "\red This MMI is mindless." + user << "This MMI is mindless." return ticker.mode.remove_cultist(M.brainmob.mind, 1) @@ -137,12 +140,12 @@ user.drop_item() M.loc = src brain = M - usr << "Added a brain." + usr << "Added a brain." icon_state = "3b" if(istype(P, /obj/item/weapon/crowbar) && brain) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the brain." + user << "You remove the brain." brain.loc = loc brain = null icon_state = "3" @@ -150,23 +153,25 @@ if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + user << "You remove the glass panel." state = 3 if (brain) icon_state = "3b" else icon_state = "3" - new /obj/item/stack/sheet/rglass( loc, 2 ) + new /obj/item/stack/sheet/rglass(loc, 2) return if(istype(P, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." - var/mob/living/silicon/ai/A = new /mob/living/silicon/ai ( loc, laws, brain ) + user << "You connect the monitor." + if(!laws.inherent.len) //If laws isn't set to null but nobody supplied a board, the AI would normally be created lawless. We don't want that. + laws = null + var/mob/living/silicon/ai/A = new /mob/living/silicon/ai (loc, laws, brain) if(A) //if there's no brain, the mob is deleted and a structure/AIcore is created A.rename_self("ai", 1) feedback_inc("cyborg_ais_created",1) - del(src) + qdel(src) /obj/structure/AIcore/deactivated name = "inactive AI" @@ -267,7 +272,7 @@ That prevents a few funky behaviors. A.cancel_camera() A << "You have been uploaded to a stationary terminal. Remote device connection restored." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." - del(T) + qdel(T) if("NINJASUIT") var/obj/item/clothing/suit/space/space_ninja/C = src var/mob/living/silicon/ai/A = C.AI @@ -278,7 +283,7 @@ That prevents a few funky behaviors. A.cancel_camera() A << "You have been uploaded to a stationary terminal. Remote device connection restored." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." - del(T) + qdel(T) if("AIFIXER")//AI Fixer terminal. var/obj/machinery/computer/aifixer/T = target switch(interaction) @@ -292,7 +297,7 @@ That prevents a few funky behaviors. C.name = "inteliCard" C.overlays.Cut() A.loc = T - T.occupant = A + T.occupier = A A.control_disabled = 1 if (A.stat == 2) T.overlays += image('icons/obj/computer.dmi', "ai-fixer-404") @@ -303,25 +308,25 @@ That prevents a few funky behaviors. A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." else - if(!C.contents.len && T.occupant && !T.active) - C.name = "inteliCard - [T.occupant.name]" + if(!C.contents.len && T.occupier && !T.active) + C.name = "inteliCard - [T.occupier.name]" T.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") - if (T.occupant.stat == 2) + if (T.occupier.stat == 2) C.icon_state = "aicard-404" T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404") else C.icon_state = "aicard-full" T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-full") - T.occupant << "You have been downloaded to a mobile storage device. Still no remote access." - U << "\blue Transfer successful: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." - T.occupant.loc = C - T.occupant.cancel_camera() - T.occupant = null + T.occupier << "You have been downloaded to a mobile storage device. Still no remote access." + U << "\blue Transfer successful: \black [T.occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + T.occupier.loc = C + T.occupier.cancel_camera() + T.occupier = null else if (C.contents.len) U << "\red ERROR: \black Artificial intelligence detected on terminal." else if (T.active) U << "\red ERROR: \black Reconstruction in progress." - else if (!T.occupant) + else if (!T.occupier) U << "\red ERROR: \black Unable to locate artificial intelligence." if("NINJASUIT") var/obj/item/clothing/suit/space/space_ninja/C = src @@ -331,7 +336,7 @@ That prevents a few funky behaviors. else var/mob/living/silicon/ai/A = C.AI A.loc = T - T.occupant = A + T.occupier = A C.AI = null A.control_disabled = 1 T.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") @@ -340,22 +345,22 @@ That prevents a few funky behaviors. A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." else - if(!C.AI && T.occupant && !T.active) - if (T.occupant.stat) - U << "\red ERROR: \black [T.occupant.name] data core is corrupted. Unable to install." + if(!C.AI && T.occupier && !T.active) + if (T.occupier.stat) + U << "\red ERROR: \black [T.occupier.name] data core is corrupted. Unable to install." else T.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-full") - T.occupant << "You have been downloaded to a mobile storage device. Still no remote access." - U << "\blue Transfer successful: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." - T.occupant.loc = C - T.occupant.cancel_camera() - T.occupant = null + T.occupier << "You have been downloaded to a mobile storage device. Still no remote access." + U << "\blue Transfer successful: \black [T.occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + T.occupier.loc = C + T.occupier.cancel_camera() + T.occupier = null else if (C.AI) U << "\red ERROR: \black Artificial intelligence detected on terminal." else if (T.active) U << "\red ERROR: \black Reconstruction in progress." - else if (!T.occupant) + else if (!T.occupier) U << "\red ERROR: \black Unable to locate artificial intelligence." if("NINJASUIT")//Ninjasuit var/obj/item/clothing/suit/space/space_ninja/T = target diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 0339f223bf7..6dfa1f4dd5f 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,125 +1,137 @@ -/obj/machinery/computer/aifixer - name = "\improper AI system integrity restorer" - icon = 'icons/obj/computer.dmi' - icon_state = "ai-fixer" - req_access = list(access_captain, access_robotics, access_heads) - var/mob/living/silicon/ai/occupant = null - var/active = 0 - circuit = /obj/item/weapon/circuitboard/aifixer - -/obj/machinery/computer/aifixer/New() - src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") - ..() - - -/obj/machinery/computer/aifixer/attackby(I as obj, user as mob) - - if(istype(I, /obj/item/device/aicard)) - var/obj/item/device/aicard/AIcard = I - if(stat & (NOPOWER|BROKEN)) - user << "This terminal isn't functioning right now, get it working!" - return - AIcard.transfer_ai("AIFIXER","AICARD",src,user) - else - ..() - return - -/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob) - if(..()) - return - - user.set_machine(src) - var/dat = "" - - if (src.occupant) - var/laws - dat += "
" - - if (src.occupant.laws.zeroth) - laws += "0: [src.occupant.laws.zeroth]
" - - var/number = 1 - for (var/index = 1, index <= src.occupant.laws.inherent.len, index++) - var/law = src.occupant.laws.inherent[index] - if (length(law) > 0) - laws += "[number]: [law]
" - number++ - - for (var/index = 1, index <= src.occupant.laws.supplied.len, index++) - var/law = src.occupant.laws.supplied[index] - if (length(law) > 0) - laws += "[number]: [law]
" - number++ - - dat += "Laws:
[laws]
" - - if (src.occupant.stat == 2) - dat += "AI non-functional" - else - dat += "AI functional" - if (!src.active) - dat += {"
Begin Reconstruction"} - else - dat += "
Reconstruction in process, please wait.
" - dat += {"
Close"} - - //user << browse(dat, "window=computer;size=400x500") - //onclose(user, "computer") - var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - -/obj/machinery/computer/aifixer/process() - if(..()) - src.updateDialog() - return - -/obj/machinery/computer/aifixer/Topic(href, href_list) - if(..()) - return - if (href_list["fix"]) - src.active = 1 - src.overlays += image('icons/obj/computer.dmi', "ai-fixer-on") - while (src.occupant.health < 100) - src.occupant.adjustOxyLoss(-1) - src.occupant.adjustFireLoss(-1) - src.occupant.adjustToxLoss(-1) - src.occupant.adjustBruteLoss(-1) - src.occupant.updatehealth() - if (src.occupant.health >= 0 && src.occupant.stat == 2) - src.occupant.stat = 0 - src.occupant.lying = 0 - dead_mob_list -= src.occupant - living_mob_list += src.occupant - src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404") - src.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") - src.updateUsrDialog() - sleep(10) - src.active = 0 - src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-on") - - - src.add_fingerprint(usr) - src.updateUsrDialog() - return - - -/obj/machinery/computer/aifixer/update_icon() - ..() - // Broken / Unpowered - if((stat & BROKEN) || (stat & NOPOWER)) - overlays.Cut() - - // Working / Powered - else - if (occupant) - switch (occupant.stat) - if (0) - overlays += image('icons/obj/computer.dmi', "ai-fixer-full") - if (2) - overlays += image('icons/obj/computer.dmi', "ai-fixer-404") - else - overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") +/obj/machinery/computer/aifixer + name = "\improper AI system integrity restorer" + icon = 'icons/obj/computer.dmi' + icon_state = "ai-fixer" + req_access = list(access_captain, access_robotics, access_heads) + var/mob/living/silicon/ai/occupier = null + var/active = 0 + circuit = /obj/item/weapon/circuitboard/aifixer + +/obj/machinery/computer/aifixer/New() + src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") + ..() + + +/obj/machinery/computer/aifixer/attackby(I as obj, user as mob) + if(occupier && istype(I, /obj/item/weapon/screwdriver)) + if(stat & (NOPOWER|BROKEN)) + user << "The screws on [name]'s screen won't budge." + else + user << "The screws on [name]'s screen won't budge and it emits a warning beep." + return + + if(istype(I, /obj/item/device/aicard)) + var/obj/item/device/aicard/AIcard = I + if(stat & (NOPOWER|BROKEN)) + if(occupier) + AIcard.transfer_ai("AIFIXER","AICARD",src,user) + overlays.Cut() + return + user << "This terminal isn't functioning right now, get it working!" + return + AIcard.transfer_ai("AIFIXER","AICARD",src,user) + else + ..() + return + +/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob) + if(..()) + return + interact(user) + +/obj/machinery/computer/aifixer/interact(mob/user) + + var/dat = "" + + if (src.occupier) + var/laws + dat += "
" + + if (src.occupier.laws.zeroth) + laws += "0: [src.occupier.laws.zeroth]
" + + var/number = 1 + for (var/index = 1, index <= src.occupier.laws.inherent.len, index++) + var/law = src.occupier.laws.inherent[index] + if (length(law) > 0) + laws += "[number]: [law]
" + number++ + + for (var/index = 1, index <= src.occupier.laws.supplied.len, index++) + var/law = src.occupier.laws.supplied[index] + if (length(law) > 0) + laws += "[number]: [law]
" + number++ + + dat += "Laws:
[laws]
" + + if (src.occupier.stat == 2) + dat += "AI non-functional" + else + dat += "AI functional" + if (!src.active) + dat += {"
Begin Reconstruction"} + else + dat += "
Reconstruction in process, please wait.
" + dat += {"
Close"} + + //user << browse(dat, "window=computer;size=400x500") + //onclose(user, "computer") + var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/computer/aifixer/process() + if(..()) + src.updateDialog() + return + +/obj/machinery/computer/aifixer/Topic(href, href_list) + if(..()) + return + if (href_list["fix"]) + src.active = 1 + src.overlays += image('icons/obj/computer.dmi', "ai-fixer-on") + while (src.occupier.health < 100) + src.occupier.adjustOxyLoss(-1) + src.occupier.adjustFireLoss(-1) + src.occupier.adjustToxLoss(-1) + src.occupier.adjustBruteLoss(-1) + src.occupier.updatehealth() + if (src.occupier.health >= 0 && src.occupier.stat == 2) + src.occupier.stat = 0 + src.occupier.lying = 0 + dead_mob_list -= src.occupier + living_mob_list += src.occupier + src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404") + src.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") + src.updateUsrDialog() + sleep(10) + src.active = 0 + src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-on") + + + src.add_fingerprint(usr) + src.updateUsrDialog() + return + + +/obj/machinery/computer/aifixer/update_icon() + ..() + // Broken / Unpowered + if((stat & BROKEN) || (stat & NOPOWER)) + overlays.Cut() + + // Working / Powered + else + if (occupier) + switch (occupier.stat) + if (0) + overlays += image('icons/obj/computer.dmi', "ai-fixer-full") + if (2) + overlays += image('icons/obj/computer.dmi', "ai-fixer-404") + else + overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 39e5691e208..449bc3b3074 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -23,7 +23,7 @@ /obj/item/toy/prize/mauler = 1, /obj/item/toy/prize/odysseus = 1, /obj/item/toy/prize/phazon = 1, - /obj/item/toy/cards = 2, + /obj/item/toy/cards/deck = 2, /obj/item/toy/nuke = 2 ) @@ -31,7 +31,7 @@ ..() var/choice = pick(typesof(/obj/machinery/computer/arcade) - /obj/machinery/computer/arcade) new choice(loc) - del(src) + qdel(src) /obj/machinery/computer/arcade/proc/prizevend() if(!contents.len) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 614933c0635..428d8384235 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -16,6 +16,10 @@ ..() set_frequency(receive_frequency) +/obj/machinery/computer/atmos_alert/Destroy() + radio_controller.remove_object(src, receive_frequency) + ..() + /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 860e475a922..99134bed064 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -28,7 +28,18 @@ var/list/records = null var/frame_desc = null - +/obj/item/weapon/circuitboard/large_tank_control + name = "cirquir board (Large Tank Control)" + build_path = /obj/machinery/computer/general_air_control/large_tank_control + origin_tech = "programming=2;engineering=3;materials=2" +/obj/item/weapon/circuitboard/turbine_computer + name = "circuit board (Turbine Computer)" + build_path = /obj/machinery/computer/turbine_computer + origin_tech = "programming=4;engineering=4;powerstorage=4" +/obj/item/weapon/circuitboard/telesci_console + name = "circuit board (Telescience Console)" + build_path = /obj/machinery/computer/telescience + origin_tech = "programming=3;bluespace=2" /obj/item/weapon/circuitboard/message_monitor name = "circuit board (Message Monitor)" build_path = /obj/machinery/computer/message_monitor @@ -112,7 +123,6 @@ /obj/item/weapon/circuitboard/arcade/orion_trail name = "circuit board (Orion_Trail)" build_path = /obj/machinery/computer/arcade/orion_trail - origin_tech = "programming=2" /obj/item/weapon/circuitboard/turbine_control name = "circuit board (Turbine control)" build_path = /obj/machinery/computer/turbine_computer @@ -155,7 +165,6 @@ /obj/item/weapon/circuitboard/ordercomp name = "circuit board (Supply Ordering Console)" build_path = /obj/machinery/computer/ordercomp - origin_tech = "programming=2" /obj/item/weapon/circuitboard/supplycomp name = "circuit board (Supply shuttle console)" build_path = /obj/machinery/computer/supplycomp @@ -168,7 +177,6 @@ /obj/item/weapon/circuitboard/mining name = "circuit board (Outpost Status Display)" build_path = /obj/machinery/computer/security/mining - origin_tech = "programming=2" /obj/item/weapon/circuitboard/comm_monitor name = "circuit board (Telecommunications Monitor)" build_path = /obj/machinery/computer/telecomms/monitor @@ -190,20 +198,16 @@ /obj/item/weapon/circuitboard/shuttle name = "circuit board (Shuttle)" build_path = /obj/machinery/computer/shuttle - origin_tech = "programming=2" id = "1" /obj/item/weapon/circuitboard/labor_shuttle name = "circuit Board (Labor Shuttle)" build_path = /obj/machinery/computer/shuttle/labor - origin_tech = "programming 2" /obj/item/weapon/circuitboard/labor_shuttle/one_way name = "circuit Board (Prisoner Shuttle Console)" build_path = /obj/machinery/computer/shuttle/labor/one_way - origin_tech = "programming 2" /obj/item/weapon/circuitboard/mining_shuttle name = "circuit Board (Mining Shuttle)" build_path = /obj/machinery/computer/shuttle/mining - origin_tech = "programming 2" /obj/item/weapon/circuitboard/HolodeckControl // Not going to let people get this, but it's just here for future name = "circuit board (Holodeck Control)" build_path = /obj/machinery/computer/HolodeckControl @@ -215,11 +219,9 @@ /obj/item/weapon/circuitboard/area_atmos name = "circuit board (Area Air Control)" build_path = /obj/machinery/computer/area_atmos - origin_tech = "programming=2" /*/obj/item/weapon/circuitboard/prison_shuttle name = "circuit board (Prison Shuttle)" - build_path = /obj/machinery/computer/prison_shuttle - origin_tech = "programming=2"*/ + build_path = /obj/machinery/computer/prison_shuttle*/ /obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) @@ -246,7 +248,7 @@ /obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) if(istype(I,/obj/item/weapon/screwdriver)) - if(src.build_path == "/obj/machinery/computer/rdconsole/core") + if(build_path == /obj/machinery/computer/rdconsole/core) name = "circuit board (RD Console - Robotics)" build_path = /obj/machinery/computer/rdconsole/robotics user << "Access protocols successfully updated." @@ -284,7 +286,7 @@ user << "You deconstruct the frame." var/obj/item/stack/sheet/metal/M = new (loc, 5) M.add_fingerprint(user) - del(src) + qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -323,14 +325,14 @@ user << "You unfasten the circuit board." src.state = 1 src.icon_state = "1" - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = P + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = P if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) if(C && C.amount >= 5) C.amount -= 5 - if(C.amount <= 0) del(C) + if(C.amount <= 0) qdel(C) user << "You add cables to the frame." src.state = 3 src.icon_state = "3" @@ -340,7 +342,7 @@ user << "You remove the cables." src.state = 2 src.icon_state = "2" - var/obj/item/weapon/cable_coil/A = new (loc) + var/obj/item/stack/cable_coil/A = new (loc) A.amount = 5 A.add_fingerprint(user) @@ -378,4 +380,4 @@ var/obj/item/weapon/circuitboard/shuttle/C = circuit S.id = C.id transfer_fingerprints_to(B) - del(src) + qdel(src) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 4b2d0c782ab..0d29218a025 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -9,7 +9,7 @@ var/mapping = 0//For the overview file, interesting bit of code. check_eye(var/mob/user as mob) - if ((get_dist(user, src) > 1 || !( user.canmove ) || user.blinded || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon))) + if ((get_dist(user, src) > 1 || user.blinded || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon))) return null var/list/viewing = viewers(src) if((istype(user,/mob/living/silicon/robot)) && (!(viewing.Find(user)))) @@ -20,67 +20,68 @@ attack_hand(var/mob/user as mob) - if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" - return + if(!stat) + if (src.z > 6) + user << "\red Unable to establish a connection: \black You're too far away from the station!" + return - if (!network) - world.log << "A computer lacks a network at [x],[y],[z]." - return - if (!(istype(network,/list))) - world.log << "The computer at [x],[y],[z] has a network that is not a list!" - return + if (!network) + world.log << "A computer lacks a network at [x],[y],[z]." + return + if (!(istype(network,/list))) + world.log << "The computer at [x],[y],[z] has a network that is not a list!" + return - if(..()) - return + if(..()) + return - var/list/L = list() - for (var/obj/machinery/camera/C in cameranet.cameras) - L.Add(C) + var/list/L = list() + for (var/obj/machinery/camera/C in cameranet.cameras) + L.Add(C) - camera_sort(L) + camera_sort(L) - var/list/D = list() - D["Cancel"] = "Cancel" - for(var/obj/machinery/camera/C in L) - if(!C.network) - world.log << "[C.c_tag] has no camera network." - continue - if(!(istype(C.network,/list))) - world.log << "[C.c_tag]'s camera network is not a list!" - continue - var/list/tempnetwork = C.network&network - if(tempnetwork.len) - D[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C + var/list/D = list() + D["Cancel"] = "Cancel" + for(var/obj/machinery/camera/C in L) + if(!C.network) + world.log << "[C.c_tag] has no camera network." + continue + if(!(istype(C.network,/list))) + world.log << "[C.c_tag]'s camera network is not a list!" + continue + var/list/tempnetwork = C.network&network + if(tempnetwork.len) + D[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C - var/t = input(user, "Which camera should you change to?") as null|anything in D - if(!t) - user.unset_machine() - return 0 - - var/obj/machinery/camera/C = D[t] - - if(t == "Cancel") - user.unset_machine() - return 0 - - if(C) - if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.can_use() )) && (!istype(user, /mob/living/silicon/ai))) - if(!C.can_use() && !isAI(user)) - src.current = null + var/t = input(user, "Which camera should you change to?") as null|anything in D + if(!t) + user.unset_machine() return 0 - else - if(isAI(user)) - var/mob/living/silicon/ai/A = user - A.eyeobj.setLoc(get_turf(C)) - A.client.eye = A.eyeobj - else - src.current = C - use_power(50) - spawn(5) - attack_hand(user) - return + var/obj/machinery/camera/C = D[t] + + if(t == "Cancel") + user.unset_machine() + return 0 + + if(C) + if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( C.can_use() )) && (!istype(user, /mob/living/silicon/ai))) + if(!C.can_use() && !isAI(user)) + src.current = null + return 0 + else + if(isAI(user)) + var/mob/living/silicon/ai/A = user + A.eyeobj.setLoc(get_turf(C)) + A.client.eye = A.eyeobj + else + src.current = C + use_power(50) + + spawn(5) + attack_hand(user) + return @@ -101,7 +102,7 @@ /obj/machinery/computer/security/telescreen/entertainment name = "entertainment monitor" - desc = "Damn, they better have /tg/thechannel on these things." + desc = "Damn, they better have the /tg/ channel on these things." icon = 'icons/obj/status_display.dmi' icon_state = "entertainment" network = list("thunder") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index aed32dc1877..3f6eedc478e 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -85,7 +85,12 @@ ..() return -/obj/machinery/computer/cloning/attack_hand(mob/user as mob) +/obj/machinery/computer/cloning/attack_hand(mob/user) + if(..()) + return + interact(user) + +/obj/machinery/computer/cloning/interact(mob/user) user.set_machine(src) add_fingerprint(user) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ca522c4d35a..abcd6c8edd6 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -507,7 +507,7 @@ user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated." return */ - if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE + if(world.time < 6000) user << "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minutes before trying again." return @@ -573,7 +573,7 @@ frequency.post_signal(src, status_signal) -/obj/machinery/computer/communications/Del() +/obj/machinery/computer/communications/Destroy() shuttle_caller_list -= src emergency_shuttle.autoshuttlecall() ..() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 9a5a68e1a6f..bdf58f727dc 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -11,9 +11,7 @@ /obj/machinery/computer/New() ..() - if(ticker) - initialize() - + power_change() /obj/machinery/computer/initialize() power_change() @@ -40,11 +38,11 @@ /obj/machinery/computer/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(25)) - del(src) + qdel(src) return if (prob(50)) verbs.Cut() @@ -58,7 +56,8 @@ /obj/machinery/computer/bullet_act(var/obj/item/projectile/Proj) if(prob(Proj.damage)) - set_broken() + if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) + set_broken() ..() @@ -112,7 +111,7 @@ user << "\blue You disconnect the monitor." A.state = 4 A.icon_state = "4" - del(src) + qdel(src) return /obj/machinery/computer/attack_hand(user) @@ -122,23 +121,23 @@ /obj/machinery/computer/attack_paw(mob/user) if(circuit) if(prob(10)) - user.visible_message("[user.name] smashes the [src.name] with /his paws.",\ + user.visible_message("[user.name] smashes the [src.name] with its paws.",\ "You smash the [src.name] with your paws.",\ "You hear a smashing sound.") set_broken() return - user.visible_message("[user.name] smashes against the [src.name] with /his paws.",\ + user.visible_message("[user.name] smashes against the [src.name] with its paws.",\ "You smash against the [src.name] with your paws.",\ "You hear a clicking sound.") /obj/machinery/computer/attack_alien(mob/user) if(circuit) if(prob(80)) - user.visible_message("[user.name] smashes the [src.name] with /his claws.",\ + user.visible_message("[user.name] smashes the [src.name] with its claws.",\ "You smash the [src.name] with your claws.",\ "You hear a smashing sound.") set_broken() return - user.visible_message("[user.name] smashes against the [src.name] with /his claws.",\ - "You smash against the [src.name] with your claws.",\ - "You hear a clicking sound.") \ No newline at end of file + user.visible_message("[user.name] smashes against the [src.name] with its claws.",\ + "You smash against the [src.name] with your claws.",\ + "You hear a clicking sound.") diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index e5d68af8258..52a768fbb4c 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -117,7 +117,7 @@ var/mob/living/silicon/robot/R = locate(href_list["magbot"]) if(istype(R) && !R.emagged && R.connected_ai == usr && !R.scrambledcodes && can_control(usr, R)) log_game("[key_name(usr)] emagged [R.name] using robotic console!") - R.emagged = 1 + R.SetEmagged(1) if(R.mind.special_role) R.verbs += /mob/living/silicon/robot/proc/ResetSecurityCodes diff --git a/code/game/machinery/computer/syndicate_shuttle.dm b/code/game/machinery/computer/syndicate_shuttle.dm index fb6aa607ab9..2d264251da9 100644 --- a/code/game/machinery/computer/syndicate_shuttle.dm +++ b/code/game/machinery/computer/syndicate_shuttle.dm @@ -28,6 +28,8 @@ var/area/transit_location = locate(/area/syndicate_station/transit) curr_location.move_contents_to(transit_location) curr_location = transit_location + curr_location.has_gravity = 0 + transit_location.has_gravity = 1 sleep(SYNDICATE_SHUTTLE_MOVE_TIME) curr_location.move_contents_to(dest_location) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 17b64808df7..c06bb4e015e 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -53,15 +53,15 @@ return switch(state) if(1) - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = P + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = P if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "You start to add cables to the frame." if(do_after(user, 20)) if(C) C.amount -= 5 - if(!C.amount) del(C) + if(!C.amount) qdel(C) user << "You add cables to the frame." state = 2 icon_state = "box_1" @@ -69,7 +69,7 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "You dismantle the frame." new /obj/item/stack/sheet/metal(src.loc, 5) - del(src) + qdel(src) if(2) if(istype(P, /obj/item/weapon/circuitboard)) var/obj/item/weapon/circuitboard/B = P @@ -92,7 +92,7 @@ user << "You remove the cables." state = 1 icon_state = "box_0" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) A.amount = 5 if(3) @@ -122,23 +122,23 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) var/obj/machinery/new_machine = new src.circuit.build_path(src.loc) for(var/obj/O in new_machine.component_parts) - del(O) + qdel(O) new_machine.component_parts = list() for(var/obj/O in src) O.loc = null new_machine.component_parts += O circuit.loc = null new_machine.RefreshParts() - del(src) + qdel(src) - if(istype(P, /obj/item/weapon)) + if(istype(P, /obj/item)) var/success for(var/I in req_components) if(istype(P, text2path(I)) && (req_components[I] > 0)) success=1 - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/CP = P - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src, 1, CP.item_color) + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/CP = P + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src, 1, CP.item_color) if(CP.use(1)) components += CC req_components[I]-- @@ -149,9 +149,10 @@ components += P req_components[I]-- update_req_desc() - break + return 1 if(!success) user << "You cannot add that to the machine!" + return 0 //Machine Frame Circuit Boards @@ -160,6 +161,187 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells. Note: Once everything is added to the public areas, will add m_amt and g_amt to circuit boards since autolathe won't be able to destroy them and players will be able to make replacements. */ + +/obj/item/weapon/circuitboard/vendor + name = "circuit board (Booze-O-Mat Vendor)" + build_path = /obj/machinery/vending/boozeomat + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + "/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/snack = "Getmore Chocolate Corp", + /obj/machinery/vending/cola = "Robust Softdrinks", + /obj/machinery/vending/cigarette = "Cigarette", + /obj/machinery/vending/autodrobe = "AutoDrobe") + +/obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/weapon/screwdriver)) + set_type(pick(names_paths), user) + + +/obj/item/weapon/circuitboard/vendor/proc/set_type(typepath, mob/user) + 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 + +/obj/item/weapon/circuitboard/smes + name = "circuit board (SMES)" + build_path = /obj/machinery/power/smes + 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/weapon/circuitboard/power_compressor + name = "circuit board (Power Compressor)" + build_path = /obj/machinery/power/compressor + 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/weapon/circuitboard/power_turbine + name = "circuit board (Power Turbine)" + build_path = /obj/machinery/power/turbine + 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/weapon/circuitboard/mech_recharger + name = "circuit board (Mechbay Recharger)" + build_path = /obj/machinery/mech_bay_recharge_port + 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/weapon/circuitboard/teleporter_hub + name = "circuit board (Teleporter Hub)" + build_path = /obj/machinery/teleport/hub + 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/weapon/circuitboard/teleporter_station + name = "circuit board (Teleporter Station)" + build_path = /obj/machinery/teleport/station + 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/weapon/circuitboard/telesci_pad + name = "circuit board (Telepad)" + build_path = /obj/machinery/telepad + 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/weapon/circuitboard/sleeper + name = "circuit board (Sleeper)" + build_path = /obj/machinery/sleeper + 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/circuitboard/cryo_tube + name = "circuit board (Cryotube)" + build_path = /obj/machinery/atmospherics/unary/cryo_cell + 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/circuitboard/thermomachine + name = "circuit board (Cooler)" + desc = "Use screwdriver to switch between heating and cooling modes." + build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer + 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/circuitboard/thermomachine/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/weapon/screwdriver)) + if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer) + build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater + name = "circuit board (Heater)" + user << "You set the board to heating." + else + build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer + name = "circuit board (Cooler)" + user << "You set the board to cooling." + +/obj/item/weapon/circuitboard/biogenerator + name = "circuit board (Biogenerator)" + build_path = /obj/machinery/biogenerator + 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/circuitboard/hydroponics + name = "circuit board (Hydroponics Tray)" + build_path = /obj/machinery/hydroponics/constructable + 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/circuitboard/microwave + name = "circuit board (Microwave)" + build_path = /obj/machinery/microwave + 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/circuitboard/chem_dispenser + name = "circuit board (Portable Chem Dispenser)" + build_path = /obj/machinery/chem_dispenser/constructable + 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/circuitboard/destructive_analyzer name = "circuit board (Destructive Analyzer)" build_path = /obj/machinery/r_n_d/destructive_analyzer @@ -205,11 +387,11 @@ to destroy them and players will be able to make replacements. name = "circuit board (PACMAN-type Generator)" build_path = /obj/machinery/power/port_gen/pacman board_type = "machine" - origin_tech = "programming=3:powerstorage=3;plasmatech=3;engineering=3" + 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/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/capacitor" = 1) /obj/item/weapon/circuitboard/pacman/super @@ -228,7 +410,7 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3" req_components = list( - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/scanning_module" = 1) /obj/item/weapon/circuitboard/mechfab @@ -248,7 +430,7 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3;biotech=3" req_components = list( - "/obj/item/weapon/cable_coil" = 2, + "/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) @@ -263,7 +445,7 @@ obj/item/weapon/circuitboard/rdserver "/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/cable_coil" = 2,) + "/obj/item/stack/cable_coil" = 2,) /obj/item/weapon/circuitboard/cyborgrecharger name = "circuit board (Cyborg Recharger)" @@ -272,7 +454,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "powerstorage=3;engineering=3" req_components = list( "/obj/item/weapon/stock_parts/capacitor" = 2, - "/obj/item/weapon/cell" = 1, + "/obj/item/weapon/stock_parts/cell" = 1, "/obj/item/weapon/stock_parts/manipulator" = 1,) // Telecomms circuit boards: @@ -295,7 +477,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/filter" = 2) /obj/item/weapon/circuitboard/telecomms/relay @@ -305,7 +487,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2;bluespace=2" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/filter" = 2) /obj/item/weapon/circuitboard/telecomms/bus @@ -315,7 +497,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/obj/item/stack/cable_coil" = 1, "/obj/item/weapon/stock_parts/subspace/filter" = 1) /obj/item/weapon/circuitboard/telecomms/processor @@ -328,7 +510,7 @@ obj/item/weapon/circuitboard/rdserver "/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/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/amplifier" = 1) /obj/item/weapon/circuitboard/telecomms/server @@ -338,7 +520,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/obj/item/stack/cable_coil" = 1, "/obj/item/weapon/stock_parts/subspace/filter" = 1) /obj/item/weapon/circuitboard/telecomms/broadcaster @@ -348,7 +530,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2;bluespace=1" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/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) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index c3ab2b9b429..12114bbc399 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -4,33 +4,44 @@ icon_state = "cell-off" density = 1 anchored = 1.0 - layer = 5 + layer = 4 var/on = 0 var/temperature_archived - var/mob/living/carbon/occupant = null var/obj/item/weapon/reagent_containers/beaker = null var/next_trans = 0 var/current_heat_capacity = 50 + state_open = 0 + var/efficiency /obj/machinery/atmospherics/unary/cryo_cell/New() ..() initialize_directions = dir + initialize() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/cryo_tube(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + RefreshParts() -/obj/machinery/atmospherics/unary/cryo_cell/Del() - eject_contents() +/obj/machinery/atmospherics/unary/cryo_cell/RefreshParts() + var/C + for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + C += M.rating + current_heat_capacity = 50 * C + efficiency = C + +/obj/machinery/atmospherics/unary/cryo_cell/Destroy() + var/turf/T = loc + T.contents += contents var/obj/item/weapon/reagent_containers/glass/B = beaker if(beaker) B.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube - ..() - -/obj/machinery/atmospherics/unary/cryo_cell/initialize() - if(node) return - var/node_connect = dir - for(var/obj/machinery/atmospherics/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break + ..() /obj/machinery/atmospherics/unary/cryo_cell/process() ..() @@ -55,20 +66,28 @@ updateDialog() return 1 +/obj/machinery/atmospherics/unary/cryo_cell/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !iscarbon(target)) + return + close_machine(target) /obj/machinery/atmospherics/unary/cryo_cell/allow_drop() return 0 +/obj/machinery/atmospherics/unary/cryo_cell/relaymove(var/mob/user) + ..() + open_machine() /obj/machinery/atmospherics/unary/cryo_cell/container_resist() - if(usr.stat) + if(stat & DEAD) return - go_out() + sleep(usr.stat * 1200) + open_machine() return /obj/machinery/atmospherics/unary/cryo_cell/examine() ..() - + if(in_range(usr, src)) usr << "You can just about make out some loose objects floating in the murk:" for(var/obj/O in src) @@ -94,8 +113,8 @@ * * @return nothing */ -/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) - if(user == occupant || user.stat) +/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main") + if(user == occupant || user.stat || panel_open) return // this is the data which will be sent to the ui @@ -128,6 +147,7 @@ occupantData["bodyTemperature"] = occupant.bodytemperature data["occupant"] = occupantData; + data["isOpen"] = state_open data["cellTemperature"] = round(air_contents.temperature) data["cellTemperatureStatus"] = "good" if(air_contents.temperature > T0C) // if greater than 273.15 kelvin (0 celcius) @@ -141,48 +161,51 @@ for(var/datum/reagent/R in beaker:reagents.reagent_list) beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list... data["beakerContents"] = beakerContents - - // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + + var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, ui_key) if (!ui) - // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm + // the ui does not exist, so we'll create a new one ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 410) - // when the ui is first opened this is the data it will use - ui.set_initial_data(data) - // open the new ui window + // When the UI is first opened this is the data it will use + ui.set_initial_data(data) ui.open() - // auto update every Master Controller tick + // Auto update every Master Controller tick ui.set_auto_update(1) - + else + // The UI is already open so push the new data to it + ui.push_data(data) + return //user.set_machine(src) /obj/machinery/atmospherics/unary/cryo_cell/Topic(href, href_list) - if(usr == occupant) + if(usr == occupant || panel_open) return 0 // don't update UIs attached to this object if(..()) return 0 // don't update UIs attached to this object if(href_list["switchOn"]) - on = 1 - update_icon() - + if(!state_open) + on = 1 + + if(href_list["open"]) + on = 0 + open_machine() + + if(href_list["close"]) + if(close_machine() == usr) + var/datum/nanoui/ui = nanomanager.get_open_ui(usr, src, "main") + ui.close() + on = 1 if(href_list["switchOff"]) on = 0 - update_icon() if(href_list["ejectBeaker"]) if(beaker) var/obj/item/weapon/reagent_containers/glass/B = beaker B.loc = get_step(loc, SOUTH) beaker = null - - if(href_list["ejectOccupant"]) - if(!occupant || isslime(usr) || ispAI(usr)) - return 0 // don't update UIs attached to this object - go_out() - + update_icon() add_fingerprint(usr) return 1 // update UIs attached to this object @@ -197,42 +220,62 @@ I.loc = src user.visible_message("[user] places [I] in [src].", \ "You place [I] in [src].") - else if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I - if(!ismob(G.affecting)) - return - for(var/mob/living/carbon/slime/M in range(1, G.affecting)) - if(M.Victim == G.affecting) - user << "[G.affecting] will not fit into [src] because they have [M] latched onto their head." - return - var/mob/M = G.affecting - if(put_mob(M)) - del(G) - nanomanager.update_uis(src) + if(!(on || occupant || state_open)) + if(default_deconstruction_screwdriver(user, "cell-o", "cell-off", I)) + return + + if(default_change_direction_wrench(user, I)) + return + + if(exchange_parts(user, I)) + return + + default_deconstruction_crowbar(I) + +/obj/machinery/atmospherics/unary/cryo_cell/open_machine() + if(!state_open && !panel_open) + layer = 3 + if(occupant) + occupant.bodytemperature = Clamp(occupant.bodytemperature, 261, 360) + ..() + if(beaker) + beaker.loc = src + +/obj/machinery/atmospherics/unary/cryo_cell/close_machine(mob/living/carbon/M) + if(state_open && !panel_open) + layer = 4 + ..(M) + return occupant /obj/machinery/atmospherics/unary/cryo_cell/update_icon() + if(panel_open) + icon_state = "cell-o" + return + if(state_open) + icon_state = "cell-open" + return if(on) if(occupant) icon_state = "cell-occupied" - return - icon_state = "cell-on" - return - icon_state = "cell-off" + else + icon_state = "cell-on" + else + icon_state = "cell-off" /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() if(air_contents.total_moles() < 10) return if(occupant) - if(occupant.stat == 2) + if(occupant.stat == 2 || occupant.health >= 100) //Why waste energy on dead or healthy people + occupant.bodytemperature = T0C return occupant.bodytemperature += 2*(air_contents.temperature - occupant.bodytemperature) * current_heat_capacity / (current_heat_capacity + air_contents.heat_capacity()) occupant.bodytemperature = max(occupant.bodytemperature, air_contents.temperature) // this is so ugly i'm sorry for doing it i'll fix it later i promise - occupant.stat = 1 if(occupant.bodytemperature < T0C) - occupant.sleeping = max(5, (1 / occupant.bodytemperature)*2000) - occupant.Paralyse(max(5, (1 / occupant.bodytemperature)*3000)) + occupant.sleeping = max(5/efficiency, (1 / occupant.bodytemperature)*2000/efficiency) + occupant.Paralyse(max(5/efficiency, (1 / occupant.bodytemperature)*3000/efficiency)) if(air_contents.oxygen > 2) if(occupant.getOxyLoss()) occupant.adjustOxyLoss(-1) else @@ -240,9 +283,9 @@ //severe damage should heal waaay slower without proper chemicals if(occupant.bodytemperature < 225) if(occupant.getToxLoss()) - occupant.adjustToxLoss(max(-1, -20 / occupant.getToxLoss())) - var/heal_brute = occupant.getBruteLoss() ? min(1, 20 / occupant.getBruteLoss()) : 0 - var/heal_fire = occupant.getFireLoss() ? min(1, 20 / occupant.getFireLoss()) : 0 + occupant.adjustToxLoss(max(-efficiency, (-20*(efficiency ** 2)) / occupant.getToxLoss())) + var/heal_brute = occupant.getBruteLoss() ? min(efficiency, 20*(efficiency**2) / occupant.getBruteLoss()) : 0 + var/heal_fire = occupant.getFireLoss() ? min(efficiency, 20*(efficiency**2) / occupant.getFireLoss()) : 0 occupant.heal_organ_damage(heal_brute,heal_fire) if(beaker && next_trans == 0) beaker.reagents.trans_to(occupant, 1, 10) @@ -271,87 +314,3 @@ expel_gas.temperature = T20C //Lets expel hot gas and see if that helps people not die as they are removed loc.assume_air(expel_gas) air_update_turf() - - -/obj/machinery/atmospherics/unary/cryo_cell/proc/go_out() - if(!occupant) - return - if(occupant.client) - occupant.client.eye = occupant.client.mob - occupant.client.perspective = MOB_PERSPECTIVE - if(occupant.loc == src) - occupant.loc = get_step(loc, SOUTH) //this doesn't account for walls or anything, but i don't forsee that being a problem. - if(occupant.bodytemperature < 261 && occupant.bodytemperature > 140) //Patch by Aranclanos to stop people from taking burn damage after being ejected - occupant.bodytemperature = 261 - - occupant = null - update_icon() - - -/obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M) - if(!istype(M)) - usr << "[src] cannot handle this liveform." - return - if(occupant) - usr << "[src] is already occupied." - return - if(!node) - usr << "The cell is not correctly connected to its pipe network!" - return - - if(M.client) - M.client.perspective = EYE_PERSPECTIVE - M.client.eye = src - M.stop_pulling() - M.loc = src - - if(M.health > -100 && (M.health < 0 || M.sleeping)) - M << "\blue You feel a cold liquid surround you. Your skin starts to freeze up." - occupant = M - add_fingerprint(usr) - update_icon() - M.ExtinguishMob() - return 1 - - -/obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject() - set name = "Eject contents" - set category = "Object" - set src in oview(1) - if(usr == occupant || contents.Find(usr)) //If the user is inside the tube... - if(usr.stat == DEAD) //and he's not dead.... - return - usr << "Release sequence activated. This will take about two minutes." - sleep(1200) - if(!src || !usr || (!occupant && !contents.Find(usr))) //Check if someone's released/replaced/bombed him already - return - go_out() //and release him from the eternal prison. - eject_contents() - else - if(usr.stat || isslime(usr) || ispAI(usr)) - return - go_out() - eject_contents() - add_fingerprint(usr) - - -/obj/machinery/atmospherics/unary/cryo_cell/verb/move_inside() - set name = "Enter cryo" - set category = "Object" - set src in oview(1) - - for(var/mob/living/carbon/slime/M in range(1,usr)) - if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you!" - return - if(usr.stat || stat & (NOPOWER|BROKEN)) - return - put_mob(usr) - -/obj/machinery/atmospherics/unary/cryo_cell/proc/eject_contents() - for(var/obj/O in src) - if(O != beaker) - O.loc = get_step(loc, SOUTH) - for(var/mob/M in contents) - M.loc = get_step(loc, SOUTH) - update_icon() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 6d812b5cc66..d8955ceceaa 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -87,14 +87,14 @@ for reference: new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) - del(src) + qdel(src) ..() ex_act(severity) switch(severity) if(1.0) visible_message("\red The barricade is blown apart!") - del(src) + qdel(src) return if(2.0) src.health -= 25 @@ -103,7 +103,7 @@ for reference: new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) - del(src) + qdel(src) return meteorhit() @@ -111,14 +111,14 @@ for reference: new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) - del(src) + qdel(src) return blob_act() src.health -= 25 if (src.health <= 0) visible_message("\red The blob eats through the barricade!") - del(src) + qdel(src) return CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff. @@ -267,4 +267,4 @@ for reference: explosion(src.loc,-1,-1,0) if(src) - del(src) \ No newline at end of file + qdel(src) \ No newline at end of file diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 65565f86b73..dafe8600e96 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -237,7 +237,7 @@ /obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature) atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 500) new/obj/structure/door_assembly/door_assembly_0( src.loc ) - del (src) + qdel(src) /obj/machinery/door/airlock/plasma/BlockSuperconductivity() //we don't stop the heat~ return 0 @@ -300,8 +300,8 @@ About the new airlock wires panel: return else if(user.hallucination > 50 && prob(10) && src.operating == 0) user << "\red You feel a powerful shock course through your body!" - user.halloss += 10 - user.stunned += 10 + user.staminaloss += 50 + user.stunned += 5 return ..(user) @@ -403,12 +403,14 @@ About the new airlock wires panel: icon_state = "door_locked" else icon_state = "door_closed" - if(p_open || welded) + if(p_open || welded || emergency) overlays = list() if(p_open) overlays += image(icon, "panel_open") if(welded) overlays += image(icon, "welded") + if(emergency && !locked) + overlays += image(icon, "elights") else icon_state = "door_open" @@ -472,6 +474,11 @@ About the new airlock wires panel: else t1 += text("IdScan enabled. Disable?
\n", src) + if(src.emergency) + t1 += text("Emergency Access Override is enabled. Disable?
\n", src) + else + t1 += text("Emergency Access Override is disabled. Enable?
\n", src) + if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER1)) t1 += text("Main Power Input wire is cut.
\n") if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER2)) @@ -542,8 +549,8 @@ About the new airlock wires panel: user << browse(t1, "window=airlock") onclose(user, "airlock") -//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door -//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door +//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 11 lift access override +//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 11 enable access override /obj/machinery/door/airlock/proc/hack(mob/user as mob) @@ -611,7 +618,7 @@ About the new airlock wires panel: if(!istype(H.head, /obj/item/clothing/head/helmet)) visible_message("\red [user] headbutts the airlock.") var/obj/item/organ/limb/affecting = H.get_organ("head") - H.Stun(8) + H.Stun(5) H.Weaken(5) if(affecting.take_damage(10, 0)) H.update_damage_overlays(0) @@ -647,8 +654,8 @@ About the new airlock wires panel: if(istype(usr, /mob/living/silicon) && src.canAIControl()) //AI - //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed - //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed + //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed, 11 emergency access + //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed, 11 emergency access if(href_list["aiDisable"]) var/code = text2num(href_list["aiDisable"]) switch (code) @@ -728,6 +735,12 @@ About the new airlock wires panel: else usr << text("Door bolt lights are already disabled!") + if(11) + // Emergency access + if (src.emergency) + emergency = 0 + else + usr << text("Emergency access is already disabled!") else if(href_list["aiEnable"]) @@ -827,6 +840,13 @@ About the new airlock wires panel: else usr << text("Door bolt lights are already enabled!") + if(11) + // Emergency access + if (!src.emergency) + emergency = 1 + else + usr << text("Emergency access is already enabled!") + add_fingerprint(usr) update_icon() if(!nowindow) @@ -856,6 +876,7 @@ About the new airlock wires panel: return else if(istype(C, /obj/item/weapon/screwdriver)) src.p_open = !( src.p_open ) + user << "You [p_open ? "open":"close"] the maintenance panel of the airlock." src.update_icon() else if(istype(C, /obj/item/weapon/wirecutters)) return src.attack_hand(user) @@ -863,7 +884,7 @@ About the new airlock wires panel: return src.attack_hand(user) else if(istype(C, /obj/item/device/assembly/signaler)) return src.attack_hand(user) - else if(istype(C, /obj/item/weapon/pai_cable)) // -- TLE + else if(istype(C, /obj/item/weapon/pai_cable)) var/obj/item/weapon/pai_cable/cable = C cable.plugin(src, user) else if(istype(C, /obj/item/weapon/crowbar) || istype(C, /obj/item/weapon/twohanded/fireaxe) ) @@ -922,7 +943,7 @@ About the new airlock wires panel: electronics = null ae.loc = src.loc - del(src) + qdel(src) return else if(arePowerSystemsOn() && !(stat & NOPOWER)) user << "\blue The airlock's motors resist your efforts to force it." diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index e4d26278b14..b50e9dc769a 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -15,6 +15,7 @@ var/glass = 0 var/normalspeed = 1 var/heat_proof = 0 // For glass airlocks/opacity firedoors + var/emergency = 0 // Emergency access override /obj/machinery/door/New() ..() @@ -29,7 +30,7 @@ return -/obj/machinery/door/Del() +/obj/machinery/door/Destroy() density = 0 air_update_turf(1) update_freelook_sight() @@ -51,7 +52,7 @@ if(istype(AM, /obj/machinery/bot)) var/obj/machinery/bot/bot = AM - if(src.check_access(bot.botcard)) + if(src.check_access(bot.botcard) || emergency == 1) if(density) open() return @@ -59,7 +60,7 @@ if(istype(AM, /obj/mecha)) var/obj/mecha/mecha = AM if(density) - if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access))) + if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access) || emergency == 1)) open() else flick("door_deny", src) @@ -87,7 +88,7 @@ user = null if(density) - if(allowed(user)) open() + if(allowed(user) || src.emergency == 1) open() else flick("door_deny", src) return @@ -128,7 +129,7 @@ open() operating = -1 return 1 - if(src.allowed(user)) + if(src.allowed(user) || src.emergency == 1) if(src.density) open() else @@ -141,7 +142,7 @@ /obj/machinery/door/blob_act() if(prob(40)) - del(src) + qdel(src) return @@ -159,10 +160,10 @@ /obj/machinery/door/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if(prob(25)) - del(src) + qdel(src) if(3.0) if(prob(80)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index c3a724ad244..3695c80ef45 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -312,9 +312,9 @@ f1.sd_SetOpacity(opacity) f2.sd_SetOpacity(opacity) - Del() - del f1 - del f2 + Destroy() + qdel(f1) + qdel(f2) ..() /obj/machinery/door/poddoor/two_tile_ver @@ -331,9 +331,9 @@ f1.sd_SetOpacity(opacity) f2.sd_SetOpacity(opacity) - Del() - del f1 - del f2 + Destroy() + qdel(f1) + qdel(f2) ..() /obj/machinery/door/poddoor/four_tile_hor @@ -358,11 +358,11 @@ f4.sd_SetOpacity(opacity) f3.sd_SetOpacity(opacity) - Del() - del f1 - del f2 - del f3 - del f4 + Destroy() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) ..() /obj/machinery/door/poddoor/four_tile_ver @@ -387,11 +387,11 @@ f4.sd_SetOpacity(opacity) f3.sd_SetOpacity(opacity) - Del() - del f1 - del f2 - del f3 - del f4 + Destroy() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) ..() /obj/machinery/door/poddoor/filler_object diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 3c095b71aba..8a9b225e5a8 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -20,7 +20,7 @@ src.base_state = src.icon_state return -/obj/machinery/door/window/Del() +/obj/machinery/door/window/Destroy() density = 0 playsound(src, "shatter", 70, 1) ..() @@ -122,22 +122,23 @@ src.health = max(0, src.health - damage) if (src.health <= 0) new /obj/item/weapon/shard(src.loc) - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) return /obj/machinery/door/window/bullet_act(var/obj/item/projectile/Proj) if(Proj.damage) - take_damage(round(Proj.damage / 2)) + if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) + take_damage(round(Proj.damage / 2)) ..() //When an object is thrown at the window /obj/machinery/door/window/hitby(AM as mob|obj) ..() - visible_message("\red The glass door was hit by [AM].") + visible_message("\The [src] was hit by \the [AM].") var/tforce = 0 if(ismob(AM)) tforce = 40 @@ -153,7 +154,7 @@ return src.attack_hand(user) /obj/machinery/door/window/attack_paw(mob/user as mob) - if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/adult)) + if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/)) if(src.operating) return src.health = max(0, src.health - 25) @@ -161,10 +162,10 @@ visible_message("\red [user] smashes against the [src.name].") if (src.health <= 0) new /obj/item/weapon/shard(src.loc) - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) else return src.attack_hand(user) @@ -199,13 +200,13 @@ if(I.damtype == BRUTE || I.damtype == BURN) src.health = max(0, src.health - aforce) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("\red [src] was hit by [I].") + visible_message("\The [src] has been hit by [user] with [I].") if (src.health <= 0) new /obj/item/weapon/shard(src.loc) - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) return diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 202de927d85..6a1518e311b 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -13,7 +13,7 @@ var/list/doppler_arrays = list() ..() doppler_arrays += src -/obj/machinery/doppler_array/Del() +/obj/machinery/doppler_array/Destroy() doppler_arrays -= src ..() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 180da00b5a5..72e0126433d 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -9,7 +9,7 @@ var/id = null var/range = 2 //this is roughly the size of brig cell var/last_flash = 0 //Don't want it getting spammed like regular flashes - var/strength = 10 //How weakened targets are when flashed. + var/strength = 5 //How weakened targets are when flashed. var/base_state = "mflash" anchored = 1 @@ -17,7 +17,7 @@ name = "portable flasher" desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements." icon_state = "pflash1-p" - strength = 8 + strength = 4 anchored = 0 base_state = "pflash" density = 1 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 5442248986a..c1b0248ac3c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -105,7 +105,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/holopad/proc/clear_holo() // hologram.SetLuminosity(0)//Clear lighting. //handled by the lighting controller when its ower is deleted - del(hologram)//Get rid of hologram. + qdel(hologram)//Get rid of hologram. + hologram = null if(master.current == src) master.current = null master = null//Null the master, since no-one is using it now. @@ -160,26 +161,26 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if (prob(50)) - del(src) + qdel(src) if(3.0) if (prob(5)) - del(src) + qdel(src) return /obj/machinery/hologram/blob_act() - del(src) + qdel(src) return /obj/machinery/hologram/meteorhit() - del(src) + qdel(src) return -/obj/machinery/hologram/Del() +/obj/machinery/hologram/holopad/Destroy() if(hologram) - src:clear_holo() + clear_holo() ..() /* diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index da354f5261e..48af8644879 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -9,7 +9,6 @@ var/operating = 0 //Is it on? var/dirty = 0 // Does it need cleaning? var/gibtime = 40 // Time from starting until meat appears - var/mob/living/occupant // Mob who has been put inside use_power = 1 idle_power_usage = 2 active_power_usage = 500 @@ -26,7 +25,7 @@ if(input_obj) if(isturf(input_obj.loc)) input_plate = input_obj.loc - del(input_obj) + qdel(input_obj) break if(!input_plate) @@ -82,6 +81,9 @@ if(src.occupant) user << "\red The gibber is full, empty it first!" return + if(default_unfasten_wrench(user, G)) + return + if (!( istype(G, /obj/item/weapon/grab)) || !(istype(G.affecting, /mob/living/carbon/human))) user << "\red This item is not suitable for the gibber!" return @@ -99,9 +101,10 @@ M.client.eye = src M.loc = src src.occupant = M - del(G) + qdel(G) update_icon() + /obj/machinery/gibber/verb/eject() set category = "Object" set name = "empty gibber" @@ -156,7 +159,7 @@ add_logs(user, occupant, "gibbed") src.occupant.death(1) src.occupant.ghostize() - del(src.occupant) + qdel(src.occupant) spawn(src.gibtime) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) operating = 0 diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index 3554877b6d7..f93bfc68340 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -4,11 +4,12 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" layer = 2.9 - density = 0 + density = 1 anchored = 0 use_power = 1 idle_power_usage = 5 active_power_usage = 100 + pass_flags = PASSTABLE var/obj/item/weapon/reagent_containers/beaker = null var/global/list/allowed_items = list ( /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = "tomatojuice", @@ -32,12 +33,16 @@ /obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(default_unfasten_wrench(user, O)) + return if (istype(O,/obj/item/weapon/reagent_containers/glass) || \ istype(O,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) if (beaker) return 1 else - user.before_take_item(O) + if(!user.unEquip(O)) + user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + return 0 O.loc = src beaker = O src.verbs += /obj/machinery/juicer/verb/detach @@ -47,7 +52,9 @@ if (!is_type_in_list(O, allowed_items)) user << "It looks as not containing any juice." return 1 - user.before_take_item(O) + if(!user.unEquip(O)) + user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + return 0 O.loc = src src.updateUsrDialog() return 0 @@ -151,7 +158,7 @@ for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents) var/r_id = get_juice_id(O) beaker.reagents.add_reagent(r_id,get_juice_amount(O)) - del(O) + qdel(O) if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) break diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 9809be206f9..540bfeeec26 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -1,4 +1,3 @@ - /obj/machinery/microwave name = "microwave" icon = 'icons/obj/kitchen.dmi' @@ -17,6 +16,7 @@ var/global/list/acceptable_items // List of the items you can put in var/global/list/acceptable_reagents // List of the reagents you can put in var/global/max_n_of_items = 0 + var/efficiency = 0 // see code/modules/food/recipes_microwave.dm for recipes @@ -41,13 +41,37 @@ if(recipe.items) max_n_of_items = max(max_n_of_items, recipe.items.len) + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/microwave(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) + RefreshParts() + +/obj/machinery/microwave/RefreshParts() + var/E + for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) + E += M.rating + efficiency = E + /******************* * Item Adding ********************/ /obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(!broken && !dirty && !operating) + if(default_deconstruction_screwdriver(user, "mw-o", "mw", O)) + return + if(default_unfasten_wrench(user, O)) + return + + if(exchange_parts(user, O)) + return + + default_deconstruction_crowbar(O) + if(src.broken > 0) - if(src.broken == 2 && istype(O, /obj/item/weapon/screwdriver)) // If it's broken and they're using a screwdriver + if(src.broken == 2 && istype(O, /obj/item/weapon/wirecutters)) // If it's broken and they're using a screwdriver user.visible_message( \ "\blue [user] starts to fix part of the microwave.", \ "\blue You start to fix part of the microwave." \ @@ -58,7 +82,7 @@ "\blue You have fixed part of the microwave." \ ) src.broken = 1 // Fix it a bit - else if(src.broken == 1 && istype(O, /obj/item/weapon/wrench)) // If it's broken and they're doing the wrench + else if(src.broken == 1 && istype(O, /obj/item/weapon/weldingtool)) // If it's broken and they're doing the wrench user.visible_message( \ "\blue [user] starts to fix part of the microwave.", \ "\blue You start to fix part of the microwave." \ @@ -72,6 +96,7 @@ src.broken = 0 // Fix it! src.dirty = 0 // just to be sure src.flags = OPENCONTAINER + return 0 //to use some fuel else user << "\red It's broken!" return 1 @@ -122,8 +147,10 @@ "\blue [user] has added one of [O] to \the [src].", \ "\blue You add one of [O] to \the [src].") else - // user.before_take_item(O) //This just causes problems so far as I can tell. -Pete - user.drop_item() + // user.unEquip(O) //This just causes problems so far as I can tell. -Pete + if(!user.drop_item()) + user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + return 0 O.loc = src user.visible_message( \ "\blue [user] has added \the [O] to \the [src].", \ @@ -163,13 +190,15 @@ ********************/ /obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu - var/dat = "" + if(panel_open) + return + var/dat = "
Please wait...!"} + dat += "Microwaving in progress!
Please wait...!
"
else if(src.dirty==100)
- dat = {"This microwave is dirty!" + dat += "Glass amount: [src.g_amount] / [max_g_amount] cm3
" + var/list/objs = list() + objs += src.L + if(src.hacked) + objs += src.LL + for(var/obj/t in objs) + if(disabled || m_amount
" + dat += "" + else + dat = wires.GetInteractWindow() + + var/datum/browser/popup = new(user, "autolathe", name, 400, 500) + popup.set_content(dat) + popup.open() + return + +/obj/machinery/autolathe/proc/shock(mob/user, prb) + if(stat & (BROKEN|NOPOWER)) // unpowered, no shock + return 0 + if(!prob(prb)) + return 0 + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() + if (electrocute_mob(user, get_area(src), src, 0.7)) + return 1 + else + return 0 diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 1d752a03258..f957a2d3a46 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -27,7 +27,7 @@ SetLuminosity(0) /obj/machinery/bot/proc/explode() - del(src) + qdel(src) /obj/machinery/bot/proc/healthcheck() if (src.health <= 0) @@ -101,9 +101,11 @@ ..() /obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj) - health -= Proj.damage - ..() - healthcheck() + if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) + health -= Proj.damage + ..() + healthcheck() + return /obj/machinery/bot/meteorhit() src.explode() diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 42f73d7a77e..b67a6b018b8 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/aibots.dmi' icon_state = "bucket_proxy" force = 3.0 - throwforce = 10.0 + throwforce = 5.0 throw_speed = 2 throw_range = 5 w_class = 3.0 @@ -304,7 +304,7 @@ text("[src.oddbutton ? "Yes" : "No" src.cleaning = 1 spawn(50) src.cleaning = 0 - del(target) + qdel(target) src.icon_state = "cleanbot[src.on]" src.anchored = 0 src.target = null @@ -324,20 +324,20 @@ text("[src.oddbutton ? "Yes" : "No" var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() - del(src) + qdel(src) return /obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) user.drop_item() - del(W) + qdel(W) var/turf/T = get_turf(src.loc) var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T) A.name = src.created_name user << "You add the robot arm to the bucket and sensor assembly. Beep boop!" - user.drop_from_inventory(src) - del(src) + 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) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 634b44b7f70..b1792a5a6b3 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -195,7 +195,7 @@ Auto Patrol: []"}, user << "Access denied." else ..() - if (!istype(W, /obj/item/weapon/screwdriver) && (!src.target)) + if (!istype(W, /obj/item/weapon/screwdriver) && !istype(W, /obj/item/weapon/weldingtool) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. if(hasvar(W,"force") && W.force)//If force is defined and non-zero src.target = user if(lasercolor)//To make up for the fact that lasertag bots don't hunt @@ -222,10 +222,10 @@ Auto Patrol: []"}, /obj/machinery/bot/ed209/process() set background = BACKGROUND_ENABLED - if (!src.on) + if (!src.on || src.disabled) return var/list/targets = list() - for (var/mob/living/carbon/C in view(12,src)) //Let's find us a target + for (var/mob/living/carbon/C in view(9,src)) //Let's find us a target var/threatlevel = 0 if ((C.stat) || (C.lying)) continue @@ -279,14 +279,14 @@ Auto Patrol: []"}, var/mob/living/carbon/M = src.target var/maxstuns = 4 if (istype(M, /mob/living/carbon/human)) - if (M.stuttering < 10 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) - M.stuttering = 10 - M.Stun(10) - M.Weaken(10) + if (M.stuttering < 5 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + M.stuttering = 5 + M.Stun(5) + M.Weaken(5) else - M.Weaken(10) - M.stuttering = 10 - M.Stun(10) + M.Weaken(5) + M.stuttering = 5 + M.Stun(5) maxstuns-- if (maxstuns <= 0) target = null @@ -791,7 +791,7 @@ Auto Patrol: []"}, s.start() new /obj/effect/decal/cleanable/oil(src.loc) - del(src) + qdel(src) /obj/machinery/bot/ed209/proc/shootAt(var/mob/target) @@ -818,14 +818,14 @@ Auto Patrol: []"}, projectile = /obj/item/projectile/energy/electrode else if(lasercolor == "b") if (src.emagged == 2) - projectile = /obj/item/projectile/omnitag + projectile = /obj/item/projectile/lasertag else - projectile = /obj/item/projectile/bluetag + projectile = /obj/item/projectile/lasertag/bluetag else if(lasercolor == "r") if (src.emagged == 2) - projectile = /obj/item/projectile/omnitag + projectile = /obj/item/projectile/lasertag else - projectile = /obj/item/projectile/redtag + projectile = /obj/item/projectile/lasertag/redtag if (!( istype(U, /turf) )) return @@ -895,9 +895,9 @@ Auto Patrol: []"}, switch(build_step) if(0,1) - if( istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg) ) + if(istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg)) user.drop_item() - del(W) + qdel(W) build_step++ user << "You add the robot leg to [src]." name = "legs/frame assembly" @@ -909,13 +909,13 @@ Auto Patrol: []"}, icon_state = "ed209_legs" if(2) - if( istype(W, /obj/item/clothing/suit/redtag) ) + if(istype(W, /obj/item/clothing/suit/redtag)) lasercolor = "r" - else if( istype(W, /obj/item/clothing/suit/bluetag) ) + else if(istype(W, /obj/item/clothing/suit/bluetag)) lasercolor = "b" - if( lasercolor || istype(W, /obj/item/clothing/suit/armor/vest) ) + if(lasercolor || istype(W, /obj/item/clothing/suit/armor/vest)) user.drop_item() - del(W) + qdel(W) build_step++ user << "You add the armor to [src]." name = "vest/legs/frame assembly" @@ -923,26 +923,38 @@ Auto Patrol: []"}, icon_state = "[lasercolor]ed209_shell" if(3) - if( istype(W, /obj/item/weapon/weldingtool) ) + if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) build_step++ name = "shielded frame assembly" user << "You welded the vest to [src]." if(4) - if( istype(W, /obj/item/clothing/head/helmet) ) - user.drop_item() - del(W) - build_step++ - user << "You add the helmet to [src]." - name = "covered and shielded frame assembly" - item_state = "[lasercolor]ed209_hat" - icon_state = "[lasercolor]ed209_hat" + switch(lasercolor) + if("b") + if(!istype(W, /obj/item/clothing/head/helmet/bluetaghelm)) + return + + if("r") + if(!istype(W, /obj/item/clothing/head/helmet/redtaghelm)) + return + + if("") + if(!istype(W, /obj/item/clothing/head/helmet)) + return + + user.drop_item() + qdel(W) + build_step++ + user << "You add the helmet to [src]." + name = "covered and shielded frame assembly" + item_state = "[lasercolor]ed209_hat" + icon_state = "[lasercolor]ed209_hat" if(5) - if( isprox(W) ) + if(isprox(W)) user.drop_item() - del(W) + qdel(W) build_step++ user << "You add the prox sensor to [src]." name = "covered, shielded and sensored frame assembly" @@ -950,8 +962,8 @@ Auto Patrol: []"}, icon_state = "[lasercolor]ed209_prox" if(6) - if( istype(W, /obj/item/weapon/cable_coil) ) - var/obj/item/weapon/cable_coil/coil = W + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = W var/turf/T = get_turf(user) user << "You start to wire [src]..." sleep(40) @@ -964,15 +976,15 @@ Auto Patrol: []"}, if(7) switch(lasercolor) if("b") - if( !istype(W, /obj/item/weapon/gun/energy/laser/bluetag) ) + if(!istype(W, /obj/item/weapon/gun/energy/laser/bluetag)) return name = "bluetag ED-209 assembly" if("r") - if( !istype(W, /obj/item/weapon/gun/energy/laser/redtag) ) + if(!istype(W, /obj/item/weapon/gun/energy/laser/redtag)) return name = "redtag ED-209 assembly" if("") - if( !istype(W, /obj/item/weapon/gun/energy/taser) ) + if(!istype(W, /obj/item/weapon/gun/energy/taser)) return name = "taser ED-209 assembly" else @@ -982,10 +994,10 @@ Auto Patrol: []"}, src.item_state = "[lasercolor]ed209_taser" src.icon_state = "[lasercolor]ed209_taser" user.drop_item() - del(W) + qdel(W) if(8) - if( istype(W, /obj/item/weapon/screwdriver) ) + if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) var/turf/T = get_turf(user) user << "Now attaching the gun to the frame..." @@ -996,42 +1008,44 @@ Auto Patrol: []"}, user << "Taser gun attached." if(9) - if( istype(W, /obj/item/weapon/cell) ) + if(istype(W, /obj/item/weapon/stock_parts/cell)) build_step++ user << "You complete the ED-209." var/turf/T = get_turf(src) new /obj/machinery/bot/ed209(T,created_name,lasercolor) user.drop_item() - del(W) - user.drop_from_inventory(src) - del(src) + qdel(W) + user.unEquip(src, 1) + qdel(src) /obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj) - if((src.lasercolor == "b") && (src.disabled == 0)) - if(istype(Proj, /obj/item/projectile/redtag)) + if(!disabled) + var/lasertag_check = 0 + if((src.lasercolor == "b")) + if(istype(Proj, /obj/item/projectile/lasertag/redtag)) + lasertag_check++ + else if((src.lasercolor == "r")) + if(istype(Proj, /obj/item/projectile/lasertag/bluetag)) + lasertag_check++ + if(lasertag_check) + icon_state = "[lasercolor]ed2090" src.disabled = 1 - del (Proj) - sleep(100) - src.disabled = 0 + target = null + spawn(100) + src.disabled = 0 + icon_state = "[lasercolor]ed2091" + return 1 else - ..() - else if((src.lasercolor == "r") && (src.disabled == 0)) - if(istype(Proj, /obj/item/projectile/bluetag)) - src.disabled = 1 - del (Proj) - sleep(100) - src.disabled = 0 - else - ..() + ..(Proj) else - ..() + ..(Proj) /obj/machinery/bot/ed209/bluetag/New()//If desired, you spawn red and bluetag bots easily new /obj/machinery/bot/ed209(get_turf(src),null,"b") - del(src) + qdel(src) /obj/machinery/bot/ed209/redtag/New() new /obj/machinery/bot/ed209(get_turf(src),null,"r") - del(src) + qdel(src) diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 0c53371b455..963f2785dfb 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -194,7 +194,7 @@ if(targetdirection != null) /* for (var/turf/space/D in view(7,src)) - if(!(D in floorbottargets) && D != src.oldtarget) // Added for bridging mode -- TLE + if(!(D in floorbottargets) && D != src.oldtarget) // Added for bridging mode if(get_dir(src, D) == targetdirection) src.oldtarget = D src.target = D @@ -331,7 +331,7 @@ T.amount -= i else src.amount += T.amount - del(T) + qdel(T) src.updateicon() src.target = null src.repairing = 0 @@ -351,7 +351,7 @@ var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel T.amount = 4 T.loc = M.loc - del(M) + qdel(M) src.target = null src.repairing = 0 @@ -387,7 +387,7 @@ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() - del(src) + qdel(src) return @@ -400,23 +400,23 @@ return if(user.s_active) user.s_active.close(user) - del(T) + qdel(T) var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles user.put_in_hands(B) user << "You add the tiles into the empty toolbox. They protrude from the top." - user.drop_from_inventory(src) - del(src) + user.unEquip(src, 1) + qdel(src) /obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob) ..() if(isprox(W)) - del(W) + qdel(W) var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor() B.created_name = src.created_name user.put_in_hands(B) user << "You add the sensor to the toolbox and tiles!" - user.drop_from_inventory(src) - del(src) + 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) @@ -430,13 +430,13 @@ /obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) - del(W) + 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 user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!" - user.drop_from_inventory(src) - del(src) + 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) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 251bd2705fb..e40e9a21db2 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -476,7 +476,7 @@ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() - del(src) + qdel(src) return /obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened! @@ -551,11 +551,11 @@ else if(istype(src,/obj/item/weapon/storage/firstaid/o2)) A.skin = "o2" - del(S) + qdel(S) user.put_in_hands(A) user << "You add the robot arm to the first aid kit." - user.drop_from_inventory(src) - del(src) + user.unEquip(src, 1) + qdel(src) /obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -572,7 +572,7 @@ if(0) if(istype(W, /obj/item/device/healthanalyzer)) user.drop_item() - del(W) + qdel(W) src.build_step++ user << "You add the health sensor to [src]." src.name = "First aid/robot arm/health analyzer assembly" @@ -581,13 +581,13 @@ if(1) if(isprox(W)) user.drop_item() - del(W) + qdel(W) src.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 - user.drop_from_inventory(src) - del(src) + user.unEquip(src, 1) + qdel(src) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 483bfcb0bb7..47a26e226c5 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -48,7 +48,7 @@ var/global/mulebot_count = 0 var/auto_return = 1 // true if auto return to home beacon after unload var/auto_pickup = 1 // true if auto-pickup at beacon - var/obj/item/weapon/cell/cell + var/obj/item/weapon/stock_parts/cell/cell var/datum/wires/mulebot/wires = null // the installed power cell @@ -105,8 +105,8 @@ var/global/mulebot_count = 0 if(toggle_lock(user)) user << "\blue Controls [(locked ? "locked" : "unlocked")]." - else if(istype(I,/obj/item/weapon/cell) && open && !cell) - var/obj/item/weapon/cell/C = I + else if(istype(I,/obj/item/weapon/stock_parts/cell) && open && !cell) + var/obj/item/weapon/stock_parts/cell/C = I user.drop_item() C.loc = src cell = C @@ -135,6 +135,9 @@ var/global/mulebot_count = 0 ) else user << "\blue [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) @@ -290,7 +293,7 @@ var/global/mulebot_count = 0 if("cellinsert") if(open && !cell) - var/obj/item/weapon/cell/C = usr.get_active_hand() + var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand() if(istype(C)) usr.drop_item() cell = C @@ -893,7 +896,7 @@ var/global/mulebot_count = 0 new /obj/item/device/assembly/prox_sensor(Tsec) new /obj/item/stack/rods(Tsec) new /obj/item/stack/rods(Tsec) - new /obj/item/weapon/cable_coil/cut(Tsec) + new /obj/item/stack/cable_coil/cut(Tsec) if (cell) cell.loc = Tsec cell.update_icon() @@ -905,4 +908,4 @@ var/global/mulebot_count = 0 new /obj/effect/decal/cleanable/oil(src.loc) unload(0) - del(src) + qdel(src) diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 31aa65c331c..7c2c15fed4d 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -171,7 +171,7 @@ Auto Patrol: []"}, user << "\red Access denied." else ..() - if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target)) + if(!istype(W, /obj/item/weapon/screwdriver) && !istype(W, /obj/item/weapon/weldingtool) && (W.force) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. src.target = user src.mode = SECBOT_HUNT @@ -219,7 +219,7 @@ Auto Patrol: []"}, walk_to(src,0) if(target) // make sure target exists - if(get_dist(src, src.target) <= 1 && isturf(src.target.loc)) // if right next to perp + 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" spawn(2) @@ -227,14 +227,14 @@ Auto Patrol: []"}, var/mob/living/carbon/M = src.target var/maxstuns = 4 if(istype(M, /mob/living/carbon/human)) - if(M.stuttering < 10 && (!(HULK in M.mutations))) - M.stuttering = 10 - M.Stun(10) - M.Weaken(10) + if(M.stuttering < 5 && (!(HULK in M.mutations))) + M.stuttering = 5 + M.Stun(5) + M.Weaken(5) else - M.Weaken(10) - M.stuttering = 10 - M.Stun(10) + M.Weaken(5) + M.stuttering = 5 + M.Stun(5) maxstuns-- if(maxstuns <= 0) target = null @@ -669,7 +669,7 @@ Auto Patrol: []"}, var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec) Sa.build_step = 1 - Sa.overlays += image('icons/obj/aibots.dmi', "hs_hole") + Sa.overlays += "hs_hole" Sa.created_name = src.name new /obj/item/device/assembly/prox_sensor(Tsec) new /obj/item/weapon/melee/baton(Tsec) @@ -682,7 +682,7 @@ Auto Patrol: []"}, s.start() new /obj/effect/decal/cleanable/oil(src.loc) - del(src) + qdel(src) /obj/machinery/bot/secbot/attack_alien(var/mob/living/carbon/alien/user as mob) ..() @@ -702,54 +702,80 @@ Auto Patrol: []"}, return if(S.secured) - del(S) + qdel(S) var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly user.put_in_hands(A) - user << "You add the signaler to the helmet." - user.drop_from_inventory(src) - del(src) + user << "You add the signaler to the helmet." + user.unEquip(src, 1) + qdel(src) else return -/obj/item/weapon/secbot_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/weapon/secbot_assembly/attackby(obj/item/I, mob/user) ..() - if((istype(W, /obj/item/weapon/weldingtool)) && (!src.build_step)) - var/obj/item/weapon/weldingtool/WT = W - if(WT.remove_fuel(0,user)) - src.build_step++ - src.overlays += image('icons/obj/aibots.dmi', "hs_hole") - user << "You weld a hole in [src]!" + if(istype(I, /obj/item/weapon/weldingtool)) + if(!build_step) + var/obj/item/weapon/weldingtool/WT = I + if(WT.remove_fuel(0, user)) + build_step++ + overlays += "hs_hole" + user << "You weld a hole in [src]!" + else if(build_step == 1) + var/obj/item/weapon/weldingtool/WT = I + if(WT.remove_fuel(0, user)) + build_step-- + overlays -= "hs_hole" + user << "You weld the hole in [src] shut!" - else if(isprox(W) && (src.build_step == 1)) + else if(isprox(I) && (build_step == 1)) user.drop_item() - src.build_step++ - user << "You add the prox sensor to [src]!" - src.overlays += image('icons/obj/aibots.dmi', "hs_eye") - src.name = "helmet/signaler/prox sensor assembly" - del(W) + build_step++ + user << "You add the prox sensor to [src]!" + overlays += "hs_eye" + name = "helmet/signaler/prox sensor assembly" + qdel(I) - else if(((istype(W, /obj/item/robot_parts/l_arm)) || (istype(W, /obj/item/robot_parts/r_arm))) && (src.build_step == 2)) + else if(((istype(I, /obj/item/robot_parts/l_arm)) || (istype(I, /obj/item/robot_parts/r_arm))) && (build_step == 2)) user.drop_item() - src.build_step++ - user << "You add the robot arm to [src]!" - src.name = "helmet/signaler/prox sensor/robot arm assembly" - src.overlays += image('icons/obj/aibots.dmi', "hs_arm") - del(W) + build_step++ + user << "You add the robot arm to [src]!" + name = "helmet/signaler/prox sensor/robot arm assembly" + overlays += "hs_arm" + qdel(I) - else if((istype(W, /obj/item/weapon/melee/baton)) && (src.build_step >= 3)) + else if((istype(I, /obj/item/weapon/melee/baton)) && (build_step >= 3)) user.drop_item() - src.build_step++ - user << "You complete the Securitron! Beep boop." + build_step++ + user << "You complete the Securitron! Beep boop." var/obj/machinery/bot/secbot/S = new /obj/machinery/bot/secbot S.loc = get_turf(src) - S.name = src.created_name - del(W) - del(src) + S.name = created_name + qdel(I) + 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) + 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) 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 if(istype(I, /obj/item/weapon/screwdriver)) + if(!build_step) + new /obj/item/device/assembly/signaler(get_turf(src)) + new /obj/item/clothing/head/helmet(get_turf(src)) + user << "You disconnect the signaler from the helmet." + qdel(src) + + else if(build_step == 2) + overlays -= "hs_eye" + new /obj/item/device/assembly/prox_sensor(get_turf(src)) + user << "You detach the proximity sensor from [src]." + build_step-- + + else if(build_step == 3) + overlays -= "hs_arm" + new /obj/item/robot_parts/l_arm(get_turf(src)) + user << "You remove the robot arm from [src]." + build_step-- diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 7577a2ddbe7..b9386833cb3 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -48,7 +48,7 @@ if(z == 1 && prob(3)) deactivate() -/obj/machinery/camera/Del() +/obj/machinery/camera/Destroy() if(istype(bug)) bug.bugged_cameras -= src.c_tag ..() @@ -90,7 +90,7 @@ return /obj/machinery/camera/blob_act() - del(src) + qdel(src) return /obj/machinery/camera/proc/setViewRange(var/num = 7) @@ -131,7 +131,7 @@ if(assembly) assembly.loc = src.loc assembly.state = 1 - del(src) + qdel(src) // OTHER @@ -180,7 +180,7 @@ playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(loc, "sparks", 50, 1) visible_message("\blue The camera has been sliced apart by [] with an energy blade!") - del(src) + qdel(src) else if(istype(W, /obj/item/device/laser_pointer)) var/obj/item/device/laser_pointer/L = W L.laser_act(src, user) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index e9665632c84..805406fb6ed 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -56,8 +56,8 @@ if(2) // State 2 - if(istype(W, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = W + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = W if(C.use(2)) user << "You add wires to the assembly." state = 3 @@ -110,7 +110,7 @@ else if(istype(W, /obj/item/weapon/wirecutters)) - new/obj/item/weapon/cable_coil(get_turf(src), 2) + new/obj/item/stack/cable_coil(get_turf(src), 2) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You cut the wires from the circuits." state = 2 @@ -120,7 +120,7 @@ if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. user << "You attach the [W] into the assembly inner circuits." upgrades += W - user.drop_item(W) + user.drop_item() W.loc = src return diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 6461837c7a7..f588e5146a3 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -77,10 +77,8 @@ //Cameras can't track people wearing an agent card or a ninja hood. if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate)) continue - if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja)) - var/obj/item/clothing/head/helmet/space/space_ninja/hood = H.head - if(!hood.canremove) - continue + if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && (H.head.flags & NODROP)) + continue // Now, are they viewable by a camera? (This is last because it's the most intensive check) if(!near_camera(M)) @@ -137,7 +135,7 @@ U << "Follow camera mode terminated." U.cameraFollow = null return - if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && !H.head.canremove) + if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && (H.head.flags & NODROP)) U << "Follow camera mode terminated." U.cameraFollow = null return diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 567cbfe5284..14a8fb54edc 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -8,7 +8,7 @@ idle_power_usage = 5 active_power_usage = 60 power_channel = EQUIP - var/obj/item/weapon/cell/charging = null + var/obj/item/weapon/stock_parts/cell/charging = null var/chargelevel = -1 proc updateicon() @@ -38,7 +38,7 @@ if(stat & BROKEN) return - if(istype(W, /obj/item/weapon/cell) && anchored) + if(istype(W, /obj/item/weapon/stock_parts/cell) && anchored) if(charging) user << "\red There is already a cell in the charger." return diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index a1fbdcb16c0..631d2eb9700 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -14,7 +14,6 @@ icon = 'icons/obj/cloning.dmi' icon_state = "pod_0" req_access = list(access_genetics) //For premature unlocking. - var/mob/living/occupant var/heal_level = 90 //The clone is released once its health reaches this level. var/locked = 0 var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine. @@ -33,8 +32,8 @@ component_parts += new /obj/item/weapon/stock_parts/manipulator(null) component_parts += new /obj/item/weapon/stock_parts/manipulator(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - component_parts += new /obj/item/weapon/cable_coil(null, 1) - component_parts += new /obj/item/weapon/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/clonepod/RefreshParts() @@ -259,18 +258,14 @@ //Let's unlock this early I guess. Might be too early, needs tweaking. /obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/screwdriver)) - if(occupant || mess || locked) - user << "The maintenance panel is locked." + if(!(occupant || mess || locked)) + if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W)) return - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]") + + if(exchange_parts(user, W)) return - if(istype(W, /obj/item/weapon/crowbar)) - if(panel_open) - default_deconstruction_crowbar() - return + default_deconstruction_crowbar(W) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (!src.check_access(W)) @@ -358,7 +353,7 @@ src.icon_state = "pod_g" src.occupant.ghostize() spawn(5) - del(src.occupant) + qdel(src.occupant) return /obj/machinery/clonepod/relaymove(mob/user as mob) @@ -377,21 +372,21 @@ for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) - del(src) + 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) - del(src) + 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) - del(src) + qdel(src) return return diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 6479c5d9344..e4c6e621fee 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -136,7 +136,7 @@ // loadProgram(target) //This could all be done better, but it works for now. -/obj/machinery/computer/HolodeckControl/Del() +/obj/machinery/computer/HolodeckControl/Destroy() emergencyShutdown() ..() @@ -200,13 +200,12 @@ if(isobj(obj)) var/mob/M = obj.loc if(ismob(M)) - M.u_equip(obj) - M.update_icons() //so their overlays update + M.unEquip(obj, 1) //Holoweapons should always drop. if(!silent) var/obj/oldobj = obj visible_message("The [oldobj.name] fades away!") - del(obj) + qdel(obj) /obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A) for(var/turf/T in A) @@ -237,10 +236,10 @@ derez(item) for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck) - del(B) + qdel(B) for(var/mob/living/simple_animal/hostile/carp/C in linkedholodeck) - del(C) + qdel(C) holographic_items = A.copy_contents_to(linkedholodeck , 1) @@ -261,7 +260,7 @@ T.temperature = 5000 T.hotspot_expose(50000,50000,1) if(L.name=="Holocarp Spawn") - new /mob/living/simple_animal/hostile/carp(L.loc) + new /mob/living/simple_animal/hostile/carp/holocarp(L.loc) /obj/machinery/computer/HolodeckControl/proc/emergencyShutdown() @@ -335,7 +334,7 @@ G.affecting.loc = src.loc G.affecting.Weaken(5) visible_message("\red [G.assailant] puts [G.affecting] on the table.") - del(W) + qdel(W) return if (istype(W, /obj/item/weapon/wrench)) @@ -357,17 +356,14 @@ flags = ON_BORDER -/obj/structure/holowindow/Del() - ..() - /obj/item/weapon/holo - damtype = HALLOSS + damtype = STAMINA /obj/item/weapon/holo/esword desc = "May the force be with you. Sorta" icon_state = "sword0" force = 3.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 throwforce = 0 w_class = 2.0 @@ -399,13 +395,13 @@ force = 30 icon_state = "sword[item_color]" w_class = 4 - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + playsound(user, 'sound/weapons/saberon.ogg', 20, 1) user << "\blue [src] is now active." else force = 3 icon_state = "sword0" w_class = 2 - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + playsound(user, 'sound/weapons/saberoff.ogg', 20, 1) user << "\blue [src] can now be concealed." add_fingerprint(user) return @@ -430,7 +426,7 @@ if((ishuman(hit_atom))) var/mob/living/carbon/M = hit_atom playsound(src, 'sound/items/dodgeball.ogg', 50, 1) - M.apply_damage(10, HALLOSS) + M.apply_damage(10, STAMINA) if(prob(5)) M.Weaken(3) visible_message("\red [M] is knocked right off \his feet!", 3) @@ -453,7 +449,7 @@ G.affecting.loc = src.loc G.affecting.Weaken(5) visible_message("\red [G.assailant] dunks [G.affecting] into the [src]!", 3) - del(W) + qdel(W) return else if (istype(W, /obj/item) && get_dist(src,user)<2) user.drop_item(src) @@ -512,7 +508,7 @@ currentarea = get_area(src.loc) if(!currentarea) - del(src) + qdel(src) if(eventstarted) usr << "The event has already begun!" @@ -543,7 +539,7 @@ eventstarted = 1 for(var/obj/structure/holowindow/W in currentarea) - del(W) + qdel(W) for(var/mob/M in currentarea) M << "FIGHT!" \ No newline at end of file diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 3e5a090df51..5f0e35b08ec 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -5,7 +5,7 @@ icon = 'icons/mob/AI.dmi' icon_state = "0" var/state = 0 - var/datum/ai_laws/laws = new /datum/ai_laws/asimov + var/datum/ai_laws/laws = new() var/obj/item/weapon/circuitboard/circuit = null var/obj/item/device/mmi/brain = null @@ -16,42 +16,42 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You wrench the frame into place." + user << "You wrench the frame into place." anchored = 1 state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.isOn()) - user << "The welder must be on for this task." + user << "The welder must be on for this task." return playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20)) if(!src || !WT.remove_fuel(0, user)) return - user << "\blue You deconstruct the frame." + user << "You deconstruct the frame." new /obj/item/stack/sheet/plasteel( loc, 4) - del(src) + qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You unfasten the frame." + user << "You unfasten the frame." anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + user << "You place the circuit board inside the frame." icon_state = "1" circuit = P user.drop_item() P.loc = src if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + user << "You screw the circuit board into place." state = 2 icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + user << "You remove the circuit board." state = 1 icon_state = "0" circuit.loc = loc @@ -59,28 +59,28 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + user << "You unfasten the circuit board." state = 1 icon_state = "1" - if(istype(P, /obj/item/weapon/cable_coil)) + if(istype(P, /obj/item/stack/cable_coil)) if(P:amount >= 5) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) P:amount -= 5 - if(!P:amount) del(P) - user << "\blue You add cables to the frame." + if(!P:amount) qdel(P) + user << "You add cables to the frame." state = 3 icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) if (brain) - user << "Get that brain out of there first" + user << "Get that brain out of there first." else playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + user << "You remove the cables." state = 2 icon_state = "2" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) A.amount = 5 if(istype(P, /obj/item/stack/sheet/rglass)) @@ -89,46 +89,49 @@ if(do_after(user, 20)) if (P) P:amount -= 2 - if(!P:amount) del(P) - user << "\blue You put in the glass panel." + if(!P:amount) qdel(P) + user << "You put in the glass panel." state = 4 icon_state = "4" - if(istype(P, /obj/item/weapon/aiModule/asimov)) - laws.add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - laws.add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") - laws.add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - usr << "Law module applied." - - if(istype(P, /obj/item/weapon/aiModule/purge)) + if(istype(P, /obj/item/weapon/aiModule/core/full)) //Allows any full core boards to be applied to AI cores. + var/obj/item/weapon/aiModule/core/M = P laws.clear_inherent_laws() - usr << "Law module applied." + for(var/templaw in M.laws) + laws.add_inherent_law(templaw) + usr << "Law module applied." + + if(istype(P, /obj/item/weapon/aiModule/reset/purge)) + laws.clear_inherent_laws() + usr << "Laws cleared applied." - if(istype(P, /obj/item/weapon/aiModule/freeform)) - var/obj/item/weapon/aiModule/freeform/M = P - laws.add_inherent_law(M.newFreeFormLaw) - usr << "Added a freeform law." + if(istype(P, /obj/item/weapon/aiModule/supplied/freeform) || istype(P, /obj/item/weapon/aiModule/core/freeformcore)) + var/obj/item/weapon/aiModule/supplied/freeform/M = P + if(M.laws[1] == "") + return + laws.add_inherent_law(M.laws[1]) + usr << "Added a freeform law." if(istype(P, /obj/item/device/mmi)) var/obj/item/device/mmi/M = P if(!M.brainmob) - user << "\red Sticking an empty MMI into the frame would sort of defeat the purpose." + user << "Sticking an empty MMI into the frame would sort of defeat the purpose." return if(M.brainmob.stat == 2) - user << "\red Sticking a dead brain into the frame would sort of defeat the purpose." + user << "Sticking a dead brain into the frame would sort of defeat the purpose." return if((config) && (!config.allow_ai)) - user << "\red This MMI does not seem to fit." + user << "This MMI does not seem to fit." return if(jobban_isbanned(M.brainmob, "AI")) - user << "\red This MMI does not seem to fit." + user << "This MMI does not seem to fit." return if(!M.brainmob.mind) - user << "\red This MMI is mindless." + user << "This MMI is mindless." return ticker.mode.remove_cultist(M.brainmob.mind, 1) @@ -137,12 +140,12 @@ user.drop_item() M.loc = src brain = M - usr << "Added a brain." + usr << "Added a brain." icon_state = "3b" if(istype(P, /obj/item/weapon/crowbar) && brain) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the brain." + user << "You remove the brain." brain.loc = loc brain = null icon_state = "3" @@ -150,23 +153,25 @@ if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + user << "You remove the glass panel." state = 3 if (brain) icon_state = "3b" else icon_state = "3" - new /obj/item/stack/sheet/rglass( loc, 2 ) + new /obj/item/stack/sheet/rglass(loc, 2) return if(istype(P, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." - var/mob/living/silicon/ai/A = new /mob/living/silicon/ai ( loc, laws, brain ) + user << "You connect the monitor." + if(!laws.inherent.len) //If laws isn't set to null but nobody supplied a board, the AI would normally be created lawless. We don't want that. + laws = null + var/mob/living/silicon/ai/A = new /mob/living/silicon/ai (loc, laws, brain) if(A) //if there's no brain, the mob is deleted and a structure/AIcore is created A.rename_self("ai", 1) feedback_inc("cyborg_ais_created",1) - del(src) + qdel(src) /obj/structure/AIcore/deactivated name = "inactive AI" @@ -267,7 +272,7 @@ That prevents a few funky behaviors. A.cancel_camera() A << "You have been uploaded to a stationary terminal. Remote device connection restored." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." - del(T) + qdel(T) if("NINJASUIT") var/obj/item/clothing/suit/space/space_ninja/C = src var/mob/living/silicon/ai/A = C.AI @@ -278,7 +283,7 @@ That prevents a few funky behaviors. A.cancel_camera() A << "You have been uploaded to a stationary terminal. Remote device connection restored." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." - del(T) + qdel(T) if("AIFIXER")//AI Fixer terminal. var/obj/machinery/computer/aifixer/T = target switch(interaction) @@ -292,7 +297,7 @@ That prevents a few funky behaviors. C.name = "inteliCard" C.overlays.Cut() A.loc = T - T.occupant = A + T.occupier = A A.control_disabled = 1 if (A.stat == 2) T.overlays += image('icons/obj/computer.dmi', "ai-fixer-404") @@ -303,25 +308,25 @@ That prevents a few funky behaviors. A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." else - if(!C.contents.len && T.occupant && !T.active) - C.name = "inteliCard - [T.occupant.name]" + if(!C.contents.len && T.occupier && !T.active) + C.name = "inteliCard - [T.occupier.name]" T.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") - if (T.occupant.stat == 2) + if (T.occupier.stat == 2) C.icon_state = "aicard-404" T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404") else C.icon_state = "aicard-full" T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-full") - T.occupant << "You have been downloaded to a mobile storage device. Still no remote access." - U << "\blue Transfer successful: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." - T.occupant.loc = C - T.occupant.cancel_camera() - T.occupant = null + T.occupier << "You have been downloaded to a mobile storage device. Still no remote access." + U << "\blue Transfer successful: \black [T.occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + T.occupier.loc = C + T.occupier.cancel_camera() + T.occupier = null else if (C.contents.len) U << "\red ERROR: \black Artificial intelligence detected on terminal." else if (T.active) U << "\red ERROR: \black Reconstruction in progress." - else if (!T.occupant) + else if (!T.occupier) U << "\red ERROR: \black Unable to locate artificial intelligence." if("NINJASUIT") var/obj/item/clothing/suit/space/space_ninja/C = src @@ -331,7 +336,7 @@ That prevents a few funky behaviors. else var/mob/living/silicon/ai/A = C.AI A.loc = T - T.occupant = A + T.occupier = A C.AI = null A.control_disabled = 1 T.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") @@ -340,22 +345,22 @@ That prevents a few funky behaviors. A << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here." U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." else - if(!C.AI && T.occupant && !T.active) - if (T.occupant.stat) - U << "\red ERROR: \black [T.occupant.name] data core is corrupted. Unable to install." + if(!C.AI && T.occupier && !T.active) + if (T.occupier.stat) + U << "\red ERROR: \black [T.occupier.name] data core is corrupted. Unable to install." else T.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-full") - T.occupant << "You have been downloaded to a mobile storage device. Still no remote access." - U << "\blue Transfer successful: \black [T.occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." - T.occupant.loc = C - T.occupant.cancel_camera() - T.occupant = null + T.occupier << "You have been downloaded to a mobile storage device. Still no remote access." + U << "\blue Transfer successful: \black [T.occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + T.occupier.loc = C + T.occupier.cancel_camera() + T.occupier = null else if (C.AI) U << "\red ERROR: \black Artificial intelligence detected on terminal." else if (T.active) U << "\red ERROR: \black Reconstruction in progress." - else if (!T.occupant) + else if (!T.occupier) U << "\red ERROR: \black Unable to locate artificial intelligence." if("NINJASUIT")//Ninjasuit var/obj/item/clothing/suit/space/space_ninja/T = target diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 0339f223bf7..6dfa1f4dd5f 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,125 +1,137 @@ -/obj/machinery/computer/aifixer - name = "\improper AI system integrity restorer" - icon = 'icons/obj/computer.dmi' - icon_state = "ai-fixer" - req_access = list(access_captain, access_robotics, access_heads) - var/mob/living/silicon/ai/occupant = null - var/active = 0 - circuit = /obj/item/weapon/circuitboard/aifixer - -/obj/machinery/computer/aifixer/New() - src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") - ..() - - -/obj/machinery/computer/aifixer/attackby(I as obj, user as mob) - - if(istype(I, /obj/item/device/aicard)) - var/obj/item/device/aicard/AIcard = I - if(stat & (NOPOWER|BROKEN)) - user << "This terminal isn't functioning right now, get it working!" - return - AIcard.transfer_ai("AIFIXER","AICARD",src,user) - else - ..() - return - -/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob) - if(..()) - return - - user.set_machine(src) - var/dat = "" - - if (src.occupant) - var/laws - dat += "
Stored AI: [src.occupant.name]
" - dat += "System integrity: [(src.occupant.health+100)/2]%" - - if (src.occupant.laws.zeroth) - laws += "0: [src.occupant.laws.zeroth]
" - - var/number = 1 - for (var/index = 1, index <= src.occupant.laws.inherent.len, index++) - var/law = src.occupant.laws.inherent[index] - if (length(law) > 0) - laws += "[number]: [law]
" - number++ - - for (var/index = 1, index <= src.occupant.laws.supplied.len, index++) - var/law = src.occupant.laws.supplied[index] - if (length(law) > 0) - laws += "[number]: [law]
" - number++ - - dat += "Laws:
[laws]
" - - if (src.occupant.stat == 2) - dat += "AI non-functional" - else - dat += "AI functional" - if (!src.active) - dat += {"
Begin Reconstruction"} - else - dat += "
Reconstruction in process, please wait.
" - dat += {"
Close"} - - //user << browse(dat, "window=computer;size=400x500") - //onclose(user, "computer") - var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - -/obj/machinery/computer/aifixer/process() - if(..()) - src.updateDialog() - return - -/obj/machinery/computer/aifixer/Topic(href, href_list) - if(..()) - return - if (href_list["fix"]) - src.active = 1 - src.overlays += image('icons/obj/computer.dmi', "ai-fixer-on") - while (src.occupant.health < 100) - src.occupant.adjustOxyLoss(-1) - src.occupant.adjustFireLoss(-1) - src.occupant.adjustToxLoss(-1) - src.occupant.adjustBruteLoss(-1) - src.occupant.updatehealth() - if (src.occupant.health >= 0 && src.occupant.stat == 2) - src.occupant.stat = 0 - src.occupant.lying = 0 - dead_mob_list -= src.occupant - living_mob_list += src.occupant - src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404") - src.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") - src.updateUsrDialog() - sleep(10) - src.active = 0 - src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-on") - - - src.add_fingerprint(usr) - src.updateUsrDialog() - return - - -/obj/machinery/computer/aifixer/update_icon() - ..() - // Broken / Unpowered - if((stat & BROKEN) || (stat & NOPOWER)) - overlays.Cut() - - // Working / Powered - else - if (occupant) - switch (occupant.stat) - if (0) - overlays += image('icons/obj/computer.dmi', "ai-fixer-full") - if (2) - overlays += image('icons/obj/computer.dmi', "ai-fixer-404") - else - overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") +/obj/machinery/computer/aifixer + name = "\improper AI system integrity restorer" + icon = 'icons/obj/computer.dmi' + icon_state = "ai-fixer" + req_access = list(access_captain, access_robotics, access_heads) + var/mob/living/silicon/ai/occupier = null + var/active = 0 + circuit = /obj/item/weapon/circuitboard/aifixer + +/obj/machinery/computer/aifixer/New() + src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") + ..() + + +/obj/machinery/computer/aifixer/attackby(I as obj, user as mob) + if(occupier && istype(I, /obj/item/weapon/screwdriver)) + if(stat & (NOPOWER|BROKEN)) + user << "The screws on [name]'s screen won't budge." + else + user << "The screws on [name]'s screen won't budge and it emits a warning beep." + return + + if(istype(I, /obj/item/device/aicard)) + var/obj/item/device/aicard/AIcard = I + if(stat & (NOPOWER|BROKEN)) + if(occupier) + AIcard.transfer_ai("AIFIXER","AICARD",src,user) + overlays.Cut() + return + user << "This terminal isn't functioning right now, get it working!" + return + AIcard.transfer_ai("AIFIXER","AICARD",src,user) + else + ..() + return + +/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob) + if(..()) + return + interact(user) + +/obj/machinery/computer/aifixer/interact(mob/user) + + var/dat = "" + + if (src.occupier) + var/laws + dat += "
Stored AI: [src.occupier.name]
" + dat += "System integrity: [(src.occupier.health+100)/2]%" + + if (src.occupier.laws.zeroth) + laws += "0: [src.occupier.laws.zeroth]
" + + var/number = 1 + for (var/index = 1, index <= src.occupier.laws.inherent.len, index++) + var/law = src.occupier.laws.inherent[index] + if (length(law) > 0) + laws += "[number]: [law]
" + number++ + + for (var/index = 1, index <= src.occupier.laws.supplied.len, index++) + var/law = src.occupier.laws.supplied[index] + if (length(law) > 0) + laws += "[number]: [law]
" + number++ + + dat += "Laws:
[laws]
" + + if (src.occupier.stat == 2) + dat += "AI non-functional" + else + dat += "AI functional" + if (!src.active) + dat += {"
Begin Reconstruction"} + else + dat += "
Reconstruction in process, please wait.
" + dat += {"
Close"} + + //user << browse(dat, "window=computer;size=400x500") + //onclose(user, "computer") + var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/computer/aifixer/process() + if(..()) + src.updateDialog() + return + +/obj/machinery/computer/aifixer/Topic(href, href_list) + if(..()) + return + if (href_list["fix"]) + src.active = 1 + src.overlays += image('icons/obj/computer.dmi', "ai-fixer-on") + while (src.occupier.health < 100) + src.occupier.adjustOxyLoss(-1) + src.occupier.adjustFireLoss(-1) + src.occupier.adjustToxLoss(-1) + src.occupier.adjustBruteLoss(-1) + src.occupier.updatehealth() + if (src.occupier.health >= 0 && src.occupier.stat == 2) + src.occupier.stat = 0 + src.occupier.lying = 0 + dead_mob_list -= src.occupier + living_mob_list += src.occupier + src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404") + src.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") + src.updateUsrDialog() + sleep(10) + src.active = 0 + src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-on") + + + src.add_fingerprint(usr) + src.updateUsrDialog() + return + + +/obj/machinery/computer/aifixer/update_icon() + ..() + // Broken / Unpowered + if((stat & BROKEN) || (stat & NOPOWER)) + overlays.Cut() + + // Working / Powered + else + if (occupier) + switch (occupier.stat) + if (0) + overlays += image('icons/obj/computer.dmi', "ai-fixer-full") + if (2) + overlays += image('icons/obj/computer.dmi', "ai-fixer-404") + else + overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 39e5691e208..449bc3b3074 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -23,7 +23,7 @@ /obj/item/toy/prize/mauler = 1, /obj/item/toy/prize/odysseus = 1, /obj/item/toy/prize/phazon = 1, - /obj/item/toy/cards = 2, + /obj/item/toy/cards/deck = 2, /obj/item/toy/nuke = 2 ) @@ -31,7 +31,7 @@ ..() var/choice = pick(typesof(/obj/machinery/computer/arcade) - /obj/machinery/computer/arcade) new choice(loc) - del(src) + qdel(src) /obj/machinery/computer/arcade/proc/prizevend() if(!contents.len) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 614933c0635..428d8384235 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -16,6 +16,10 @@ ..() set_frequency(receive_frequency) +/obj/machinery/computer/atmos_alert/Destroy() + radio_controller.remove_object(src, receive_frequency) + ..() + /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 860e475a922..99134bed064 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -28,7 +28,18 @@ var/list/records = null var/frame_desc = null - +/obj/item/weapon/circuitboard/large_tank_control + name = "cirquir board (Large Tank Control)" + build_path = /obj/machinery/computer/general_air_control/large_tank_control + origin_tech = "programming=2;engineering=3;materials=2" +/obj/item/weapon/circuitboard/turbine_computer + name = "circuit board (Turbine Computer)" + build_path = /obj/machinery/computer/turbine_computer + origin_tech = "programming=4;engineering=4;powerstorage=4" +/obj/item/weapon/circuitboard/telesci_console + name = "circuit board (Telescience Console)" + build_path = /obj/machinery/computer/telescience + origin_tech = "programming=3;bluespace=2" /obj/item/weapon/circuitboard/message_monitor name = "circuit board (Message Monitor)" build_path = /obj/machinery/computer/message_monitor @@ -112,7 +123,6 @@ /obj/item/weapon/circuitboard/arcade/orion_trail name = "circuit board (Orion_Trail)" build_path = /obj/machinery/computer/arcade/orion_trail - origin_tech = "programming=2" /obj/item/weapon/circuitboard/turbine_control name = "circuit board (Turbine control)" build_path = /obj/machinery/computer/turbine_computer @@ -155,7 +165,6 @@ /obj/item/weapon/circuitboard/ordercomp name = "circuit board (Supply Ordering Console)" build_path = /obj/machinery/computer/ordercomp - origin_tech = "programming=2" /obj/item/weapon/circuitboard/supplycomp name = "circuit board (Supply shuttle console)" build_path = /obj/machinery/computer/supplycomp @@ -168,7 +177,6 @@ /obj/item/weapon/circuitboard/mining name = "circuit board (Outpost Status Display)" build_path = /obj/machinery/computer/security/mining - origin_tech = "programming=2" /obj/item/weapon/circuitboard/comm_monitor name = "circuit board (Telecommunications Monitor)" build_path = /obj/machinery/computer/telecomms/monitor @@ -190,20 +198,16 @@ /obj/item/weapon/circuitboard/shuttle name = "circuit board (Shuttle)" build_path = /obj/machinery/computer/shuttle - origin_tech = "programming=2" id = "1" /obj/item/weapon/circuitboard/labor_shuttle name = "circuit Board (Labor Shuttle)" build_path = /obj/machinery/computer/shuttle/labor - origin_tech = "programming 2" /obj/item/weapon/circuitboard/labor_shuttle/one_way name = "circuit Board (Prisoner Shuttle Console)" build_path = /obj/machinery/computer/shuttle/labor/one_way - origin_tech = "programming 2" /obj/item/weapon/circuitboard/mining_shuttle name = "circuit Board (Mining Shuttle)" build_path = /obj/machinery/computer/shuttle/mining - origin_tech = "programming 2" /obj/item/weapon/circuitboard/HolodeckControl // Not going to let people get this, but it's just here for future name = "circuit board (Holodeck Control)" build_path = /obj/machinery/computer/HolodeckControl @@ -215,11 +219,9 @@ /obj/item/weapon/circuitboard/area_atmos name = "circuit board (Area Air Control)" build_path = /obj/machinery/computer/area_atmos - origin_tech = "programming=2" /*/obj/item/weapon/circuitboard/prison_shuttle name = "circuit board (Prison Shuttle)" - build_path = /obj/machinery/computer/prison_shuttle - origin_tech = "programming=2"*/ + build_path = /obj/machinery/computer/prison_shuttle*/ /obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) @@ -246,7 +248,7 @@ /obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) if(istype(I,/obj/item/weapon/screwdriver)) - if(src.build_path == "/obj/machinery/computer/rdconsole/core") + if(build_path == /obj/machinery/computer/rdconsole/core) name = "circuit board (RD Console - Robotics)" build_path = /obj/machinery/computer/rdconsole/robotics user << "Access protocols successfully updated." @@ -284,7 +286,7 @@ user << "You deconstruct the frame." var/obj/item/stack/sheet/metal/M = new (loc, 5) M.add_fingerprint(user) - del(src) + qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -323,14 +325,14 @@ user << "You unfasten the circuit board." src.state = 1 src.icon_state = "1" - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = P + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = P if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) if(C && C.amount >= 5) C.amount -= 5 - if(C.amount <= 0) del(C) + if(C.amount <= 0) qdel(C) user << "You add cables to the frame." src.state = 3 src.icon_state = "3" @@ -340,7 +342,7 @@ user << "You remove the cables." src.state = 2 src.icon_state = "2" - var/obj/item/weapon/cable_coil/A = new (loc) + var/obj/item/stack/cable_coil/A = new (loc) A.amount = 5 A.add_fingerprint(user) @@ -378,4 +380,4 @@ var/obj/item/weapon/circuitboard/shuttle/C = circuit S.id = C.id transfer_fingerprints_to(B) - del(src) + qdel(src) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 4b2d0c782ab..0d29218a025 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -9,7 +9,7 @@ var/mapping = 0//For the overview file, interesting bit of code. check_eye(var/mob/user as mob) - if ((get_dist(user, src) > 1 || !( user.canmove ) || user.blinded || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon))) + if ((get_dist(user, src) > 1 || user.blinded || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon))) return null var/list/viewing = viewers(src) if((istype(user,/mob/living/silicon/robot)) && (!(viewing.Find(user)))) @@ -20,67 +20,68 @@ attack_hand(var/mob/user as mob) - if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" - return + if(!stat) + if (src.z > 6) + user << "\red Unable to establish a connection: \black You're too far away from the station!" + return - if (!network) - world.log << "A computer lacks a network at [x],[y],[z]." - return - if (!(istype(network,/list))) - world.log << "The computer at [x],[y],[z] has a network that is not a list!" - return + if (!network) + world.log << "A computer lacks a network at [x],[y],[z]." + return + if (!(istype(network,/list))) + world.log << "The computer at [x],[y],[z] has a network that is not a list!" + return - if(..()) - return + if(..()) + return - var/list/L = list() - for (var/obj/machinery/camera/C in cameranet.cameras) - L.Add(C) + var/list/L = list() + for (var/obj/machinery/camera/C in cameranet.cameras) + L.Add(C) - camera_sort(L) + camera_sort(L) - var/list/D = list() - D["Cancel"] = "Cancel" - for(var/obj/machinery/camera/C in L) - if(!C.network) - world.log << "[C.c_tag] has no camera network." - continue - if(!(istype(C.network,/list))) - world.log << "[C.c_tag]'s camera network is not a list!" - continue - var/list/tempnetwork = C.network&network - if(tempnetwork.len) - D[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C + var/list/D = list() + D["Cancel"] = "Cancel" + for(var/obj/machinery/camera/C in L) + if(!C.network) + world.log << "[C.c_tag] has no camera network." + continue + if(!(istype(C.network,/list))) + world.log << "[C.c_tag]'s camera network is not a list!" + continue + var/list/tempnetwork = C.network&network + if(tempnetwork.len) + D[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C - var/t = input(user, "Which camera should you change to?") as null|anything in D - if(!t) - user.unset_machine() - return 0 - - var/obj/machinery/camera/C = D[t] - - if(t == "Cancel") - user.unset_machine() - return 0 - - if(C) - if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.can_use() )) && (!istype(user, /mob/living/silicon/ai))) - if(!C.can_use() && !isAI(user)) - src.current = null + var/t = input(user, "Which camera should you change to?") as null|anything in D + if(!t) + user.unset_machine() return 0 - else - if(isAI(user)) - var/mob/living/silicon/ai/A = user - A.eyeobj.setLoc(get_turf(C)) - A.client.eye = A.eyeobj - else - src.current = C - use_power(50) - spawn(5) - attack_hand(user) - return + var/obj/machinery/camera/C = D[t] + + if(t == "Cancel") + user.unset_machine() + return 0 + + if(C) + if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( C.can_use() )) && (!istype(user, /mob/living/silicon/ai))) + if(!C.can_use() && !isAI(user)) + src.current = null + return 0 + else + if(isAI(user)) + var/mob/living/silicon/ai/A = user + A.eyeobj.setLoc(get_turf(C)) + A.client.eye = A.eyeobj + else + src.current = C + use_power(50) + + spawn(5) + attack_hand(user) + return @@ -101,7 +102,7 @@ /obj/machinery/computer/security/telescreen/entertainment name = "entertainment monitor" - desc = "Damn, they better have /tg/thechannel on these things." + desc = "Damn, they better have the /tg/ channel on these things." icon = 'icons/obj/status_display.dmi' icon_state = "entertainment" network = list("thunder") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index aed32dc1877..3f6eedc478e 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -85,7 +85,12 @@ ..() return -/obj/machinery/computer/cloning/attack_hand(mob/user as mob) +/obj/machinery/computer/cloning/attack_hand(mob/user) + if(..()) + return + interact(user) + +/obj/machinery/computer/cloning/interact(mob/user) user.set_machine(src) add_fingerprint(user) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ca522c4d35a..abcd6c8edd6 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -507,7 +507,7 @@ user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated." return */ - if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE + if(world.time < 6000) user << "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minutes before trying again." return @@ -573,7 +573,7 @@ frequency.post_signal(src, status_signal) -/obj/machinery/computer/communications/Del() +/obj/machinery/computer/communications/Destroy() shuttle_caller_list -= src emergency_shuttle.autoshuttlecall() ..() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 9a5a68e1a6f..bdf58f727dc 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -11,9 +11,7 @@ /obj/machinery/computer/New() ..() - if(ticker) - initialize() - + power_change() /obj/machinery/computer/initialize() power_change() @@ -40,11 +38,11 @@ /obj/machinery/computer/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(25)) - del(src) + qdel(src) return if (prob(50)) verbs.Cut() @@ -58,7 +56,8 @@ /obj/machinery/computer/bullet_act(var/obj/item/projectile/Proj) if(prob(Proj.damage)) - set_broken() + if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) + set_broken() ..() @@ -112,7 +111,7 @@ user << "\blue You disconnect the monitor." A.state = 4 A.icon_state = "4" - del(src) + qdel(src) return /obj/machinery/computer/attack_hand(user) @@ -122,23 +121,23 @@ /obj/machinery/computer/attack_paw(mob/user) if(circuit) if(prob(10)) - user.visible_message("[user.name] smashes the [src.name] with /his paws.",\ + user.visible_message("[user.name] smashes the [src.name] with its paws.",\ "You smash the [src.name] with your paws.",\ "You hear a smashing sound.") set_broken() return - user.visible_message("[user.name] smashes against the [src.name] with /his paws.",\ + user.visible_message("[user.name] smashes against the [src.name] with its paws.",\ "You smash against the [src.name] with your paws.",\ "You hear a clicking sound.") /obj/machinery/computer/attack_alien(mob/user) if(circuit) if(prob(80)) - user.visible_message("[user.name] smashes the [src.name] with /his claws.",\ + user.visible_message("[user.name] smashes the [src.name] with its claws.",\ "You smash the [src.name] with your claws.",\ "You hear a smashing sound.") set_broken() return - user.visible_message("[user.name] smashes against the [src.name] with /his claws.",\ - "You smash against the [src.name] with your claws.",\ - "You hear a clicking sound.") \ No newline at end of file + user.visible_message("[user.name] smashes against the [src.name] with its claws.",\ + "You smash against the [src.name] with your claws.",\ + "You hear a clicking sound.") diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index e5d68af8258..52a768fbb4c 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -117,7 +117,7 @@ var/mob/living/silicon/robot/R = locate(href_list["magbot"]) if(istype(R) && !R.emagged && R.connected_ai == usr && !R.scrambledcodes && can_control(usr, R)) log_game("[key_name(usr)] emagged [R.name] using robotic console!") - R.emagged = 1 + R.SetEmagged(1) if(R.mind.special_role) R.verbs += /mob/living/silicon/robot/proc/ResetSecurityCodes diff --git a/code/game/machinery/computer/syndicate_shuttle.dm b/code/game/machinery/computer/syndicate_shuttle.dm index fb6aa607ab9..2d264251da9 100644 --- a/code/game/machinery/computer/syndicate_shuttle.dm +++ b/code/game/machinery/computer/syndicate_shuttle.dm @@ -28,6 +28,8 @@ var/area/transit_location = locate(/area/syndicate_station/transit) curr_location.move_contents_to(transit_location) curr_location = transit_location + curr_location.has_gravity = 0 + transit_location.has_gravity = 1 sleep(SYNDICATE_SHUTTLE_MOVE_TIME) curr_location.move_contents_to(dest_location) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 17b64808df7..c06bb4e015e 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -53,15 +53,15 @@ return switch(state) if(1) - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = P + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = P if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "You start to add cables to the frame." if(do_after(user, 20)) if(C) C.amount -= 5 - if(!C.amount) del(C) + if(!C.amount) qdel(C) user << "You add cables to the frame." state = 2 icon_state = "box_1" @@ -69,7 +69,7 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "You dismantle the frame." new /obj/item/stack/sheet/metal(src.loc, 5) - del(src) + qdel(src) if(2) if(istype(P, /obj/item/weapon/circuitboard)) var/obj/item/weapon/circuitboard/B = P @@ -92,7 +92,7 @@ user << "You remove the cables." state = 1 icon_state = "box_0" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) A.amount = 5 if(3) @@ -122,23 +122,23 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) var/obj/machinery/new_machine = new src.circuit.build_path(src.loc) for(var/obj/O in new_machine.component_parts) - del(O) + qdel(O) new_machine.component_parts = list() for(var/obj/O in src) O.loc = null new_machine.component_parts += O circuit.loc = null new_machine.RefreshParts() - del(src) + qdel(src) - if(istype(P, /obj/item/weapon)) + if(istype(P, /obj/item)) var/success for(var/I in req_components) if(istype(P, text2path(I)) && (req_components[I] > 0)) success=1 - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/CP = P - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src, 1, CP.item_color) + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/CP = P + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src, 1, CP.item_color) if(CP.use(1)) components += CC req_components[I]-- @@ -149,9 +149,10 @@ components += P req_components[I]-- update_req_desc() - break + return 1 if(!success) user << "You cannot add that to the machine!" + return 0 //Machine Frame Circuit Boards @@ -160,6 +161,187 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells. Note: Once everything is added to the public areas, will add m_amt and g_amt to circuit boards since autolathe won't be able to destroy them and players will be able to make replacements. */ + +/obj/item/weapon/circuitboard/vendor + name = "circuit board (Booze-O-Mat Vendor)" + build_path = /obj/machinery/vending/boozeomat + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + "/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/snack = "Getmore Chocolate Corp", + /obj/machinery/vending/cola = "Robust Softdrinks", + /obj/machinery/vending/cigarette = "Cigarette", + /obj/machinery/vending/autodrobe = "AutoDrobe") + +/obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/weapon/screwdriver)) + set_type(pick(names_paths), user) + + +/obj/item/weapon/circuitboard/vendor/proc/set_type(typepath, mob/user) + 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 + +/obj/item/weapon/circuitboard/smes + name = "circuit board (SMES)" + build_path = /obj/machinery/power/smes + 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/weapon/circuitboard/power_compressor + name = "circuit board (Power Compressor)" + build_path = /obj/machinery/power/compressor + 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/weapon/circuitboard/power_turbine + name = "circuit board (Power Turbine)" + build_path = /obj/machinery/power/turbine + 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/weapon/circuitboard/mech_recharger + name = "circuit board (Mechbay Recharger)" + build_path = /obj/machinery/mech_bay_recharge_port + 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/weapon/circuitboard/teleporter_hub + name = "circuit board (Teleporter Hub)" + build_path = /obj/machinery/teleport/hub + 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/weapon/circuitboard/teleporter_station + name = "circuit board (Teleporter Station)" + build_path = /obj/machinery/teleport/station + 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/weapon/circuitboard/telesci_pad + name = "circuit board (Telepad)" + build_path = /obj/machinery/telepad + 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/weapon/circuitboard/sleeper + name = "circuit board (Sleeper)" + build_path = /obj/machinery/sleeper + 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/circuitboard/cryo_tube + name = "circuit board (Cryotube)" + build_path = /obj/machinery/atmospherics/unary/cryo_cell + 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/circuitboard/thermomachine + name = "circuit board (Cooler)" + desc = "Use screwdriver to switch between heating and cooling modes." + build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer + 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/circuitboard/thermomachine/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/weapon/screwdriver)) + if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer) + build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater + name = "circuit board (Heater)" + user << "You set the board to heating." + else + build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer + name = "circuit board (Cooler)" + user << "You set the board to cooling." + +/obj/item/weapon/circuitboard/biogenerator + name = "circuit board (Biogenerator)" + build_path = /obj/machinery/biogenerator + 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/circuitboard/hydroponics + name = "circuit board (Hydroponics Tray)" + build_path = /obj/machinery/hydroponics/constructable + 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/circuitboard/microwave + name = "circuit board (Microwave)" + build_path = /obj/machinery/microwave + 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/circuitboard/chem_dispenser + name = "circuit board (Portable Chem Dispenser)" + build_path = /obj/machinery/chem_dispenser/constructable + 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/circuitboard/destructive_analyzer name = "circuit board (Destructive Analyzer)" build_path = /obj/machinery/r_n_d/destructive_analyzer @@ -205,11 +387,11 @@ to destroy them and players will be able to make replacements. name = "circuit board (PACMAN-type Generator)" build_path = /obj/machinery/power/port_gen/pacman board_type = "machine" - origin_tech = "programming=3:powerstorage=3;plasmatech=3;engineering=3" + 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/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/capacitor" = 1) /obj/item/weapon/circuitboard/pacman/super @@ -228,7 +410,7 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3" req_components = list( - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/scanning_module" = 1) /obj/item/weapon/circuitboard/mechfab @@ -248,7 +430,7 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "programming=3;biotech=3" req_components = list( - "/obj/item/weapon/cable_coil" = 2, + "/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) @@ -263,7 +445,7 @@ obj/item/weapon/circuitboard/rdserver "/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/cable_coil" = 2,) + "/obj/item/stack/cable_coil" = 2,) /obj/item/weapon/circuitboard/cyborgrecharger name = "circuit board (Cyborg Recharger)" @@ -272,7 +454,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "powerstorage=3;engineering=3" req_components = list( "/obj/item/weapon/stock_parts/capacitor" = 2, - "/obj/item/weapon/cell" = 1, + "/obj/item/weapon/stock_parts/cell" = 1, "/obj/item/weapon/stock_parts/manipulator" = 1,) // Telecomms circuit boards: @@ -295,7 +477,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/filter" = 2) /obj/item/weapon/circuitboard/telecomms/relay @@ -305,7 +487,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2;bluespace=2" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/filter" = 2) /obj/item/weapon/circuitboard/telecomms/bus @@ -315,7 +497,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/obj/item/stack/cable_coil" = 1, "/obj/item/weapon/stock_parts/subspace/filter" = 1) /obj/item/weapon/circuitboard/telecomms/processor @@ -328,7 +510,7 @@ obj/item/weapon/circuitboard/rdserver "/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/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/amplifier" = 1) /obj/item/weapon/circuitboard/telecomms/server @@ -338,7 +520,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/obj/item/stack/cable_coil" = 1, "/obj/item/weapon/stock_parts/subspace/filter" = 1) /obj/item/weapon/circuitboard/telecomms/broadcaster @@ -348,7 +530,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=2;engineering=2;bluespace=1" req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/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) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index c3ab2b9b429..12114bbc399 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -4,33 +4,44 @@ icon_state = "cell-off" density = 1 anchored = 1.0 - layer = 5 + layer = 4 var/on = 0 var/temperature_archived - var/mob/living/carbon/occupant = null var/obj/item/weapon/reagent_containers/beaker = null var/next_trans = 0 var/current_heat_capacity = 50 + state_open = 0 + var/efficiency /obj/machinery/atmospherics/unary/cryo_cell/New() ..() initialize_directions = dir + initialize() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/cryo_tube(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + RefreshParts() -/obj/machinery/atmospherics/unary/cryo_cell/Del() - eject_contents() +/obj/machinery/atmospherics/unary/cryo_cell/RefreshParts() + var/C + for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + C += M.rating + current_heat_capacity = 50 * C + efficiency = C + +/obj/machinery/atmospherics/unary/cryo_cell/Destroy() + var/turf/T = loc + T.contents += contents var/obj/item/weapon/reagent_containers/glass/B = beaker if(beaker) B.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube - ..() - -/obj/machinery/atmospherics/unary/cryo_cell/initialize() - if(node) return - var/node_connect = dir - for(var/obj/machinery/atmospherics/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break + ..() /obj/machinery/atmospherics/unary/cryo_cell/process() ..() @@ -55,20 +66,28 @@ updateDialog() return 1 +/obj/machinery/atmospherics/unary/cryo_cell/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !iscarbon(target)) + return + close_machine(target) /obj/machinery/atmospherics/unary/cryo_cell/allow_drop() return 0 +/obj/machinery/atmospherics/unary/cryo_cell/relaymove(var/mob/user) + ..() + open_machine() /obj/machinery/atmospherics/unary/cryo_cell/container_resist() - if(usr.stat) + if(stat & DEAD) return - go_out() + sleep(usr.stat * 1200) + open_machine() return /obj/machinery/atmospherics/unary/cryo_cell/examine() ..() - + if(in_range(usr, src)) usr << "You can just about make out some loose objects floating in the murk:" for(var/obj/O in src) @@ -94,8 +113,8 @@ * * @return nothing */ -/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) - if(user == occupant || user.stat) +/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main") + if(user == occupant || user.stat || panel_open) return // this is the data which will be sent to the ui @@ -128,6 +147,7 @@ occupantData["bodyTemperature"] = occupant.bodytemperature data["occupant"] = occupantData; + data["isOpen"] = state_open data["cellTemperature"] = round(air_contents.temperature) data["cellTemperatureStatus"] = "good" if(air_contents.temperature > T0C) // if greater than 273.15 kelvin (0 celcius) @@ -141,48 +161,51 @@ for(var/datum/reagent/R in beaker:reagents.reagent_list) beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list... data["beakerContents"] = beakerContents - - // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + + var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, ui_key) if (!ui) - // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm + // the ui does not exist, so we'll create a new one ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 410) - // when the ui is first opened this is the data it will use - ui.set_initial_data(data) - // open the new ui window + // When the UI is first opened this is the data it will use + ui.set_initial_data(data) ui.open() - // auto update every Master Controller tick + // Auto update every Master Controller tick ui.set_auto_update(1) - + else + // The UI is already open so push the new data to it + ui.push_data(data) + return //user.set_machine(src) /obj/machinery/atmospherics/unary/cryo_cell/Topic(href, href_list) - if(usr == occupant) + if(usr == occupant || panel_open) return 0 // don't update UIs attached to this object if(..()) return 0 // don't update UIs attached to this object if(href_list["switchOn"]) - on = 1 - update_icon() - + if(!state_open) + on = 1 + + if(href_list["open"]) + on = 0 + open_machine() + + if(href_list["close"]) + if(close_machine() == usr) + var/datum/nanoui/ui = nanomanager.get_open_ui(usr, src, "main") + ui.close() + on = 1 if(href_list["switchOff"]) on = 0 - update_icon() if(href_list["ejectBeaker"]) if(beaker) var/obj/item/weapon/reagent_containers/glass/B = beaker B.loc = get_step(loc, SOUTH) beaker = null - - if(href_list["ejectOccupant"]) - if(!occupant || isslime(usr) || ispAI(usr)) - return 0 // don't update UIs attached to this object - go_out() - + update_icon() add_fingerprint(usr) return 1 // update UIs attached to this object @@ -197,42 +220,62 @@ I.loc = src user.visible_message("[user] places [I] in [src].", \ "You place [I] in [src].") - else if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I - if(!ismob(G.affecting)) - return - for(var/mob/living/carbon/slime/M in range(1, G.affecting)) - if(M.Victim == G.affecting) - user << "[G.affecting] will not fit into [src] because they have [M] latched onto their head." - return - var/mob/M = G.affecting - if(put_mob(M)) - del(G) - nanomanager.update_uis(src) + if(!(on || occupant || state_open)) + if(default_deconstruction_screwdriver(user, "cell-o", "cell-off", I)) + return + + if(default_change_direction_wrench(user, I)) + return + + if(exchange_parts(user, I)) + return + + default_deconstruction_crowbar(I) + +/obj/machinery/atmospherics/unary/cryo_cell/open_machine() + if(!state_open && !panel_open) + layer = 3 + if(occupant) + occupant.bodytemperature = Clamp(occupant.bodytemperature, 261, 360) + ..() + if(beaker) + beaker.loc = src + +/obj/machinery/atmospherics/unary/cryo_cell/close_machine(mob/living/carbon/M) + if(state_open && !panel_open) + layer = 4 + ..(M) + return occupant /obj/machinery/atmospherics/unary/cryo_cell/update_icon() + if(panel_open) + icon_state = "cell-o" + return + if(state_open) + icon_state = "cell-open" + return if(on) if(occupant) icon_state = "cell-occupied" - return - icon_state = "cell-on" - return - icon_state = "cell-off" + else + icon_state = "cell-on" + else + icon_state = "cell-off" /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() if(air_contents.total_moles() < 10) return if(occupant) - if(occupant.stat == 2) + if(occupant.stat == 2 || occupant.health >= 100) //Why waste energy on dead or healthy people + occupant.bodytemperature = T0C return occupant.bodytemperature += 2*(air_contents.temperature - occupant.bodytemperature) * current_heat_capacity / (current_heat_capacity + air_contents.heat_capacity()) occupant.bodytemperature = max(occupant.bodytemperature, air_contents.temperature) // this is so ugly i'm sorry for doing it i'll fix it later i promise - occupant.stat = 1 if(occupant.bodytemperature < T0C) - occupant.sleeping = max(5, (1 / occupant.bodytemperature)*2000) - occupant.Paralyse(max(5, (1 / occupant.bodytemperature)*3000)) + occupant.sleeping = max(5/efficiency, (1 / occupant.bodytemperature)*2000/efficiency) + occupant.Paralyse(max(5/efficiency, (1 / occupant.bodytemperature)*3000/efficiency)) if(air_contents.oxygen > 2) if(occupant.getOxyLoss()) occupant.adjustOxyLoss(-1) else @@ -240,9 +283,9 @@ //severe damage should heal waaay slower without proper chemicals if(occupant.bodytemperature < 225) if(occupant.getToxLoss()) - occupant.adjustToxLoss(max(-1, -20 / occupant.getToxLoss())) - var/heal_brute = occupant.getBruteLoss() ? min(1, 20 / occupant.getBruteLoss()) : 0 - var/heal_fire = occupant.getFireLoss() ? min(1, 20 / occupant.getFireLoss()) : 0 + occupant.adjustToxLoss(max(-efficiency, (-20*(efficiency ** 2)) / occupant.getToxLoss())) + var/heal_brute = occupant.getBruteLoss() ? min(efficiency, 20*(efficiency**2) / occupant.getBruteLoss()) : 0 + var/heal_fire = occupant.getFireLoss() ? min(efficiency, 20*(efficiency**2) / occupant.getFireLoss()) : 0 occupant.heal_organ_damage(heal_brute,heal_fire) if(beaker && next_trans == 0) beaker.reagents.trans_to(occupant, 1, 10) @@ -271,87 +314,3 @@ expel_gas.temperature = T20C //Lets expel hot gas and see if that helps people not die as they are removed loc.assume_air(expel_gas) air_update_turf() - - -/obj/machinery/atmospherics/unary/cryo_cell/proc/go_out() - if(!occupant) - return - if(occupant.client) - occupant.client.eye = occupant.client.mob - occupant.client.perspective = MOB_PERSPECTIVE - if(occupant.loc == src) - occupant.loc = get_step(loc, SOUTH) //this doesn't account for walls or anything, but i don't forsee that being a problem. - if(occupant.bodytemperature < 261 && occupant.bodytemperature > 140) //Patch by Aranclanos to stop people from taking burn damage after being ejected - occupant.bodytemperature = 261 - - occupant = null - update_icon() - - -/obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M) - if(!istype(M)) - usr << "[src] cannot handle this liveform." - return - if(occupant) - usr << "[src] is already occupied." - return - if(!node) - usr << "The cell is not correctly connected to its pipe network!" - return - - if(M.client) - M.client.perspective = EYE_PERSPECTIVE - M.client.eye = src - M.stop_pulling() - M.loc = src - - if(M.health > -100 && (M.health < 0 || M.sleeping)) - M << "\blue You feel a cold liquid surround you. Your skin starts to freeze up." - occupant = M - add_fingerprint(usr) - update_icon() - M.ExtinguishMob() - return 1 - - -/obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject() - set name = "Eject contents" - set category = "Object" - set src in oview(1) - if(usr == occupant || contents.Find(usr)) //If the user is inside the tube... - if(usr.stat == DEAD) //and he's not dead.... - return - usr << "Release sequence activated. This will take about two minutes." - sleep(1200) - if(!src || !usr || (!occupant && !contents.Find(usr))) //Check if someone's released/replaced/bombed him already - return - go_out() //and release him from the eternal prison. - eject_contents() - else - if(usr.stat || isslime(usr) || ispAI(usr)) - return - go_out() - eject_contents() - add_fingerprint(usr) - - -/obj/machinery/atmospherics/unary/cryo_cell/verb/move_inside() - set name = "Enter cryo" - set category = "Object" - set src in oview(1) - - for(var/mob/living/carbon/slime/M in range(1,usr)) - if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you!" - return - if(usr.stat || stat & (NOPOWER|BROKEN)) - return - put_mob(usr) - -/obj/machinery/atmospherics/unary/cryo_cell/proc/eject_contents() - for(var/obj/O in src) - if(O != beaker) - O.loc = get_step(loc, SOUTH) - for(var/mob/M in contents) - M.loc = get_step(loc, SOUTH) - update_icon() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 6d812b5cc66..d8955ceceaa 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -87,14 +87,14 @@ for reference: new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) - del(src) + qdel(src) ..() ex_act(severity) switch(severity) if(1.0) visible_message("\red The barricade is blown apart!") - del(src) + qdel(src) return if(2.0) src.health -= 25 @@ -103,7 +103,7 @@ for reference: new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) - del(src) + qdel(src) return meteorhit() @@ -111,14 +111,14 @@ for reference: new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) new /obj/item/stack/sheet/wood(get_turf(src)) - del(src) + qdel(src) return blob_act() src.health -= 25 if (src.health <= 0) visible_message("\red The blob eats through the barricade!") - del(src) + qdel(src) return CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff. @@ -267,4 +267,4 @@ for reference: explosion(src.loc,-1,-1,0) if(src) - del(src) \ No newline at end of file + qdel(src) \ No newline at end of file diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 65565f86b73..dafe8600e96 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -237,7 +237,7 @@ /obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature) atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 500) new/obj/structure/door_assembly/door_assembly_0( src.loc ) - del (src) + qdel(src) /obj/machinery/door/airlock/plasma/BlockSuperconductivity() //we don't stop the heat~ return 0 @@ -300,8 +300,8 @@ About the new airlock wires panel: return else if(user.hallucination > 50 && prob(10) && src.operating == 0) user << "\red You feel a powerful shock course through your body!" - user.halloss += 10 - user.stunned += 10 + user.staminaloss += 50 + user.stunned += 5 return ..(user) @@ -403,12 +403,14 @@ About the new airlock wires panel: icon_state = "door_locked" else icon_state = "door_closed" - if(p_open || welded) + if(p_open || welded || emergency) overlays = list() if(p_open) overlays += image(icon, "panel_open") if(welded) overlays += image(icon, "welded") + if(emergency && !locked) + overlays += image(icon, "elights") else icon_state = "door_open" @@ -472,6 +474,11 @@ About the new airlock wires panel: else t1 += text("IdScan enabled. Disable?
\n", src) + if(src.emergency) + t1 += text("Emergency Access Override is enabled. Disable?
\n", src) + else + t1 += text("Emergency Access Override is disabled. Enable?
\n", src) + if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER1)) t1 += text("Main Power Input wire is cut.
\n") if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER2)) @@ -542,8 +549,8 @@ About the new airlock wires panel: user << browse(t1, "window=airlock") onclose(user, "airlock") -//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door -//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door +//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 11 lift access override +//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 11 enable access override /obj/machinery/door/airlock/proc/hack(mob/user as mob) @@ -611,7 +618,7 @@ About the new airlock wires panel: if(!istype(H.head, /obj/item/clothing/head/helmet)) visible_message("\red [user] headbutts the airlock.") var/obj/item/organ/limb/affecting = H.get_organ("head") - H.Stun(8) + H.Stun(5) H.Weaken(5) if(affecting.take_damage(10, 0)) H.update_damage_overlays(0) @@ -647,8 +654,8 @@ About the new airlock wires panel: if(istype(usr, /mob/living/silicon) && src.canAIControl()) //AI - //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed - //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed + //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed, 11 emergency access + //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed, 11 emergency access if(href_list["aiDisable"]) var/code = text2num(href_list["aiDisable"]) switch (code) @@ -728,6 +735,12 @@ About the new airlock wires panel: else usr << text("Door bolt lights are already disabled!") + if(11) + // Emergency access + if (src.emergency) + emergency = 0 + else + usr << text("Emergency access is already disabled!") else if(href_list["aiEnable"]) @@ -827,6 +840,13 @@ About the new airlock wires panel: else usr << text("Door bolt lights are already enabled!") + if(11) + // Emergency access + if (!src.emergency) + emergency = 1 + else + usr << text("Emergency access is already enabled!") + add_fingerprint(usr) update_icon() if(!nowindow) @@ -856,6 +876,7 @@ About the new airlock wires panel: return else if(istype(C, /obj/item/weapon/screwdriver)) src.p_open = !( src.p_open ) + user << "You [p_open ? "open":"close"] the maintenance panel of the airlock." src.update_icon() else if(istype(C, /obj/item/weapon/wirecutters)) return src.attack_hand(user) @@ -863,7 +884,7 @@ About the new airlock wires panel: return src.attack_hand(user) else if(istype(C, /obj/item/device/assembly/signaler)) return src.attack_hand(user) - else if(istype(C, /obj/item/weapon/pai_cable)) // -- TLE + else if(istype(C, /obj/item/weapon/pai_cable)) var/obj/item/weapon/pai_cable/cable = C cable.plugin(src, user) else if(istype(C, /obj/item/weapon/crowbar) || istype(C, /obj/item/weapon/twohanded/fireaxe) ) @@ -922,7 +943,7 @@ About the new airlock wires panel: electronics = null ae.loc = src.loc - del(src) + qdel(src) return else if(arePowerSystemsOn() && !(stat & NOPOWER)) user << "\blue The airlock's motors resist your efforts to force it." diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index e4d26278b14..b50e9dc769a 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -15,6 +15,7 @@ var/glass = 0 var/normalspeed = 1 var/heat_proof = 0 // For glass airlocks/opacity firedoors + var/emergency = 0 // Emergency access override /obj/machinery/door/New() ..() @@ -29,7 +30,7 @@ return -/obj/machinery/door/Del() +/obj/machinery/door/Destroy() density = 0 air_update_turf(1) update_freelook_sight() @@ -51,7 +52,7 @@ if(istype(AM, /obj/machinery/bot)) var/obj/machinery/bot/bot = AM - if(src.check_access(bot.botcard)) + if(src.check_access(bot.botcard) || emergency == 1) if(density) open() return @@ -59,7 +60,7 @@ if(istype(AM, /obj/mecha)) var/obj/mecha/mecha = AM if(density) - if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access))) + if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access) || emergency == 1)) open() else flick("door_deny", src) @@ -87,7 +88,7 @@ user = null if(density) - if(allowed(user)) open() + if(allowed(user) || src.emergency == 1) open() else flick("door_deny", src) return @@ -128,7 +129,7 @@ open() operating = -1 return 1 - if(src.allowed(user)) + if(src.allowed(user) || src.emergency == 1) if(src.density) open() else @@ -141,7 +142,7 @@ /obj/machinery/door/blob_act() if(prob(40)) - del(src) + qdel(src) return @@ -159,10 +160,10 @@ /obj/machinery/door/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if(prob(25)) - del(src) + qdel(src) if(3.0) if(prob(80)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index c3a724ad244..3695c80ef45 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -312,9 +312,9 @@ f1.sd_SetOpacity(opacity) f2.sd_SetOpacity(opacity) - Del() - del f1 - del f2 + Destroy() + qdel(f1) + qdel(f2) ..() /obj/machinery/door/poddoor/two_tile_ver @@ -331,9 +331,9 @@ f1.sd_SetOpacity(opacity) f2.sd_SetOpacity(opacity) - Del() - del f1 - del f2 + Destroy() + qdel(f1) + qdel(f2) ..() /obj/machinery/door/poddoor/four_tile_hor @@ -358,11 +358,11 @@ f4.sd_SetOpacity(opacity) f3.sd_SetOpacity(opacity) - Del() - del f1 - del f2 - del f3 - del f4 + Destroy() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) ..() /obj/machinery/door/poddoor/four_tile_ver @@ -387,11 +387,11 @@ f4.sd_SetOpacity(opacity) f3.sd_SetOpacity(opacity) - Del() - del f1 - del f2 - del f3 - del f4 + Destroy() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) ..() /obj/machinery/door/poddoor/filler_object diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 3c095b71aba..8a9b225e5a8 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -20,7 +20,7 @@ src.base_state = src.icon_state return -/obj/machinery/door/window/Del() +/obj/machinery/door/window/Destroy() density = 0 playsound(src, "shatter", 70, 1) ..() @@ -122,22 +122,23 @@ src.health = max(0, src.health - damage) if (src.health <= 0) new /obj/item/weapon/shard(src.loc) - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) return /obj/machinery/door/window/bullet_act(var/obj/item/projectile/Proj) if(Proj.damage) - take_damage(round(Proj.damage / 2)) + if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) + take_damage(round(Proj.damage / 2)) ..() //When an object is thrown at the window /obj/machinery/door/window/hitby(AM as mob|obj) ..() - visible_message("\red The glass door was hit by [AM].") + visible_message("\The [src] was hit by \the [AM].") var/tforce = 0 if(ismob(AM)) tforce = 40 @@ -153,7 +154,7 @@ return src.attack_hand(user) /obj/machinery/door/window/attack_paw(mob/user as mob) - if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/adult)) + if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/)) if(src.operating) return src.health = max(0, src.health - 25) @@ -161,10 +162,10 @@ visible_message("\red [user] smashes against the [src.name].") if (src.health <= 0) new /obj/item/weapon/shard(src.loc) - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) else return src.attack_hand(user) @@ -199,13 +200,13 @@ if(I.damtype == BRUTE || I.damtype == BURN) src.health = max(0, src.health - aforce) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("\red [src] was hit by [I].") + visible_message("\The [src] has been hit by [user] with [I].") if (src.health <= 0) new /obj/item/weapon/shard(src.loc) - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) return diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 202de927d85..6a1518e311b 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -13,7 +13,7 @@ var/list/doppler_arrays = list() ..() doppler_arrays += src -/obj/machinery/doppler_array/Del() +/obj/machinery/doppler_array/Destroy() doppler_arrays -= src ..() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 180da00b5a5..72e0126433d 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -9,7 +9,7 @@ var/id = null var/range = 2 //this is roughly the size of brig cell var/last_flash = 0 //Don't want it getting spammed like regular flashes - var/strength = 10 //How weakened targets are when flashed. + var/strength = 5 //How weakened targets are when flashed. var/base_state = "mflash" anchored = 1 @@ -17,7 +17,7 @@ name = "portable flasher" desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements." icon_state = "pflash1-p" - strength = 8 + strength = 4 anchored = 0 base_state = "pflash" density = 1 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 5442248986a..c1b0248ac3c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -105,7 +105,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/holopad/proc/clear_holo() // hologram.SetLuminosity(0)//Clear lighting. //handled by the lighting controller when its ower is deleted - del(hologram)//Get rid of hologram. + qdel(hologram)//Get rid of hologram. + hologram = null if(master.current == src) master.current = null master = null//Null the master, since no-one is using it now. @@ -160,26 +161,26 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if (prob(50)) - del(src) + qdel(src) if(3.0) if (prob(5)) - del(src) + qdel(src) return /obj/machinery/hologram/blob_act() - del(src) + qdel(src) return /obj/machinery/hologram/meteorhit() - del(src) + qdel(src) return -/obj/machinery/hologram/Del() +/obj/machinery/hologram/holopad/Destroy() if(hologram) - src:clear_holo() + clear_holo() ..() /* diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index da354f5261e..48af8644879 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -9,7 +9,6 @@ var/operating = 0 //Is it on? var/dirty = 0 // Does it need cleaning? var/gibtime = 40 // Time from starting until meat appears - var/mob/living/occupant // Mob who has been put inside use_power = 1 idle_power_usage = 2 active_power_usage = 500 @@ -26,7 +25,7 @@ if(input_obj) if(isturf(input_obj.loc)) input_plate = input_obj.loc - del(input_obj) + qdel(input_obj) break if(!input_plate) @@ -82,6 +81,9 @@ if(src.occupant) user << "\red The gibber is full, empty it first!" return + if(default_unfasten_wrench(user, G)) + return + if (!( istype(G, /obj/item/weapon/grab)) || !(istype(G.affecting, /mob/living/carbon/human))) user << "\red This item is not suitable for the gibber!" return @@ -99,9 +101,10 @@ M.client.eye = src M.loc = src src.occupant = M - del(G) + qdel(G) update_icon() + /obj/machinery/gibber/verb/eject() set category = "Object" set name = "empty gibber" @@ -156,7 +159,7 @@ add_logs(user, occupant, "gibbed") src.occupant.death(1) src.occupant.ghostize() - del(src.occupant) + qdel(src.occupant) spawn(src.gibtime) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) operating = 0 diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index 3554877b6d7..f93bfc68340 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -4,11 +4,12 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" layer = 2.9 - density = 0 + density = 1 anchored = 0 use_power = 1 idle_power_usage = 5 active_power_usage = 100 + pass_flags = PASSTABLE var/obj/item/weapon/reagent_containers/beaker = null var/global/list/allowed_items = list ( /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = "tomatojuice", @@ -32,12 +33,16 @@ /obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(default_unfasten_wrench(user, O)) + return if (istype(O,/obj/item/weapon/reagent_containers/glass) || \ istype(O,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) if (beaker) return 1 else - user.before_take_item(O) + if(!user.unEquip(O)) + user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + return 0 O.loc = src beaker = O src.verbs += /obj/machinery/juicer/verb/detach @@ -47,7 +52,9 @@ if (!is_type_in_list(O, allowed_items)) user << "It looks as not containing any juice." return 1 - user.before_take_item(O) + if(!user.unEquip(O)) + user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + return 0 O.loc = src src.updateUsrDialog() return 0 @@ -151,7 +158,7 @@ for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents) var/r_id = get_juice_id(O) beaker.reagents.add_reagent(r_id,get_juice_amount(O)) - del(O) + qdel(O) if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) break diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 9809be206f9..540bfeeec26 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -1,4 +1,3 @@ - /obj/machinery/microwave name = "microwave" icon = 'icons/obj/kitchen.dmi' @@ -17,6 +16,7 @@ var/global/list/acceptable_items // List of the items you can put in var/global/list/acceptable_reagents // List of the reagents you can put in var/global/max_n_of_items = 0 + var/efficiency = 0 // see code/modules/food/recipes_microwave.dm for recipes @@ -41,13 +41,37 @@ if(recipe.items) max_n_of_items = max(max_n_of_items, recipe.items.len) + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/microwave(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) + RefreshParts() + +/obj/machinery/microwave/RefreshParts() + var/E + for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) + E += M.rating + efficiency = E + /******************* * Item Adding ********************/ /obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(!broken && !dirty && !operating) + if(default_deconstruction_screwdriver(user, "mw-o", "mw", O)) + return + if(default_unfasten_wrench(user, O)) + return + + if(exchange_parts(user, O)) + return + + default_deconstruction_crowbar(O) + if(src.broken > 0) - if(src.broken == 2 && istype(O, /obj/item/weapon/screwdriver)) // If it's broken and they're using a screwdriver + if(src.broken == 2 && istype(O, /obj/item/weapon/wirecutters)) // If it's broken and they're using a screwdriver user.visible_message( \ "\blue [user] starts to fix part of the microwave.", \ "\blue You start to fix part of the microwave." \ @@ -58,7 +82,7 @@ "\blue You have fixed part of the microwave." \ ) src.broken = 1 // Fix it a bit - else if(src.broken == 1 && istype(O, /obj/item/weapon/wrench)) // If it's broken and they're doing the wrench + else if(src.broken == 1 && istype(O, /obj/item/weapon/weldingtool)) // If it's broken and they're doing the wrench user.visible_message( \ "\blue [user] starts to fix part of the microwave.", \ "\blue You start to fix part of the microwave." \ @@ -72,6 +96,7 @@ src.broken = 0 // Fix it! src.dirty = 0 // just to be sure src.flags = OPENCONTAINER + return 0 //to use some fuel else user << "\red It's broken!" return 1 @@ -122,8 +147,10 @@ "\blue [user] has added one of [O] to \the [src].", \ "\blue You add one of [O] to \the [src].") else - // user.before_take_item(O) //This just causes problems so far as I can tell. -Pete - user.drop_item() + // user.unEquip(O) //This just causes problems so far as I can tell. -Pete + if(!user.drop_item()) + user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + return 0 O.loc = src user.visible_message( \ "\blue [user] has added \the [O] to \the [src].", \ @@ -163,13 +190,15 @@ ********************/ /obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu - var/dat = "" + if(panel_open) + return + var/dat = "
"
if(src.broken > 0)
- dat = {"Bzzzzttttt"}
+ dat += "ERROR: 09734014-A2379-D18746 --Bad memory
Contact your operator or use command line to rebase memory ///git checkout {HEAD} -a commit pull --rebase push {*NEW HEAD*}
" //Thats how all the git fiddling looks to me
else if(src.operating)
- dat = {"Microwaving in progress!Contact your operator or use command line to rebase memory ///git checkout {HEAD} -a commit pull --rebase push {*NEW HEAD*}
Please wait...!"} + dat += "Microwaving in progress!
Please wait...!
Please clean it before use!"} + dat += "ERROR: >> 0 --Responce input zero
Contact your operator of the device manifactor support." else var/list/items_counts = new var/list/items_measures = new @@ -196,12 +225,12 @@ for (var/O in items_counts) var/N = items_counts[O] if (!(O in items_measures)) - dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} + dat += "[capitalize(O)]: [N] [lowertext(O)]\s
" else if (N==1) - dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} + dat += "[capitalize(O)]: [N] [items_measures[O]]
" else - dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} + dat += "[capitalize(O)]: [N] [items_measures_p[O]]
" for (var/datum/reagent/R in reagents.reagent_list) var/display_name = R.name @@ -209,23 +238,20 @@ display_name = "hot sauce" if (R.id == "frostoil") display_name = "cold sauce" - dat += {"[display_name]: [R.volume] unit\s
"} + dat += "[display_name]: [R.volume] unit\s
" if (items_counts.len==0 && reagents.reagent_list.len==0) - dat = {"The microwave is empty
"} + dat += "The microwave is empty." else - dat = {"Ingredients:
[dat]"} - dat += {"
\ -Turn on!
\ -Eject ingredients!
\ -"} + dat = "
Ingredients:
[dat]" + dat += "Turn on" + dat += "Eject ingredients" - user << browse("" @@ -149,57 +155,19 @@ dat += "(x25)" if(N > 1) dat += "(All)" - /* - if((findtext(O,"seeds") || findtext(O,"mycelium")) && N>1) - var/max_bags = round((N-1)/7)+1 - dat += "(1 Bag)" - if(max_bags > 2) // at least 14 - dat += "(2 Bags)" - if(max_bags > 5) // at least 35 - dat += "(5 Bags)" - if(max_bags > 1) - dat += "(Bag All)" - */ + dat += "
" dat += "" - user << browse("
" + dat += "Toggle Drying " + user << browse("
Interface & News networks Operational." - dat += "
Property of Nanotransen Inc" - if(news_network.wanted_issue) - dat+= "
Read Wanted Issue" - dat+= "
Create Feed Channel" - dat+= "
View Feed Channels" - dat+= "
Submit new Feed story" - dat+= "
Print newspaper" - dat+= "
Re-scan User" - dat+= "
Exit" - if(src.securityCaster) - var/wanted_already = 0 - if(news_network.wanted_issue) - wanted_already = 1 - - dat+="
Feed Security functions:
" - dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" - dat+="
Censor Feed Stories" - dat+="
Mark Feed Channel with Nanotrasen D-Notice" - dat+="
The newscaster recognises you as: [src.scanned_user]" - if(1) - dat+= "Station Feed Channels
" - if( isemptylist(news_network.network_channels) ) - dat+="No active channels found..." - else - for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - if(CHANNEL.is_admin_channel) - dat+="[CHANNEL.channel_name]
" - else - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" - /*for(var/datum/feed_channel/CHANNEL in src.channel_list) - dat+="[CHANNEL.channel_name]:
\[created by: [CHANNEL.author]\]
" - if( isemptylist(CHANNEL.messages) ) - dat+="No feed messages found in channel...
" - else - for(var/datum/feed_message/MESSAGE in CHANNEL.messages) - dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
"*/ - - dat+="
Refresh" - dat+="
Back" - if(2) - dat+="Creating new Feed Channel..." - dat+="
Channel Name: [src.channel_name]
" - dat+="Channel Author: [src.scanned_user]
" - dat+="Will Accept Public Feeds: [(src.c_locked) ? ("NO") : ("YES")]
" - dat+="
Submit
Cancel
" - if(3) - dat+="Creating new Feed Message..." - dat+="
Receiving Channel: [src.channel_name]
" //MARK - dat+="Message Author: [src.scanned_user]
" - dat+="Message Body: [src.msg]
" - dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" - dat+="
Submit
Cancel
" - if(4) - dat+="Feed story successfully submitted to [src.channel_name].
" - dat+="
Return
" - if(5) - dat+="Feed Channel [src.channel_name] created successfully.
" - dat+="
Return
" - if(6) - dat+="ERROR: Could not submit Feed story to Network.
" - if(src.channel_name=="") - dat+="•Invalid receiving channel name.
" - if(src.scanned_user=="Unknown") - dat+="•Channel author unverified.
" - if(src.msg == "" || src.msg == "\[REDACTED\]") - dat+="•Invalid message body.
" - - dat+="
Return
" - if(7) - dat+="ERROR: Could not submit Feed Channel to Network.
" - //var/list/existing_channels = list() //Let's get dem existing channels - OBSOLETE - var/list/existing_authors = list() - for(var/datum/feed_channel/FC in news_network.network_channels) - //existing_channels += FC.channel_name //OBSOLETE - if(FC.author == "\[REDACTED\]") - existing_authors += FC.backup_author - else - existing_authors += FC.author - if(src.scanned_user in existing_authors) - dat+="•There already exists a Feed channel under your name.
" - if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") - dat+="•Invalid channel name.
" - var/check = 0 - for(var/datum/feed_channel/FC in news_network.network_channels) - if(FC.channel_name == src.channel_name) - check = 1 - break - if(check) - dat+="•Channel name already in use.
" - if(src.scanned_user=="Unknown") - dat+="•Channel author unverified.
" - dat+="
Return
" - if(8) - var/total_num=length(news_network.network_channels) - var/active_num=total_num - var/message_num=0 - for(var/datum/feed_channel/FC in news_network.network_channels) - if(!FC.censored) - message_num += length(FC.messages) //Dont forget, datum/feed_channel's var messages is a list of datum/feed_message - else - active_num-- - dat+="Network currently serves a total of [total_num] Feed channels, [active_num] of which are active, and a total of [message_num] Feed Stories." //TODO: CONTINUE - dat+="
Liquid Paper remaining: [(src.paper_remaining) *100 ] cm^3" - dat+="
Print Paper" - dat+="
Cancel" - if(9) - dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]
" - if(src.viewing_channel.censored) - dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" - dat+="No further feed story additions are allowed while the D-Notice is in effect.
" - else - if( isemptylist(src.viewing_channel.messages) ) - dat+="No feed messages found in channel...
" - else - var/i = 0 - for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) - i++ - dat+="-[MESSAGE.body]
" - if(MESSAGE.img) - usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") - dat+="
" - dat+="\[Story by [MESSAGE.author]\]
" - dat+="
Refresh" - dat+="
Back" - if(10) - dat+="Nanotrasen Feed Censorship Tool
" - dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
" - dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it." - dat+="
Select Feed channel to get Stories from:
" - if(isemptylist(news_network.network_channels)) - dat+="No feed channels found active...
" - else - for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" - dat+="
Cancel" - if(11) - dat+="Nanotrasen D-Notice Handler
" - dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" - dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed" - dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
" - if(isemptylist(news_network.network_channels)) - dat+="No feed channels found active...
" - else - for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" - - dat+="
Back" - if(12) - dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" - dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
" - - - if( isemptylist(src.viewing_channel.messages) ) - dat+="No feed messages found in channel...
" - else - 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+="
Back" - if(13) - dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" - dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
" - if(src.viewing_channel.censored) - dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" - dat+="No further feed story additions are allowed while the D-Notice is in effect.
" - else - if( isemptylist(src.viewing_channel.messages) ) - dat+="No feed messages found in channel...
" - else - for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) - dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" - - dat+="
Back" - if(14) - dat+="Wanted Issue Handler:" - var/wanted_already = 0 - var/end_param = 1 - if(news_network.wanted_issue) - wanted_already = 1 - end_param = 2 - - if(wanted_already) - dat+="
A wanted issue is already in Feed Circulation. You can edit or cancel it below." - dat+="
" - dat+="Criminal Name: [src.channel_name]
" - dat+="Description: [src.msg]
" - dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" - if(wanted_already) - dat+="Wanted Issue created by: [news_network.wanted_issue.backup_author]
" - else - dat+="Wanted Issue will be created under prosecutor: [src.scanned_user]
" - dat+="
[(wanted_already) ? ("Edit Issue") : ("Submit")]" - if(wanted_already) - dat+="
Take down Issue" - dat+="
Cancel" - if(15) - dat+="Wanted issue for [src.channel_name] is now in Network Circulation.
" - dat+="
Return
" - if(16) - dat+="ERROR: Wanted Issue rejected by Network.
" - if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") - dat+="•Invalid name for person wanted.
" - if(src.scanned_user=="Unknown") - dat+="•Issue author unverified.
" - if(src.msg == "" || src.msg == "\[REDACTED\]") - dat+="•Invalid description.
" - dat+="
Return
" - if(17) - dat+="Wanted Issue successfully deleted from Circulation
" - dat+="
Return
" - if(18) - if(news_network.wanted_issue) - dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [news_network.wanted_issue.backup_author]\]
" - dat+="Criminal: [news_network.wanted_issue.author]
" - dat+="Description: [news_network.wanted_issue.body]
" - dat+="Photo:: " - if(news_network.wanted_issue.img) - usr << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") - dat+="
"
- else
- dat+="None"
- else
- dat+="No current wanted issue found." - dat+="
Back
" - if(19) - dat+="Wanted issue for [src.channel_name] successfully edited.
" - dat+="
Return
" - if(20) - dat+="Printing successful. Please receive your newspaper from the bottom of the machine.
" - dat+="Return" - if(21) - dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.
" - dat+="Return" - else - dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" - - //human_or_robot_user << browse(dat, "window=newscaster_main;size=400x600") - //onclose(human_or_robot_user, "newscaster_main") - - var/datum/browser/popup = new(human_or_robot_user, "newscaster_main", "Newscaster Unit #[src.unit_no]", 400, 600) - popup.set_content(dat) - popup.set_title_image(human_or_robot_user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - - /*if(src.isbroken) //debugging shit - return - src.hitstaken++ - if(src.hitstaken==3) - src.isbroken = 1 - src.update_icon()*/ - - -/obj/machinery/newscaster/Topic(href, href_list) - if(..()) - return - 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", "")) - while (findtext(src.channel_name," ") == 1) - src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1) - src.updateUsrDialog() - //src.update_icon() - - else if(href_list["set_channel_lock"]) - src.c_locked = !src.c_locked - src.updateUsrDialog() - //src.update_icon() - - else if(href_list["submit_new_channel"]) - //var/list/existing_channels = list() //OBSOLETE - var/list/existing_authors = list() - for(var/datum/feed_channel/FC in news_network.network_channels) - //existing_channels += FC.channel_name - if(FC.author == "\[REDACTED\]") - existing_authors += FC.backup_author - else - existing_authors +=FC.author - var/check = 0 - for(var/datum/feed_channel/FC in news_network.network_channels) - if(FC.channel_name == src.channel_name) - check = 1 - break - if(src.channel_name == "" || src.channel_name == "\[REDACTED\]" || src.scanned_user == "Unknown" || check || (src.scanned_user in existing_authors) ) - src.screen=7 - else - var/choice = alert("Please confirm Feed channel creation","Network Channel Handler","Confirm","Cancel") - if(choice=="Confirm") - var/datum/feed_channel/newChannel = new /datum/feed_channel - newChannel.channel_name = src.channel_name - newChannel.author = src.scanned_user - newChannel.locked = c_locked - feedback_inc("newscaster_channels",1) - /*for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) //Let's add the new channel in all casters. - NEWSCASTER.channel_list += newChannel*/ //Now that it is sane, get it into the list. -OBSOLETE - news_network.network_channels += newChannel //Adding channel to the global network - src.screen=5 - src.updateUsrDialog() - //src.update_icon() - - else if(href_list["set_channel_receiving"]) - //var/list/datum/feed_channel/available_channels = list() - var/list/available_channels = list() - for(var/datum/feed_channel/F in news_network.network_channels) - if( (!F.locked || F.author == scanned_user) && !F.censored) - available_channels += F.channel_name - src.channel_name = strip_html(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels ) - 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.updateUsrDialog() - - else if(href_list["set_attachment"]) - AttachPhoto(usr) - src.updateUsrDialog() - - else if(href_list["submit_new_message"]) - if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) - src.screen=6 - else - var/datum/feed_message/newMsg = new /datum/feed_message - newMsg.author = src.scanned_user - newMsg.body = src.msg - if(photo) - newMsg.img = photo.img - feedback_inc("newscaster_stories",1) - for(var/datum/feed_channel/FC in news_network.network_channels) - if(FC.channel_name == src.channel_name) - FC.messages += newMsg //Adding message to the network's appropriate feed_channel - break - src.screen=4 - for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) - NEWSCASTER.newsAlert(src.channel_name) - - src.updateUsrDialog() - - else if(href_list["create_channel"]) - src.screen=2 - src.updateUsrDialog() - - else if(href_list["create_feed_story"]) - src.screen=3 - src.updateUsrDialog() - - else if(href_list["menu_paper"]) - src.screen=8 - src.updateUsrDialog() - else if(href_list["print_paper"]) - if(!src.paper_remaining) - src.screen=21 - else - src.print_paper() - src.screen = 20 - src.updateUsrDialog() - - else if(href_list["menu_censor_story"]) - src.screen=10 - src.updateUsrDialog() - - else if(href_list["menu_censor_channel"]) - src.screen=11 - src.updateUsrDialog() - - else if(href_list["menu_wanted"]) - var/already_wanted = 0 - if(news_network.wanted_issue) - already_wanted = 1 - - if(already_wanted) - src.channel_name = news_network.wanted_issue.author - src.msg = news_network.wanted_issue.body - src.screen = 14 - 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.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.updateUsrDialog() - - else if(href_list["submit_wanted"]) - var/input_param = text2num(href_list["submit_wanted"]) - if(src.msg == "" || src.channel_name == "" || src.scanned_user == "Unknown") - src.screen = 16 - else - var/choice = alert("Please confirm Wanted Issue [(input_param==1) ? ("creation.") : ("edit.")]","Network Security Handler","Confirm","Cancel") - if(choice=="Confirm") - if(input_param==1) //If input_param == 1 we're submitting a new wanted issue. At 2 we're just editing an existing one. See the else below - var/datum/feed_message/WANTED = new /datum/feed_message - WANTED.author = src.channel_name - WANTED.body = src.msg - WANTED.backup_author = src.scanned_user //I know, a bit wacky - if(photo) - WANTED.img = photo.img - news_network.wanted_issue = WANTED - for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) - NEWSCASTER.newsAlert() - NEWSCASTER.update_icon() - src.screen = 15 - else - if(news_network.wanted_issue.is_admin_message) - alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot edit it.","Ok") - return - news_network.wanted_issue.author = src.channel_name - news_network.wanted_issue.body = src.msg - news_network.wanted_issue.backup_author = src.scanned_user - if(photo) - news_network.wanted_issue.img = photo.img - src.screen = 19 - - src.updateUsrDialog() - - else if(href_list["cancel_wanted"]) - if(news_network.wanted_issue.is_admin_message) - alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot take it down.","Ok") - return - var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel") - if(choice=="Confirm") - news_network.wanted_issue = null - for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) - NEWSCASTER.update_icon() - src.screen=17 - src.updateUsrDialog() - - else if(href_list["view_wanted"]) - src.screen=18 - src.updateUsrDialog() - else if(href_list["censor_channel_author"]) - var/datum/feed_channel/FC = locate(href_list["censor_channel_author"]) - if(FC.is_admin_channel) - alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") - return - if(FC.author != "\[REDACTED\]") - FC.backup_author = FC.author - FC.author = "\[REDACTED\]" - else - FC.author = FC.backup_author - src.updateUsrDialog() - - else if(href_list["censor_channel_story_author"]) - var/datum/feed_message/MSG = locate(href_list["censor_channel_story_author"]) - if(MSG.is_admin_message) - alert("This message was created by a Nanotrasen Officer. You cannot censor its author.","Ok") - return - if(MSG.author != "\[REDACTED\]") - MSG.backup_author = MSG.author - MSG.author = "\[REDACTED\]" - else - MSG.author = MSG.backup_author - src.updateUsrDialog() - - else if(href_list["censor_channel_story_body"]) - var/datum/feed_message/MSG = locate(href_list["censor_channel_story_body"]) - if(MSG.is_admin_message) - alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") - return - if(MSG.body != "\[REDACTED\]") - MSG.backup_body = MSG.body - MSG.body = "\[REDACTED\]" - else - MSG.body = MSG.backup_body - src.updateUsrDialog() - - else if(href_list["pick_d_notice"]) - var/datum/feed_channel/FC = locate(href_list["pick_d_notice"]) - src.viewing_channel = FC - src.screen=13 - src.updateUsrDialog() - - else if(href_list["toggle_d_notice"]) - var/datum/feed_channel/FC = locate(href_list["toggle_d_notice"]) - if(FC.is_admin_channel) - alert("This channel was created by a Nanotrasen Officer. You cannot place a D-Notice upon it.","Ok") - return - FC.censored = !FC.censored - src.updateUsrDialog() - - else if(href_list["view"]) - src.screen=1 - src.updateUsrDialog() - - else if(href_list["setScreen"]) //Brings us to the main menu and resets all fields~ - src.screen = text2num(href_list["setScreen"]) - if (src.screen == 0) - src.scanned_user = "Unknown"; - msg = ""; - src.c_locked=0; - channel_name=""; - src.viewing_channel = null - src.updateUsrDialog() - - else if(href_list["show_channel"]) - var/datum/feed_channel/FC = locate(href_list["show_channel"]) - src.viewing_channel = FC - src.screen = 9 - src.updateUsrDialog() - - else if(href_list["pick_censor_channel"]) - var/datum/feed_channel/FC = locate(href_list["pick_censor_channel"]) - src.viewing_channel = FC - src.screen = 12 - src.updateUsrDialog() - - else if(href_list["refresh"]) - src.updateUsrDialog() - - -/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/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) - if( istype(I, /obj/item/device/pda) ) - var/obj/item/device/pda/P = I - if(P.id) - src.scanned_user = "[P.id.registered_name] ([P.id.assignment])" - src.screen=2 - else - var/obj/item/weapon/card/id/T = I - src.scanned_user = text("[T.registered_name] ([T.assignment])") - src.screen=2*/ //Obsolete after autorecognition - - 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].") - else - if(istype(I, /obj/item/weapon) ) - 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." ) - 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]!" ) - 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]!" ) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) - else - user << "This does nothing." - src.update_icon() - - -/obj/machinery/newscaster/attack_paw(mob/user as mob) - user << "The newscaster controls are far too complicated for your tiny brain!" - return - -/obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) - if(photo) - photo.loc = src.loc - user.put_in_inactive_hand(photo) - photo = null - if(istype(user.get_active_hand(), /obj/item/weapon/photo)) - photo = user.get_active_hand() - user.drop_item() - photo.loc = src - if(istype(usr,/mob/living/silicon/ai)) - var/list/nametemp = list() - var/find - var/datum/picture/selection - var/mob/living/silicon/ai/tempAI = user - if(tempAI.aicamera.aipictures.len == 0) - usr << "No images saved" - return - for(var/datum/picture/t in tempAI.aicamera.aipictures) - nametemp += t.fields["name"] - find = input("Select image (numbered in order taken)") in nametemp - var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() - for(var/datum/picture/q in tempAI.aicamera.aipictures) - if(q.fields["name"] == find) - selection = q - break // just in case some AI decides to take 10 thousand pictures in a round - P.icon = selection.fields["icon"] - P.img = selection.fields["img"] - P.desc = selection.fields["desc"] - photo = P - - - - - -//######################################################################################################################## -//###################################### NEWSPAPER! ###################################################################### -//######################################################################################################################## - -/obj/item/weapon/newspaper - name = "newspaper" - desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." - icon = 'icons/obj/bureaucracy.dmi' - icon_state = "newspaper" - w_class = 2 //Let's make it fit in trashbags! - attack_verb = list("bapped") - var/screen = 0 - var/pages = 0 - var/curr_page = 0 - var/list/datum/feed_channel/news_content = list() - var/datum/feed_message/important_message = null - var/scribble="" - var/scribble_page = null - -/*obj/item/weapon/newspaper/attack_hand(mob/user as mob) - ..() - world << "derp"*/ - -obj/item/weapon/newspaper/attack_self(mob/user as mob) - if(ishuman(user)) - var/mob/living/carbon/human/human_user = user - var/dat - src.pages = 0 - switch(screen) - if(0) //Cover - dat+="
The Griffon
"
- dat+="Nanotrasen-standard newspaper, for use on Nanotrasen© Space Facilities
" - if(isemptylist(src.news_content)) - if(src.important_message) - dat+="Contents:
- **Important Security Announcement** \[page [src.pages+2]\]
- "
- for(var/datum/feed_channel/NP in src.news_content)
- src.pages++
- if(src.important_message)
- dat+="**Important Security Announcement** \[page [src.pages+2]\]
" - var/temp_page=0 - for(var/datum/feed_channel/NP in src.news_content) - temp_page++ - dat+="[NP.channel_name] \[page [temp_page+1]\]
" - dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" - dat+= "
" - if(1) // X channel pages inbetween. - for(var/datum/feed_channel/NP in src.news_content) - src.pages++ //Let's get it right again. - var/datum/feed_channel/C = src.news_content[src.curr_page] - dat+="[C.channel_name] \[created by: [C.author]\]
" - if(C.censored) - dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a D-Notice. Its contents were not transferred to the newspaper at the time of printing." - else - if(isemptylist(C.messages)) - dat+="No Feed stories stem from this channel..." - else - dat+="
- "
- var/i = 0
- for(var/datum/feed_message/MESSAGE in C.messages)
- i++
- dat+="-[MESSAGE.body]
" - if(MESSAGE.img) - user << browse_rsc(MESSAGE.img, "tmp_photo[i].png") - dat+="
" - dat+="\[Story by [MESSAGE.author]\]
" - dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" - dat+= "
" - if(2) //Last page - for(var/datum/feed_channel/NP in src.news_content) - src.pages++ - if(src.important_message!=null) - dat+="
Wanted Issue:
" - dat+="Criminal name: [important_message.author]
" - dat+="Description: [important_message.body]
" - dat+="Photo:: " - if(important_message.img) - user << browse_rsc(important_message.img, "tmp_photow.png") - dat+="
"
- else
- dat+="None"
- else
- dat+="Apart from some uninteresting Classified ads, there's nothing on this page..."
- if(scribble_page==curr_page)
- dat+="There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" - dat+= "
" - else - dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" - - dat+="
[src.curr_page+1]
"
- human_user << browse(dat, "window=newspaper_main;size=300x400")
- onclose(human_user, "newspaper_main")
- else
- user << "The paper is full of intelligible symbols!"
-
-
-obj/item/weapon/newspaper/Topic(href, href_list)
- var/mob/living/U = usr
- ..()
- if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ))
- U.set_machine(src)
- if(href_list["next_page"])
- if(curr_page==src.pages+1)
- return //Don't need that at all, but anyway.
- if(src.curr_page == src.pages) //We're at the middle, get to the end
- src.screen = 2
- else
- if(curr_page == 0) //We're at the start, get to the middle
- src.screen=1
- src.curr_page++
- playsound(src.loc, "pageturn", 50, 1)
-
- else if(href_list["prev_page"])
- if(curr_page == 0)
- return
- if(curr_page == 1)
- src.screen = 0
-
- else
- if(curr_page == src.pages+1) //we're at the end, let's go back to the middle.
- src.screen = 1
- src.curr_page--
- playsound(src.loc, "pageturn", 50, 1)
-
- if (istype(src.loc, /mob))
- src.attack_self(src.loc)
-
-
-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?"
- else
- var/s = strip_html( input(user, "Write something", "Newspaper", "") )
- s = copytext(sanitize(s), 1, MAX_MESSAGE_LEN)
- if (!s)
- return
- if (!in_range(src, usr) && src.loc != usr)
- return
- src.scribble_page = src.curr_page
- src.scribble = s
- src.attack_self(user)
- return
-
-
-////////////////////////////////////helper procs
-
-
-/obj/machinery/newscaster/proc/scan_user(mob/living/user as mob)
- if(istype(user,/mob/living/carbon/human)) //User is a human
- var/mob/living/carbon/human/human_user = user
- if(human_user.wear_id) //Newscaster scans you
- if(istype(human_user.wear_id, /obj/item/device/pda) ) //autorecognition, woo!
- var/obj/item/device/pda/P = human_user.wear_id
- if(P.id)
- src.scanned_user = "[P.id.registered_name] ([P.id.assignment])"
- else
- src.scanned_user = "Unknown"
- else if(istype(human_user.wear_id, /obj/item/weapon/card/id) )
- var/obj/item/weapon/card/id/ID = human_user.wear_id
- src.scanned_user ="[ID.registered_name] ([ID.assignment])"
- else
- src.scanned_user ="Unknown"
- else
- src.scanned_user ="Unknown"
- else
- var/mob/living/silicon/ai_user = user
- src.scanned_user = "[ai_user.name] ([ai_user.job])"
-
-
-/obj/machinery/newscaster/proc/print_paper()
- feedback_inc("newscaster_newspapers_printed",1)
- var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper
- for(var/datum/feed_channel/FC in news_network.network_channels)
- NEWSPAPER.news_content += FC
- if(news_network.wanted_issue)
- NEWSPAPER.important_message = news_network.wanted_issue
- NEWSPAPER.loc = get_turf(src)
- src.paper_remaining--
- return
-
-//Removed for now so these aren't even checked every tick. Left this here in-case Agouri needs it later.
-///obj/machinery/newscaster/process() //Was thinking of doing the icon update through process, but multiple iterations per second does not
-// return //bode well with a newscaster network of 10+ machines. Let's just return it, as it's added in the machines list.
-
-/obj/machinery/newscaster/proc/newsAlert(channel) //This isn't Agouri's work, for it is ugly and vile.
- var/turf/T = get_turf(src) //Who the fuck uses spawn(600) anyway, jesus christ
- if(channel)
- for(var/mob/O in hearers(world.view-1, T))
- O.show_message("[src.name] beeps, \"Breaking news from [channel]!\"",2)
- src.alert = 1
- src.update_icon()
- spawn(300)
- src.alert = 0
- src.update_icon()
- playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)
- else
- for(var/mob/O in hearers(world.view-1, T))
- O.show_message("[src.name] beeps, \"Attention! Wanted issue distributed!\"",2)
- playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 75, 1)
- return
+//##############################################
+//################### NEWSCASTERS BE HERE! ####
+//###-Agouri###################################
+
+/datum/feed_message
+ var/author =""
+ var/body =""
+ //var/parent_channel
+ var/backup_body =""
+ var/backup_author =""
+ var/is_admin_message = 0
+ var/icon/img = null
+
+/datum/feed_channel
+ var/channel_name=""
+ var/list/datum/feed_message/messages = list()
+ //var/message_count = 0
+ var/locked=0
+ var/author=""
+ var/backup_author=""
+ var/censored=0
+ var/is_admin_channel=0
+ //var/page = null //For newspapers
+
+/datum/feed_message/proc/clear()
+ src.author = ""
+ src.body = ""
+ src.backup_body = ""
+ src.backup_author = ""
+ src.img = null
+
+/datum/feed_channel/proc/clear()
+ src.channel_name = ""
+ src.messages = list()
+ src.locked = 0
+ src.author = ""
+ src.backup_author = ""
+ src.censored = 0
+ src.is_admin_channel = 0
+
+/datum/feed_network
+ var/list/datum/feed_channel/network_channels = list()
+ var/datum/feed_message/wanted_issue
+
+var/datum/feed_network/news_network = new /datum/feed_network //The global news-network, which is coincidentally a global list.
+
+var/list/obj/machinery/newscaster/allCasters = list() //Global list that will contain reference to all newscasters in existence.
+
+
+/obj/item/newscaster_frame
+ name = "newscaster frame"
+ desc = "Used to build newscasters, just secure to the wall."
+ icon_state = "newscaster"
+ item_state = "syringe_kit"
+ m_amt = 25000
+ g_amt = 15000
+
+/obj/item/newscaster_frame/proc/try_build(turf/on_wall)
+ if (get_dist(on_wall,usr)>1)
+ return
+ var/ndir = get_dir(usr,on_wall)
+ if (!(ndir in cardinal))
+ return
+ var/turf/loc = get_turf(usr)
+ var/area/A = loc.loc
+ if (!istype(loc, /turf/simulated/floor))
+ usr << "Newscaster cannot be placed on this spot."
+ return
+ if (A.requires_power == 0 || A.name == "Space")
+ usr << "Newscaster cannot be placed in this area."
+ return
+ for(var/obj/machinery/newscaster/T in loc)
+ usr << "There is another newscaster here."
+ return
+ var/obj/machinery/newscaster/N = new(loc)
+ N.pixel_y -= (loc.y - on_wall.y) * 32
+ N.pixel_x -= (loc.x - on_wall.x) * 32
+ qdel(src)
+
+
+
+
+/obj/machinery/newscaster
+ name = "newscaster"
+ desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!"
+ icon = 'icons/obj/terminals.dmi'
+ icon_state = "newscaster_normal"
+ var/isbroken = 0 //1 if someone banged it with something heavy
+ var/ispowered = 1 //starts powered, changes with power_change()
+ //var/list/datum/feed_channel/channel_list = list() //This list will contain the names of the feed channels. Each name will refer to a data region where the messages of the feed channels are stored.
+ //OBSOLETE: We're now using a global news network
+ var/screen = 0 //Or maybe I'll make it into a list within a list afterwards... whichever I prefer, go fuck yourselves :3
+ // 0 = welcome screen - main menu
+ // 1 = view feed channels
+ // 2 = create feed channel
+ // 3 = create feed story
+ // 4 = feed story submited sucessfully
+ // 5 = feed channel created successfully
+ // 6 = ERROR: Cannot create feed story
+ // 7 = ERROR: Cannot create feed channel
+ // 8 = print newspaper
+ // 9 = viewing channel feeds
+ // 10 = censor feed story
+ // 11 = censor feed channel
+ //Holy shit this is outdated, made this when I was still starting newscasters :3
+ var/paper_remaining = 0
+ var/securityCaster = 0
+ // 0 = Caster cannot be used to issue wanted posters
+ // 1 = the opposite
+ var/unit_no = 0 //Each newscaster has a unit number
+ //var/datum/feed_message/wanted //We're gonna use a feed_message to store data of the wanted person because fields are similar
+ //var/wanted_issue = 0 //OBSOLETE
+ // 0 = there's no WANTED issued, we don't need a special icon_state
+ // 1 = Guess what.
+ var/alert_delay = 500
+ var/alert = 0
+ // 0 = there hasn't been a news/wanted update in the last alert_delay
+ // 1 = there has
+ var/scanned_user = "Unknown" //Will contain the name of the person who currently uses the newscaster
+ var/msg = ""; //Feed message
+ var/obj/item/weapon/photo/photo = null
+ var/channel_name = ""; //the feed channel which will be receiving the feed, or being created
+ 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
+ luminosity = 0
+ anchored = 1
+
+
+/obj/machinery/newscaster/security_unit //Security unit
+ name = "security newscaster"
+ securityCaster = 1
+
+/obj/machinery/newscaster/New() //Constructor, ho~
+ allCasters += src
+ src.paper_remaining = 15 // Will probably change this to something better
+ for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) // Let's give it an appropriate unit number
+ src.unit_no++
+ src.update_icon() //for any custom ones on the map...
+ ..() //I just realised the newscasters weren't in the global machines list. The superconstructor call will tend to that
+
+/obj/machinery/newscaster/Destroy()
+ allCasters -= src
+ ..()
+
+/obj/machinery/newscaster/update_icon()
+ if(!ispowered || isbroken)
+ icon_state = "newscaster_off"
+ if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite.
+ src.overlays.Cut()
+ src.overlays += image(src.icon, "crack3")
+ return
+
+ src.overlays.Cut() //reset overlays
+
+ if(news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message
+ icon_state = "newscaster_wanted"
+ return
+
+ if(alert) //new message alert overlay
+ src.overlays += "newscaster_alert"
+
+ if(hitstaken > 0) //Cosmetic damage overlay
+ src.overlays += image(src.icon, "crack[hitstaken]")
+
+ icon_state = "newscaster_normal"
+ return
+
+/obj/machinery/newscaster/power_change()
+ if(isbroken) //Broken shit can't be powered.
+ return
+ if( src.powered() )
+ src.ispowered = 1
+ stat &= ~NOPOWER
+ src.update_icon()
+ else
+ spawn(rand(0, 15))
+ src.ispowered = 0
+ stat |= NOPOWER
+ src.update_icon()
+
+
+/obj/machinery/newscaster/ex_act(severity)
+ switch(severity)
+ if(1.0)
+ qdel(src)
+ return
+ if(2.0)
+ src.isbroken=1
+ if(prob(50))
+ qdel(src)
+ else
+ src.update_icon() //can't place it above the return and outside the if-else. or we might get runtimes of null.update_icon() if(prob(50)) goes in.
+ return
+ else
+ if(prob(50))
+ src.isbroken=1
+ src.update_icon()
+ return
+ return
+
+/obj/machinery/newscaster/attack_ai(mob/user as mob)
+ return src.attack_hand(user)
+
+/obj/machinery/newscaster/attack_hand(mob/user as mob) //########### THE MAIN BEEF IS HERE! And in the proc below this...############
+ if(!src.ispowered || src.isbroken)
+ return
+ if(istype(user, /mob/living/carbon/human) || istype(user,/mob/living/silicon) )
+ var/mob/living/human_or_robot_user = user
+ var/dat
+
+ src.scan_user(human_or_robot_user) //Newscaster scans you
+
+ switch(screen)
+ if(0)
+ dat += "Welcome to Newscasting Unit #[src.unit_no].Interface & News networks Operational." + dat += "
Property of Nanotransen Inc" + if(news_network.wanted_issue) + dat+= "
Read Wanted Issue" + dat+= "
Create Feed Channel" + dat+= "
View Feed Channels" + dat+= "
Submit new Feed story" + dat+= "
Print newspaper" + dat+= "
Re-scan User" + dat+= "
Exit" + if(src.securityCaster) + var/wanted_already = 0 + if(news_network.wanted_issue) + wanted_already = 1 + + dat+="
Feed Security functions:
" + dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" + dat+="
Censor Feed Stories" + dat+="
Mark Feed Channel with Nanotrasen D-Notice" + dat+="
The newscaster recognises you as: [src.scanned_user]" + if(1) + dat+= "Station Feed Channels
" + if( isemptylist(news_network.network_channels) ) + dat+="No active channels found..." + else + for(var/datum/feed_channel/CHANNEL in news_network.network_channels) + if(CHANNEL.is_admin_channel) + dat+="[CHANNEL.channel_name]
" + else + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + /*for(var/datum/feed_channel/CHANNEL in src.channel_list) + dat+="[CHANNEL.channel_name]:
\[created by: [CHANNEL.author]\]
" + if( isemptylist(CHANNEL.messages) ) + dat+="No feed messages found in channel...
" + else + for(var/datum/feed_message/MESSAGE in CHANNEL.messages) + dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
"*/ + + dat+="
Refresh" + dat+="
Back" + if(2) + dat+="Creating new Feed Channel..." + dat+="
Channel Name: [src.channel_name]
" + dat+="Channel Author: [src.scanned_user]
" + dat+="Will Accept Public Feeds: [(src.c_locked) ? ("NO") : ("YES")]
" + dat+="
Submit
Cancel
" + if(3) + dat+="Creating new Feed Message..." + dat+="
Receiving Channel: [src.channel_name]
" //MARK + dat+="Message Author: [src.scanned_user]
" + dat+="Message Body: [src.msg]
" + dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="
Submit
Cancel
" + if(4) + dat+="Feed story successfully submitted to [src.channel_name].
" + dat+="
Return
" + if(5) + dat+="Feed Channel [src.channel_name] created successfully.
" + dat+="
Return
" + if(6) + dat+="ERROR: Could not submit Feed story to Network.
" + if(src.channel_name=="") + dat+="•Invalid receiving channel name.
" + if(src.scanned_user=="Unknown") + dat+="•Channel author unverified.
" + if(src.msg == "" || src.msg == "\[REDACTED\]") + dat+="•Invalid message body.
" + + dat+="
Return
" + if(7) + dat+="ERROR: Could not submit Feed Channel to Network.
" + //var/list/existing_channels = list() //Let's get dem existing channels - OBSOLETE + var/list/existing_authors = list() + for(var/datum/feed_channel/FC in news_network.network_channels) + //existing_channels += FC.channel_name //OBSOLETE + if(FC.author == "\[REDACTED\]") + existing_authors += FC.backup_author + else + existing_authors += FC.author + if(src.scanned_user in existing_authors) + dat+="•There already exists a Feed channel under your name.
" + if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") + dat+="•Invalid channel name.
" + var/check = 0 + for(var/datum/feed_channel/FC in news_network.network_channels) + if(FC.channel_name == src.channel_name) + check = 1 + break + if(check) + dat+="•Channel name already in use.
" + if(src.scanned_user=="Unknown") + dat+="•Channel author unverified.
" + dat+="
Return
" + if(8) + var/total_num=length(news_network.network_channels) + var/active_num=total_num + var/message_num=0 + for(var/datum/feed_channel/FC in news_network.network_channels) + if(!FC.censored) + message_num += length(FC.messages) //Dont forget, datum/feed_channel's var messages is a list of datum/feed_message + else + active_num-- + dat+="Network currently serves a total of [total_num] Feed channels, [active_num] of which are active, and a total of [message_num] Feed Stories." //TODO: CONTINUE + dat+="
Liquid Paper remaining: [(src.paper_remaining) *100 ] cm^3" + dat+="
Print Paper" + dat+="
Cancel" + if(9) + dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]
" + if(src.viewing_channel.censored) + dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" + dat+="No further feed story additions are allowed while the D-Notice is in effect.
" + else + if( isemptylist(src.viewing_channel.messages) ) + dat+="No feed messages found in channel...
" + else + var/i = 0 + for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) + i++ + dat+="-[MESSAGE.body]
" + if(MESSAGE.img) + usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") + dat+="
" + dat+="\[Story by [MESSAGE.author]\]
" + dat+="
Refresh" + dat+="
Back" + if(10) + dat+="Nanotrasen Feed Censorship Tool
" + dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
" + dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it." + dat+="
Select Feed channel to get Stories from:
" + if(isemptylist(news_network.network_channels)) + dat+="No feed channels found active...
" + else + for(var/datum/feed_channel/CHANNEL in news_network.network_channels) + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + dat+="
Cancel" + if(11) + dat+="Nanotrasen D-Notice Handler
" + dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" + dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed" + dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
" + if(isemptylist(news_network.network_channels)) + dat+="No feed channels found active...
" + else + for(var/datum/feed_channel/CHANNEL in news_network.network_channels) + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + + dat+="
Back" + if(12) + dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" + dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
" + + + if( isemptylist(src.viewing_channel.messages) ) + dat+="No feed messages found in channel...
" + else + 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+="
Back" + if(13) + dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" + dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
" + if(src.viewing_channel.censored) + dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" + dat+="No further feed story additions are allowed while the D-Notice is in effect.
" + else + if( isemptylist(src.viewing_channel.messages) ) + dat+="No feed messages found in channel...
" + else + for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) + dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" + + dat+="
Back" + if(14) + dat+="Wanted Issue Handler:" + var/wanted_already = 0 + var/end_param = 1 + if(news_network.wanted_issue) + wanted_already = 1 + end_param = 2 + + if(wanted_already) + dat+="
A wanted issue is already in Feed Circulation. You can edit or cancel it below." + dat+="
" + dat+="Criminal Name: [src.channel_name]
" + dat+="Description: [src.msg]
" + dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + if(wanted_already) + dat+="Wanted Issue created by: [news_network.wanted_issue.backup_author]
" + else + dat+="Wanted Issue will be created under prosecutor: [src.scanned_user]
" + dat+="
[(wanted_already) ? ("Edit Issue") : ("Submit")]" + if(wanted_already) + dat+="
Take down Issue" + dat+="
Cancel" + if(15) + dat+="Wanted issue for [src.channel_name] is now in Network Circulation.
" + dat+="
Return
" + if(16) + dat+="ERROR: Wanted Issue rejected by Network.
" + if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") + dat+="•Invalid name for person wanted.
" + if(src.scanned_user=="Unknown") + dat+="•Issue author unverified.
" + if(src.msg == "" || src.msg == "\[REDACTED\]") + dat+="•Invalid description.
" + dat+="
Return
" + if(17) + dat+="Wanted Issue successfully deleted from Circulation
" + dat+="
Return
" + if(18) + if(news_network.wanted_issue) + dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [news_network.wanted_issue.backup_author]\]
" + dat+="Criminal: [news_network.wanted_issue.author]
" + dat+="Description: [news_network.wanted_issue.body]
" + dat+="Photo:: " + if(news_network.wanted_issue.img) + usr << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") + dat+="
"
+ else
+ dat+="None"
+ else
+ dat+="No current wanted issue found." + dat+="
Back
" + if(19) + dat+="Wanted issue for [src.channel_name] successfully edited.
" + dat+="
Return
" + if(20) + dat+="Printing successful. Please receive your newspaper from the bottom of the machine.
" + dat+="Return" + if(21) + dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.
" + dat+="Return" + else + dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" + + //human_or_robot_user << browse(dat, "window=newscaster_main;size=400x600") + //onclose(human_or_robot_user, "newscaster_main") + + var/datum/browser/popup = new(human_or_robot_user, "newscaster_main", "Newscaster Unit #[src.unit_no]", 400, 600) + popup.set_content(dat) + popup.set_title_image(human_or_robot_user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + + /*if(src.isbroken) //debugging shit + return + src.hitstaken++ + if(src.hitstaken==3) + src.isbroken = 1 + src.update_icon()*/ + + +/obj/machinery/newscaster/Topic(href, href_list) + if(..()) + return + 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", "")) + while (findtext(src.channel_name," ") == 1) + src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1) + src.updateUsrDialog() + //src.update_icon() + + else if(href_list["set_channel_lock"]) + src.c_locked = !src.c_locked + src.updateUsrDialog() + //src.update_icon() + + else if(href_list["submit_new_channel"]) + //var/list/existing_channels = list() //OBSOLETE + var/list/existing_authors = list() + for(var/datum/feed_channel/FC in news_network.network_channels) + //existing_channels += FC.channel_name + if(FC.author == "\[REDACTED\]") + existing_authors += FC.backup_author + else + existing_authors +=FC.author + var/check = 0 + for(var/datum/feed_channel/FC in news_network.network_channels) + if(FC.channel_name == src.channel_name) + check = 1 + break + if(src.channel_name == "" || src.channel_name == "\[REDACTED\]" || src.scanned_user == "Unknown" || check || (src.scanned_user in existing_authors) ) + src.screen=7 + else + var/choice = alert("Please confirm Feed channel creation","Network Channel Handler","Confirm","Cancel") + if(choice=="Confirm") + var/datum/feed_channel/newChannel = new /datum/feed_channel + newChannel.channel_name = src.channel_name + newChannel.author = src.scanned_user + newChannel.locked = c_locked + feedback_inc("newscaster_channels",1) + /*for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) //Let's add the new channel in all casters. + NEWSCASTER.channel_list += newChannel*/ //Now that it is sane, get it into the list. -OBSOLETE + news_network.network_channels += newChannel //Adding channel to the global network + src.screen=5 + src.updateUsrDialog() + //src.update_icon() + + else if(href_list["set_channel_receiving"]) + //var/list/datum/feed_channel/available_channels = list() + var/list/available_channels = list() + for(var/datum/feed_channel/F in news_network.network_channels) + if( (!F.locked || F.author == scanned_user) && !F.censored) + available_channels += F.channel_name + src.channel_name = strip_html(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels ) + 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.updateUsrDialog() + + else if(href_list["set_attachment"]) + AttachPhoto(usr) + src.updateUsrDialog() + + else if(href_list["submit_new_message"]) + if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) + src.screen=6 + else + var/datum/feed_message/newMsg = new /datum/feed_message + newMsg.author = src.scanned_user + newMsg.body = src.msg + if(photo) + newMsg.img = photo.img + feedback_inc("newscaster_stories",1) + for(var/datum/feed_channel/FC in news_network.network_channels) + if(FC.channel_name == src.channel_name) + FC.messages += newMsg //Adding message to the network's appropriate feed_channel + break + src.screen=4 + for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) + NEWSCASTER.newsAlert(src.channel_name) + + src.updateUsrDialog() + + else if(href_list["create_channel"]) + src.screen=2 + src.updateUsrDialog() + + else if(href_list["create_feed_story"]) + src.screen=3 + src.updateUsrDialog() + + else if(href_list["menu_paper"]) + src.screen=8 + src.updateUsrDialog() + else if(href_list["print_paper"]) + if(!src.paper_remaining) + src.screen=21 + else + src.print_paper() + src.screen = 20 + src.updateUsrDialog() + + else if(href_list["menu_censor_story"]) + src.screen=10 + src.updateUsrDialog() + + else if(href_list["menu_censor_channel"]) + src.screen=11 + src.updateUsrDialog() + + else if(href_list["menu_wanted"]) + var/already_wanted = 0 + if(news_network.wanted_issue) + already_wanted = 1 + + if(already_wanted) + src.channel_name = news_network.wanted_issue.author + src.msg = news_network.wanted_issue.body + src.screen = 14 + 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.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.updateUsrDialog() + + else if(href_list["submit_wanted"]) + var/input_param = text2num(href_list["submit_wanted"]) + if(src.msg == "" || src.channel_name == "" || src.scanned_user == "Unknown") + src.screen = 16 + else + var/choice = alert("Please confirm Wanted Issue [(input_param==1) ? ("creation.") : ("edit.")]","Network Security Handler","Confirm","Cancel") + if(choice=="Confirm") + if(input_param==1) //If input_param == 1 we're submitting a new wanted issue. At 2 we're just editing an existing one. See the else below + var/datum/feed_message/WANTED = new /datum/feed_message + WANTED.author = src.channel_name + WANTED.body = src.msg + WANTED.backup_author = src.scanned_user //I know, a bit wacky + if(photo) + WANTED.img = photo.img + news_network.wanted_issue = WANTED + for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) + NEWSCASTER.newsAlert() + NEWSCASTER.update_icon() + src.screen = 15 + else + if(news_network.wanted_issue.is_admin_message) + alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot edit it.","Ok") + return + news_network.wanted_issue.author = src.channel_name + news_network.wanted_issue.body = src.msg + news_network.wanted_issue.backup_author = src.scanned_user + if(photo) + news_network.wanted_issue.img = photo.img + src.screen = 19 + + src.updateUsrDialog() + + else if(href_list["cancel_wanted"]) + if(news_network.wanted_issue.is_admin_message) + alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot take it down.","Ok") + return + var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel") + if(choice=="Confirm") + news_network.wanted_issue = null + for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) + NEWSCASTER.update_icon() + src.screen=17 + src.updateUsrDialog() + + else if(href_list["view_wanted"]) + src.screen=18 + src.updateUsrDialog() + else if(href_list["censor_channel_author"]) + var/datum/feed_channel/FC = locate(href_list["censor_channel_author"]) + if(FC.is_admin_channel) + alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") + return + if(FC.author != "\[REDACTED\]") + FC.backup_author = FC.author + FC.author = "\[REDACTED\]" + else + FC.author = FC.backup_author + src.updateUsrDialog() + + else if(href_list["censor_channel_story_author"]) + var/datum/feed_message/MSG = locate(href_list["censor_channel_story_author"]) + if(MSG.is_admin_message) + alert("This message was created by a Nanotrasen Officer. You cannot censor its author.","Ok") + return + if(MSG.author != "\[REDACTED\]") + MSG.backup_author = MSG.author + MSG.author = "\[REDACTED\]" + else + MSG.author = MSG.backup_author + src.updateUsrDialog() + + else if(href_list["censor_channel_story_body"]) + var/datum/feed_message/MSG = locate(href_list["censor_channel_story_body"]) + if(MSG.is_admin_message) + alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") + return + if(MSG.body != "\[REDACTED\]") + MSG.backup_body = MSG.body + MSG.body = "\[REDACTED\]" + else + MSG.body = MSG.backup_body + src.updateUsrDialog() + + else if(href_list["pick_d_notice"]) + var/datum/feed_channel/FC = locate(href_list["pick_d_notice"]) + src.viewing_channel = FC + src.screen=13 + src.updateUsrDialog() + + else if(href_list["toggle_d_notice"]) + var/datum/feed_channel/FC = locate(href_list["toggle_d_notice"]) + if(FC.is_admin_channel) + alert("This channel was created by a Nanotrasen Officer. You cannot place a D-Notice upon it.","Ok") + return + FC.censored = !FC.censored + src.updateUsrDialog() + + else if(href_list["view"]) + src.screen=1 + src.updateUsrDialog() + + else if(href_list["setScreen"]) //Brings us to the main menu and resets all fields~ + src.screen = text2num(href_list["setScreen"]) + if (src.screen == 0) + src.scanned_user = "Unknown"; + msg = ""; + src.c_locked=0; + channel_name=""; + src.viewing_channel = null + src.updateUsrDialog() + + else if(href_list["show_channel"]) + var/datum/feed_channel/FC = locate(href_list["show_channel"]) + src.viewing_channel = FC + src.screen = 9 + src.updateUsrDialog() + + else if(href_list["pick_censor_channel"]) + var/datum/feed_channel/FC = locate(href_list["pick_censor_channel"]) + src.viewing_channel = FC + src.screen = 12 + src.updateUsrDialog() + + else if(href_list["refresh"]) + src.updateUsrDialog() + + +/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/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) + if( istype(I, /obj/item/device/pda) ) + var/obj/item/device/pda/P = I + if(P.id) + src.scanned_user = "[P.id.registered_name] ([P.id.assignment])" + src.screen=2 + else + var/obj/item/weapon/card/id/T = I + src.scanned_user = text("[T.registered_name] ([T.assignment])") + src.screen=2*/ //Obsolete after autorecognition + + if(istype(I, /obj/item/weapon/wrench)) + user << "Now [anchored ? "un" : ""]securing [name]" + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + if(do_after(user, 60)) + new /obj/item/newscaster_frame(loc) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + qdel(src) + return + + 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].") + else + if(istype(I, /obj/item/weapon) ) + 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." ) + 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]!" ) + 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]!" ) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) + else + user << "This does nothing." + src.update_icon() + + +/obj/machinery/newscaster/attack_paw(mob/user as mob) + user << "The newscaster controls are far too complicated for your tiny brain!" + return + +/obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) + if(photo) + photo.loc = src.loc + user.put_in_inactive_hand(photo) + photo = null + if(istype(user.get_active_hand(), /obj/item/weapon/photo)) + photo = user.get_active_hand() + user.drop_item() + photo.loc = src + if(istype(usr,/mob/living/silicon/ai)) + var/list/nametemp = list() + var/find + var/datum/picture/selection + var/mob/living/silicon/ai/tempAI = user + if(tempAI.aicamera.aipictures.len == 0) + usr << "No images saved" + return + for(var/datum/picture/t in tempAI.aicamera.aipictures) + nametemp += t.fields["name"] + find = input("Select image (numbered in order taken)") in nametemp + var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() + for(var/datum/picture/q in tempAI.aicamera.aipictures) + if(q.fields["name"] == find) + selection = q + break // just in case some AI decides to take 10 thousand pictures in a round + P.icon = selection.fields["icon"] + P.img = selection.fields["img"] + P.desc = selection.fields["desc"] + photo = P + + + + + +//######################################################################################################################## +//###################################### NEWSPAPER! ###################################################################### +//######################################################################################################################## + +/obj/item/weapon/newspaper + name = "newspaper" + desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "newspaper" + w_class = 2 //Let's make it fit in trashbags! + attack_verb = list("bapped") + var/screen = 0 + var/pages = 0 + var/curr_page = 0 + var/list/datum/feed_channel/news_content = list() + var/datum/feed_message/important_message = null + var/scribble="" + var/scribble_page = null + +/*obj/item/weapon/newspaper/attack_hand(mob/user as mob) + ..() + world << "derp"*/ + +obj/item/weapon/newspaper/attack_self(mob/user as mob) + if(ishuman(user)) + var/mob/living/carbon/human/human_user = user + var/dat + src.pages = 0 + switch(screen) + if(0) //Cover + dat+="
The Griffon
"
+ dat+="Nanotrasen-standard newspaper, for use on Nanotrasen© Space Facilities
" + if(isemptylist(src.news_content)) + if(src.important_message) + dat+="Contents:
- **Important Security Announcement** \[page [src.pages+2]\]
- "
+ for(var/datum/feed_channel/NP in src.news_content)
+ src.pages++
+ if(src.important_message)
+ dat+="**Important Security Announcement** \[page [src.pages+2]\]
" + var/temp_page=0 + for(var/datum/feed_channel/NP in src.news_content) + temp_page++ + dat+="[NP.channel_name] \[page [temp_page+1]\]
" + dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" + dat+= "
" + if(1) // X channel pages inbetween. + for(var/datum/feed_channel/NP in src.news_content) + src.pages++ //Let's get it right again. + var/datum/feed_channel/C = src.news_content[src.curr_page] + dat+="[C.channel_name] \[created by: [C.author]\]
" + if(C.censored) + dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a D-Notice. Its contents were not transferred to the newspaper at the time of printing." + else + if(isemptylist(C.messages)) + dat+="No Feed stories stem from this channel..." + else + dat+="
- "
+ var/i = 0
+ for(var/datum/feed_message/MESSAGE in C.messages)
+ i++
+ dat+="-[MESSAGE.body]
" + if(MESSAGE.img) + user << browse_rsc(MESSAGE.img, "tmp_photo[i].png") + dat+="
" + dat+="\[Story by [MESSAGE.author]\]
" + dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" + dat+= "
" + if(2) //Last page + for(var/datum/feed_channel/NP in src.news_content) + src.pages++ + if(src.important_message!=null) + dat+="
Wanted Issue:
" + dat+="Criminal name: [important_message.author]
" + dat+="Description: [important_message.body]
" + dat+="Photo:: " + if(important_message.img) + user << browse_rsc(important_message.img, "tmp_photow.png") + dat+="
"
+ else
+ dat+="None"
+ else
+ dat+="Apart from some uninteresting Classified ads, there's nothing on this page..."
+ if(scribble_page==curr_page)
+ dat+="There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" + dat+= "
" + else + dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" + + dat+="
[src.curr_page+1]
"
+ human_user << browse(dat, "window=newspaper_main;size=300x400")
+ onclose(human_user, "newspaper_main")
+ else
+ user << "The paper is full of intelligible symbols!"
+
+
+obj/item/weapon/newspaper/Topic(href, href_list)
+ var/mob/living/U = usr
+ ..()
+ if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ))
+ U.set_machine(src)
+ if(href_list["next_page"])
+ if(curr_page==src.pages+1)
+ return //Don't need that at all, but anyway.
+ if(src.curr_page == src.pages) //We're at the middle, get to the end
+ src.screen = 2
+ else
+ if(curr_page == 0) //We're at the start, get to the middle
+ src.screen=1
+ src.curr_page++
+ playsound(src.loc, "pageturn", 50, 1)
+
+ else if(href_list["prev_page"])
+ if(curr_page == 0)
+ return
+ if(curr_page == 1)
+ src.screen = 0
+
+ else
+ if(curr_page == src.pages+1) //we're at the end, let's go back to the middle.
+ src.screen = 1
+ src.curr_page--
+ playsound(src.loc, "pageturn", 50, 1)
+
+ if (istype(src.loc, /mob))
+ src.attack_self(src.loc)
+
+
+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?"
+ else
+ var/s = strip_html( input(user, "Write something", "Newspaper", "") )
+ s = copytext(sanitize(s), 1, MAX_MESSAGE_LEN)
+ if (!s)
+ return
+ if (!in_range(src, usr) && src.loc != usr)
+ return
+ src.scribble_page = src.curr_page
+ src.scribble = s
+ src.attack_self(user)
+ return
+
+
+////////////////////////////////////helper procs
+
+
+/obj/machinery/newscaster/proc/scan_user(mob/living/user as mob)
+ if(istype(user,/mob/living/carbon/human)) //User is a human
+ var/mob/living/carbon/human/human_user = user
+ if(human_user.wear_id) //Newscaster scans you
+ if(istype(human_user.wear_id, /obj/item/device/pda) ) //autorecognition, woo!
+ var/obj/item/device/pda/P = human_user.wear_id
+ if(P.id)
+ src.scanned_user = "[P.id.registered_name] ([P.id.assignment])"
+ else
+ src.scanned_user = "Unknown"
+ else if(istype(human_user.wear_id, /obj/item/weapon/card/id) )
+ var/obj/item/weapon/card/id/ID = human_user.wear_id
+ src.scanned_user ="[ID.registered_name] ([ID.assignment])"
+ else
+ src.scanned_user ="Unknown"
+ else
+ src.scanned_user ="Unknown"
+ else
+ var/mob/living/silicon/ai_user = user
+ src.scanned_user = "[ai_user.name] ([ai_user.job])"
+
+
+/obj/machinery/newscaster/proc/print_paper()
+ feedback_inc("newscaster_newspapers_printed",1)
+ var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper
+ for(var/datum/feed_channel/FC in news_network.network_channels)
+ NEWSPAPER.news_content += FC
+ if(news_network.wanted_issue)
+ NEWSPAPER.important_message = news_network.wanted_issue
+ NEWSPAPER.loc = get_turf(src)
+ src.paper_remaining--
+ return
+
+//Removed for now so these aren't even checked every tick. Left this here in-case Agouri needs it later.
+///obj/machinery/newscaster/process() //Was thinking of doing the icon update through process, but multiple iterations per second does not
+// return //bode well with a newscaster network of 10+ machines. Let's just return it, as it's added in the machines list.
+
+/obj/machinery/newscaster/proc/newsAlert(channel) //This isn't Agouri's work, for it is ugly and vile.
+ var/turf/T = get_turf(src) //Who the fuck uses spawn(600) anyway, jesus christ
+ if(channel)
+ for(var/mob/O in hearers(world.view-1, T))
+ O.show_message("[src.name] beeps, \"Breaking news from [channel]!\"",2)
+ src.alert = 1
+ src.update_icon()
+ spawn(300)
+ src.alert = 0
+ src.update_icon()
+ playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)
+ else
+ for(var/mob/O in hearers(world.view-1, T))
+ O.show_message("[src.name] beeps, \"Attention! Wanted issue distributed!\"",2)
+ playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 75, 1)
+ return
\ No newline at end of file
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index 35954c0c8b6..e8e0fd7d30d 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -353,7 +353,7 @@ proc/getb(col)
/mob/proc/clearmap()
src.client.screen -= src.mapobjs
for(var/obj/screen/O in mapobjs)
- del(O)
+ qdel(O)
mapobjs = null
src.unset_machine()
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 4cec3d742c7..69b80866b86 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -543,7 +543,7 @@ Buildable meters
"[user] fastens the [src].", \
"\blue You have fastened the [src].", \
"You hear ratchet.")
- del(src) // remove the pipe item
+ qdel(src) // remove the pipe item
return
//TODO: DEFERRED
@@ -571,7 +571,7 @@ Buildable meters
new/obj/machinery/meter( src.loc )
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "\blue You have fastened the meter to the pipe"
- del(src)
+ qdel(src)
#undef PIPE_SIMPLE_STRAIGHT
#undef PIPE_SIMPLE_BENT
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 03a6b917f10..68497181eae 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -75,7 +75,7 @@
if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter))
usr << "You put [W] back into [src]."
user.drop_item()
- del(W)
+ qdel(W)
return
else if (istype(W, /obj/item/weapon/wrench))
if (!anchored && !isinspace())
@@ -116,7 +116,7 @@
//Allow you to push disposal pipes into it (for those with density 1)
/obj/machinery/pipedispenser/disposal/Crossed(var/obj/structure/disposalconstruct/pipe as obj)
if(istype(pipe) && !pipe.anchored)
- del(pipe)
+ qdel(pipe)
Nah
*/
@@ -132,7 +132,7 @@ Nah
if (pipe.anchored)
return
- del(pipe)
+ qdel(pipe)
/obj/machinery/pipedispenser/disposal/attack_hand(user as mob)
if(..())
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 2c2549bf579..3671edddeaa 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -60,12 +60,15 @@
cover = new /obj/machinery/porta_turret_cover(loc)
cover.Parent_Turret = src
+ setup()
+/obj/machinery/porta_turret/proc/setup()
if(!installation) //if for some reason the turret has no gun (ie, admin spawned) it resorts to basic taser shots
projectile = /obj/item/projectile/energy/electrode //holder for the projectile, here it is being set
eprojectile = /obj/item/projectile/beam //holder for the projectile when emagged, if it is different
sound = 1
else
+ sound = null
var/obj/item/weapon/gun/energy/E=new installation //All energy-based weapons are applicable
var/obj/item/ammo_casing/shottype = E.ammo_type[1]
projectile = shottype.projectile_type
@@ -73,7 +76,7 @@
switch(E.type)
if(/obj/item/weapon/gun/energy/laser/bluetag)
- eprojectile = /obj/item/projectile/omnitag //This bolt will stun ERRYONE with a vest
+ eprojectile = /obj/item/projectile/lasertag/bluetag
lasercolor = "b"
req_access = list(access_maint_tunnels, access_theatre)
check_records = 0
@@ -84,7 +87,7 @@
shot_delay = 30
if(/obj/item/weapon/gun/energy/laser/redtag)
- eprojectile = /obj/item/projectile/omnitag
+ eprojectile = /obj/item/projectile/lasertag/redtag
lasercolor = "r"
req_access = list(access_maint_tunnels, access_theatre)
check_records = 0
@@ -130,9 +133,9 @@
egun = 1
-/obj/machinery/porta_turret/Del()
+/obj/machinery/porta_turret/Destroy()
//deletes its own cover with it
- del(cover)
+ qdel(cover)
..()
@@ -258,7 +261,7 @@
new /obj/item/device/assembly/prox_sensor(loc)
else
user << "You remove the turret but did not manage to salvage anything."
- del(src)
+ qdel(src)
if(istype(I, /obj/item/weapon/card/emag) && !emagged)
//Emagging the turret makes it go bonkers and stun everyone. It also makes
@@ -285,7 +288,7 @@
user << "You unsecure the exterior bolts on the turret."
icon_state = "turretCover"
invisibility = 0
- del(cover) //deletes the cover, and the turret instance itself becomes its own cover.
+ qdel(cover) //deletes the cover, and the turret instance itself becomes its own cover.
else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda))
//Behavior lock/unlock mangement
@@ -317,7 +320,8 @@
sleep(60)
attacked = 0
- health -= Proj.damage
+ if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+ health -= Proj.damage
..()
@@ -327,15 +331,15 @@
die() //the death process :(
if(lasercolor == "b" && disabled == 0)
- if(istype(Proj, /obj/item/projectile/redtag))
+ if(istype(Proj, /obj/item/projectile/lasertag/redtag))
disabled = 1
- del (Proj)
+ qdel(Proj)
sleep(100)
disabled = 0
if(lasercolor == "r" && disabled == 0)
- if(istype(Proj, /obj/item/projectile/bluetag))
+ if(istype(Proj, /obj/item/projectile/lasertag/bluetag))
disabled = 1
- del (Proj)
+ qdel(Proj)
sleep(100)
disabled = 0
@@ -360,7 +364,7 @@
/obj/machinery/porta_turret/ex_act(severity)
if(severity >= 3) //turret dies if an explosion touches it!
- del(src)
+ qdel(src)
else
die()
@@ -372,7 +376,7 @@
invisibility = 0
spark_system.start() //creates some sparks because they look cool
density = 1
- del(cover) //deletes the cover - no need on keeping it there!
+ qdel(cover) //deletes the cover - no need on keeping it there!
@@ -383,7 +387,7 @@
if(cover == null && anchored) //if it has no cover and is anchored
if(stat & BROKEN) //if the turret is borked
- del(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug
+ qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug
else
cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover
@@ -642,19 +646,20 @@
playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
user << "You dismantle the turret construction."
new /obj/item/stack/sheet/metal( loc, 5)
- del(src)
+ qdel(src)
return
if(1)
if(istype(I, /obj/item/stack/sheet/metal))
- if(I:amount>=2) //requires 2 metal sheets
+ var/obj/item/stack/sheet/metal/M = I
+ if(M.amount>=2) //requires 2 metal sheets
user << "You add some metal armor to the interior frame."
build_step = 2
- I:amount -= 2
+ M.amount -= 2
icon_state = "turret_frame2"
- if(I:amount <= 0)
- user.before_take_item(I)
- del(I)
+ if(M.amount <= 0)
+ user.unEquip(M, 1) //We're deleting it anyway, so no point in having NODROP fuck shit up.
+ qdel(M)
else
user << "You need two sheets of metal for that."
return
@@ -697,12 +702,14 @@
if(isrobot(user))
return
var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun
+ if(!user.unEquip(I))
+ user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
+ return
installation = I.type //installation becomes I.type
gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge
user << "You add [I] to the turret."
build_step = 4
- user.before_take_item(I)
- del(I) //delete the gun :(
+ qdel(I) //delete the gun :(
return
else if(istype(I, /obj/item/weapon/wrench))
@@ -714,9 +721,11 @@
if(4)
if(isprox(I))
build_step = 5
+ if(!user.unEquip(I))
+ user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
+ return
user << "You add the prox sensor to the turret."
- user.before_take_item(I)
- del(I)
+ qdel(I)
return
//attack_hand() removes the gun
@@ -732,13 +741,14 @@
if(6)
if(istype(I, /obj/item/stack/sheet/metal))
- if(I:amount>=2)
+ var/obj/item/stack/sheet/metal/M = I
+ if(M.amount>=2)
user << "You add some metal armor to the exterior frame."
build_step = 7
- I:amount -= 2
- if(I:amount <= 0)
- user.before_take_item(I)
- del(I)
+ M.amount -= 2
+ if(M.amount <= 0)
+ user.unEquip(M, 1) //If we don't force-unequip, bugs happen because the item was deleted without updating the neccesary stuffs.
+ qdel(M)
else
user << "You need two sheets of metal for that."
return
@@ -768,11 +778,12 @@
Turret.name = finish_name
Turret.installation = installation
Turret.gun_charge = gun_charge
+ Turret.setup()
// Turret.cover=new/obj/machinery/porta_turret_cover(loc)
// Turret.cover.Parent_Turret=Turret
// Turret.cover.name = finish_name
- del(src)
+ qdel(src)
else if(istype(I, /obj/item/weapon/crowbar))
playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
@@ -970,7 +981,7 @@ Status: []"}, user << "You unsecure the exterior bolts on the turret." Parent_Turret.icon_state = "turretCover" Parent_Turret.invisibility = 0 - del(src) + qdel(src) else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) if(Parent_Turret.allowed(user)) @@ -998,4 +1009,4 @@ Status: []
"}, New() installation = new/obj/item/weapon/gun/energy/laser(loc) - ..() \ No newline at end of file + ..() diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 11668d874c5..4cffd8b367f 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -80,7 +80,7 @@ if(istype(charging, /obj/item/weapon/melee/baton)) var/obj/item/weapon/melee/baton/B = charging if(B.bcell) - if(B.bcell.give(175)) + if(B.bcell.give(1500)) //Because otherwise it takes two minutes to fully charge due to 15k cells. - Neerti icon_state = "recharger1" use_power(200) else diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index a17948ecdff..9ac66a450e6 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -7,7 +7,6 @@ use_power = 1 idle_power_usage = 5 active_power_usage = 1000 - var/mob/living/silicon/robot/occupant = null var/open = 1 var/construct_op = 0 var/circuitboard = "/obj/item/weapon/circuitboard/cyborgrecharger" @@ -15,6 +14,7 @@ req_access = list(access_robotics) var/recharge_speed var/repairs + var/mob/living/silicon/robot/occupier /obj/machinery/recharge_station/New() @@ -24,7 +24,7 @@ component_parts += new /obj/item/weapon/stock_parts/capacitor(null) component_parts += new /obj/item/weapon/stock_parts/capacitor(null) component_parts += new /obj/item/weapon/stock_parts/manipulator(null) - component_parts += new /obj/item/weapon/cell/high(null) + component_parts += new /obj/item/weapon/stock_parts/cell/high(null) RefreshParts() build_icon() @@ -35,7 +35,7 @@ recharge_speed += C.rating * 100 for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) repairs += M.rating - 1 - for(var/obj/item/weapon/cell/C in component_parts) + for(var/obj/item/weapon/stock_parts/cell/C in component_parts) recharge_speed *= C.maxcharge / 10000 @@ -43,8 +43,8 @@ if(!(NOPOWER|BROKEN)) return - if(src.occupant) - process_occupant() + if(src.occupier) + process_occupier() return 1 @@ -55,15 +55,15 @@ /obj/machinery/recharge_station/relaymove(mob/user as mob) if(user.stat) return - open() + open_machine() /obj/machinery/recharge_station/emp_act(severity) if(stat & (BROKEN|NOPOWER)) ..(severity) return - if(occupant) - occupant.emp_act(severity) - open() + if(occupier) + occupier.emp_act(severity) + open_machine() ..(severity) /obj/machinery/recharge_station/attack_paw(user as mob) @@ -73,126 +73,14 @@ return attack_hand(user) /obj/machinery/recharge_station/attackby(obj/item/P as obj, mob/user as mob) - if (istype(P, /obj/item/weapon/card/id/)) - if (construct_op == 0) - if (src.allowed(user)) - if (emagged == 0) - if (locked == 1) - user << "You turn off the ID lock." - locked = 0 - return - else if (locked == 0) - user << "You turn on the ID lock." - locked = 1 - return - else - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(2, 1, src) - s.start() - user << "\red The ID lock is broken!" - return + if(open) + if(default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P)) return - else - user << "The ID lock can't be accessed in this state." - else if (istype(P, /obj/item/weapon/card/emag)) - if (construct_op == 0) - if (emagged == 0) - emagged = 1 - locked = 0 - src.req_access = null - user << "\red You break the ID lock on the [src]." - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(2, 1, src) - s.start() - return - else - user << "The ID lock can't be accessed in this state." - if(locked == 0) - if(open == 1) - switch(construct_op) - if(0) - if(istype(P, /obj/item/weapon/screwdriver)) - user << "You open the circuit cover." - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - icon_state = "borgdecon1" - construct_op ++ - if(1) - if(istype(P, /obj/item/weapon/screwdriver)) - user << "You close the circuit cover." - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - icon_state = "borgcharger0" - construct_op -- - if(istype(P, /obj/item/weapon/wrench)) - user << "You dislodge the internal plating." - playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - icon_state = "borgdecon2" - construct_op ++ - if(2) - if(istype(P, /obj/item/weapon/wrench)) - user << "You secure the internal plating." - playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - icon_state = "borgdecon1" - construct_op -- - if(istype(P, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "You remove the cables." - icon_state = "borgdecon3" - construct_op ++ - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( user.loc ) - A.amount = 5 - stat |= BROKEN // the machine's been borked! - if(3) - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/A = P - if(A.amount >= 5) - user << "You insert the cables." - A.amount -= 5 - if(A.amount <= 0) - user.drop_item() - del(A) - icon_state = "borgdecon2" - construct_op -- - stat &= ~BROKEN // the machine's not borked anymore! - else - user << "You need more cable" - if(istype(P, /obj/item/weapon/crowbar)) - user << "You begin prying out the circuit board and components..." - playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - if(do_after(user,60)) - user << "You finish prying out the components." - - // Drop all the component stuff - if(contents.len > 0) - for(var/obj/x in src) - x.loc = user.loc - else - - // If the machine wasn't made during runtime, probably doesn't have components: - // manually find the components and drop them! - var/newpath = text2path(circuitboard) - var/obj/item/weapon/circuitboard/C = new newpath - for(var/I in C.req_components) - for(var/i = 1, i <= C.req_components[I], i++) - newpath = text2path(I) - var/obj/item/s = new newpath - s.loc = user.loc - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/A = P - A.amount = 1 - - // Drop a circuit board too - C.loc = user.loc - - // Create a machine frame and delete the current machine - var/obj/machinery/constructable_frame/machine_frame/F = new - F.loc = src.loc - del(src) - else - user << "This needs to be open first." - else - user << "This needs to be unlocked first." + if(exchange_parts(user, P)) + return + default_deconstruction_crowbar(P) /obj/machinery/recharge_station/attack_hand(user as mob) if(..()) return @@ -204,69 +92,70 @@ /obj/machinery/recharge_station/proc/toggle_open() if(open) - close() + close_machine() else - open() + open_machine() -/obj/machinery/recharge_station/proc/open() - if(occupant) - if (occupant.client) - occupant.client.eye = occupant - occupant.client.perspective = MOB_PERSPECTIVE - occupant.loc = loc - occupant = null +/obj/machinery/recharge_station/open_machine() + if(occupier) + if (occupier.client) + occupier.client.eye = occupier + occupier.client.perspective = MOB_PERSPECTIVE + occupier.loc = loc + occupier = null use_power = 1 open = 1 density = 0 build_icon() -/obj/machinery/recharge_station/proc/close() - for(var/mob/living/silicon/robot/R in loc) - R.stop_pulling() - if(R.client) - R.client.eye = src - R.client.perspective = EYE_PERSPECTIVE - R.loc = src - occupant = R - use_power = 2 - add_fingerprint(R) - break - open = 0 - density = 1 - build_icon() +/obj/machinery/recharge_station/close_machine() + if(!panel_open) + for(var/mob/living/silicon/robot/R in loc) + R.stop_pulling() + if(R.client) + R.client.eye = src + R.client.perspective = EYE_PERSPECTIVE + R.loc = src + occupier = R + use_power = 2 + add_fingerprint(R) + break + open = 0 + density = 1 + build_icon() /obj/machinery/recharge_station/proc/build_icon() if(NOPOWER|BROKEN) if(open) icon_state = "borgcharger0" else - if(occupant) + if(occupier) icon_state = "borgcharger1" else icon_state = "borgcharger2" else icon_state = "borgcharger0" -/obj/machinery/recharge_station/proc/process_occupant() - if(occupant) +/obj/machinery/recharge_station/proc/process_occupier() + if(occupier) restock_modules() if(repairs) - occupant.heal_organ_damage(repairs, repairs - 1) - if(occupant.cell) - if(occupant.cell.charge >= occupant.cell.maxcharge) - occupant.cell.charge = occupant.cell.maxcharge + occupier.heal_organ_damage(repairs, repairs - 1) + if(occupier.cell) + if(occupier.cell.charge >= occupier.cell.maxcharge) + occupier.cell.charge = occupier.cell.maxcharge else - occupant.cell.charge = min(occupant.cell.charge + recharge_speed, occupant.cell.maxcharge) + occupier.cell.charge = min(occupier.cell.charge + recharge_speed, occupier.cell.maxcharge) /obj/machinery/recharge_station/proc/restock_modules() - if(occupant) - if(occupant.module && occupant.module.modules) - var/list/um = occupant.contents|occupant.module.modules - // ^ makes sinle list of active (occupant.contents) and inactive modules (occupant.module.modules) + if(occupier) + if(occupier.module && occupier.module.modules) + var/list/um = occupier.contents|occupier.module.modules + // ^ makes sinle list of active (occupier.contents) and inactive modules (occupier.module.modules) var/coeff = recharge_speed / 200 for(var/obj/O in um) // Engineering - if(istype(O,/obj/item/stack/sheet/metal) || istype(O,/obj/item/stack/sheet/rglass) || istype(O,/obj/item/stack/rods) || istype(O,/obj/item/weapon/cable_coil)|| istype(O,/obj/item/stack/tile/plasteel)) + if(istype(O,/obj/item/stack/sheet/metal) || istype(O,/obj/item/stack/sheet/rglass) || istype(O,/obj/item/stack/rods) || istype(O,/obj/item/stack/cable_coil)|| istype(O,/obj/item/stack/tile/plasteel)) if(O:amount < 50) O:amount += coeff // Security @@ -300,17 +189,17 @@ if(istype(O, /obj/item/device/lightreplacer)) var/obj/item/device/lightreplacer/LR = O var/i = 1 - for(1, i < coeff, i++) - LR.Charge(occupant) + for(1, i <= coeff, i++) + LR.Charge(occupier) - if(occupant) - if(occupant.module) - occupant.module.respawn_consumable(occupant) + if(occupier) + if(occupier.module) + occupier.module.respawn_consumable(occupier) //Emagged items for janitor and medical borg - if(occupant.module.emag) - if(istype(occupant.module.emag, /obj/item/weapon/reagent_containers/spray)) - var/obj/item/weapon/reagent_containers/spray/S = occupant.module.emag + if(occupier.module.emag) + if(istype(occupier.module.emag, /obj/item/weapon/reagent_containers/spray)) + var/obj/item/weapon/reagent_containers/spray/S = occupier.module.emag if(S.name == "polyacid spray") S.reagents.add_reagent("pacid", 2 * coeff) else if(S.name == "lube spray") diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 466a2f52338..5c73bad1431 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -91,7 +91,7 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/proc/recycle(var/obj/item/I, var/sound = 1) I.loc = src.loc if(!istype(I, /obj/item/weapon/disk/nuclear)) - del(I) + qdel(I) if(prob(15)) new /obj/item/stack/sheet/metal(loc) if(prob(10)) @@ -138,8 +138,8 @@ var/const/SAFETY_COOLDOWN = 100 // Remove and recycle the equipped items. for(var/obj/item/I in L.get_equipped_items()) - L.drop_from_inventory(I) - recycle(I, 0) + if(L.unEquip(I)) + recycle(I, 0) // Instantly lie down, also go unconscious from the pain, before you die. L.Paralyse(5) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 62973585332..0505105dc51 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -26,13 +26,13 @@ count++ if (O:amount < 1) - del(O) + qdel(O) - user << "You insert [count] metal sheet\s into the fabricator." + user << "You insert [count] metal sheet\s into \the [src]." src.overlays -= "fab-load-metal" updateDialog() else - user << "The robot part maker is full. Please remove metal from the robot part maker in order to insert more." + user << "\The [src] is full." /obj/machinery/robotic_fabricator/power_change() if (powered()) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 473ad23024f..855ca45dc7b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -15,7 +15,7 @@ ..() air_update_turf(1) -/obj/machinery/shield/Del() +/obj/machinery/shield/Destroy() opacity = 0 density = 0 air_update_turf(1) @@ -47,7 +47,7 @@ if (src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 @@ -60,7 +60,7 @@ if(src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 @@ -72,7 +72,7 @@ ..() if(health <=0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 spawn(20) if(src) opacity = 0 @@ -81,25 +81,25 @@ switch(severity) if(1.0) if (prob(75)) - del(src) + qdel(src) if(2.0) if (prob(50)) - del(src) + qdel(src) if(3.0) if (prob(25)) - del(src) + qdel(src) return /obj/machinery/shield/emp_act(severity) switch(severity) if(1) - del(src) + qdel(src) if(2) if(prob(50)) - del(src) + qdel(src) /obj/machinery/shield/blob_act() - del(src) + qdel(src) /obj/machinery/shield/hitby(AM as mob|obj) @@ -121,7 +121,7 @@ //Handle the destruction of the shield if (src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return //The shield becomes dense to absorb the blow.. purely asthetic. @@ -152,9 +152,9 @@ var/locked = 0 var/shield_range = 4 -/obj/machinery/shieldgen/Del() +/obj/machinery/shieldgen/Destroy() for(var/obj/machinery/shield/shield_tile in deployed_shields) - del(shield_tile) + qdel(shield_tile) ..() @@ -176,13 +176,13 @@ update_icon() for(var/obj/machinery/shield/shield_tile in deployed_shields) - del(shield_tile) + qdel(shield_tile) deployed_shields.Cut() /obj/machinery/shieldgen/process() if(malfunction && active) if(deployed_shields.len && prob(5)) - del(pick(deployed_shields)) + qdel(pick(deployed_shields)) return @@ -190,7 +190,7 @@ if(health <= 30) src.malfunction = 1 if(health <= 0) - del(src) + qdel(src) update_icon() return @@ -265,8 +265,8 @@ user << "\blue You open the panel and expose the wiring." is_open = 1 - else if(istype(W, /obj/item/weapon/cable_coil) && malfunction && is_open) - var/obj/item/weapon/cable_coil/coil = W + else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) + var/obj/item/stack/cable_coil/coil = W user << "\blue You begin to replace the wires." //if(do_after(user, min(60, round( ((maxhealth/health)*10)+(malfunction*10) ))) //Take longer to repair heavier damage if(do_after(user, 30)) @@ -516,14 +516,14 @@ T2 = T if(locate(/obj/machinery/shieldwall) in T) F = (locate(/obj/machinery/shieldwall) in T) - del(F) + qdel(F) if(locate(/obj/machinery/shieldwallgen) in T) G = (locate(/obj/machinery/shieldwallgen) in T) if(!G.active) break -/obj/machinery/shieldwallgen/Del() +/obj/machinery/shieldwallgen/Destroy() src.cleanup(1) src.cleanup(2) src.cleanup(4) @@ -569,11 +569,11 @@ /obj/machinery/shieldwall/process() if(needs_power) if(isnull(gen_primary)||isnull(gen_secondary)) - del(src) + qdel(src) return if(!(gen_primary.active)||!(gen_secondary.active)) - del(src) + qdel(src) return // if(prob(50)) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 8161c2c51f1..2c8c6e91c6e 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -5,7 +5,7 @@ icon_state = "sheater0" name = "space heater" desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire." - var/obj/item/weapon/cell/cell + var/obj/item/weapon/stock_parts/cell/cell var/on = 0 var/open = 0 var/set_temperature = 50 // in celcius, add T0C for kelvin @@ -49,14 +49,14 @@ ..(severity) attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/cell)) + if(istype(I, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) user << "There is already a power cell inside." return else // insert cell - var/obj/item/weapon/cell/C = usr.get_active_hand() + var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand() if(istype(C)) user.drop_item() cell = C @@ -136,7 +136,7 @@ if("cellinstall") if(open && !cell) - var/obj/item/weapon/cell/C = usr.get_active_hand() + var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand() if(istype(C)) usr.drop_item() cell = C @@ -167,9 +167,9 @@ var/heat_capacity = removed.heat_capacity() //world << "heating ([heat_capacity])" - if(heat_capacity == 0 || heat_capacity == null) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE + if(heat_capacity == 0 || heat_capacity == null) // Added check to avoid divide by zero (oshi-) runtime errors heat_capacity = 1 - removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE + removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios cell.use(heating_power/20000) //world << "now at [removed.temperature]" diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index a4060b67073..d61307589bf 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -7,7 +7,7 @@ name = "suit storage unit" desc = "An industrial U-Stor-It Storage unit designed to accomodate all kinds of space suits. Its on-board equipment also allows the user to decontaminate the contents through a UV-ray purging cycle. There's a warning label dangling from the control pad, reading \"STRICTLY NO BIOLOGICALS IN THE CONFINES OF THE UNIT\"." icon = 'icons/obj/suitstorage.dmi' - icon_state = "suitstorage000000100" //order is: [has helmet][has suit][has human][is open][is locked][is UV cycling][is powered][is dirty/broken] [is superUVcycling] + icon_state = "close" anchored = 1 density = 1 var/mob/living/carbon/human/OCCUPANT = null @@ -45,18 +45,28 @@ if(MASK_TYPE) MASK = new MASK_TYPE(src) -/obj/machinery/suit_storage_unit/update_icon() - var/hashelmet = 0 - var/hassuit = 0 - var/hashuman = 0 - if(HELMET) - hashelmet = 1 - if(SUIT) - hassuit = 1 - if(OCCUPANT) - hashuman = 1 - icon_state = text("suitstorage[][][][][][][][][]",hashelmet,hassuit,hashuman,src.isopen,src.islocked,src.isUV,src.ispowered,src.isbroken,src.issuperUV) +/obj/machinery/suit_storage_unit/update_icon() //overlays yaaaay - Jordie + src.overlays = 0 + if(!isopen) + overlays += "close" + if(OCCUPANT) + overlays += "human" + if(OCCUPANT && isUV) + overlays += "uvhuman" + if(isUV) + overlays += "uv" + if(issuperUV && isUV) + overlays += "super" + if(isopen) + overlays += "open" + if(SUIT && isopen) + overlays += "suit" + if(HELMET && isopen) + overlays += "helm" + if(isbroken && isopen) + overlays += "broken" + return /obj/machinery/suit_storage_unit/power_change() if( powered() ) @@ -78,12 +88,12 @@ if(1.0) if(prob(50)) src.dump_everything() //So suits dont survive all the time - del(src) + qdel(src) return if(2.0) if(prob(50)) src.dump_everything() - del(src) + qdel(src) return else return @@ -472,7 +482,7 @@ src.update_icon() // for(var/obj/O in src) -// del(O) +// qdel(O) src.add_fingerprint(usr) src.updateUsrDialog() @@ -518,13 +528,13 @@ //for(var/obj/O in src) // O.loc = src.loc src.add_fingerprint(user) - del(G) + qdel(G) src.updateUsrDialog() src.update_icon() return return if( istype(I,/obj/item/clothing/suit/space) ) - if(!src.isopen) + if(!src.isopen || src.isbroken) return var/obj/item/clothing/suit/space/S = I if(src.SUIT) @@ -538,7 +548,7 @@ src.updateUsrDialog() return if( istype(I,/obj/item/clothing/head/helmet) ) - if(!src.isopen) + if(!src.isopen || src.isbroken) return var/obj/item/clothing/head/helmet/H = I if(src.HELMET) @@ -552,7 +562,7 @@ src.updateUsrDialog() return if( istype(I,/obj/item/clothing/mask) ) - if(!src.isopen) + if(!src.isopen || src.isbroken) return var/obj/item/clothing/mask/M = I if(src.MASK) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index ddedae35197..d452688974f 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -118,7 +118,7 @@ user << "\blue Locked In" new droptype( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) - del(src) + qdel(src) return /obj/item/device/sbeacondrop/bomb @@ -203,7 +203,7 @@ return - Del() + Destroy() if(active) Deactivate() ..() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 1875bfc0c4a..a3098d0580e 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -102,6 +102,9 @@ /obj/machinery/syndicatebomb/attack_hand(var/mob/user) interact(user) +/obj/machinery/syndicatebomb/attack_ai() + return + /obj/machinery/syndicatebomb/interact(var/mob/user) if(wires) wires.Interact(user) @@ -136,6 +139,7 @@ if(payload && !istype(payload, /obj/item/weapon/bombcore/training)) message_admins("[key_name(user)]? has primed a [name] ([payload]) for detonation at [A.name] (JMP).") log_game("[key_name(user)] has primed a [name] ([payload]) for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") + payload.adminlog = "The [src.name] that [key_name(user)] had primed detonated!" /obj/machinery/syndicatebomb/proc/isWireCut(var/index) return wires.IsIndexCut(index) @@ -173,13 +177,17 @@ item_state = "eshield0" w_class = 3.0 origin_tech = "syndicate=6;combat=5" + var/adminlog = null /obj/item/weapon/bombcore/ex_act(severity) //Little boom can chain a big boom src.detonate() /obj/item/weapon/bombcore/proc/detonate() + if(adminlog) + message_admins(adminlog) + log_game(adminlog) explosion(get_turf(src),2,5,11, flame_range = 11) - del(src) + qdel(src) /obj/item/weapon/bombcore/proc/defuse() //Note: Because of how var/defused is used you shouldn't override this UNLESS you intend to set the var to 0 or @@ -211,7 +219,7 @@ holder.loc.visible_message("\red \icon[holder] Alert: Bomb has detonated. Your score is now [defusals] for [attempts]. Resetting wires...") reset() else - del(src) + qdel(src) /obj/item/weapon/bombcore/training/defuse() var/obj/machinery/syndicatebomb/holder = src.loc @@ -227,21 +235,24 @@ origin_tech = null /obj/item/weapon/bombcore/badmin/defuse() //because we wouldn't want them being harvested by players - del(src) + var/obj/machinery/syndicatebomb/B = src.loc + qdel(B) + qdel(src) /obj/item/weapon/bombcore/badmin/summon/ var/summon_path = /obj/item/weapon/reagent_containers/food/snacks/cookie var/amt_summon = 1 /obj/item/weapon/bombcore/badmin/summon/detonate() + var/obj/machinery/syndicatebomb/B = src.loc for(var/i = 0; i < amt_summon; i++) var/atom/movable/X = new summon_path X.loc = get_turf(src) if(prob(50)) for(var/j = 1, j <= rand(1, 3), j++) step(X, pick(NORTH,SOUTH,EAST,WEST)) - - del(src) + qdel(B) + qdel(src) /obj/item/weapon/bombcore/badmin/summon/clown summon_path = /mob/living/simple_animal/hostile/retaliate/clown diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index e1ae4223a80..8bb964a7302 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -96,7 +96,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Do a snazzy animation! --- */ flick("broadcaster_send", src) -/obj/machinery/telecomms/broadcaster/Del() +/obj/machinery/telecomms/broadcaster/Destroy() // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. if(message_delay) message_delay = 0 @@ -365,7 +365,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/part_b_extra = "" if(data == 3) // intercepted radio message part_b_extra = " (Intercepted)" - var/part_b = " \[[freq_text]\][part_b_extra] \[[freq_text]\][part_b_extra] " if (display_freq==SYND_FREQ) @@ -397,7 +397,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- This following recording is intended for research and feedback in the use of department radio channels --- - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\] \icon[radio]\[[freq_text]\][part_b_extra] \icon[radio]\[[freq_text]\][part_b_extra] " if (display_freq==SYND_FREQ) @@ -688,7 +688,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- This following recording is intended for research and feedback in the use of department radio channels --- - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\] ") - del(src) + qdel(src) /obj/effect/spider/spiderling/healthcheck() if(health <= 0) @@ -183,7 +183,7 @@ if(!grow_as) grow_as = pick(typesof(/mob/living/simple_animal/hostile/giant_spider)) new grow_as(src.loc) - del(src) + qdel(src) /obj/effect/spider/cocoon name = "cocoon" @@ -204,11 +204,11 @@ if(do_after(user,(breakout_time*60*10))) if(!user || user.stat != CONSCIOUS || user.loc != src) return - Del() + qdel(src) -/obj/effect/spider/cocoon/Del() +/obj/effect/spider/cocoon/Destroy() src.visible_message("\red \The [src] splits open.") for(var/atom/movable/A in contents) A.loc = src.loc diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 933baa31e02..7c61a05111e 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -54,7 +54,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(adminlog) message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z])") - log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) in area [epicenter.loc.name] ") + log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z])") // Play sounds; we want sounds to be different depending on distance so we will manually do it ourselves. // Stereo users will also hear the direction of the explosion! @@ -86,9 +86,9 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa var/lighting_controller_was_processing = lighting_controller.processing //Pause the lighting updates for a bit lighting_controller.processing = 0 - var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild - if(defer_powernet_rebuild != 2) - defer_powernet_rebuild = 1 +// var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild +// if(defer_powernet_rebuild != 2) +// defer_powernet_rebuild = 1 if(heavy_impact_range > 1) var/datum/effect/system/explosion/E = new/datum/effect/system/explosion() @@ -118,13 +118,11 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(T) if(flame_dist && prob(40) && !istype(T, /turf/space)) - spawn() - new/obj/effect/hotspot(T) //Mostly for ambience! + new/obj/effect/hotspot(T) //Mostly for ambience! hotspot_exists = 1 if(dist) - spawn() - if(T) - T.ex_act(dist) + if(T) + T.ex_act(dist) //------- THINGS IN TURFS FIRES ------- @@ -134,14 +132,12 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(AM) //Something is inside T (We have already checked T exists above) - RR if(flame_dist) //if it has flame distance, run this - RR if(isliving(AM) && !hotspot_exists && !istype(T, /turf/space)) - spawn() - if(AM && AM.loc!=null) - new /obj/effect/hotspot(AM.loc) + if(AM && AM.loc!=null) + new /obj/effect/hotspot(AM.loc) //Just in case we missed a mob while they were in flame_range, but a hotspot didn't spawn on them, otherwise it looks weird when you just burst into flame out of nowhere if(dist) //if no flame_dist, run this - RR - spawn() - if(AM) - AM.ex_act(dist) + if(AM) + AM.ex_act(dist) @@ -158,9 +154,9 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa sleep(8) if(!lighting_controller.processing) lighting_controller.processing = lighting_controller_was_processing - if(!powernet_rebuild_was_deferred_already) - if(defer_powernet_rebuild != 2) - defer_powernet_rebuild = 0 +// if(!powernet_rebuild_was_deferred_already) +// if(defer_powernet_rebuild != 2) +// defer_powernet_rebuild = 0 return 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 91b91f4332f..96a4a7a1ef2 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -2,16 +2,12 @@ name = "item" icon = 'icons/obj/items.dmi' var/item_state = null - var/r_speed = 1.0 - var/health = null - var/burn_point = null - var/burning = null var/hitsound = null + var/throwhitsound = null var/w_class = 3.0 var/slot_flags = 0 //This is used to determine on which slots an item can fit. pass_flags = PASSTABLE pressure_resistance = 5 -// causeerrorheresoifixthis var/obj/item/master = null var/heat_protection = 0 //flags which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm @@ -31,7 +27,6 @@ var/permeability_coefficient = 1 // for chemicals/diseases var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit) var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up - var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) var/list/allowed = null //suit storage stuff. var/obj/item/device/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers. @@ -40,24 +35,30 @@ /obj/item/device icon = 'icons/obj/device.dmi' +/obj/item/Destroy() + if(ismob(loc)) + var/mob/m = loc + m.unEquip(src, 1) + return ..() + /obj/item/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(50)) - del(src) + qdel(src) return if(3.0) if (prob(5)) - del(src) + qdel(src) return else return /obj/item/blob_act() - del(src) + qdel(src) //user: The mob that is suiciding //damagetype: The type of damage the item will inflict on the user @@ -108,7 +109,16 @@ if(src.blood_DNA) f_name = "a bloody [name]" - usr << "\icon[src]This is [f_name]. It is a [size] item." + var/determiner + var/pronoun + if(src.gender == PLURAL) + determiner = "These are" + pronoun = "They are" + else + determiner = "This is" + pronoun = "It is" + + usr << "\icon[src][determiner] [f_name]. [pronoun] a [size] item." //e.g. These are some gloves. They are a small item. or This is a toolbox. It is a bulky item. if(src.desc) usr << src.desc @@ -122,17 +132,14 @@ S.remove_from_storage(src) src.throwing = 0 - if (src.loc == user) - //canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N - if(!src.canremove) + if (loc == user) + if(!user.unEquip(src)) return - else - user.u_equip(src) else - if(isliving(src.loc)) + if(isliving(loc)) return user.next_move = max(user.next_move+2,world.time + 2) - src.pickup(user) + pickup(user) add_fingerprint(user) user.put_in_active_hand(src) return @@ -147,11 +154,8 @@ M.client.screen -= src src.throwing = 0 if (src.loc == user) - //canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N - if(istype(src, /obj/item/clothing) && !src:canremove) + if(!user.unEquip(src)) return - else - user.u_equip(src) else if(istype(src.loc, /mob/living)) return @@ -167,7 +171,7 @@ if(!A.has_fine_manipulation || w_class >= 4) if(src in A.contents) // To stop Aliens having items stuck in their pockets - A.drop_from_inventory(src) + A.unEquip(src) user << "Your claws aren't capable of such fine manipulation." return attack_paw(A) @@ -346,6 +350,8 @@ return 0 return 1 if(slot_l_store) + if(flags & NODROP) //Pockets aren't visible, so you can't move NODROP items into them. + return 0 if(H.l_store) return 0 if(!H.w_uniform) @@ -357,6 +363,8 @@ if( w_class <= 2 || (slot_flags & SLOT_POCKET) ) return 1 if(slot_r_store) + if(flags & NODROP) + return 0 if(H.r_store) return 0 if(!H.w_uniform) @@ -369,6 +377,8 @@ return 1 return 0 if(slot_s_store) + if(flags & NODROP) //Suit storage NODROP items drop if you take a suit off, this is to prevent people exploiting this. + return 0 if(H.s_store) return 0 if(!H.wear_suit) @@ -537,7 +547,7 @@ M.drop_item() M.eye_blurry += 10 M.Paralyse(1) - M.Weaken(4) + M.Weaken(2) if (prob(M.eye_stat - 10 + 1)) if(M.stat != 2) M << "\red You go blind!" @@ -556,4 +566,5 @@ /obj/item/clothing/gloves/clean_blood() . = ..() if(.) - transfer_blood = 0 \ No newline at end of file + transfer_blood = 0 + bloody_hands_mob = null diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index b0001e65c8f..208a2111da1 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -11,7 +11,7 @@ ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) - del(src) + qdel(src) /obj/item/apc_frame/proc/try_build(turf/on_wall) if (get_dist(on_wall,usr)>1) @@ -24,7 +24,7 @@ if (!istype(loc, /turf/simulated/floor)) usr << "\red APC cannot be placed on this spot." return - if (A.requires_power == 0 || A.name == "Space") + if (A.requires_power == 0 || istype(A, /area/space)) usr << "\red APC cannot be placed in this area." return if (A.get_apc()) @@ -35,9 +35,9 @@ usr << "\red There is another network terminal here." return else - var/obj/item/weapon/cable_coil/C = new /obj/item/weapon/cable_coil(loc) + var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc) C.amount = 10 usr << "You cut the cables and disassemble the unused power terminal." - del(T) + qdel(T) new /obj/machinery/power/apc(loc, ndir, 1) - del(src) + qdel(src) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 152377dff1c..e671f5d4d11 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -80,7 +80,7 @@ move an amendment to the drawing. return A /obj/item/blueprints/proc/get_area_type(var/area/A = get_area()) - if (A.name == "Space") + if (istype(A,/area/space)) return AREA_SPACE var/list/SPECIALS = list( /area/shuttle, diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index f21832f87a0..35709d906ff 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -10,7 +10,7 @@ /obj/item/bodybag/attack_self(mob/user) var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) R.add_fingerprint(user) - del(src) + qdel(src) /obj/item/weapon/storage/box/bodybags @@ -79,7 +79,7 @@ visible_message("[usr] folds up [src].") var/obj/item/bodybag/B = new /obj/item/bodybag(get_turf(src)) usr.put_in_hands(B) - del(src) + qdel(src) /obj/structure/closet/bodybag/update_icon() diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index ca0c40fe668..3584b97b282 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -65,8 +65,8 @@ new/obj/item/trash/candle(src.loc) if(istype(src.loc, /mob)) var/mob/M = src.loc - M.before_take_item(src) - del(src) + M.unEquip(src, 1) //src is being deleted anyway + qdel(src) update_icon() if(istype(loc, /turf)) //start a fire if possible var/turf/T = loc @@ -78,18 +78,18 @@ lit = 0 update_icon() SetLuminosity(0) - user.SetLuminosity(user.luminosity - CANDLE_LUMINOSITY) + user.AddLuminosity(-CANDLE_LUMINOSITY) /obj/item/candle/pickup(mob/user) if(lit) SetLuminosity(0) - user.SetLuminosity(user.luminosity + CANDLE_LUMINOSITY) + user.AddLuminosity(CANDLE_LUMINOSITY) /obj/item/candle/dropped(mob/user) if(lit) - user.SetLuminosity(user.luminosity - CANDLE_LUMINOSITY) + user.AddLuminosity(-CANDLE_LUMINOSITY) SetLuminosity(CANDLE_LUMINOSITY) #undef CANDLE_LUMINOSITY \ No newline at end of file diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 35f84590fad..bed61da06e7 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -1,21 +1,18 @@ /obj/item/toy/crayon/red icon_state = "crayonred" colour = "#DA0000" - shadeColour = "#810C0C" colourName = "red" /obj/item/toy/crayon/orange icon_state = "crayonorange" colour = "#FF9300" - shadeColour = "#A55403" colourName = "orange" /obj/item/toy/crayon/yellow icon_state = "crayonyellow" colour = "#FFF200" - shadeColour = "#886422" colourName = "yellow" @@ -23,21 +20,18 @@ /obj/item/toy/crayon/green icon_state = "crayongreen" colour = "#A8E61D" - shadeColour = "#61840F" colourName = "green" /obj/item/toy/crayon/blue icon_state = "crayonblue" colour = "#00B7EF" - shadeColour = "#0082A8" colourName = "blue" /obj/item/toy/crayon/purple icon_state = "crayonpurple" colour = "#DA00FF" - shadeColour = "#810CFF" colourName = "purple" @@ -46,31 +40,26 @@ icon_state = "crayonmime" desc = "A very sad-looking crayon." colour = "#FFFFFF" - shadeColour = "#000000" colourName = "mime" uses = 0 /obj/item/toy/crayon/mime/attack_self(mob/living/user as mob) //inversion - if(colour != "#FFFFFF" && shadeColour != "#000000") + if(colour != "#FFFFFF") colour = "#FFFFFF" - shadeColour = "#000000" - user << "You will now draw in white and black with this crayon." + user << "You will now draw in white with this crayon." else colour = "#000000" - shadeColour = "#FFFFFF" - user << "You will now draw in black and white with this crayon." + user << "You will now draw in black with this crayon." return /obj/item/toy/crayon/rainbow icon_state = "crayonrainbow" colour = "#FFF000" - shadeColour = "#000FFF" colourName = "rainbow" uses = 0 /obj/item/toy/crayon/rainbow/attack_self(mob/living/user as mob) colour = input(user, "Please select the main colour.", "Crayon colour") as color - shadeColour = input(user, "Please select the shade colour.", "Crayon colour") as color return /obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity) @@ -86,13 +75,13 @@ if("rune") user << "You start drawing a rune on the [target.name]." if(instant || do_after(user, 50)) - new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype) + new /obj/effect/decal/cleanable/crayon(target,colour,drawtype) user << "You finish drawing." if(uses) uses-- if(!uses) user << "\red You used up your crayon!" - del(src) + qdel(src) return /obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) @@ -103,6 +92,6 @@ uses -= 5 if(uses <= 0) user << "\red You ate your crayon!" - del(src) + qdel(src) else ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e409e1efbbb..3d18e1a5f17 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -202,11 +202,11 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/pickup(mob/user) if(fon) SetLuminosity(0) - user.SetLuminosity(user.luminosity + f_lum) + user.AddLuminosity(f_lum) /obj/item/device/pda/dropped(mob/user) if(fon) - user.SetLuminosity(user.luminosity - f_lum) + user.AddLuminosity(-f_lum) SetLuminosity(f_lum) /obj/item/device/pda/New() @@ -507,11 +507,11 @@ var/global/list/obj/item/device/pda/PDAs = list() if("Light") if(fon) fon = 0 - if(src in U.contents) U.SetLuminosity(U.luminosity - f_lum) + if(src in U.contents) U.AddLuminosity(-f_lum) else SetLuminosity(0) else fon = 1 - if(src in U.contents) U.SetLuminosity(U.luminosity + f_lum) + if(src in U.contents) U.AddLuminosity(f_lum) else SetLuminosity(f_lum) if("Medical Scan") if(scanmode == 1) @@ -948,10 +948,10 @@ var/global/list/obj/item/device/pda/PDAs = list() explosion(T, -1, -1, 2, 3) - del(src) + qdel(src) return -/obj/item/device/pda/Del() +/obj/item/device/pda/Destroy() PDAs -= src if (src.id) src.id.loc = get_turf(src.loc) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 7e657c718ca..cb18cc0c7a4 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -292,7 +292,7 @@ Code: menu += " Lockdown |" menu += " Biohazard \]
" - if (43) //Muskets' and Rockdtben's power monitor :D + if (43) menu = "
Power Monitors - Please select one
" powmonitor = null powermonitors = list() @@ -318,7 +318,7 @@ Code: menu += "" - if (433) //Muskets' and Rockdtben's power monitor :D + if (433) menu = "
Power Monitor
" if(!powmonitor) menu += "\red No connection
" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index a51decc1379..24c0d8f5af2 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -5,7 +5,7 @@ slot_flags = SLOT_BELT item_state = "electronic" throwforce = 5.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 origin_tech = "syndicate=4;magnets=4" @@ -41,7 +41,7 @@ if(active_dummy) eject_all() playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) - del(active_dummy) + qdel(active_dummy) active_dummy = null usr << "\blue You deactivate the [src]." var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) @@ -54,7 +54,7 @@ if(!O) return var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, src) - del(O) + qdel(O) usr << "\blue You activate the [src]." var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' @@ -69,7 +69,7 @@ spark_system.start() eject_all() if(delete_dummy) - del(active_dummy) + qdel(active_dummy) active_dummy = null can_use = 0 spawn(50) can_use = 1 @@ -140,6 +140,6 @@ step(src, direction) return -/obj/effect/dummy/chameleon/Del() +/obj/effect/dummy/chameleon/Destroy() master.disrupt(0) ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 2e1096009d7..56a57d8a849 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -3,16 +3,18 @@ desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production." icon_state = "flash" item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) - throwforce = 5 + throwforce = 0 w_class = 1.0 - throw_speed = 4 - throw_range = 10 + throw_speed = 3 + throw_range = 7 flags = CONDUCT origin_tech = "magnets=2;combat=1" var/times_used = 0 //Number of times it's been used. var/broken = 0 //Is the flash burnt out? var/last_used = 0 //last world.time it was used. + var/burnt = "flashburnt" + var/flashanim = "flash2" /obj/item/device/flash/proc/clown_check(mob/user) if(user && (CLUMSY in user.mutations) && prob(50)) @@ -33,7 +35,7 @@ /obj/item/device/flash/proc/burn_out(mob/user = null) //Made so you can override it if you want to have an invincible flash from R&D or something. broken = 1 - icon_state = "flashburnt" + icon_state = burnt if(user) user << "The bulb has burnt out!" @@ -68,7 +70,7 @@ if(iscarbon(M)) var/safety = M:eyecheck() if(safety <= 0) - M.Weaken(10) + M.Weaken(5) flick("e_flash", M.flash) if(ishuman(M) && ishuman(user) && M.stat != DEAD) @@ -109,10 +111,10 @@ animation.master = user flick("blspell", animation) sleep(5) - del(animation) + qdel(animation) if(!flashfail) - flick("flash2", src) + flick(flashanim, src) if(!issilicon(M)) user.visible_message("[user] blinds [M] with the flash!") @@ -156,14 +158,9 @@ animation.master = user flick("blspell", animation) sleep(5) - del(animation) + qdel(animation) for(var/mob/living/carbon/M in oviewers(3, null)) - if(prob(50)) - if (locate(/obj/item/weapon/cloaking_device, M)) - for(var/obj/item/weapon/cloaking_device/S in M) - S.active = 0 - S.icon_state = "shield0" var/safety = M:eyecheck() if(!safety) if(!M.blinded) @@ -184,7 +181,7 @@ var/mob/living/carbon/M = loc var/safety = M.eyecheck() if(safety <= 0) - M.Weaken(10) + M.Weaken(5) flick("e_flash", M.flash) for(var/mob/O in viewers(M, null)) O.show_message("[M] is blinded by the flash!") @@ -206,4 +203,12 @@ /obj/item/device/flash/synthetic/attack_self(mob/living/carbon/user, flag = 0, emp = 0) ..() if(!broken) - burn_out(user) \ No newline at end of file + burn_out(user) + +/obj/item/device/flash/memorizer + name = "memorizer" + desc = "If you see this, you're not likely to remember it any time soon." + icon_state = "memorizer" + item_state = "nullrod" + burnt = "memorizerburnt" + flashanim = "memorizer2" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 5d0e80c3ada..8993adf9cf3 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -26,13 +26,13 @@ if(on) icon_state = "[initial(icon_state)]-on" if(loc == user) - user.SetLuminosity(user.luminosity + brightness_on) + user.AddLuminosity(brightness_on) else if(isturf(loc)) SetLuminosity(brightness_on) else icon_state = initial(icon_state) if(loc == user) - user.SetLuminosity(user.luminosity - brightness_on) + user.AddLuminosity(-brightness_on) else if(isturf(loc)) SetLuminosity(0) @@ -89,13 +89,13 @@ /obj/item/device/flashlight/pickup(mob/user) if(on) - user.SetLuminosity(user.luminosity + brightness_on) + user.AddLuminosity(brightness_on) SetLuminosity(0) /obj/item/device/flashlight/dropped(mob/user) if(on) - user.SetLuminosity(user.luminosity - brightness_on) + user.AddLuminosity(-brightness_on) SetLuminosity(brightness_on) @@ -189,12 +189,19 @@ . = ..() // All good, turn it on. if(.) - user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!") + user.visible_message("[user] lights the [src].", "You light the [src]!") src.force = on_damage src.damtype = "fire" processing_objects += src - +/obj/item/device/flashlight/flare/torch + name = "torch" + desc = "A torch fashioned from some leaves and a log." + w_class = 4 + brightness_on = 7 + icon_state = "torch" + item_state = "torch_off" + on_damage = 10 /obj/item/device/flashlight/slime @@ -222,7 +229,7 @@ ..() processing_objects.Add(src) -/obj/item/device/flashlight/emp/Del() +/obj/item/device/flashlight/emp/Destroy() processing_objects.Remove(src) ..() diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index f3ad94f3fe7..3f60c5402b1 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -10,8 +10,7 @@ m_amt = 500 g_amt = 500 w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter. - origin_tech = "combat=1" - origin_tech = "magnets=2" + origin_tech = "combat=1;magnets=2" var/turf/pointer_loc var/energy = 5 var/max_energy = 5 @@ -205,4 +204,4 @@ energy = max_energy recharging = 0 recharge_locked = 0 - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 9cb72a9b928..9c6dbbdb37c 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -86,7 +86,7 @@ G.amount = remaining if(!G.amount) user.drop_item() - del(G) + qdel(G) AddUses(increment) user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining." return @@ -98,7 +98,7 @@ AddUses(1) user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." user.drop_item() - del(L) + qdel(L) return else user << "You need a working light." @@ -164,7 +164,7 @@ target.brightness = L2.brightness target.on = target.has_power() target.update() - del(L2) + qdel(L2) if(target.on && target.rigged) target.explode() diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 9a17fff3770..88bec2edc50 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -10,13 +10,14 @@ icon_state = "multitool" force = 5.0 w_class = 2.0 - throwforce = 5.0 - throw_range = 15 + throwforce = 0 + throw_range = 7 throw_speed = 3 m_amt = 50 g_amt = 20 origin_tech = "magnets=1;engineering=1" var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage + hitsound = 'sound/weapons/tap.ogg' // Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby. @@ -30,7 +31,7 @@ processing_objects += src -/obj/item/device/multitool/ai_detect/Del() +/obj/item/device/multitool/ai_detect/Destroy() processing_objects -= src ..() diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index c38169c621b..3fa8f1593f8 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -14,7 +14,7 @@ ..() overlays += "pai-off" -/obj/item/device/paicard/Del() +/obj/item/device/paicard/Destroy() //Will stop people throwing friend pAIs into the singularity so they can respawn if(!isnull(pai)) pai.death(0) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index aee901aad5f..868bd0133c1 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -94,6 +94,8 @@ "[user] activates \the [src]!", \ "You activate \the [src]!", "You hear a click.") + message_admins("Power sink activated by [key_name(user, user.client)](?) at ([x],[y],[z] - JMP)") + log_game("Power sink activated by [key_name(user)] at ([x],[y],[z])") set_mode(OPERATING) if(OPERATING) @@ -127,10 +129,14 @@ if(A.operating && A.cell) A.cell.charge = max(0, A.cell.charge - 50) power_drained += 50 + if(A.charging == 2) // If the cell was full + A.charging = 1 // It's no longer full if(power_drained > max_power * 0.95) + message_admins("Power sink at ([x],[y],[z] - JMP) is about to explode") playsound(src, 'sound/effects/screech.ogg', 100, 1, 1) + if(power_drained >= max_power) processing_objects.Remove(src) explosion(src.loc, 3,6,9,12) - del(src) + qdel(src) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 853890021fa..28f9936054a 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -30,4 +30,4 @@ /obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy. proc/digest_delay() spawn(600) - del(src)*/ //Bacon beacons are no more rip in peace \ No newline at end of file + qdel(src)*/ //Bacon beacons are no more rip in peace \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 095849c6f9f..482db3a9d23 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -28,18 +28,22 @@ var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) A.icon = 'icons/obj/assemblies.dmi' - user.drop_from_inventory(W) + if(!user.unEquip(W)) + user << "\the [W] is stuck to your hand, you cannot attach it to \the [src]!" + return W.loc = A W.master = A A.part1 = W - user.drop_from_inventory(src) + user.unEquip(src) loc = A master = A A.part2 = src user.put_in_hands(A) A.add_fingerprint(user) + if(src.flags & NODROP) + A.flags |= NODROP /obj/item/device/radio/electropack/Topic(href, href_list) //..() @@ -98,7 +102,7 @@ s.set_up(3, 1, M) s.start() - M.Weaken(10) + M.Weaken(5) if(master && !isWireCut(WIRE_SIGNAL)) master.receive_signal() diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index ddf8238de04..463f17caf6d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -36,7 +36,7 @@ origin_tech = "syndicate=3" /obj/item/device/radio/headset/syndicate/New() ..() - del(keyslot1) + qdel(keyslot1) keyslot1 = new /obj/item/device/encryptionkey/syndicate syndie = 1 recalculateChannels() @@ -45,7 +45,7 @@ origin_tech = "syndicate=3" /obj/item/device/radio/headset/binary/New() ..() - del(keyslot1) + qdel(keyslot1) keyslot1 = new /obj/item/device/encryptionkey/binary recalculateChannels() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 8e03f22f48f..3e49179e76f 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -15,7 +15,7 @@ ..() processing_objects += src -/obj/item/device/radio/intercom/Del() +/obj/item/device/radio/intercom/Destroy() processing_objects -= src ..() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 3839e5f7325..edac441eae1 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -29,8 +29,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use // "Example" = FREQ_LISTENING|FREQ_BROADCASTING flags = CONDUCT slot_flags = SLOT_BELT - throw_speed = 2 - throw_range = 9 + throw_speed = 3 + throw_range = 7 w_class = 2 g_amt = 25 m_amt = 75 @@ -448,7 +448,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use var/list/receive = list() //for (var/obj/item/device/radio/R in radio_connection.devices) - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) // Modified for security headset code -- TLE + for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) //if(R.accept_rad(src, message)) receive |= R.send_hear(display_freq, 0) @@ -498,7 +498,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use if(!freq_text) freq_text = format_frequency(display_freq) - var/part_b = " \[[freq_text]\] \[[freq_text]\] " if (display_freq==SYND_FREQ) @@ -524,7 +524,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use //This following recording is intended for research and feedback in the use of department radio channels. - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\]