diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm index 52ab6d043ad..438894ca865 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm @@ -62,6 +62,7 @@ max volume of plasma storeable by the field = the total volume of a number of ti active_power_usage = 500 //multiplied by field strength var/cached_power_avail = 0 directwired = 1 + anchored = 0 var/state = 0 var/locked = 1 diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm index 64e9f46535e..6d18b71f4cb 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm @@ -3,17 +3,19 @@ name = "Fuel Injector" icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' icon_state = "injector0" + density = 1 - var/state = 2 + anchored = 0 + var/state = 0 var/locked = 0 + req_access = list(access_engine) + var/obj/item/weapon/fuel_assembly/cur_assembly var/fuel_usage = 0.0001 //percentage of available fuel to use per cycle var/id_tag = "One" var/injecting = 0 var/trying_to_swap_fuel = 0 - // - req_access = list(access_engine) - // + use_power = 1 idle_power_usage = 10 active_power_usage = 500 diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 38662ddcf52..48c13eb8499 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -46,7 +46,7 @@ for(var/obj/effect/dummy/chameleon/AD in src) AD.loc = src.loc - for(var/obj/item/I in src) + for(var/obj/I in src) I.loc = src.loc for(var/mob/M in src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 05d8b4241b0..0026aa53165 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -175,15 +175,29 @@ redlight = "largemetalr" greenlight = "largemetalg" -/obj/structure/closet/crate/secure/large_reinforced - name = "large crate" +/obj/structure/closet/crate/secure/large/close() + //we can hold up to one large item + var/found = 0 + for(var/obj/structure/S in src.loc) + if(S == src) + continue + if(!S.anchored) + found = 1 + S.loc = src + break + if(!found) + for(var/obj/machinery/M in src.loc) + if(!M.anchored) + M.loc = src + break + ..() + +//fluff variant +/obj/structure/closet/crate/secure/large/reinforced desc = "A hefty, reinforced metal crate with an electronic locking system." - icon = 'icons/obj/storage.dmi' icon_state = "largermetal" icon_opened = "largermetalopen" icon_closed = "largermetal" - redlight = "largemetalr" - greenlight = "largemetalg" /obj/structure/closet/crate/secure desc = "A secure crate." @@ -206,6 +220,23 @@ icon_opened = "largemetalopen" icon_closed = "largemetal" +/obj/structure/closet/crate/large/close() + //we can hold up to one large item + var/found = 0 + for(var/obj/structure/S in src.loc) + if(S == src) + continue + if(!S.anchored) + found = 1 + S.loc = src + break + if(!found) + for(var/obj/machinery/M in src.loc) + if(!M.anchored) + M.loc = src + break + ..() + /obj/structure/closet/crate/hydroponics name = "Hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 30fe52b562a..c5c24814a2a 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -388,8 +388,7 @@ commented out in r5061, I left it because of the shroom thingies if(artifact_find) B.artifact_find = artifact_find else if(src.excavation_level + P.excavation_amount >= 100) - spawn(0) - artifact_debris() + artifact_debris() gets_drilled(B ? 0 : 1) return @@ -477,13 +476,8 @@ commented out in r5061, I left it because of the shroom thingies for (var/i=0;i
  • Mix separator with sample - The resulting mixture is very close to the final product, but make sure to extract any leftover reagents and the chemical waste byproduct.
    • -
  • Bring sample to boil - Using a standard bunsen burner, bring the mixture to a boil to vaporise the remaining unwanted matter. Remember +
  • Bring sample to boil - Using a standard bunsen burner, bring the mixture containing at least 5u of DST to a boil to vaporise the remaining unwanted matter. Remember to again clear out any waste byproducts.

    • Contents @@ -411,3 +411,65 @@ "} + +/obj/item/weapon/book/manual/stasis + name = "Cellular suspension, the new Cryogenics?" + icon_state = "stasis" + author = "Elvin Schmidt" + title = "Cellular suspension, the new Cryogenics?" + dat = {" + + + + + +

    Contents

    +
      +
    1. Forward: A replacement for cryosleep?
      2. +
    2. The breakthrough
      3. +
    3. Applying this new principle
      4. +
    +
    +

    Forward: A replacement for cryosleep?

    + The development of rudimentary cryofreezing in the 20th and 21st centuries was hailed as a crank science by some, but many early visionaries recognised the + potential it had to change the way we approach so many fields, such as medicine, therapeutics and space travel. It was breakthroughs in the field in the 22nd and + later centures that turned the procedure from science fiction to science fact, however. Since then, cryogenics has become a hallmark of modern science, and + regarded as one of the great achievements of our era. As with all sciences however, they have their time and are superseded by newer technological miracles when + it is over.
    + Contents + +

    The breakthrough

    + It was in examining the effects of decellerated, blue-space high energy particles when transphased through bluespace that the effects where primarily noticed. + Due to exigent properties of that dimension, transphasing those particles capable of existing in bluespace with high stability levels has the effect of bringing + some of those effects into realspace. Examining the Hoffman emissions in particular, it was discovered that they exhibited a-entropic behaviour, and in what is + now termed the 'Effete Hoffman Principle,' it was found that metastabilising the Hoffman radiation resulted in the effect being applied across other physical + interactions, in particular forces and reactions.
    + Contents + +

    Applying this new principle

    + When combined with an appropriate energy-effect replicate for cryogenics (slowing down biological activity, thus stabilising the organics), the effect is + effectively identical to cryogenics, and while it consumes vastly more power and requires extremely complex equipment, it's (for all intents and purposes) superior + to cryogenics, all that remains is to 'commercialise' the process by enabling cheaper development and mass production.
    + The Effete Hoffman Principle can be tweak-combined with other effects however, for different purposes. A division of PMC Research initially developed the application + in prisons as a literal 'suspension field' where convincts are held immobile in the air, and the use quickly spread to numerous other areas.
    +
    + By examining the material resonance properties of certain strong waveforms when combined with Hoffman radiation, an effect was produced able to reverse energy + transferral through matter, and to slow the effects of gravity. When combined with energy repulse technology, the triple effects compound themselves into a much + stronger field, although all three componenets do slightly different things. High energy researchers assure me of the following key points:
    +
      +
    1. The energy repulsion factor provides a 'shell' capable of weak suspension.
      2. +
    2. The Hoffman emissions nullify energy transferral and other kinetic activity, maintaining stability inside the field.
      3. +
    3. The resonant waveform combines the effects of the above two points, and applies it magnified onto it's synched 'resonance' materials.
      4. +
    + As an interesting aside, a carbon waveform was chosen for the field in prison suspension fields, due to it's resonance with organic matter.
    + Contents + + + + "} diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index ec1f4f18046..3f682f65951 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -53,6 +53,7 @@ new /obj/item/weapon/book/manual/materials_chemistry_analysis(src) new /obj/item/weapon/book/manual/anomaly_testing(src) new /obj/item/weapon/book/manual/anomaly_spectroscopy(src) + new /obj/item/weapon/book/manual/stasis(src) update_icon() //---- Lockers and closets @@ -96,10 +97,11 @@ new /obj/item/device/radio/beacon(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/weapon/pickaxe(src) + new /obj/item/device/measuring_tape(src) return //---- Isolation room air alarms /obj/machinery/alarm/isolation name = "Isolation room air control" - req_access = list(access_research) \ No newline at end of file + req_access = list(access_research) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index 40980994ce3..36a75826f72 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -82,13 +82,14 @@ dat += "
    " if(!locked) dat += "Select field mode
    " - dat += "[field_type=="carbon"?"":"" ]Diffracted CO2 laser
    " + dat += "[field_type=="carbon"?"":"" ]Diffracted carbon dioxide laser
    " dat += "[field_type=="nitrogen"?"":"" ]Nitrogen tracer field
    " dat += "[field_type=="potassium"?"":"" ]Potassium refrigerant cloud
    " dat += "[field_type=="mercury"?"":"" ]Mercury dispersion wave
    " dat += "[field_type=="iron"?"":"" ]Iron wafer conduction field
    " dat += "[field_type=="calcium"?"":"" ]Calcium binary deoxidiser
    " - dat += "[field_type=="plasma"?"":"" ]Plasma saturated field
    " + dat += "[field_type=="plasma"?"":"" ]Chlorine diffusion emissions
    " + dat += "[field_type=="plasma"?"":"" ]Plasma saturated field
    " else dat += "
    " dat += "
    " @@ -260,6 +261,9 @@ if("plasma") success = 1 // + if("calcium") + success = 1 + // if("iron") success = 1 for(var/mob/living/silicon/R in T) diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm index 948328d9c83..7d4187c0d5b 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm @@ -72,6 +72,7 @@ excavation_amount = 5 drill_sound = 'sound/items/Screwdriver.ogg' drill_verb = "delicately picking" + w_class = 2 /obj/item/weapon/pickaxe/six_pick name = "1/1 pick" diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 1f7cecb6e09..08dc71cb1dd 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ