\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). + //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/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 7aa3c4120c3..a56343316ea 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -341,12 +341,12 @@ proc/process_ghost_teleport_locs() //EXTRA -/area/asteroid // -- TLE +/area/asteroid name = "\improper Asteroid" icon_state = "asteroid" requires_power = 0 -/area/asteroid/cave // -- TLE +/area/asteroid/cave name = "\improper Asteroid - Underground" icon_state = "cave" requires_power = 0 diff --git a/code/game/dna.dm b/code/game/dna.dm index abcb01f1375..f4c6530b7b8 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -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 @@ -852,14 +855,17 @@ if(buffer_slot["SE"]) I = new /obj/item/weapon/dnainjector(loc) I.fields = list("SE"=buffer_slot["SE"]) + I.damage_coeff = connected.damage_coeff if("ui") if(buffer_slot["UI"]) I = new /obj/item/weapon/dnainjector(loc) I.fields = list("UI"=buffer_slot["UI"]) + I.damage_coeff = connected.damage_coeff else if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) I = new /obj/item/weapon/dnainjector(loc) I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"]) + I.damage_coeff = connected.damage_coeff if(I) injectorready = 0 spawn(INJECTOR_TIMEOUT) @@ -971,3 +977,11 @@ proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE) if(value > values) value = values return value + + +/datum/dna/proc/is_same_as(var/datum/dna/D) + if(uni_identity == D.uni_identity && struc_enzymes == D.struc_enzymes && real_name == D.real_name) + if(mutantrace == D.mutantrace && blood_type == D.blood_type) + return 1 + return 0 + diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index ef5ba5c8b98..2709071b448 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -223,6 +223,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" var/chem_charges = 20 var/chem_storage = 50 var/chem_recharge_rate = 0.5 + var/chem_recharge_slowdown = 0 var/sting_range = 2 var/changelingID = "Changeling" var/geneticdamage = 0 @@ -232,7 +233,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" var/mimicing = "" var/canrespec = 0 var/datum/dna/chosen_dna - var/chosen_sting + var/obj/effect/proc_holder/changeling/sting/chosen_sting + var/space_suit_active = 0 /datum/changeling/New(var/gender=FEMALE) ..() @@ -249,63 +251,33 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/changeling/proc/regenerate() - chem_charges = min(max(0, chem_charges+chem_recharge_rate), chem_storage) + chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage) geneticdamage = max(0, geneticdamage-1) -/datum/changeling/proc/GetDNA(var/dna_owner) - var/datum/dna/chosen_dna +/datum/changeling/proc/get_dna(var/dna_owner) for(var/datum/dna/DNA in absorbed_dna) if(dna_owner == DNA.real_name) - chosen_dna = DNA - break - return chosen_dna - - -//Checks if the target DNA is valid and absorbable. -/datum/changeling/proc/can_absorb_dna(mob/living/carbon/T, mob/living/carbon/U) - if(absorbed_dna[1] == U.dna)//If our current DNA is the stalest, we gotta ditch it. - U << "We have reached our capacity to store genetic information! We must transform before absorbing more." - return 0 - - if(T) - if(NOCLONE in T.mutations || HUSK in T.mutations) - U << "DNA of [T] is ruined beyond usability!" - return 0 - - if(!ishuman(T))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! - U << "We could gain no benefit from absorbing a lesser creature." - return 0 - - for(var/datum/dna/D in absorbed_dna) - if(T.dna.uni_identity == D.uni_identity) - if(T.dna.struc_enzymes == D.struc_enzymes) - if(T.dna.real_name == D.real_name) - if(T.dna.mutantrace == D.mutantrace) - if(T.dna.blood_type == D.blood_type) - U << "We already have that DNA in storage." - return 0 - - if(!check_dna_integrity(T)) - U << "[T] is not compatible with our biology." - return 0 + return DNA +/datum/changeling/proc/can_absorb_dna(var/mob/living/carbon/user, var/mob/living/carbon/target) + if(absorbed_dna[1] == user.dna)//If our current DNA is the stalest, we gotta ditch it. + user << "We have reached our capacity to store genetic information! We must transform before absorbing more." + return + if(!target) + return + if(NOCLONE in target.mutations || HUSK in target.mutations) + user << "DNA of [target] is ruined beyond usability!" + return + if(!ishuman(target))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! + user << "We could gain no benefit from absorbing a lesser creature." + return + var/datum/dna/tDna = target.dna + for(var/datum/dna/D in absorbed_dna) + if(tDna.is_same_as(D)) + user << "We already have that DNA in storage." + return + if(!check_dna_integrity(target)) + user << "[target] is not compatible with our biology." + return return 1 - - -//Absorbs the target DNA. -/datum/changeling/proc/absorb_dna(mob/living/carbon/T) - shuffle_dna() - T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. - var/datum/dna/new_dna = new T.dna.type - new_dna.uni_identity = T.dna.uni_identity - new_dna.struc_enzymes = T.dna.struc_enzymes - new_dna.real_name = T.dna.real_name - new_dna.mutantrace = T.dna.mutantrace - new_dna.blood_type = T.dna.blood_type - absorbed_dna |= new_dna //And add the target DNA to our absorbed list. - absorbedcount++ //all that done, let's increment the objective counter. - -/datum/changeling/proc/shuffle_dna()//boots out the stalest DNA. - if(absorbed_dna.len) - absorbed_dna.Cut(1,2) \ No newline at end of file diff --git a/code/game/gamemodes/changeling/changeling_mutations.dm b/code/game/gamemodes/changeling/changeling_mutations.dm deleted file mode 100644 index 986a9d0a90b..00000000000 --- a/code/game/gamemodes/changeling/changeling_mutations.dm +++ /dev/null @@ -1,52 +0,0 @@ -//This only contains the arm blade for now because I'm a lazy fuck. Yers truely, Miauw, resident lazy fuck. -/obj/item/weapon/melee/arm_blade - name = "arm blade" - desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter" - icon = 'icons/obj/weapons.dmi' - icon_state = "arm_blade" - item_state = "arm_blade" - flags = ABSTRACT | NODROP - w_class = 5.0 - force = 25 - throwforce = 0 //Just to be on the safe side - throw_range = 0 - throw_speed = 0 - -/obj/item/weapon/melee/arm_blade/New() - ..() - if(ismob(loc)) - loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!") - -/obj/item/weapon/melee/arm_blade/dropped(mob/user) - visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate our blade into our body", "" - return - - else if(A.locked) - user << "The airlock's bolts prevent it from being forced." - return - - else - //user.say("Heeeeeeeeeerrre's Johnny!") - user.visible_message("[user] forces the door to open with \his [src]!", "We force the door to open.", "You hear a metal screeching sound.") - A.open(1) diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm new file mode 100644 index 00000000000..6cae17bd2cc --- /dev/null +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -0,0 +1,80 @@ +/* + * Don't use the apostrophe in name or desc. Causes script errors. + * TODO: combine atleast some of the functionality with /proc_holder/spell + */ + +/obj/effect/proc_holder/changeling + panel = "Changeling" + name = "Prototype Sting" + desc = "" // Fluff + var/helptext = "" // Details + var/chemical_cost = 0 // negative chemical cost is for passive abilities (chemical glands) + var/dna_cost = -1 //cost of the sting in dna points. 0 = auto-purchase, -1 = cannot be purchased + var/req_dna = 0 //amount of dna needed to use this ability. Changelings always have atleast 1 + var/req_human = 0 //if you need to be human to use this ability + var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD + var/genetic_damage = 0 // genetic damage caused by using the sting. Nothing to do with cloneloss. + var/max_genetic_damage = 100 // hard counter for spamming abilities. Not used/balanced much yet. + + +/obj/effect/proc_holder/changeling/proc/on_purchase(var/mob/user) + return + +/obj/effect/proc_holder/changeling/Click() + var/mob/user = usr + if(!user || !user.mind || !user.mind.changeling) + return + try_to_sting(user) + +/obj/effect/proc_holder/changeling/proc/try_to_sting(var/mob/user, var/mob/target) + if(!can_sting(user, target)) + return + var/datum/changeling/c = user.mind.changeling + if(sting_action(user, target)) + sting_feedback(user, target) + take_chemical_cost(c) + +/obj/effect/proc_holder/changeling/proc/sting_action(var/mob/user, var/mob/target) + return 0 + +/obj/effect/proc_holder/changeling/proc/sting_feedback(var/mob/user, var/mob/target) + return 0 + +/obj/effect/proc_holder/changeling/proc/take_chemical_cost(var/datum/changeling/changeling) + changeling.chem_charges -= chemical_cost + changeling.geneticdamage += genetic_damage + +//Fairly important to remember to return 1 on success >.< +/obj/effect/proc_holder/changeling/proc/can_sting(var/mob/user, var/mob/target) + if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards + return 0 + if(req_human && !ishuman(user)) + user << "We cannot do that in this form!" + return 0 + var/datum/changeling/c = user.mind.changeling + if(c.chem_charges
|
+ 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]" : "")]
-
- - |
-
Tank Control System
" if(input_info) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5f5cc02048d..a460626269c 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -120,7 +120,7 @@ var/global/list/autolathe_recipes_hidden = list( \ if (stat) return 1 if (busy) - user << "\red The autolathe is busy. Please wait for completion of previous operation." + user << "The autolathe is busy. Please wait for completion of previous operation." return 1 if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", O)) @@ -145,13 +145,13 @@ var/global/list/autolathe_recipes_hidden = list( \ return 1 if (src.m_amount + O.m_amt > max_m_amount) - user << "\red The autolathe is full. Please remove metal from the autolathe in order to insert more." + user << "The autolathe is full. Please remove metal from the autolathe in order to insert more." return 1 if (src.g_amount + O.g_amt > max_g_amount) - user << "\red The autolathe is full. Please remove glass from the autolathe in order to insert more." + user << "The autolathe is full. Please remove glass from the autolathe in order to insert more." return 1 if (O.m_amt == 0 && O.g_amt == 0) - user << "\red This object does not contain significant amounts of metal or glass, or cannot be accepted by the autolathe due to size or hazardous materials." + user << "This object does not contain significant amounts of metal or glass, or cannot be accepted by the autolathe due to size or hazardous materials." return 1 var/amount = 1 @@ -227,7 +227,7 @@ var/global/list/autolathe_recipes_hidden = list( \ src.g_amount = 0 busy = 0 else - usr << "\red The autolathe is busy. Please wait for completion of previous operation." + usr << "The autolathe is busy. Please wait for completion of previous operation." src.updateUsrDialog() return @@ -246,27 +246,27 @@ var/global/list/autolathe_recipes_hidden = list( \ var/dat if(!panel_open) var/coeff = 2 ** prod_coeff - dat = "Metal Amount: [src.m_amount] / [max_m_amount] cm3
" - dat += "Glass Amount: [src.g_amount] / [max_g_amount] cm3
" + dat = "
" - dat += "Glass Amount: [src.g_amount] / [max_g_amount] cm3
" + dat = "
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 += "[t.name]"
+ 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]"
+ dat += " x[10]"
if (max_multiplier>25 && !disabled)
- dat += " x[25]"
+ dat += " x[25]"
if (max_multiplier>1 && !disabled)
- dat += " x[max_multiplier]"
+ 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"
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index e113689bdb5..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
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index b06a181fa9f..49ef88bdbd5 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -244,7 +244,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."
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index aed30d352a9..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
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 5179e09843c..dafe8600e96 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -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) @@ -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) ) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 710b31ac969..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() ..() @@ -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 diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 25488f3a3ac..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' @@ -46,8 +45,7 @@ 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) - component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) RefreshParts() /obj/machinery/microwave/RefreshParts() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index a4972ab05f1..9ac66a450e6 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -189,7 +189,7 @@ if(istype(O, /obj/item/device/lightreplacer)) var/obj/item/device/lightreplacer/LR = O var/i = 1 - for(1, i < coeff, i++) + for(1, i <= coeff, i++) LR.Charge(occupier) if(occupier) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index a74260c1dcd..2c8c6e91c6e 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -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/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index dc0d8090b15..8bb964a7302 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -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]\] " var/blackbox_msg = "[part_a][source][part_blackbox_b]\"[text]\"[part_c]" //var/blackbox_admin_msg = "[part_a][M.name] (Real name: [M.real_name])[part_blackbox_b][quotedmsg][part_c]" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c12111d1d2f..ba2fb0a906c 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -222,12 +222,12 @@ if(premium.len > 0) dat += "Coin slot: " if (coin) - dat += "[coin] Remove" + dat += "[coin] Remove" else dat += "No coin Remove" if(!panel_open)//Vending machines do not dispense items when they are unscrewed - dat += "
" + 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
\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) @@ -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) ) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 710b31ac969..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() ..() @@ -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 diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 25488f3a3ac..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' @@ -46,8 +45,7 @@ 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) - component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) RefreshParts() /obj/machinery/microwave/RefreshParts() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index a4972ab05f1..9ac66a450e6 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -189,7 +189,7 @@ if(istype(O, /obj/item/device/lightreplacer)) var/obj/item/device/lightreplacer/LR = O var/i = 1 - for(1, i < coeff, i++) + for(1, i <= coeff, i++) LR.Charge(occupier) if(occupier) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index a74260c1dcd..2c8c6e91c6e 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -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/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index dc0d8090b15..8bb964a7302 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -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]\] " var/blackbox_msg = "[part_a][source][part_blackbox_b]\"[text]\"[part_c]" //var/blackbox_admin_msg = "[part_a][M.name] (Real name: [M.real_name])[part_blackbox_b][quotedmsg][part_c]" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c12111d1d2f..ba2fb0a906c 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -222,12 +222,12 @@ if(premium.len > 0) dat += "Coin slot: " if (coin) - dat += "[coin] Remove" + dat += "[coin] Remove" else dat += "No coin Remove" if(!panel_open)//Vending machines do not dispense items when they are unscrewed - dat += "
Select an Item
" + dat += "Select an item
" dat += ""
if(product_records.len == 0)
dat += "No product loaded!"
@@ -243,10 +243,10 @@
for (var/datum/data/vending_product/R in display_records)
dat += ""
if(R.amount > 0)
- dat += "Vend "
+ dat += "Vend "
else
- dat += "Sold Out "
- dat += "[R.product_name]:"
+ dat += "Sold out "
+ dat += "[sanitize(R.product_name)]:"
dat += " [R.amount]"
dat += " "
dat += ""
@@ -833,9 +833,6 @@
/obj/item/weapon/stock_parts/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8,
/obj/item/weapon/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5,/obj/item/weapon/stock_parts/micro_laser = 5,
/obj/item/weapon/stock_parts/matter_bin = 5,/obj/item/weapon/stock_parts/manipulator = 5,/obj/item/weapon/stock_parts/console_screen = 5)
- // There was an incorrect entry (cablecoil/power). I improvised to cablecoil/heavyduty.
- // Another invalid entry, /obj/item/weapon/circuitry. I don't even know what that would translate to, removed it.
- // The original products list wasn't finished. The ones without given quantities became quantity 5. -Sayu
//This one's from bay12
/obj/machinery/vending/robotics
@@ -848,5 +845,3 @@
/obj/item/weapon/stock_parts/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3,
/obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5,
/obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5)
- //everything after the power cell had no amounts, I improvised. -Sayu
-
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index a4927d95ccf..218e8975358 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -25,7 +25,7 @@
desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel."
name = "\improper Seraph"
icon_state = "seraph"
- operation_req_access = list(access_cent_creed)
+ operation_req_access = list(access_cent_specops)
step_in = 3
health = 550
wreckage = /obj/structure/mecha_wreckage/seraph
diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm
new file mode 100644
index 00000000000..cd77cbe6dfe
--- /dev/null
+++ b/code/game/mecha/combat/reticence.dm
@@ -0,0 +1,26 @@
+/obj/mecha/combat/reticence
+ desc = "A silent, fast, and nigh-invisible miming exosuit. Popular among mimes and mime assassins."
+ name = "\improper reticence"
+ icon_state = "reticence"
+ step_in = 2
+ dir_in = 1 //Facing North.
+ health = 100
+ deflect_chance = 3
+ damage_absorption = list("brute"=0.75,"fire"=1,"bullet"=0.8,"laser"=0.7,"energy"=0.85,"bomb"=1)
+ max_temperature = 15000
+ wreckage = /obj/structure/mecha_wreckage/reticence
+ operation_req_access = list(access_theatre)
+ add_req_access = 0
+ internal_damage_threshold = 25
+ max_equip = 2
+ step_energy_drain = 3
+ color = "#87878715"
+ stepsound = null
+
+/obj/mecha/combat/reticence/loaded/New()
+ ..()
+ var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/tool/rcd //HAHA IT MAKES WALLS GET IT
+ ME.attach(src)
+ return
\ No newline at end of file
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index b1eb2dff542..3d990e77ddd 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -205,6 +205,14 @@
projectiles = 24
projectile_energy_cost = 15
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced
+ name = "\improper S.H.H. \"Quietus\" Carbine"
+ fire_sound = "sound/weapons/Gunshot_silenced.ogg"
+ icon_state = "mecha_mime"
+ equip_cooldown = 30
+ projectile = /obj/item/projectile/bullet/mime
+ projectiles = 6
+ projectile_energy_cost = 50
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
name = "\improper LBX AC 10 \"Scattershot\""
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 0c37bff25b0..c6f8cdf7afc 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -13,8 +13,10 @@
idle_power_usage = 20
active_power_usage = 5000
req_access = list(access_robotics)
- var/time_coeff = 1.5 //can be upgraded with research
- var/resource_coeff = 1.5 //can be upgraded with research
+ var/time_coeff = 1
+ var/resource_coeff = 1
+ var/time_coeff_tech = 1
+ var/resource_coeff_tech = 1
var/list/resources = list(
"metal"=0,
"glass"=0,
@@ -164,14 +166,14 @@
T += Ma.rating
T -= 1
var/diff
- diff = round(initial(resource_coeff) - (initial(resource_coeff)*(T))/6,0.01)
+ diff = round(initial(resource_coeff) - (initial(resource_coeff)*(T))/8,0.01)
if(resource_coeff!=diff)
resource_coeff = diff
T = 0
for(var/obj/item/weapon/stock_parts/manipulator/Ml in component_parts)
T += Ml.rating
T -= 1
- diff = round(initial(time_coeff) - (initial(time_coeff)*(T))/4,0.01)
+ diff = round(initial(time_coeff) - (initial(time_coeff)*(T))/5,0.01)
if(time_coeff!=diff)
time_coeff = diff
@@ -467,9 +469,9 @@
pmat += Ml.rating
if(pmat >= 1)
pmat -= 1//So the equations don't have to be reworked, upgrading a single part from T1 to T2 is == to 1 tech level
- diff = round(initial(resource_coeff) - (initial(resource_coeff)*(T.level+pmat))/25,0.01)
- if(resource_coeff!=diff)
- resource_coeff = diff
+ diff = round(initial(resource_coeff_tech) - (initial(resource_coeff_tech)*(T.level+pmat))/30,0.01)
+ if(resource_coeff_tech>diff)
+ resource_coeff_tech = diff
output+="Production efficiency increased.
" if("programming") var/ptime = 0 @@ -477,9 +479,9 @@ ptime += Ma.rating if(ptime >= 2) ptime -= 2 - diff = round(initial(time_coeff) - (initial(time_coeff)*(T.level+ptime))/25,0.1) - if(time_coeff!=diff) - time_coeff = diff + diff = round(initial(time_coeff_tech) - (initial(time_coeff_tech)*(T.level+ptime))/25,0.1) + if(time_coeff_tech>diff) + time_coeff_tech = diff output+="Production routines updated.
" return output @@ -525,15 +527,15 @@ if(part.vars.Find("construction_time") && part.vars.Find("construction_cost")) var/list/L = part_sets["Misc"] if(L.Find(part.type)) - return round(part:construction_cost[resource]*(resource_coeff/2), roundto) //hacky scary skeletons send shivers down your spine - return round(part:construction_cost[resource]*resource_coeff, roundto) + return round(part:construction_cost[resource]*(resource_coeff/2)*resource_coeff_tech, roundto) //hacky scary skeletons send shivers down your spine + return round(part:construction_cost[resource]*resource_coeff*resource_coeff_tech, roundto) else return 0 /obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(var/obj/item/part as obj, var/roundto=1) //Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects if(part.vars.Find("construction_time") && part.vars.Find("construction_cost")) - return round(part:construction_time*time_coeff, roundto) + return round(part:construction_time*time_coeff*time_coeff_tech, roundto) else return 0 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 7d121713b16..f95760be264 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -61,7 +61,6 @@ var/datum/global_iterator/pr_give_air //moves air from tank to cabin var/datum/global_iterator/pr_internal_damage //processes internal damage - var/wreckage var/list/equipment = new @@ -69,6 +68,9 @@ var/max_equip = 3 var/datum/events/events + var/stepsound = 'sound/mecha/mechturn.ogg' + + /obj/mecha/New() ..() events = new @@ -308,20 +310,20 @@ /obj/mecha/proc/mechturn(direction) dir = direction - playsound(src,'sound/mecha/mechturn.ogg',40,1) + if(stepsound) + playsound(src,stepsound,40,1) return 1 /obj/mecha/proc/mechstep(direction) var/result = step(src,direction) - if(result) - playsound(src,'sound/mecha/mechstep.ogg',40,1) + if(result && stepsound) + playsound(src,stepsound,40,1) return result - /obj/mecha/proc/mechsteprand() var/result = step_rand(src) - if(result) - playsound(src,'sound/mecha/mechstep.ogg',40,1) + if(result && stepsound) + playsound(src,stepsound,40,1) return result /obj/mecha/Bump(var/atom/obstacle) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index bf85c76bfa1..2f27fbfa34e 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -100,7 +100,10 @@ name = "\improper Seraph wreckage" icon_state = "seraph-broken" - +/obj/structure/mecha_wreckage/reticence + name = "\improper Reticence wreckage" + icon_state = "reticence-broken" + color = "#87878715" /obj/structure/mecha_wreckage/ripley name = "\improper Ripley wreckage" diff --git a/code/game/objects/effects/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm index 35cc039a08a..af71ac97f4f 100644 --- a/code/game/objects/effects/spawners/vaultspawner.dm +++ b/code/game/objects/effects/spawners/vaultspawner.dm @@ -18,9 +18,11 @@ for(var/i = lowBoundX,i<=hiBoundX,i++) for(var/j = lowBoundY,j<=hiBoundY,j++) + var/turf/T = locate(i,j,z) if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY) - new /turf/simulated/wall/vault(locate(i,j,z),type) + T.ChangeTurf(/turf/simulated/wall/vault) else - new /turf/simulated/floor/vault(locate(i,j,z),type) + T.ChangeTurf(/turf/simulated/floor/vault) + T.icon_state = "[type]vault" - qdel(src) \ No newline at end of file + qdel(src) 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 = "
" powmonitor = null powermonitors = list() @@ -318,7 +318,7 @@ Code: menu += "" - if (433) //Muskets' and Rockdtben's power monitor :D + if (433) menu = "
" if(!powmonitor) menu += "\red No connection
" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index c3d4b2a0d32..88bec2edc50 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -17,6 +17,7 @@ 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. diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 04e26786580..edac441eae1 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -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]\]
" if("programming") var/ptime = 0 @@ -477,9 +479,9 @@ ptime += Ma.rating if(ptime >= 2) ptime -= 2 - diff = round(initial(time_coeff) - (initial(time_coeff)*(T.level+ptime))/25,0.1) - if(time_coeff!=diff) - time_coeff = diff + diff = round(initial(time_coeff_tech) - (initial(time_coeff_tech)*(T.level+ptime))/25,0.1) + if(time_coeff_tech>diff) + time_coeff_tech = diff output+="Production routines updated.
" return output @@ -525,15 +527,15 @@ if(part.vars.Find("construction_time") && part.vars.Find("construction_cost")) var/list/L = part_sets["Misc"] if(L.Find(part.type)) - return round(part:construction_cost[resource]*(resource_coeff/2), roundto) //hacky scary skeletons send shivers down your spine - return round(part:construction_cost[resource]*resource_coeff, roundto) + return round(part:construction_cost[resource]*(resource_coeff/2)*resource_coeff_tech, roundto) //hacky scary skeletons send shivers down your spine + return round(part:construction_cost[resource]*resource_coeff*resource_coeff_tech, roundto) else return 0 /obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(var/obj/item/part as obj, var/roundto=1) //Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects if(part.vars.Find("construction_time") && part.vars.Find("construction_cost")) - return round(part:construction_time*time_coeff, roundto) + return round(part:construction_time*time_coeff*time_coeff_tech, roundto) else return 0 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 7d121713b16..f95760be264 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -61,7 +61,6 @@ var/datum/global_iterator/pr_give_air //moves air from tank to cabin var/datum/global_iterator/pr_internal_damage //processes internal damage - var/wreckage var/list/equipment = new @@ -69,6 +68,9 @@ var/max_equip = 3 var/datum/events/events + var/stepsound = 'sound/mecha/mechturn.ogg' + + /obj/mecha/New() ..() events = new @@ -308,20 +310,20 @@ /obj/mecha/proc/mechturn(direction) dir = direction - playsound(src,'sound/mecha/mechturn.ogg',40,1) + if(stepsound) + playsound(src,stepsound,40,1) return 1 /obj/mecha/proc/mechstep(direction) var/result = step(src,direction) - if(result) - playsound(src,'sound/mecha/mechstep.ogg',40,1) + if(result && stepsound) + playsound(src,stepsound,40,1) return result - /obj/mecha/proc/mechsteprand() var/result = step_rand(src) - if(result) - playsound(src,'sound/mecha/mechstep.ogg',40,1) + if(result && stepsound) + playsound(src,stepsound,40,1) return result /obj/mecha/Bump(var/atom/obstacle) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index bf85c76bfa1..2f27fbfa34e 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -100,7 +100,10 @@ name = "\improper Seraph wreckage" icon_state = "seraph-broken" - +/obj/structure/mecha_wreckage/reticence + name = "\improper Reticence wreckage" + icon_state = "reticence-broken" + color = "#87878715" /obj/structure/mecha_wreckage/ripley name = "\improper Ripley wreckage" diff --git a/code/game/objects/effects/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm index 35cc039a08a..af71ac97f4f 100644 --- a/code/game/objects/effects/spawners/vaultspawner.dm +++ b/code/game/objects/effects/spawners/vaultspawner.dm @@ -18,9 +18,11 @@ for(var/i = lowBoundX,i<=hiBoundX,i++) for(var/j = lowBoundY,j<=hiBoundY,j++) + var/turf/T = locate(i,j,z) if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY) - new /turf/simulated/wall/vault(locate(i,j,z),type) + T.ChangeTurf(/turf/simulated/wall/vault) else - new /turf/simulated/floor/vault(locate(i,j,z),type) + T.ChangeTurf(/turf/simulated/floor/vault) + T.icon_state = "[type]vault" - qdel(src) \ No newline at end of file + qdel(src) 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/multitool.dm b/code/game/objects/items/devices/multitool.dm index c3d4b2a0d32..88bec2edc50 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -17,6 +17,7 @@ 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. diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 04e26786580..edac441eae1 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -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]\]