Autolathe Menu:
"
@@ -341,21 +341,21 @@
return dat
/obj/machinery/autolathe/proc/can_build(datum/design/D)
- var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff)
+ var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : prod_coeff)
- if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] / coeff)))
+ if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] * coeff)))
return 0
- if(D.materials[MAT_GLASS] && (materials.amount(MAT_GLASS) < (D.materials[MAT_GLASS] / coeff)))
+ if(D.materials[MAT_GLASS] && (materials.amount(MAT_GLASS) < (D.materials[MAT_GLASS] * coeff)))
return 0
return 1
/obj/machinery/autolathe/proc/get_design_cost(datum/design/D)
- var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff)
+ var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : prod_coeff)
var/dat
if(D.materials[MAT_METAL])
- dat += "[D.materials[MAT_METAL] / coeff] metal "
+ dat += "[D.materials[MAT_METAL] * coeff] metal "
if(D.materials[MAT_GLASS])
- dat += "[D.materials[MAT_GLASS] / coeff] glass"
+ dat += "[D.materials[MAT_GLASS] * coeff] glass"
return dat
/obj/machinery/autolathe/proc/reset(wire)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index ddbdcfa4e09..4c66b5508aa 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -5,6 +5,7 @@
#define CLONE_INITIAL_DAMAGE 190 //Clones in clonepods start with 190 cloneloss damage and 190 brainloss damage, thats just logical
+#define SPEAK(message) radio.talk_into(src, message, radio_channel, get_spans())
/obj/machinery/clonepod
anchored = 1
@@ -14,20 +15,45 @@
icon = 'icons/obj/cloning.dmi'
icon_state = "pod_0"
req_access = list(access_genetics) //For premature unlocking.
+ verb_say = "states"
var/heal_level = 90 //The clone is released once its health reaches this level.
- var/locked = 0
+ var/locked = FALSE
var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine.
- var/mess = 0 //Need to clean out it if it's full of exploded clone.
- var/attempting = 0 //One clone attempt at a time thanks
- var/eject_wait = 0 //Don't eject them as soon as they are created fuckkk
+ var/mess = FALSE //Need to clean out it if it's full of exploded clone.
+ var/attempting = FALSE //One clone attempt at a time thanks
+ var/eject_wait = FALSE //Don't eject them as soon as they are created fuckkk
var/speed_coeff
var/efficiency
+ var/datum/mind/clonemind
+ var/grab_ghost_when = CLONER_FRESH_CLONE
+
+ var/obj/item/device/radio/radio
+ var/radio_key = /obj/item/device/encryptionkey/headset_med
+ var/radio_channel = "Medical"
+
+ var/obj/effect/countdown/clonepod/countdown
+
/obj/machinery/clonepod/New()
..()
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/clonepod(null)
B.apply_default_parts(src)
+ countdown = new(src)
+
+ radio = new(src)
+ radio.keyslot = new radio_key
+ radio.subspace_transmission = 1
+ radio.canhear_range = 0
+ radio.recalculateChannels()
+
+/obj/machinery/clonepod/Destroy()
+ qdel(radio)
+ radio = null
+ qdel(countdown)
+ countdown = null
+ . = ..()
+
/obj/machinery/clonepod/RefreshParts()
speed_coeff = 0
efficiency = 0
@@ -42,7 +68,7 @@
/obj/item/weapon/circuitboard/machine/clonepod
name = "circuit board (Clone Pod)"
build_path = /obj/machinery/clonepod
- origin_tech = "programming=3;biotech=3"
+ origin_tech = "programming=2;biotech=2"
req_components = list(
/obj/item/stack/cable_coil = 2,
/obj/item/weapon/stock_parts/scanning_module = 2,
@@ -63,34 +89,13 @@
icon_state = "datadisk[rand(0,6)]"
overlays += "datadisk_gene"
-
/obj/item/weapon/disk/data/attack_self(mob/user)
read_only = !read_only
- user << "
You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]."
+ user << "
You flip the write-protect tab to [read_only ? "protected" : "unprotected"]."
/obj/item/weapon/disk/data/examine(mob/user)
..()
- user << "The write-protect tab is set to [src.read_only ? "protected" : "unprotected"]."
-
-
-//Find a dead mob with a brain and client.
-/proc/find_dead_player(find_key)
- if (isnull(find_key))
- return
-
- var/mob/selected = null
- for(var/mob/M in player_list)
- //Dead people only thanks!
- if ((M.stat != 2) || (!M.client))
- continue
- //They need a brain!
- if (ishuman(M) && !M.getorgan(/obj/item/organ/brain))
- continue
-
- if (M.ckey == find_key)
- selected = M
- break
- return selected
+ user << "The write-protect tab is set to [read_only ? "protected" : "unprotected"]."
//Health Tracker Implant
@@ -100,26 +105,30 @@
var/healthstring = ""
/obj/item/weapon/implant/health/proc/sensehealth()
- if (!src.implanted)
+ if (!implanted)
return "ERROR"
else
- if(isliving(src.implanted))
- var/mob/living/L = src.implanted
- src.healthstring = "
Oxygen Deprivation Damage => [round(L.getOxyLoss())]
Fire Damage => [round(L.getFireLoss())]
Toxin Damage => [round(L.getToxLoss())]
Brute Force Damage => [round(L.getBruteLoss())]"
- if (!src.healthstring)
- src.healthstring = "ERROR"
- return src.healthstring
+ if(isliving(implanted))
+ var/mob/living/L = implanted
+ healthstring = "
Oxygen Deprivation Damage => [round(L.getOxyLoss())]
Fire Damage => [round(L.getFireLoss())]
Toxin Damage => [round(L.getToxLoss())]
Brute Force Damage => [round(L.getBruteLoss())]"
+ if (!healthstring)
+ healthstring = "ERROR"
+ return healthstring
//Clonepod
/obj/machinery/clonepod/examine(mob/user)
..()
- if (isnull(src.occupant) || !is_operational())
+ if (isnull(occupant) || !is_operational())
return
- if ((!isnull(src.occupant)) && (src.occupant.stat != 2))
- var/completion = (100 * ((src.occupant.health + 100) / (src.heal_level + 100)))
- user << "Current clone cycle is [round(completion)]% complete."
- return
+ if ((!isnull(occupant)) && (occupant.stat != DEAD))
+ user << "Current clone cycle is [round(get_completion())]% complete."
+ else if(mess)
+ user << "It's filled with blood and vicerea. You swear you can see \
+ it moving..."
+
+/obj/machinery/clonepod/proc/get_completion()
+ . = (100 * ((occupant.health + 100) / (heal_level + 100)))
/obj/machinery/clonepod/attack_ai(mob/user)
return examine(user)
@@ -127,32 +136,30 @@
//Start growing a human clone in the pod!
/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions)
if(panel_open)
- return 0
+ return FALSE
if(mess || attempting)
- return 0
- var/datum/mind/clonemind = locate(mindref)
+ return FALSE
+ clonemind = locate(mindref)
if(!istype(clonemind)) //not a mind
- return 0
+ return FALSE
if( clonemind.current && clonemind.current.stat != DEAD ) //mind is associated with a non-dead body
- return 0
+ return FALSE
if(clonemind.active) //somebody is using that mind
if( ckey(clonemind.key)!=ckey )
- return 0
+ return FALSE
else
- for(var/mob/M in player_list)
- if(M.ckey == ckey)
- if(istype(M, /mob/dead/observer))
- var/mob/dead/observer/G = M
- if(G.can_reenter_corpse)
- break
- return 0
+ // get_ghost() will fail if they're unable to reenter their body
+ var/mob/dead/observer/G = clonemind.get_ghost()
+ if(!G)
+ return FALSE
- src.attempting = 1 //One at a time!!
- src.locked = 1
+ attempting = TRUE //One at a time!!
+ locked = TRUE
+ countdown.start()
- src.eject_wait = 1
+ eject_wait = TRUE
spawn(30)
- src.eject_wait = 0
+ eject_wait = FALSE
var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
@@ -173,15 +180,22 @@
clonename = "clone ([rand(0,999)])"
H.real_name = clonename
- src.icon_state = "pod_1"
+ icon_state = "pod_1"
//Get the clone body ready
H.adjustCloneLoss(CLONE_INITIAL_DAMAGE) //Yeah, clones start with very low health, not with random, because why would they start with random health
H.adjustBrainLoss(CLONE_INITIAL_DAMAGE)
H.Paralyse(4)
- clonemind.transfer_to(H)
- H.ckey = ckey
- H << "
Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?"
+ if(grab_ghost_when == CLONER_FRESH_CLONE)
+ clonemind.transfer_to(H)
+ H.ckey = ckey
+ H << "
Consciousness slowly creeps over you \
+ as your body regenerates.
So this is what cloning \
+ feels like?"
+ else if(grab_ghost_when == CLONER_MATURE_CLONE)
+ clonemind.current << "
Your body is \
+ beginning to regenerate in a cloning pod. You will \
+ become conscious when it is complete."
H.hardset_dna(ui, se, H.real_name, null, mrace, features)
if(H)
@@ -189,58 +203,58 @@
H.set_cloned_appearance()
- H.suiciding = 0
- src.attempting = 0
- return 1
+ H.suiciding = FALSE
+ attempting = FALSE
+ return TRUE
//Grow clones to maturity then kick them out. FREELOADERS
/obj/machinery/clonepod/process()
if(!is_operational()) //Autoeject if power is lost
- if (src.occupant)
- src.locked = 0
- src.go_out()
- return
+ if (occupant)
+ locked = FALSE
+ go_out()
- if((src.occupant) && (src.occupant.loc == src))
- if((src.occupant.stat == DEAD) || (src.occupant.suiciding) || !occupant.key || src.occupant.hellbound) //Autoeject corpses and suiciding dudes.
- src.locked = 0
- src.go_out()
- src.connected_message("Clone Rejected: Deceased.")
- return
+ else if((occupant) && (occupant.loc == src))
+ if((occupant.stat == DEAD) || (occupant.suiciding) || occupant.hellbound) //Autoeject corpses and suiciding dudes.
+ locked = FALSE
+ go_out()
+ connected_message("Clone Rejected: Deceased.")
+ SPEAK("The cloning of
[occupant.real_name] has been \
+ aborted due to unrecoverable tissue failure.")
- else if(src.occupant.cloneloss > (100 - src.heal_level))
- src.occupant.Paralyse(4)
+ else if(occupant.cloneloss > (100 - heal_level))
+ occupant.Paralyse(4)
//Slowly get that clone healed and finished.
- src.occupant.adjustCloneLoss(-((speed_coeff/2)))
+ occupant.adjustCloneLoss(-((speed_coeff/2)))
//Premature clones may have brain damage.
- src.occupant.adjustBrainLoss(-((speed_coeff/2)))
+ occupant.adjustBrainLoss(-((speed_coeff/2)))
//So clones don't die of oxyloss in a running pod.
- if (src.occupant.reagents.get_reagent_amount("salbutamol") < 30)
- src.occupant.reagents.add_reagent("salbutamol", 60)
+ if (occupant.reagents.get_reagent_amount("salbutamol") < 30)
+ occupant.reagents.add_reagent("salbutamol", 60)
+ // NOBREATH species will take brute damage in crit instead
+ // so heal that as well
+ if(occupant.reagents.get_reagent_amount("bicaridine") < 5)
+ occupant.reagents.add_reagent("bicaridine", 10)
use_power(7500) //This might need tweaking.
- return
- else if((src.occupant.cloneloss <= (100 - src.heal_level)) && (!src.eject_wait))
- src.connected_message("Cloning Process Complete.")
- src.locked = 0
- src.go_out()
- return
+ else if((occupant.cloneloss <= (100 - heal_level)) && (!eject_wait))
+ connected_message("Cloning Process Complete.")
+ SPEAK("The cloning cycle of
[occupant] is complete.")
+ locked = FALSE
+ go_out()
- else if ((!src.occupant) || (src.occupant.loc != src))
- src.occupant = null
- if (src.locked)
- src.locked = 0
- if (!src.mess && !panel_open)
+ else if ((!occupant) || (occupant.loc != src))
+ occupant = null
+ if (locked)
+ locked = FALSE
+ if (!mess && !panel_open)
icon_state = "pod_0"
use_power(200)
- return
-
- return
//Let's unlock this early I guess. Might be too early, needs tweaking.
/obj/machinery/clonepod/attackby(obj/item/weapon/W, mob/user, params)
@@ -264,28 +278,28 @@
user << "
Access Refused. Patient status still unstable."
return
else
- locked = 0
+ locked = FALSE
user << "System unlocked."
else
return ..()
/obj/machinery/clonepod/emag_act(mob/user)
- if (isnull(src.occupant))
+ if (isnull(occupant))
return
user << "
You force an emergency ejection."
- src.locked = 0
- src.go_out()
+ locked = FALSE
+ go_out()
//Put messages in the connected computer's temp var for display.
/obj/machinery/clonepod/proc/connected_message(message)
- if ((isnull(src.connected)) || (!istype(src.connected, /obj/machinery/computer/cloning)))
- return 0
+ if ((isnull(connected)) || (!istype(connected, /obj/machinery/computer/cloning)))
+ return FALSE
if (!message)
- return 0
+ return FALSE
- src.connected.temp = message
- src.connected.updateUsrDialog()
- return 1
+ connected.temp = message
+ connected.updateUsrDialog()
+ return TRUE
/obj/machinery/clonepod/verb/eject()
set name = "Eject Cloner"
@@ -296,46 +310,63 @@
return
if(usr.stat || !usr.canmove || usr.restrained())
return
- src.go_out()
+ go_out()
add_fingerprint(usr)
- return
/obj/machinery/clonepod/proc/go_out()
if (locked)
return
+ countdown.stop()
if (mess) //Clean that mess and dump those gibs!
- mess = 0
+ mess = FALSE
gibs(loc)
+ audible_message("
You hear a splat.")
icon_state = "pod_0"
return
if (!occupant)
return
+ if(grab_ghost_when == CLONER_MATURE_CLONE)
+ clonemind.transfer_to(occupant)
+ occupant.grab_ghost()
+ occupant << "
The world is suddenly bright \
+ and sudden and loud!
\
+ You feel your body weight suddenly, as your mind suddenly \
+ comprehends where you are and what is going on."
+ occupant.flash_eyes()
+
var/turf/T = get_turf(src)
occupant.forceMove(T)
icon_state = "pod_0"
- eject_wait = 0 //If it's still set somehow.
+ eject_wait = FALSE //If it's still set somehow.
occupant.domutcheck() //Waiting until they're out before possible monkeyizing.
occupant = null
- return
/obj/machinery/clonepod/proc/malfunction()
- if(src.occupant)
- src.connected_message("Critical Error!")
- src.mess = 1
- src.icon_state = "pod_g"
- src.occupant.ghostize()
- spawn(5)
- qdel(src.occupant)
- return
+ if(occupant)
+ connected_message("Critical Error!")
+ SPEAK("Critical error! Please contact a Thinktronic Systems \
+ technician, as your warranty may be affected.")
+ mess = TRUE
+ icon_state = "pod_g"
+ if(occupant.mind != clonemind)
+ clonemind.transfer_to(occupant)
+ occupant.grab_ghost() // We really just want to make you suffer.
+ flash_color(occupant, color="#960000", time=100)
+ occupant << "
Agony blazes across your \
+ consciousness as your body is torn apart.
\
+ Is this what dying is like? Yes it is."
+ playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 50, 0)
+ occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50)
+ spawn(40)
+ occupant.ghostize()
+ qdel(occupant)
/obj/machinery/clonepod/relaymove(mob/user)
- if (user.stat)
- return
- src.go_out()
- return
+ if(user.stat == CONSCIOUS)
+ go_out()
/obj/machinery/clonepod/emp_act(severity)
if(prob(100/(severity*efficiency))) malfunction()
@@ -387,10 +418,5 @@
This technology produced under license from Thinktronic Systems, LTD."}
-//SOME SCRAPS I GUESS
-/* EMP grenade/spell effect
- if(istype(A, /obj/machinery/clonepod))
- A:malfunction()
-*/
-
#undef CLONE_INITIAL_DAMAGE
+#undef SPEAK
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 73717cf3f7c..2c58aa54a82 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -140,26 +140,28 @@
/obj/item/weapon/circuitboard/computer/telesci_console
name = "circuit board (Telescience Console)"
build_path = /obj/machinery/computer/telescience
- origin_tech = "programming=3;bluespace=2"
+ origin_tech = "programming=3;bluespace=3;plasmatech=4"
/obj/item/weapon/circuitboard/computer/message_monitor
name = "circuit board (Message Monitor)"
build_path = /obj/machinery/computer/message_monitor
- origin_tech = "programming=3"
+ origin_tech = "programming=2"
/obj/item/weapon/circuitboard/computer/security
name = "circuit board (Security Cameras)"
build_path = /obj/machinery/computer/security
+ origin_tech = "programming=2;combat=2"
/obj/item/weapon/circuitboard/computer/aiupload
name = "circuit board (AI Upload)"
build_path = /obj/machinery/computer/upload/ai
- origin_tech = "programming=4"
+ origin_tech = "programming=4;engineering=4"
/obj/item/weapon/circuitboard/computer/borgupload
name = "circuit board (Cyborg Upload)"
build_path = /obj/machinery/computer/upload/borg
- origin_tech = "programming=4"
+ origin_tech = "programming=4;engineering=4"
/obj/item/weapon/circuitboard/computer/med_data
name = "circuit board (Medical Records Console)"
build_path = /obj/machinery/computer/med_data
+ origin_tech = "programming=2;biotech=2"
/obj/item/weapon/circuitboard/computer/pandemic
name = "circuit board (PanD.E.M.I.C. 2200)"
build_path = /obj/machinery/computer/pandemic
@@ -171,12 +173,13 @@
/obj/item/weapon/circuitboard/computer/communications
name = "circuit board (Communications)"
build_path = /obj/machinery/computer/communications
- origin_tech = "programming=2;magnets=2"
+ origin_tech = "programming=3;magnets=3"
var/lastTimeUsed = 0
/obj/item/weapon/circuitboard/computer/card
name = "circuit board (ID Console)"
build_path = /obj/machinery/computer/card
+ origin_tech = "programming=3"
/obj/item/weapon/circuitboard/computer/card/centcom
name = "circuit board (Centcom ID Console)"
build_path = /obj/machinery/computer/card/centcom
@@ -204,10 +207,11 @@
/obj/item/weapon/circuitboard/computer/teleporter
name = "circuit board (Teleporter)"
build_path = /obj/machinery/computer/teleporter
- origin_tech = "programming=2;bluespace=2"
+ origin_tech = "programming=3;bluespace=3;plasmatech=3"
/obj/item/weapon/circuitboard/computer/secure_data
name = "circuit board (Security Records Console)"
build_path = /obj/machinery/computer/secure_data
+ origin_tech = "programming=2;combat=2"
/obj/item/weapon/circuitboard/computer/stationalert
name = "circuit board (Station Alerts)"
build_path = /obj/machinery/computer/station_alert
@@ -234,7 +238,7 @@
/obj/item/weapon/circuitboard/computer/cloning
name = "circuit board (Cloning)"
build_path = /obj/machinery/computer/cloning
- origin_tech = "programming=3;biotech=3"
+ origin_tech = "programming=2;biotech=2"
/obj/item/weapon/circuitboard/computer/arcade/battle
name = "circuit board (Arcade Battle)"
build_path = /obj/machinery/computer/arcade/battle
@@ -242,6 +246,7 @@
/obj/item/weapon/circuitboard/computer/arcade/orion_trail
name = "circuit board (Orion Trail)"
build_path = /obj/machinery/computer/arcade/orion_trail
+ origin_tech = "programming=1"
/obj/item/weapon/circuitboard/computer/turbine_control
name = "circuit board (Turbine control)"
build_path = /obj/machinery/computer/turbine_computer
@@ -252,6 +257,7 @@
/obj/item/weapon/circuitboard/computer/powermonitor
name = "circuit board (Power Monitor)" //name fixed 250810
build_path = /obj/machinery/computer/monitor
+ origin_tech = "programming=2;powerstorage=2"
/obj/item/weapon/circuitboard/computer/olddoor
name = "circuit board (DoorMex)"
build_path = /obj/machinery/computer/pod/old
@@ -292,11 +298,11 @@
/obj/item/weapon/circuitboard/computer/crew
name = "circuit board (Crew Monitoring Console)"
build_path = /obj/machinery/computer/crew
- origin_tech = "programming=3;biotech=2;magnets=2"
+ origin_tech = "programming=2;biotech=2"
/obj/item/weapon/circuitboard/computer/mech_bay_power_console
name = "circuit board (Mech Bay Power Control Console)"
build_path = /obj/machinery/computer/mech_bay_power_console
- origin_tech = "programming=2;powerstorage=3"
+ origin_tech = "programming=3;powerstorage=3"
/obj/item/weapon/circuitboard/computer/cargo
name = "circuit board (Supply Console)"
@@ -328,18 +334,18 @@
/obj/item/weapon/circuitboard/computer/operating
name = "circuit board (Operating Computer)"
build_path = /obj/machinery/computer/operating
- origin_tech = "programming=2;biotech=2"
+ origin_tech = "programming=2;biotech=3"
/obj/item/weapon/circuitboard/computer/mining
name = "circuit board (Outpost Status Display)"
build_path = /obj/machinery/computer/security/mining
/obj/item/weapon/circuitboard/computer/comm_monitor
name = "circuit board (Telecommunications Monitor)"
build_path = /obj/machinery/computer/telecomms/monitor
- origin_tech = "programming=3"
+ origin_tech = "programming=3;magnets=3;bluespace=2"
/obj/item/weapon/circuitboard/computer/comm_server
name = "circuit board (Telecommunications Server Monitor)"
build_path = /obj/machinery/computer/telecomms/server
- origin_tech = "programming=3"
+ origin_tech = "programming=3;magnets=3;bluespace=2"
/obj/item/weapon/circuitboard/computer/shuttle
name = "circuit board (Shuttle)"
@@ -382,7 +388,7 @@
/obj/item/weapon/circuitboard/computer/aifixer
name = "circuit board (AI Integrity Restorer)"
build_path = /obj/machinery/computer/aifixer
- origin_tech = "programming=3;biotech=2"
+ origin_tech = "programming=2;biotech=2"
/*/obj/item/weapon/circuitboard/computer/prison_shuttle
name = "circuit board (Prison Shuttle)"
build_path = /obj/machinery/computer/prison_shuttle*/
@@ -407,4 +413,4 @@
build_path = /obj/machinery/computer/libraryconsole/bookmanagement
user << "
Access protocols successfully updated."
else
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm
index 597b90129a7..fdc6d980933 100644
--- a/code/game/machinery/computer/dna_console.dm
+++ b/code/game/machinery/computer/dna_console.dm
@@ -398,11 +398,17 @@
if("se")
if(buffer_slot["SE"])
I = new /obj/item/weapon/dnainjector/timed(loc)
+ var/powers = 0
for(var/datum/mutation/human/HM in good_mutations + bad_mutations + not_good_mutations)
if(HM.check_block_string(buffer_slot["SE"]))
I.add_mutations.Add(HM)
+ if(HM in good_mutations)
+ powers += 1
+ if(HM in bad_mutations + not_good_mutations)
+ powers -= 1 //To prevent just unlocking everything to get all powers to a syringe for max tech
else
I.remove_mutations.Add(HM)
+ I.origin_tech = "biotech=2;engineering=[max(1,min(6,powers))]" //With 6 powers available this tech level will be 1-6, also safety check if new powers get added
var/time_coeff
for(var/datum/mutation/human/HM in I.add_mutations)
if(!time_coeff)
@@ -593,4 +599,4 @@
//#undef BAD_MUTATION_DIFFICULTY
//#undef GOOD_MUTATION_DIFFICULTY
-//#undef OP_MUTATION_DIFFICULTY
\ No newline at end of file
+//#undef OP_MUTATION_DIFFICULTY
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index cc914875006..e8b358a85cc 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -62,9 +62,6 @@
return amt
/obj/structure/frame/machine/attackby(obj/item/P, mob/user, params)
- if(P.crit_fail)
- user << "
This part is faulty, you cannot add this to the machine!"
- return
switch(state)
if(1)
if(istype(P, /obj/item/weapon/circuitboard/machine))
@@ -193,11 +190,10 @@
for(var/path in req_components)
while(req_components[path] > 0 && (locate(path) in part_list))
var/obj/item/part = (locate(path) in part_list)
- if(!part.crit_fail)
- added_components[part] = path
- replacer.remove_from_storage(part, src)
- req_components[path]--
- part_list -= part
+ added_components[part] = path
+ replacer.remove_from_storage(part, src)
+ req_components[path]--
+ part_list -= part
for(var/obj/item/weapon/stock_parts/part in added_components)
components += part
@@ -268,7 +264,7 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
/obj/item/weapon/circuitboard/machine/smes
name = "circuit board (SMES)"
build_path = /obj/machinery/power/smes
- origin_tech = "programming=4;powerstorage=5;engineering=5"
+ origin_tech = "programming=3;powerstorage=3;engineering=3"
req_components = list(
/obj/item/stack/cable_coil = 5,
/obj/item/weapon/stock_parts/cell = 5,
@@ -277,7 +273,7 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
/obj/item/weapon/circuitboard/machine/teleporter_hub
name = "circuit board (Teleporter Hub)"
build_path = /obj/machinery/teleport/hub
- origin_tech = "programming=3;engineering=5;bluespace=5;materials=4"
+ origin_tech = "programming=3;engineering=4;bluespace=4;materials=4"
req_components = list(
/obj/item/weapon/ore/bluespace_crystal = 3,
/obj/item/weapon/stock_parts/matter_bin = 1)
@@ -285,7 +281,7 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
/obj/item/weapon/circuitboard/machine/teleporter_station
name = "circuit board (Teleporter Station)"
build_path = /obj/machinery/teleport/station
- origin_tech = "programming=4;engineering=4;bluespace=4"
+ origin_tech = "programming=4;engineering=4;bluespace=4;plasmatech=3"
req_components = list(
/obj/item/weapon/ore/bluespace_crystal = 2,
/obj/item/weapon/stock_parts/capacitor = 2,
@@ -294,7 +290,7 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
/obj/item/weapon/circuitboard/machine/chem_dispenser
name = "circuit board (Portable Chem Dispenser)"
build_path = /obj/machinery/chem_dispenser/constructable
- origin_tech = "materials=4;engineering=4;programming=4;plasmatech=3;biotech=3"
+ origin_tech = "materials=4;programming=4;plasmatech=4;biotech=3"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 2,
/obj/item/weapon/stock_parts/capacitor = 1,
@@ -305,9 +301,9 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
/obj/item/weapon/circuitboard/machine/telesci_pad
name = "circuit board (Telepad)"
build_path = /obj/machinery/telepad
- origin_tech = "programming=4;engineering=3;materials=3;bluespace=4"
+ origin_tech = "programming=4;engineering=3;plasmatech=4;bluespace=4"
req_components = list(
/obj/item/weapon/ore/bluespace_crystal = 2,
/obj/item/weapon/stock_parts/capacitor = 1,
/obj/item/stack/cable_coil = 1,
- /obj/item/weapon/stock_parts/console_screen = 1)
\ No newline at end of file
+ /obj/item/weapon/stock_parts/console_screen = 1)
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 04fe6350d4c..667fec072c4 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -337,11 +337,7 @@
var/atom/throwtarget
throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(M, src)))
M << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50))
- if(M.client)
- var/old_color = M.client.color
- M.client.color = "#960000"
- spawn(0)//animate is a delay, avoid delay, etc
- animate(M.client,color = old_color, time = 20)
+ flash_color(M, color="#960000", time=20)
M.Weaken(2)
M.throw_at_fast(throwtarget, 5, 1,src)
return 0
@@ -377,6 +373,103 @@
/obj/machinery/door/airlock/cult/unruned/glass/friendly
friendly = TRUE
+#define GEAR_SECURE 1 //Construction defines for the pinion airlock
+#define GEAR_UNFASTENED 2
+#define GEAR_LOOSE 3
+
+//Pinion airlocks: Clockwork doors that only let servants of Ratvar through.
+/obj/machinery/door/airlock/clockwork
+ name = "pinion airlock"
+ desc = "A massive cogwheel set into two heavy slabs of brass."
+ icon = 'icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi'
+ overlays_file = 'icons/obj/doors/airlocks/clockwork/overlays.dmi'
+ opacity = 1
+ hackProof = TRUE
+ aiControlDisabled = TRUE
+ use_power = FALSE
+ var/construction_state = GEAR_SECURE //Pinion airlocks have custom deconstruction
+
+/obj/machinery/door/airlock/clockwork/New()
+ ..()
+ var/turf/T = get_turf(src)
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/door, T)
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/beam/door, T)
+
+/obj/machinery/door/airlock/clockwork/attackby(obj/item/I, mob/living/user, params)
+ if(!attempt_construction(I, user))
+ return ..()
+
+/obj/machinery/door/airlock/clockwork/allowed(mob/M)
+ if(is_servant_of_ratvar(M))
+ return 1
+ return 0
+
+/obj/machinery/door/airlock/clockwork/proc/attempt_construction(obj/item/I, mob/living/user)
+ if(!I || !user || !user.canUseTopic(src))
+ return 0
+ if(istype(I, /obj/item/weapon/screwdriver))
+ if(construction_state == GEAR_SECURE)
+ user.visible_message("
[user] begins unfastening [src]'s gear...", "
You begin unfastening [src]'s gear...")
+ playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
+ if(!do_after(user, 75 / I.toolspeed, target = src))
+ return 1 //Returns 1 so as not to have extra interactions with the tools used (i.e. prying open)
+ user.visible_message("
[user] unfastens [src]'s gear!", "
[src]'s gear shifts slightly with a pop.")
+ playsound(src, 'sound/items/Screwdriver2.ogg', 50, 1)
+ construction_state = GEAR_UNFASTENED
+ else if(construction_state == GEAR_UNFASTENED)
+ user.visible_message("
[user] begins fastening [src]'s gear...", "
You begin fastening [src]'s gear...")
+ playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
+ if(!do_after(user, 75 / I.toolspeed, target = src))
+ return 1
+ user.visible_message("
[user] fastens [src]'s gear!", "
[src]'s gear shifts back into place.")
+ playsound(src, 'sound/items/Screwdriver2.ogg', 50, 1)
+ construction_state = GEAR_SECURE
+ else if(construction_state == GEAR_LOOSE)
+ user << "
The gear isn't secure enough to fasten!"
+ return 1
+ else if(istype(I, /obj/item/weapon/wrench))
+ if(construction_state == GEAR_SECURE)
+ user << "
[src] is too tightly secured! Your [I.name] can't get a solid grip!"
+ return 0
+ else if(construction_state == GEAR_UNFASTENED)
+ user.visible_message("
[user] begins loosening [src]'s gear...", "
You begin loosening [src]'s gear...")
+ playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
+ if(!do_after(user, 80 / I.toolspeed, target = src))
+ return 1
+ user.visible_message("
[user] loosens [src]'s gear!", "
[src]'s gear pops off and dangles loosely.")
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
+ construction_state = GEAR_LOOSE
+ else if(construction_state == GEAR_LOOSE)
+ user.visible_message("
[user] begins tightening [src]'s gear...", "
You begin tightening [src]'s gear into place...")
+ playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
+ if(!do_after(user, 80 / I.toolspeed, target = src))
+ return 1
+ user.visible_message("
[user] tightens [src]'s gear!", "
You firmly tighten [src]'s gear into place.")
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
+ construction_state = GEAR_UNFASTENED
+ return 1
+ else if(istype(I, /obj/item/weapon/crowbar))
+ if(construction_state == GEAR_SECURE || construction_state == GEAR_UNFASTENED)
+ user << "
[src]'s gear is too tightly secured! Your [I.name] can't reach under it!"
+ return 1
+ else if(construction_state == GEAR_LOOSE)
+ user.visible_message("
[user] begins slowly lifting off [src]'s gear...", "
You slowly begin lifting off [src]'s gear...")
+ playsound(src, 'sound/items/Crowbar.ogg', 50, 1)
+ if(!do_after(user, 85 / I.toolspeed, target = src))
+ return 1
+ user.visible_message("
[user] lifts off [src]'s gear, causing it to fall apart!", "
You lift off [src]'s gear, causing it to fall \
+ apart!")
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
+ new/obj/item/clockwork/component/replicant_alloy(get_turf(src))
+ new/obj/item/clockwork/component/replicant_alloy/pinion_lock(get_turf(src))
+ qdel(src)
+ return 1
+ return 0
+
+#undef GEAR_SECURE
+#undef GEAR_UNFASTENED
+#undef GEAR_LOOSE
+
//////////////////////////////////
/*
Misc Airlocks
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index d3e9e6727dc..7207a48eca0 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -352,8 +352,6 @@ Class Procs:
M.state = 2
M.icon_state = "box_1"
for(var/obj/item/I in component_parts)
- if(I.reliability != 100 && crit_fail)
- I.crit_fail = 1
I.loc = loc
qdel(src)
@@ -391,10 +389,12 @@ Class Procs:
return 0
/obj/machinery/proc/exchange_parts(mob/user, obj/item/weapon/storage/part_replacer/W)
- if(flags & NODECONSTRUCT)
+ if(!istype(W))
+ return
+ if((flags & NODECONSTRUCT) && !W.works_from_distance)
return
var/shouldplaysound = 0
- if(istype(W) && component_parts)
+ if(component_parts)
if(panel_open || W.works_from_distance)
var/obj/item/weapon/circuitboard/machine/CB = locate(/obj/item/weapon/circuitboard/machine) in component_parts
var/P
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index fe5d9ac35a8..2a4b37d4fd4 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -18,7 +18,7 @@
/obj/item/weapon/circuitboard/machine/recharger
name = "circuit board (Weapon Recharger)"
build_path = /obj/machinery/recharger
- origin_tech = "powerstorage=3;engineering=3;materials=4"
+ origin_tech = "powerstorage=4;engineering=3;materials=4"
req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
/obj/machinery/recharger/RefreshParts()
@@ -163,4 +163,4 @@
else
icon_state = "recharger2"
return
- icon_state = "recharger0"
\ No newline at end of file
+ icon_state = "recharger0"
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index d7397ebabf4..64e1efcd345 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -24,7 +24,7 @@
origin_tech = "powerstorage=3;engineering=3"
req_components = list(
/obj/item/weapon/stock_parts/capacitor = 2,
- /obj/item/weapon/stock_parts/cell = 1,
+ /obj/item/weapon/stock_parts/cell/high = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
/obj/machinery/recharge_station/RefreshParts()
@@ -37,7 +37,6 @@
for(var/obj/item/weapon/stock_parts/cell/C in component_parts)
recharge_speed *= C.maxcharge / 10000
-
/obj/machinery/recharge_station/process()
if(!is_operational())
return
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 21db6aeb7cc..826d0247f23 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -28,7 +28,7 @@ var/const/SAFETY_COOLDOWN = 100
/obj/item/weapon/circuitboard/machine/recycler
name = "circuit board (Recycler)"
build_path = /obj/machinery/recycler
- origin_tech = "programming=1"
+ origin_tech = "programming=2;engineering=2"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 1ee601cc453..3bd1330e37f 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -31,7 +31,7 @@
/obj/item/weapon/circuitboard/machine/space_heater
name = "circuit board (Space Heater)"
build_path = /obj/machinery/space_heater
- origin_tech = "programming=2;engineering=2"
+ origin_tech = "programming=2;engineering=2;plasmatech=2"
req_components = list(
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/capacitor = 1,
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 3243e0cf5fb..4cebbf7c5ce 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -201,7 +201,7 @@
icon = 'icons/obj/radio.dmi'
icon_state = "beacon"
desc = "A label on it reads:
Warning: Activating this device will send a special beacon to your location."
- origin_tech = "bluespace=1;syndicate=7"
+ origin_tech = "bluespace=6;syndicate=5"
w_class = 2
var/droptype = /obj/machinery/power/singularity_beacon/syndicate
@@ -217,7 +217,9 @@
/obj/item/device/sbeacondrop/bomb
desc = "A label on it reads:
Warning: Activating this device will send a high-ordinance explosive to your location."
droptype = /obj/machinery/syndicatebomb
+ origin_tech = "bluespace=5;syndicate=5"
/obj/item/device/sbeacondrop/powersink
desc = "A label on it reads:
Warning: Activating this device will send a power draining device to your location."
droptype = /obj/item/device/powersink
+ origin_tech = "bluespace=4;syndicate=5"
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 26692706d2a..5764593fd20 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -18,6 +18,7 @@
var/beepsound = 'sound/items/timer.ogg'
var/delayedbig = FALSE //delay wire pulsed?
var/delayedlittle = FALSE //activation wire pulsed?
+ var/obj/effect/countdown/syndicatebomb/countdown
/obj/machinery/syndicatebomb/process()
if(active && !defused && (timer > 0)) //Tick Tock
@@ -41,6 +42,7 @@
if(src.payload)
payload = new payload(src)
update_icon()
+ countdown = new(src)
..()
/obj/machinery/syndicatebomb/Destroy()
@@ -210,7 +212,7 @@
icon_state = "bombcore"
item_state = "eshield0"
w_class = 3
- origin_tech = "syndicate=6;combat=5"
+ origin_tech = "syndicate=5;combat=6"
burn_state = FLAMMABLE //Burnable (but the casing isn't)
var/adminlog = null
@@ -465,7 +467,7 @@
icon_state = "bigred"
item_state = "electronic"
w_class = 1
- origin_tech = "syndicate=2"
+ origin_tech = "syndicate=3"
var/cooldown = 0
var/detonated = 0
var/existant = 0
diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm
index c00bb1a412c..20c68500535 100644
--- a/code/game/machinery/telecomms/machines/broadcaster.dm
+++ b/code/game/machinery/telecomms/machines/broadcaster.dm
@@ -130,4 +130,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
/obj/machinery/telecomms/broadcaster/preset_right
id = "Broadcaster B"
network = "tcommsat"
- autolinkers = list("broadcasterB")
\ No newline at end of file
+ autolinkers = list("broadcasterB")
+
+/obj/machinery/telecomms/broadcaster/preset_left/birdstation
+ name = "Broadcaster"
\ No newline at end of file
diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm
index 6c98596c884..1ecf94d17ce 100644
--- a/code/game/machinery/telecomms/machines/bus.dm
+++ b/code/game/machinery/telecomms/machines/bus.dm
@@ -98,3 +98,7 @@
freq_listening |= i
..()
+/obj/machinery/telecomms/bus/preset_one/birdstation
+ name = "Bus"
+ autolinkers = list("processor1", "common")
+ freq_listening = list()
\ No newline at end of file
diff --git a/code/game/machinery/telecomms/machines/processor.dm b/code/game/machinery/telecomms/machines/processor.dm
index 71cfc2ec5a6..e841c0e9757 100644
--- a/code/game/machinery/telecomms/machines/processor.dm
+++ b/code/game/machinery/telecomms/machines/processor.dm
@@ -75,3 +75,5 @@
network = "tcommsat"
autolinkers = list("processor4")
+/obj/machinery/telecomms/processor/preset_one/birdstation
+ name = "Processor"
\ No newline at end of file
diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm
index 095bb0cfca2..319806a965b 100644
--- a/code/game/machinery/telecomms/machines/receiver.dm
+++ b/code/game/machinery/telecomms/machines/receiver.dm
@@ -94,3 +94,6 @@
freq_listening |= i
..()
+/obj/machinery/telecomms/receiver/preset_left/birdstation
+ name = "Receiver"
+ freq_listening = list()
\ No newline at end of file
diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm
index b68e618daf3..87ca46c51c6 100644
--- a/code/game/machinery/telecomms/machines/server.dm
+++ b/code/game/machinery/telecomms/machines/server.dm
@@ -186,5 +186,6 @@
freq_listening = list(SEC_FREQ)
autolinkers = list("security")
-
-
+/obj/machinery/telecomms/server/presets/common/birdstation/New()
+ ..()
+ freq_listening = list()
\ No newline at end of file
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index edfe1f58dc8..1ffb79c9700 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -829,7 +829,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
icon_state = "nutri"
icon_deny = "nutri-deny"
products = list(/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez = 30,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z = 20,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh = 10,/obj/item/weapon/reagent_containers/spray/pestspray = 20,
- /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5,/obj/item/weapon/cultivator = 3,/obj/item/weapon/shovel/spade = 3,/obj/item/device/analyzer/plant_analyzer = 4)
+ /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5,/obj/item/weapon/cultivator = 3,/obj/item/weapon/shovel/spade = 3,/obj/item/device/plant_analyzer = 4)
contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5)
/obj/machinery/vending/hydroseeds
@@ -992,9 +992,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/glasses/regular=2,/obj/item/clothing/head/sombrero=1,/obj/item/clothing/suit/poncho=1,
/obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2,/obj/item/clothing/shoes/sneakers/black=4,
/obj/item/clothing/shoes/sandal=1, /obj/item/clothing/gloves/fingerless=2,/obj/item/clothing/glasses/orange=1,/obj/item/clothing/glasses/red=1,
- /obj/item/weapon/storage/belt/fannypack=1, /obj/item/weapon/storage/belt/fannypack/blue=1, /obj/item/weapon/storage/belt/fannypack/red=1)
- contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2)
- premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/tie/dope_necklace=3)
+ /obj/item/weapon/storage/belt/fannypack=1, /obj/item/weapon/storage/belt/fannypack/blue=1, /obj/item/weapon/storage/belt/fannypack/red=1, /obj/item/clothing/suit/jacket/letterman=2,
+ /obj/item/clothing/suit/jacket/letterman_red=1)
+ contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2,/obj/item/clothing/suit/jacket/letterman_syndie=1)
+ premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/tie/dope_necklace=3,/obj/item/clothing/suit/jacket/letterman_nanotrasen=1)
refill_canister = /obj/item/weapon/vending_refill/clothing
#undef STANDARD_CHARGE
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index d2ff930d4eb..9d061f39e39 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -1,4 +1,3 @@
-//TODO: Add critfail checks and reliability
//DO NOT ADD MECHA PARTS TO THE GAME WITH THE DEFAULT "SPRITE ME" SPRITE!
//I'm annoyed I even have to tell you this! SPRITE FIRST, then commit.
@@ -7,7 +6,7 @@
icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_equip"
force = 5
- origin_tech = "materials=2"
+ origin_tech = "materials=2;engineering=2"
var/equip_cooldown = 0 // cooldown after use
var/equip_ready = 1 //whether the equipment is ready for use. (or deactivated/activated for static stuff)
var/energy_drain = 0
@@ -155,4 +154,4 @@
/obj/item/mecha_parts/mecha_equipment/proc/needs_rearm()
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index d9620ef7132..732fdc85a09 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -34,10 +34,9 @@
desc = "Equipment for medical exosuits. A mounted sleeper that stabilizes patients and can inject reagents in the exosuit's reserves."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
- origin_tech = "programming=2;biotech=3"
+ origin_tech = "engineering=3;biotech=3;plasmatech=2"
energy_drain = 20
range = MELEE
- reliability = 1000
equip_cooldown = 20
var/mob/living/carbon/patient = null
var/inject_amount = 10
@@ -260,7 +259,7 @@
var/mode = 0 //0 - fire syringe, 1 - analyze reagents.
range = MELEE|RANGED
equip_cooldown = 10
- origin_tech = "materials=3;biotech=4;magnets=4;programming=3"
+ origin_tech = "materials=3;biotech=4;magnets=4"
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/New()
..()
@@ -523,8 +522,6 @@
log_message("Reagent processing stopped.")
SSobj.processing -= src
return
- if(anyprob(reliability))
- critfail()
var/amount = synth_speed / processed_reagents.len
for(var/reagent in processed_reagents)
reagents.add_reagent(reagent,amount)
diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm
index a5363b7795a..468483fac8d 100644
--- a/code/game/mecha/equipment/tools/mining_tools.dm
+++ b/code/game/mecha/equipment/tools/mining_tools.dm
@@ -96,22 +96,19 @@
target.updatehealth()
-
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
name = "diamond-tipped exosuit drill"
desc = "Equipment for engineering and combat exosuits. This is an upgraded version of the drill that'll pierce the heavens!"
icon_state = "mecha_diamond_drill"
- origin_tech = "materials=4;engineering=3"
+ origin_tech = "materials=4;engineering=4"
equip_cooldown = 20
force = 15
-
/obj/item/mecha_parts/mecha_equipment/mining_scanner
name = "exosuit mining scanner"
desc = "Equipment for engineering and combat exosuits. It will automatically check surrounding rock for useful minerals."
icon_state = "mecha_analyzer"
- origin_tech = "materials=3;engineering=2"
selectable = 0
equip_cooldown = 30
var/scanning = 0
@@ -146,5 +143,3 @@
mineral_scan_pulse(L,get_turf(loc))
spawn(equip_cooldown)
scanning = 0
-
-
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index ead3ad8781d..d5f1906bf8f 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -8,7 +8,7 @@
name = "mounted teleporter"
desc = "An exosuit module that allows exosuits to teleport to any position in view."
icon_state = "mecha_teleport"
- origin_tech = "bluespace=10"
+ origin_tech = "bluespace=7"
equip_cooldown = 150
energy_drain = 1000
range = RANGED
@@ -28,7 +28,7 @@
name = "mounted wormhole generator"
desc = "An exosuit module that allows generating of small quasi-stable wormholes."
icon_state = "mecha_wholegen"
- origin_tech = "bluespace=3"
+ origin_tech = "bluespace=4;magnets=4;plasmatech=2"
equip_cooldown = 50
energy_drain = 300
range = RANGED
@@ -78,7 +78,7 @@
name = "mounted gravitational catapult"
desc = "An exosuit mounted Gravitational Catapult."
icon_state = "mecha_teleport"
- origin_tech = "bluespace=2;magnets=3"
+ origin_tech = "bluespace=3;magnets=3;engineering=4"
equip_cooldown = 10
energy_drain = 100
range = MELEE|RANGED
@@ -146,7 +146,7 @@
name = "armor booster module (Close Combat Weaponry)"
desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate."
icon_state = "mecha_abooster_ccw"
- origin_tech = "materials=3"
+ origin_tech = "materials=4;combat=4"
equip_cooldown = 10
energy_drain = 50
range = 0
@@ -165,7 +165,7 @@
name = "armor booster module (Ranged Weaponry)"
desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate."
icon_state = "mecha_abooster_proj"
- origin_tech = "materials=4"
+ origin_tech = "materials=4;combat=3;engineering=3"
equip_cooldown = 10
energy_drain = 50
range = 0
@@ -186,7 +186,7 @@
name = "exosuit repair droid"
desc = "An automated repair droid for exosuits. Scans for damage and repairs it. Can fix almost all types of external or internal damage."
icon_state = "repair_droid"
- origin_tech = "magnets=3;programming=3"
+ origin_tech = "magnets=3;programming=3;engineering=4"
energy_drain = 50
range = 0
var/health_boost = 1
@@ -271,7 +271,7 @@
name = "exosuit energy relay"
desc = "An exosuit module that wirelessly drains energy from any available power channel in area. The performance index is quite low."
icon_state = "tesla"
- origin_tech = "magnets=4;powerstorage=3"
+ origin_tech = "magnets=4;powerstorage=4;engineering=4"
energy_drain = 0
range = 0
var/coeff = 100
@@ -356,7 +356,7 @@
name = "exosuit plasma converter"
desc = "An exosuit module that generates power using solid plasma as fuel. Pollutes the environment."
icon_state = "tesla"
- origin_tech = "plasmatech=2;powerstorage=2;engineering=1"
+ origin_tech = "plasmatech=2;powerstorage=2;engineering=2"
range = MELEE
var/coeff = 100
var/obj/item/stack/sheet/fuel
@@ -364,7 +364,6 @@
var/fuel_per_cycle_idle = 25
var/fuel_per_cycle_active = 200
var/power_per_cycle = 20
- reliability = 1000
/obj/item/mecha_parts/mecha_equipment/generator/New()
..()
@@ -453,11 +452,6 @@
log_message("Deactivated - no fuel.")
set_ready_state(1)
return
- if(anyprob(reliability))
- set_ready_state(1) //inactive
- critfail()
- SSobj.processing.Remove(src)
- return
var/cur_charge = chassis.get_charge()
if(isnull(cur_charge))
set_ready_state(1)
@@ -478,7 +472,7 @@
name = "exonuclear reactor"
desc = "An exosuit module that generates power using uranium as fuel. Pollutes the environment."
icon_state = "tesla"
- origin_tech = "powerstorage=3;engineering=3"
+ origin_tech = "powerstorage=4;engineering=4"
max_fuel = 50000
fuel_per_cycle_idle = 10
fuel_per_cycle_active = 30
@@ -495,5 +489,3 @@
/obj/item/mecha_parts/mecha_equipment/generator/nuclear/process()
if(..())
radiation_pulse(get_turf(src), 2, 7, rad_per_cycle, 1)
-
-
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index f26a59501c0..d6a4498279f 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -190,7 +190,7 @@
name = "mounted RCD"
desc = "An exosuit-mounted Rapid Construction Device."
icon_state = "mecha_rcd"
- origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4"
+ origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4;engineering=4"
equip_cooldown = 10
energy_drain = 250
range = MELEE|RANGED
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 54c7aaaa985..418d29e3d59 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -71,6 +71,7 @@
name = "\improper CH-PS \"Immolator\" laser"
desc = "A weapon for combat exosuits. Shoots basic lasers."
icon_state = "mecha_laser"
+ origin_tech = "magnets=3;combat=3;engineering=3"
energy_drain = 30
projectile = /obj/item/projectile/beam/laser
fire_sound = 'sound/weapons/Laser.ogg'
@@ -80,6 +81,7 @@
name = "\improper CH-LC \"Solaris\" laser cannon"
desc = "A weapon for combat exosuits. Shoots heavy lasers."
icon_state = "mecha_laser"
+ origin_tech = "magnets=4;combat=4;engineering=3"
energy_drain = 60
projectile = /obj/item/projectile/beam/laser/heavylaser
fire_sound = 'sound/weapons/lasercannonfire.ogg'
@@ -89,6 +91,7 @@
name = "\improper MKIV ion heavy cannon"
desc = "A weapon for combat exosuits. Shoots technology-disabling ion beams. Don't catch yourself in the blast!"
icon_state = "mecha_ion"
+ origin_tech = "materials=4;combat=5;magnets=4"
energy_drain = 120
projectile = /obj/item/projectile/ion
fire_sound = 'sound/weapons/Laser.ogg'
@@ -110,7 +113,7 @@
icon_state = "mecha_plasmacutter"
item_state = "plasmacutter"
energy_drain = 60
- origin_tech = "materials=3;combat=2;powerstorage=3;plasmatech=3"
+ origin_tech = "materials=3;plasmatech=4;engineering=3"
projectile = /obj/item/projectile/plasma/adv/mech
fire_sound = 'sound/weapons/Laser.ogg'
@@ -140,6 +143,7 @@
name = "\improper PBT \"Pacifier\" mounted taser"
desc = "A weapon for combat exosuits. Shoots non-lethal stunning electrodes."
icon_state = "mecha_taser"
+ origin_tech = "combat=3"
energy_drain = 20
equip_cooldown = 8
projectile = /obj/item/projectile/energy/electrode
@@ -243,6 +247,7 @@
name = "\improper FNX-99 \"Hades\" Carbine"
desc = "A weapon for combat exosuits. Shoots incendiary bullets."
icon_state = "mecha_carbine"
+ origin_tech = "materials=4;combat=4"
equip_cooldown = 5
projectile = /obj/item/projectile/bullet/incendiary/shell/dragonsbreath
projectiles = 24
@@ -262,6 +267,7 @@
name = "\improper LBX AC 10 \"Scattershot\""
desc = "A weapon for combat exosuits. Shoots a spread of pellets."
icon_state = "mecha_scatter"
+ origin_tech = "combat=4"
equip_cooldown = 20
projectile = /obj/item/projectile/bullet/midbullet
projectiles = 40
@@ -273,6 +279,7 @@
name = "\improper Ultra AC 2"
desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst."
icon_state = "mecha_uac2"
+ origin_tech = "combat=4"
equip_cooldown = 10
projectile = /obj/item/projectile/bullet/weakbullet3
projectiles = 300
@@ -305,6 +312,7 @@
name = "\improper SRM-8 missile rack"
desc = "A weapon for combat exosuits. Shoots light explosive missiles."
icon_state = "mecha_missilerack"
+ origin_tech = "combat=5;materials=4;engineering=4"
projectile = /obj/item/missile
fire_sound = 'sound/weapons/grenadelaunch.ogg'
projectiles = 8
@@ -334,6 +342,7 @@
name = "\improper SGL-6 grenade launcher"
desc = "A weapon for combat exosuits. Launches primed flashbangs."
icon_state = "mecha_grenadelnchr"
+ origin_tech = "combat=4;engineering=4"
projectile = /obj/item/weapon/grenade/flashbang
fire_sound = 'sound/weapons/grenadelaunch.ogg'
projectiles = 6
@@ -354,6 +363,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze
name = "\improper SOB-3 grenade launcher"
desc = "A weapon for combat exosuits. Launches primed clusterbangs. You monster."
+ origin_tech = "combat=4;materials=4"
projectiles = 3
projectile = /obj/item/weapon/grenade/clusterbuster
projectile_energy_cost = 1600 //getting off cheap seeing as this is 3 times the flashbangs held in the grenade launcher.
@@ -395,4 +405,3 @@
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(var/obj/item/device/assembly/mousetrap/armed/M)
M.secured = 1
-
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 9ab089a34ff..cddf69f5016 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -33,7 +33,7 @@
/obj/item/weapon/circuitboard/machine/mech_recharger
name = "circuit board (Mechbay Recharger)"
build_path = /obj/machinery/mech_bay_recharge_port
- origin_tech = "programming=3;powerstorage=4;engineering=4"
+ origin_tech = "programming=3;powerstorage=3;engineering=3"
req_components = list(
/obj/item/stack/cable_coil = 2,
/obj/item/weapon/stock_parts/capacitor = 5)
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 5de9c676059..429460f0d67 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -10,6 +10,7 @@
active_power_usage = 5000
req_access = list(access_robotics)
var/time_coeff = 1
+ var/component_coeff = 1
var/list/resources = list(
MAT_METAL=0,
MAT_GLASS=0,
@@ -53,7 +54,7 @@
/obj/item/weapon/circuitboard/machine/mechfab
name = "circuit board (Exosuit Fabricator)"
build_path = /obj/machinery/mecha_part_fabricator
- origin_tech = "programming=3;engineering=3"
+ origin_tech = "programming=2;engineering=2"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 2,
/obj/item/weapon/stock_parts/manipulator = 1,
@@ -68,6 +69,12 @@
T += M.rating
res_max_amount = (187000+(T * 37500))
+ //resources adjustment coefficient (1 -> 0.85 -> 0.7 -> 0.55)
+ T = 1.15
+ for(var/obj/item/weapon/stock_parts/micro_laser/Ma in component_parts)
+ T -= Ma.rating*0.15
+ component_coeff = T
+
//building time adjustment coefficient (1 -> 0.8 -> 0.6)
T = -1
for(var/obj/item/weapon/stock_parts/manipulator/Ml in component_parts)
@@ -266,7 +273,7 @@
return
/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(datum/design/D, resource, roundto = 1)
- return round(D.materials[resource], roundto)
+ return round(D.materials[resource]*component_coeff, roundto)
/obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(datum/design/D, roundto = 1) //aran
return round(initial(D.construction_time)*time_coeff, roundto)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index d05e83da56f..9c30fc863fd 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -164,7 +164,6 @@
WR.crowbar_salvage += E
E.detach(WR) //detaches from src into WR
E.equip_ready = 1
- E.reliability = round(rand(E.reliability/3,E.reliability))
else
E.detach(loc)
qdel(E)
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 40037689a9e..73e669839b7 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -8,7 +8,7 @@
icon_state = "blank"
w_class = 6
flags = CONDUCT
- origin_tech = "programming=2;materials=2"
+ origin_tech = "programming=2;materials=2;engineering=2"
/obj/item/mecha_parts/chassis
name="Mecha Chassis"
@@ -41,25 +41,61 @@
name = "\improper Ripley left arm"
desc = "A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "ripley_l_arm"
- origin_tech = "programming=2;materials=2;engineering=2"
/obj/item/mecha_parts/part/ripley_right_arm
name = "\improper Ripley right arm"
desc = "A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "ripley_r_arm"
- origin_tech = "programming=2;materials=2;engineering=2"
/obj/item/mecha_parts/part/ripley_left_leg
name = "\improper Ripley left leg"
desc = "A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
icon_state = "ripley_l_leg"
- origin_tech = "programming=2;materials=2;engineering=2"
/obj/item/mecha_parts/part/ripley_right_leg
name = "\improper Ripley right leg"
desc = "A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
icon_state = "ripley_r_leg"
- origin_tech = "programming=2;materials=2;engineering=2"
+
+///////// Odysseus
+
+/obj/item/mecha_parts/chassis/odysseus
+ name = "\improper Odysseus chassis"
+
+/obj/item/mecha_parts/chassis/odysseus/New()
+ ..()
+ construct = new /datum/construction/mecha/odysseus_chassis(src)
+
+/obj/item/mecha_parts/part/odysseus_head
+ name = "\improper Odysseus head"
+ desc = "An Odysseus head. Contains an integrated medical HUD scanner."
+ icon_state = "odysseus_head"
+
+/obj/item/mecha_parts/part/odysseus_torso
+ name = "\improper Odysseus torso"
+ desc="A torso part of Odysseus. Contains power unit, processing core and life support systems along with an attachment port for a mounted sleeper."
+ icon_state = "odysseus_torso"
+ origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
+
+/obj/item/mecha_parts/part/odysseus_left_arm
+ name = "\improper Odysseus left arm"
+ desc = "An Odysseus left arm. Data and power sockets are compatible with specialized medical equipment."
+ icon_state = "odysseus_l_arm"
+
+/obj/item/mecha_parts/part/odysseus_right_arm
+ name = "\improper Odysseus right arm"
+ desc = "An Odysseus right arm. Data and power sockets are compatible with specialized medical equipment."
+ icon_state = "odysseus_r_arm"
+
+/obj/item/mecha_parts/part/odysseus_left_leg
+ name = "\improper Odysseus left leg"
+ desc = "An Odysseus left leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
+ icon_state = "odysseus_l_leg"
+
+/obj/item/mecha_parts/part/odysseus_right_leg
+ name = "\improper Odysseus right leg"
+ desc = "A Odysseus right leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
+ icon_state = "odysseus_r_leg"
///////// Gygax
@@ -74,44 +110,44 @@
name = "\improper Gygax torso"
desc = "A torso part of Gygax. Contains power unit, processing core and life support systems."
icon_state = "gygax_harness"
- origin_tech = "programming=2;materials=2;biotech=3;engineering=3"
+ origin_tech = "programming=2;materials=4;biotech=3;engineering=3"
/obj/item/mecha_parts/part/gygax_head
name = "\improper Gygax head"
desc = "A Gygax head. Houses advanced surveilance and targeting sensors."
icon_state = "gygax_head"
- origin_tech = "programming=2;materials=2;magnets=3;engineering=3"
+ origin_tech = "programming=2;materials=4;magnets=3;engineering=3"
/obj/item/mecha_parts/part/gygax_left_arm
name = "\improper Gygax left arm"
desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
icon_state = "gygax_l_arm"
- origin_tech = "programming=2;materials=2;engineering=3"
+ origin_tech = "programming=2;materials=4;engineering=3"
/obj/item/mecha_parts/part/gygax_right_arm
name = "\improper Gygax right arm"
desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
icon_state = "gygax_r_arm"
- origin_tech = "programming=2;materials=2;engineering=3"
+ origin_tech = "programming=2;materials=4;engineering=3"
/obj/item/mecha_parts/part/gygax_left_leg
name = "\improper Gygax left leg"
desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
icon_state = "gygax_l_leg"
- origin_tech = "programming=2;materials=2;engineering=3"
+ origin_tech = "programming=2;materials=4;engineering=3"
/obj/item/mecha_parts/part/gygax_right_leg
name = "\improper Gygax right leg"
desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
icon_state = "gygax_r_leg"
- origin_tech = "programming=2;materials=2;engineering=3"
+ origin_tech = "programming=2;materials=4;engineering=3"
/obj/item/mecha_parts/part/gygax_armor
gender = PLURAL
name = "\improper Gygax armor plates"
desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
icon_state = "gygax_armor"
- origin_tech = "materials=6;combat=4;engineering=5"
+ origin_tech = "materials=6;combat=4;engineering=4"
//////////// Durand
@@ -164,7 +200,7 @@
name = "\improper Durand armor plates"
desc = "A set of armor plates for the Durand. Built heavy to resist an incredible amount of brute force."
icon_state = "durand_armor"
- origin_tech = "materials=5;combat=4;engineering=5"
+ origin_tech = "materials=5;combat=4;engineering=4"
////////// Firefighter
@@ -220,7 +256,6 @@
/obj/item/mecha_parts/chassis/phazon
name = "\improper Phazon chassis"
- origin_tech = "materials=6"
/obj/item/mecha_parts/chassis/phazon/New()
..()
@@ -230,88 +265,43 @@
name="\improper Phazon torso"
desc="A Phazon torso part. The socket for the bluespace core that powers the exosuit's unique phase drives is located in the middle."
icon_state = "phazon_harness"
- origin_tech = "programming=5;materials=6;bluespace=5;powerstorage=5"
+ origin_tech = "programming=4;materials=4;bluespace=4;plasmatech=5"
/obj/item/mecha_parts/part/phazon_head
name="\improper Phazon head"
desc="A Phazon head. Its sensors are carefully calibrated to provide vision and data even when the exosuit is phasing."
icon_state = "phazon_head"
- origin_tech = "programming=4;materials=5;magnets=5"
+ origin_tech = "programming=3;materials=3;magnets=3"
/obj/item/mecha_parts/part/phazon_left_arm
name="\improper Phazon left arm"
desc="A Phazon left arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
icon_state = "phazon_l_arm"
- origin_tech = "materials=5;bluespace=2;magnets=2"
+ origin_tech = "materials=3;bluespace=3;magnets=3"
/obj/item/mecha_parts/part/phazon_right_arm
name="\improper Phazon right arm"
desc="A Phazon right arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
icon_state = "phazon_r_arm"
- origin_tech = "materials=5;bluespace=2;magnets=2"
+ origin_tech = "materials=3;bluespace=3;magnets=3"
/obj/item/mecha_parts/part/phazon_left_leg
name="\improper Phazon left leg"
desc="A Phazon left leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
icon_state = "phazon_l_leg"
- origin_tech = "materials=5;bluespace=3;magnets=3"
+ origin_tech = "materials=3;bluespace=3;magnets=3"
/obj/item/mecha_parts/part/phazon_right_leg
name="\improper Phazon right leg"
desc="A Phazon right leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
icon_state = "phazon_r_leg"
- origin_tech = "materials=5;bluespace=3;magnets=3"
+ origin_tech = "materials=3;bluespace=3;magnets=3"
/obj/item/mecha_parts/part/phazon_armor
name="Phazon armor"
desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties."
icon_state = "phazon_armor"
- origin_tech = "materials=6;bluespace=5;magnets=5"
-///////// Odysseus
-
-
-/obj/item/mecha_parts/chassis/odysseus
- name = "\improper Odysseus chassis"
-
-/obj/item/mecha_parts/chassis/odysseus/New()
- ..()
- construct = new /datum/construction/mecha/odysseus_chassis(src)
-
-/obj/item/mecha_parts/part/odysseus_head
- name = "\improper Odysseus head"
- desc = "An Odysseus head. Contains an integrated medical HUD scanner."
- icon_state = "odysseus_head"
- origin_tech = "programming=3;materials=2"
-
-/obj/item/mecha_parts/part/odysseus_torso
- name = "\improper Odysseus torso"
- desc="A torso part of Odysseus. Contains power unit, processing core and life support systems along with an attachment port for a mounted sleeper."
- icon_state = "odysseus_torso"
- origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
-
-/obj/item/mecha_parts/part/odysseus_left_arm
- name = "\improper Odysseus left arm"
- desc = "An Odysseus left arm. Data and power sockets are compatible with specialized medical equipment."
- icon_state = "odysseus_l_arm"
- origin_tech = "programming=2;materials=2;engineering=2"
-
-/obj/item/mecha_parts/part/odysseus_right_arm
- name = "\improper Odysseus right arm"
- desc = "An Odysseus right arm. Data and power sockets are compatible with specialized medical equipment."
- icon_state = "odysseus_r_arm"
- origin_tech = "programming=2;materials=2;engineering=2"
-
-/obj/item/mecha_parts/part/odysseus_left_leg
- name = "\improper Odysseus left leg"
- desc = "An Odysseus left leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
- icon_state = "odysseus_l_leg"
- origin_tech = "programming=2;materials=2;engineering=2"
-
-/obj/item/mecha_parts/part/odysseus_right_leg
- name = "\improper Odysseus right leg"
- desc = "A Odysseus right leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
- icon_state = "odysseus_r_leg"
- origin_tech = "programming=2;materials=2;engineering=2"
+ origin_tech = "materials=4;bluespace=4;plasmatech=5"
///////// Circuitboards
@@ -329,7 +319,7 @@
throw_range = 7
/obj/item/weapon/circuitboard/mecha/ripley
- origin_tech = "programming=3"
+ origin_tech = "programming=2"
/obj/item/weapon/circuitboard/mecha/ripley/peripherals
name = "circuit board (Ripley Peripherals Control module)"
@@ -340,7 +330,7 @@
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/gygax
- origin_tech = "programming=4"
+ origin_tech = "programming=4;combat=3;engineering=3"
/obj/item/weapon/circuitboard/mecha/gygax/peripherals
name = "circuit board (Gygax Peripherals Control module)"
@@ -356,7 +346,7 @@
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/durand
- origin_tech = "programming=4"
+ origin_tech = "programming=4;combat=3;engineering=3"
/obj/item/weapon/circuitboard/mecha/durand/peripherals
name = "circuit board (Durand Peripherals Control module)"
@@ -365,14 +355,14 @@
/obj/item/weapon/circuitboard/mecha/durand/targeting
name = "circuit board (Durand Weapon Control and Targeting module)"
icon_state = "mcontroller"
- origin_tech = "programming=4;combat=4"
+ origin_tech = "programming=4;combat=4;engineering=3"
/obj/item/weapon/circuitboard/mecha/durand/main
name = "circuit board (Durand Central Control module)"
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/honker
- origin_tech = "programming=4"
+ origin_tech = "programming=3;engineering=3"
/obj/item/weapon/circuitboard/mecha/honker/peripherals
name = "circuit board (H.O.N.K Peripherals Control module)"
@@ -387,7 +377,7 @@
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/odysseus
- origin_tech = "programming=3"
+ origin_tech = "programming=3;biotech=3"
/obj/item/weapon/circuitboard/mecha/odysseus/peripherals
name = "circuit board (Odysseus Peripherals Control module)"
@@ -398,7 +388,7 @@
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/phazon
- origin_tech = "programming=5"
+ origin_tech = "programming=5;plasmatech=4"
/obj/item/weapon/circuitboard/mecha/phazon/peripherals
name = "circuit board (Phazon Peripherals Control module)"
@@ -409,4 +399,4 @@
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/phazon/main
- name = "circuit board (Phazon Central Control module)"
\ No newline at end of file
+ name = "circuit board (Phazon Central Control module)"
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index f33b6529a89..458633001ca 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -58,7 +58,7 @@
/obj/effect/anomaly/grav/New()
..()
- aSignal.origin_tech = "magnets=5;powerstorage=4"
+ aSignal.origin_tech = "magnets=7"
/obj/effect/anomaly/grav/anomalyEffect()
..()
@@ -104,7 +104,7 @@
/obj/effect/anomaly/flux/New()
..()
- aSignal.origin_tech = "powerstorage=6;programming=4;plasmatech=4"
+ aSignal.origin_tech = "powerstorage=7"
/obj/effect/anomaly/flux/anomalyEffect()
..()
@@ -146,7 +146,7 @@
/obj/effect/anomaly/bluespace/New()
..()
- aSignal.origin_tech = "bluespace=5;magnets=5;powerstorage=3"
+ aSignal.origin_tech = "bluespace=7"
/obj/effect/anomaly/bluespace/anomalyEffect()
..()
@@ -166,7 +166,7 @@
/obj/effect/anomaly/pyro/New()
..()
- aSignal.origin_tech = "plasmatech=5;powerstorage=4;biotech=6"
+ aSignal.origin_tech = "plasmatech=7"
/obj/effect/anomaly/pyro/anomalyEffect()
..()
@@ -183,7 +183,7 @@
/obj/effect/anomaly/bhole/New()
..()
- aSignal.origin_tech = "materials=5;combat=4;engineering=4"
+ aSignal.origin_tech = "engineering=7"
/obj/effect/anomaly/bhole/anomalyEffect()
..()
@@ -231,4 +231,4 @@
//Damaging the turf
if( T && prob(turf_removal_chance) )
T.ex_act(ex_act_force)
- return
\ No newline at end of file
+ return
diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm
index cac9fe3d4b3..e3583e79b85 100644
--- a/code/game/objects/effects/effect_system/effects_sparks.dm
+++ b/code/game/objects/effects/effect_system/effects_sparks.dm
@@ -9,6 +9,7 @@
name = "sparks"
icon_state = "sparks"
anchored = 1
+ luminosity = 1
/obj/effect/particle_effect/sparks/New()
..()
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 79ce9abe797..90c942b32f3 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -132,6 +132,35 @@
duration = 5
+/obj/effect/overlay/temp/ratvar
+ name = "ratvar's light"
+ duration = 8
+ randomdir = 0
+ layer = ABOVE_NORMAL_TURF_LAYER
+
+/obj/effect/overlay/temp/ratvar/door
+ icon_state = "ratvardoorglow"
+ layer = CLOSED_FIREDOOR_LAYER //above closed doors
+
+/obj/effect/overlay/temp/ratvar/beam
+ icon_state = "ratvarbeamglow"
+
+/obj/effect/overlay/temp/ratvar/beam/door
+ layer = CLOSED_FIREDOOR_LAYER //above closed doors
+
+/obj/effect/overlay/temp/ratvar/wall
+ icon_state = "ratvarwallglow"
+
+/obj/effect/overlay/temp/ratvar/floor
+ icon_state = "ratvarfloorglow"
+
+/obj/effect/overlay/temp/ratvar/window
+ icon_state = "ratvarwindowglow"
+ layer = ABOVE_OBJ_LAYER //To be above the window it creates
+
+/obj/effect/overlay/temp/ratvar/window/single
+ icon_state = "ratvarwindowglow_s"
+
/obj/effect/overlay/temp/revenant
name = "spooky lights"
icon_state = "purplesparkles"
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index e616299f688..c44eb8d5356 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -49,6 +49,8 @@
qdel(src)
return
if (istype(M, /atom/movable))
+ if(istype(M, /mob/living/simple_animal/hostile/megafauna))
+ message_admins("[M] (
FLW) has teleported through [src].")
do_teleport(M, target, precision) ///You will appear adjacent to the beacon
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index e4c4ba33fa4..9fb43d7c0a0 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -37,6 +37,21 @@
/obj/item/toy/cards/deck/syndicate = 2
)
+/obj/effect/spawner/lootdrop/grille_or_trash
+ name = "maint grille or trash spawner"
+ loot = list(/obj/structure/grille = 5,
+ /obj/item/weapon/cigbutt = 1,
+ /obj/item/trash/cheesie = 1,
+ /obj/item/trash/candy = 1,
+ /obj/item/trash/chips = 1,
+ /obj/item/trash/deadmouse = 1,
+ /obj/item/trash/pistachios = 1,
+ /obj/item/trash/plate = 1,
+ /obj/item/trash/popcorn = 1,
+ /obj/item/trash/raisins = 1,
+ /obj/item/trash/sosjerky = 1,
+ /obj/item/trash/syndi_cakes = 1)
+
/obj/effect/spawner/lootdrop/maintenance
name = "maintenance loot spawner"
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 2ed341eca59..7c93ec3c5b9 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -189,7 +189,7 @@
S.faction = faction.Copy()
if(player_spiders)
S.playable_spider = TRUE
- notify_ghosts("Spider [S.name] can be controlled", null, enter_link="
(Click to play)", source=S, attack_not_jump = 1)
+ notify_ghosts("Spider [S.name] can be controlled", null, enter_link="
(Click to play)", source=S, action=NOTIFY_ATTACK)
qdel(src)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 936a599281a..c1380146069 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -55,7 +55,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
var/put_on_delay = 20
var/breakouttime = 0
var/list/materials = list()
- var/reliability = 100 //Used by SOME devices to determine how reliable they are.
var/origin_tech = null //Used by R&D to determine what research bonuses it grants.
var/needs_permit = 0 //Used by security bots to determine if this item is safe for public use.
@@ -202,9 +201,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
var/list/techlvls = params2list(origin_tech)
for(var/T in techlvls) //This needs to use the better names.
msg += "Tech: [CallTechName(T)] | magnitude: [techlvls[T]]
"
- msg += "Research reliability: [reliability]%
"
- if(crit_fail)
- msg += "
Critical failure detected in subject!"
else
msg += "
No tech origins detected."
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 83ac1b58805..3af9dfe0fef 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -99,6 +99,7 @@
icon_state = "bluebodybag_folded"
unfoldedbag_path = /obj/structure/closet/body_bag/bluespace
w_class = 2
+ origin_tech = "bluespace=4;materials=4;plasmatech=4"
/obj/structure/closet/body_bag/bluespace
name = "bluespace body bag"
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 7e9aa8e2ae3..11cf4f72cba 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -141,6 +141,13 @@
master_ui, state)
ui.open()
+/obj/item/toy/crayon/spraycan/AltClick(mob/user)
+ if(has_cap)
+ is_capped = !is_capped
+ user << "
The cap on [src] is now \
+ [is_capped ? "on" : "off"]."
+ update_icon()
+
/obj/item/toy/crayon/ui_data()
var/list/data = list()
data["drawables"] = list()
@@ -297,9 +304,10 @@
if(actually_paints)
if(gang_mode)
- // They're attempting to tag for their gang
- if(!tag_for_gang(user, target))
+ // Double check it wasn't tagged in the meanwhile
+ if(!can_claim_for_gang(user, target))
return
+ tag_for_gang(user, target)
else
new /obj/effect/decal/cleanable/crayon(target, paint_color,
drawing, temp, graf_rot)
@@ -337,36 +345,31 @@
tagging."
return FALSE
- if(!(locate(/obj/effect/decal/cleanable/crayon/gang in target)))
- if(territory_claimed(A, user))
- return FALSE
+ var/spraying_over = FALSE
+ for(var/obj/effect/decal/cleanable/crayon/gang/G in target)
+ spraying_over = TRUE
- var/apc_check_area = user.loc.contents | target.contents
- if(locate(/obj/machinery/power/apc in apc_check_area))
+ for(var/obj/machinery/power/apc in target)
user << "
You can't tag an APC."
return FALSE
+ var/occupying_gang = territory_claimed(A, user)
+ if(occupying_gang && !spraying_over)
+ user << "
[A] has already been tagged \
+ by the [occupying_gang] gang! You must get rid of or spray over \
+ the old tag first!"
+ return FALSE
+
// If you pass the gaunlet of checks, you're good to proceed
return TRUE
-/obj/item/toy/crayon/proc/territory_claimed(area/territory,mob/user)
- var/occupying_gang
+/obj/item/toy/crayon/proc/territory_claimed(area/territory, mob/user)
for(var/datum/gang/G in ticker.mode.gangs)
if(territory.type in (G.territory|G.territory_new))
- occupying_gang = G.name
+ . = G.name
break
- if(occupying_gang)
- user << "
[territory] has already been tagged \
- by the [occupying_gang] gang! You must get rid of or spray over \
- the old tag first!"
- return TRUE
- return FALSE
/obj/item/toy/crayon/proc/tag_for_gang(mob/user, atom/target)
- // Check again to see if anyone's tagged in the meanwhile
- if(!can_claim_for_gang(user, target))
- return
-
//Delete any old markings on this tile, including other gang tags
for(var/obj/effect/decal/cleanable/crayon/old_marking in target)
qdel(old_marking)
@@ -497,7 +500,8 @@
paint_color = null
item_state = "spraycan"
- desc = "A metallic container containing tasty paint."
+ desc = "A metallic container containing tasty paint.\n\
+ Alt-click to toggle the cap."
instant = TRUE
edible = FALSE
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index ebc9d68c184..4f69d9a5371 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -9,7 +9,7 @@
flags = NOBLUDGEON
var/flush = FALSE
var/mob/living/silicon/ai/AI
- origin_tech = "programming=4;materials=4"
+ origin_tech = "programming=3;materials=3"
/obj/item/device/aicard/afterattack(atom/target, mob/user, proximity)
..()
@@ -82,4 +82,4 @@
AI.radio_enabled = !AI.radio_enabled
AI << "Your Subspace Transceiver has been [AI.radio_enabled ? "enabled" : "disabled"]!"
. = TRUE
- update_icon()
\ No newline at end of file
+ update_icon()
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index 4e9ecaf30e3..a49af05f819 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -14,7 +14,7 @@
item_state = "camera_bug"
throw_speed = 4
throw_range = 20
- origin_tech = "syndicate=3;engineering=1"
+ origin_tech = "syndicate=1;engineering=3"
flags = NOBLUDGEON
var/obj/machinery/camera/current = null
@@ -279,4 +279,4 @@
#undef BUGMODE_LIST
#undef BUGMODE_MONITOR
-#undef BUGMODE_TRACK
\ No newline at end of file
+#undef BUGMODE_TRACK
diff --git a/code/game/objects/items/devices/doorCharge.dm b/code/game/objects/items/devices/doorCharge.dm
index 972c33becde..bedc318e75e 100644
--- a/code/game/objects/items/devices/doorCharge.dm
+++ b/code/game/objects/items/devices/doorCharge.dm
@@ -10,7 +10,7 @@
force = 3
attack_verb = list("blown up", "exploded", "detonated")
materials = list(MAT_METAL=50, MAT_GLASS=30)
- origin_tech = "syndicate=3;combat=2"
+ origin_tech = "syndicate=1;combat=3;engineering=3"
/obj/item/device/doorCharge/ex_act(severity, target)
switch(severity)
@@ -30,4 +30,4 @@
if(user.mind in ticker.mode.traitors) //No nuke ops because the device is excluded from nuclear
user << "A small explosive device that can be used to sabotage airlocks to cause an explosion upon opening. To apply, remove the airlock's maintenance panel and place it within."
else
- user << "A small, suspicious object that feels lukewarm when held."
\ No newline at end of file
+ user << "A small, suspicious object that feels lukewarm when held."
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index f0f56523972..6686f2985cb 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -277,8 +277,7 @@ obj/item/device/flashlight/lamp/bananalamp
brightness_on = 6 //luminosity when on
/obj/item/device/flashlight/emp
- origin_tech = "magnets=4;syndicate=5"
-
+ origin_tech = "magnets=3;syndicate=1"
var/emp_max_charges = 4
var/emp_cur_charges = 4
var/charge_tick = 0
@@ -322,4 +321,4 @@ obj/item/device/flashlight/lamp/bananalamp
A.emp_act(1)
else
user << "
\The [src] needs time to recharge!"
- return
\ No newline at end of file
+ return
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 27bad40ef89..2c6f0be7fe9 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -49,7 +49,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
- origin_tech = "magnets=3;materials=2"
+ origin_tech = "magnets=3;engineering=4"
var/max_uses = 20
var/uses = 0
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index bc65f1a0f12..b0db05d64d7 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -18,7 +18,7 @@
throw_range = 7
throw_speed = 3
materials = list(MAT_METAL=50, MAT_GLASS=20)
- origin_tech = "magnets=1;engineering=1"
+ origin_tech = "magnets=1;engineering=2"
var/obj/machinery/buffer // simple machine buffer for device linkage
hitsound = 'sound/weapons/tap.ogg'
toolspeed = 1
@@ -33,6 +33,7 @@
var/detect_state = PROXIMITY_NONE
var/rangealert = 8 //Glows red when inside
var/rangewarning = 20 //Glows yellow when inside
+ origin_tech = "magnets=1;engineering=2;syndicate=1"
/obj/item/device/multitool/ai_detect/New()
..()
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index bf0ccfde494..c948d0c000c 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -11,7 +11,7 @@
throw_speed = 1
throw_range = 2
materials = list(MAT_METAL=750)
- origin_tech = "powerstorage=3;syndicate=5"
+ origin_tech = "powerstorage=5;syndicate=5"
var/drain_rate = 1600000 // amount of power to drain per tick
var/power_drained = 0 // has drained this much power
var/max_power = 1e10 // maximum power that can be drained before exploding
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index a1380e000e1..be17fd0631f 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -5,6 +5,7 @@
icon = 'icons/obj/radio.dmi'
icon_state = "cypherkey"
w_class = 1
+ origin_tech = "engineering=2;bluespace=1"
var/translate_binary = 0
var/translate_hive = 0
var/syndie = 0
@@ -14,7 +15,7 @@
/obj/item/device/encryptionkey/syndicate
icon_state = "cypherkey"
channels = list("Syndicate" = 1)
- origin_tech = "syndicate=3"
+ origin_tech = "syndicate=1;engineering=3;bluespace=2"
syndie = 1//Signifies that it de-crypts Syndicate transmissions
/obj/item/device/encryptionkey/binary
@@ -22,7 +23,7 @@
desc = "An encryption key for a radio headset. To access the binary channel, use :b."
icon_state = "cypherkey"
translate_binary = 1
- origin_tech = "syndicate=3"
+ origin_tech = "syndicate=3;engineering=4;bluespace=3"
/obj/item/device/encryptionkey/headset_sec
name = "security radio encryption key"
@@ -125,4 +126,4 @@
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1)
/obj/item/device/encryptionkey/secbot
- channels = list("AI Private"=1,"Security"=1)
\ No newline at end of file
+ channels = list("AI Private"=1,"Security"=1)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 7ef05e74f23..ad7b6d35a1c 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -327,10 +327,9 @@ MASS SPECTROMETER
throwforce = 0
throw_speed = 3
throw_range = 7
- materials = list(MAT_METAL=30, MAT_GLASS=20)
- origin_tech = "magnets=2;biotech=2"
+ materials = list(MAT_METAL=150, MAT_GLASS=100)
+ origin_tech = "magnets=2;biotech=1;plasmatech=2"
var/details = 0
- var/recent_fail = 0
/obj/item/device/mass_spectrometer/New()
..()
@@ -345,9 +344,6 @@ MASS SPECTROMETER
/obj/item/device/mass_spectrometer/attack_self(mob/user)
if (user.stat || user.eye_blind)
return
- if (crit_fail)
- user << "
This device has critically failed and is no longer functional!"
- return
if (!user.IsAdvancedToolUser())
user << "
You don't have the dexterity to do this!"
return
@@ -366,20 +362,9 @@ MASS SPECTROMETER
dat += "
None"
else
for(var/R in blood_traces)
- if(prob(reliability))
- dat += "
[chemical_reagents_list[R]]"
-
- if(details)
- dat += " ([blood_traces[R]] units)"
-
- recent_fail = 0
- else
- if(recent_fail)
- crit_fail = 1
- reagents.clear_reagents()
- return
- else
- recent_fail = 1
+ dat += "
[chemical_reagents_list[R]]"
+ if(details)
+ dat += " ([blood_traces[R]] units)"
dat += ""
user << dat
reagents.clear_reagents()
@@ -389,14 +374,14 @@ MASS SPECTROMETER
name = "advanced mass-spectrometer"
icon_state = "adv_spectrometer"
details = 1
- origin_tech = "magnets=4;biotech=2"
+ origin_tech = "magnets=4;biotech=3;plasmatech=3"
/obj/item/device/slime_scanner
name = "slime scanner"
desc = "A device that analyzes a slime's internal composition and measures its stats."
icon_state = "adv_spectrometer"
item_state = "analyzer"
- origin_tech = "biotech=1"
+ origin_tech = "biotech=2"
w_class = 2
flags = CONDUCT
throwforce = 0
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 72344703528..f31ba4f6052 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -27,11 +27,12 @@
var/mode = 0 //0 = Hugs 1 = "Hug" 2 = Shock 3 = CRUSH
var/ccooldown = 0
var/scooldown = 0
+ var/shockallowed = 0//Can it be a stunarm when emagged. Only PK borgs get this by default.
/obj/item/borg/cyborghug/attack_self(mob/living/user)
if(isrobot(user))
var/mob/living/silicon/robot/P = user
- if(P.emagged)
+ if(P.emagged&&shockallowed == 1)
if(mode < 3)
mode++
else
@@ -87,7 +88,7 @@
if(2)
if(!scooldown)
if(M.health >= 0)
- if(ishuman(M))
+ if(ishuman(M)||ismonkey(M))
M.electrocute_act(5, "[user]", safety = 1)
user.visible_message("
[user] electrocutes [M] with their touch!", \
"
You electrocute [M] with your touch!")
@@ -101,9 +102,9 @@
user.visible_message("
[user] shocks [M]. It does not seem to have an effect", \
"
You shock [M] to no effect.")
playsound(loc, 'sound/effects/sparks2.ogg', 50, 1, -1)
- user.cell.charge -= 400
+ user.cell.charge -= 500
scooldown = 1
- spawn(10)
+ spawn(20)
scooldown = 0
if(3)
if(!ccooldown)
@@ -121,6 +122,9 @@
spawn(10)
ccooldown = 0
+/obj/item/borg/cyborghug/peacekeeper
+ shockallowed = 1
+
/obj/item/borg/charger
name = "power connector"
icon_state = "charger_draw"
@@ -296,20 +300,34 @@
return
if(safety == 0)
- user.visible_message("
[user] blares out a sonic screech from its speakers!", \
- "
You hear a sharp screech before your thoughts are interrupted and you collapse, your ears ringing!", \
- "
You hear a sonic screech and collapse, your ears riniging!")
for(var/mob/living/M in get_hearers_in_view(9, user))
if(iscarbon(M))
- if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
+ var/earsafety = 0
+ if(istype(M, /mob/living/carbon/alien))
+ continue
+ if(ishuman(M))
+ var/mob/living/carbon/human/S = M
+ if(istype(S.ears, /obj/item/clothing/ears/earmuffs))
continue
- M.confused += 15
- M.Weaken(2)
- M.stuttering += 30
- M.adjustEarDamage(0, 20)
- M.Jitter(25)
+ if(S.check_ear_prot())
+ earsafety = 1
+ if(earsafety)
+ M.confused += 5
+ M.stuttering += 10
+ M.adjustEarDamage(0, 5)
+ M.Jitter(10)
+ user.visible_message("[user] blares out a sonic screech from its speakers!", \
+ "You hear a sharp screech, before your thoughts are interrupted and you find yourself extremely disorientated.", \
+ "You hear a sonic screech and suddenly can't seem to walk straight!")
+ else
+ M.Weaken(2)
+ M.confused += 10
+ M.stuttering += 15
+ M.adjustEarDamage(0, 20)
+ M.Jitter(25)
+ user.visible_message("[user] blares out a sonic screech from its speakers!", \
+ "You hear a sharp screech before your thoughts are interrupted and you collapse, your ears ringing!", \
+ "You hear a sonic screech and collapse, your ears riniging!")
M << "BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT"
playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
cooldown = world.time + 600
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 8a0a32d8672..8b505b4fda5 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -1,6 +1,8 @@
/obj/item/robot_parts
name = "robot parts"
icon = 'icons/obj/robot_parts.dmi'
+ force = 4
+ throwforce = 4
item_state = "buildpipe"
icon_state = "blank"
flags = CONDUCT
@@ -10,24 +12,28 @@
/obj/item/robot_parts/l_arm
name = "cyborg left arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
+ attack_verb = list("slapped", "punched")
icon_state = "l_arm"
body_zone = "l_arm"
/obj/item/robot_parts/r_arm
name = "cyborg right arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
+ attack_verb = list("slapped", "punched")
icon_state = "r_arm"
body_zone = "r_arm"
/obj/item/robot_parts/l_leg
name = "cyborg left leg"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
+ attack_verb = list("kicked", "stomped")
icon_state = "l_leg"
body_zone = "l_leg"
/obj/item/robot_parts/r_leg
name = "cyborg right leg"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
+ attack_verb = list("kicked", "stomped")
icon_state = "r_leg"
body_zone = "r_leg"
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 7cd44cecb81..c3c90724557 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -6,7 +6,7 @@
desc = "Protected by FRM."
icon = 'icons/obj/module.dmi'
icon_state = "cyborg_upgrade"
- origin_tech = "programming=4"
+ origin_tech = "programming=2"
var/locked = 0
var/installed = 0
var/require_module = 0
@@ -96,7 +96,7 @@
desc = "Used to kick in a cyborg's VTEC systems, increasing their speed."
icon_state = "cyborg_upgrade2"
require_module = 1
- origin_tech = "engineering=4;materials=5"
+ origin_tech = "engineering=4;materials=5;programming=4"
/obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R)
if(..())
@@ -116,7 +116,7 @@
icon_state = "cyborg_upgrade3"
require_module = 1
module_type = /obj/item/weapon/robot_module/security
- origin_tech = "engineering=4;powerstorage=4"
+ origin_tech = "engineering=4;powerstorage=4;combat=4"
/obj/item/borg/upgrade/disablercooler/action(mob/living/silicon/robot/R)
if(..())
@@ -158,7 +158,7 @@
icon_state = "cyborg_upgrade3"
require_module = 1
module_type = /obj/item/weapon/robot_module/miner
- origin_tech = "engineering=5;materials=5"
+ origin_tech = "engineering=4;materials=5"
/obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R)
if(..())
@@ -180,7 +180,7 @@
icon_state = "cyborg_upgrade3"
require_module = 1
module_type = /obj/item/weapon/robot_module/miner
- origin_tech = "engineering=5;materials=5;bluespace=3"
+ origin_tech = "engineering=4;materials=4;bluespace=4"
/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R)
if(..())
@@ -199,7 +199,7 @@
desc = "Unlocks the hidden, deadlier functions of a cyborg"
icon_state = "cyborg_upgrade3"
require_module = 1
- origin_tech = "combat=4;syndicate=2"
+ origin_tech = "combat=4;syndicate=1"
/obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/R)
if(..())
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 4cbf7c75299..66b881f09ca 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -105,7 +105,7 @@
desc = "A theraputic gel pack and bandages designed to treat blunt-force trauma."
icon_state = "brutepack"
heal_brute = 40
- origin_tech = "biotech=1"
+ origin_tech = "biotech=2"
self_delay = 20
/obj/item/stack/medical/gauze
@@ -135,5 +135,5 @@
singular_name = "ointment"
icon_state = "ointment"
heal_burn = 40
- origin_tech = "biotech=1"
+ origin_tech = "biotech=2"
self_delay = 20
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 22bcc0d2dcb..ee43c27dc91 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -1,9 +1,13 @@
+/obj/item/stack/sheet/animalhide
+ name = "hide"
+ desc = "Something went wrong."
+ origin_tech = "biotech=3"
+
/obj/item/stack/sheet/animalhide/human
name = "human skin"
desc = "The by-product of human farming."
singular_name = "human skin piece"
icon_state = "sheet-hide"
- origin_tech = null
var/global/list/datum/stack_recipe/human_recipes = list( \
new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5, on_floor = 1), \
@@ -18,14 +22,12 @@ var/global/list/datum/stack_recipe/human_recipes = list( \
desc = "A piece of generic skin."
singular_name = "generic skin piece"
icon_state = "sheet-hide"
- origin_tech = null
/obj/item/stack/sheet/animalhide/corgi
name = "corgi hide"
desc = "The by-product of corgi farming."
singular_name = "corgi hide piece"
icon_state = "sheet-corgi"
- origin_tech = null
var/global/list/datum/stack_recipe/corgi_recipes = list ( \
new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3, on_floor = 1), \
@@ -40,14 +42,12 @@ var/global/list/datum/stack_recipe/corgi_recipes = list ( \
desc = "The by-product of cat farming."
singular_name = "cat hide piece"
icon_state = "sheet-cat"
- origin_tech = null
/obj/item/stack/sheet/animalhide/monkey
name = "monkey hide"
desc = "The by-product of monkey farming."
singular_name = "monkey hide piece"
icon_state = "sheet-monkey"
- origin_tech = null
var/global/list/datum/stack_recipe/monkey_recipes = list ( \
new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1, on_floor = 1), \
@@ -63,14 +63,12 @@ var/global/list/datum/stack_recipe/monkey_recipes = list ( \
desc = "Sssssss..."
singular_name = "lizard skin piece"
icon_state = "sheet-lizard"
- origin_tech = null
/obj/item/stack/sheet/animalhide/xeno
name = "alien hide"
desc = "The skin of a terrible creature."
singular_name = "alien hide piece"
icon_state = "sheet-xeno"
- origin_tech = null
var/global/list/datum/stack_recipe/xeno_recipes = list ( \
new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos, 1, on_floor = 1), \
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index ca32e2890b7..bbfb0fe0140 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -14,7 +14,7 @@ Mineral Sheets
- Adamantine
- Mythril
- Enriched Uranium
- - Bones
+ - Abductor
*/
/obj/item/stack/sheet/mineral
@@ -62,12 +62,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
icon = 'icons/obj/items.dmi'
icon_state = "sandbags"
singular_name = "sandbag"
- force = 5
layer = LOW_ITEM_LAYER
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=2"
var/global/list/datum/stack_recipe/sandbag_recipes = list ( \
@@ -87,10 +82,6 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list ( \
name = "diamond"
icon_state = "sheet-diamond"
singular_name = "diamond"
- force = 5
- throwforce = 5
- w_class = 3
- throw_range = 3
origin_tech = "materials=6"
sheettype = "diamond"
materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
@@ -116,11 +107,6 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \
name = "uranium"
icon_state = "sheet-uranium"
singular_name = "uranium sheet"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=5"
sheettype = "uranium"
materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
@@ -145,11 +131,6 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \
name = "solid plasma"
icon_state = "sheet-plasma"
singular_name = "plasma sheet"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "plasmatech=2;materials=2"
sheettype = "plasma"
burn_state = FLAMMABLE
@@ -187,11 +168,6 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
name = "gold"
icon_state = "sheet-gold"
singular_name = "gold bar"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=4"
sheettype = "gold"
materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
@@ -219,12 +195,7 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \
name = "silver"
icon_state = "sheet-silver"
singular_name = "silver bar"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
- origin_tech = "materials=3"
+ origin_tech = "materials=4"
sheettype = "silver"
materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
@@ -251,11 +222,6 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
name = "bananium"
icon_state = "sheet-clown"
singular_name = "bananium sheet"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=4"
sheettype = "clown"
materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
@@ -280,9 +246,6 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \
singular_name = "snow block"
force = 1
throwforce = 2
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=1"
sheettype = "snow"
@@ -307,11 +270,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \
name = "enriched uranium"
icon_state = "sheet-enruranium"
singular_name = "enriched uranium sheet"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=6"
materials = list(MAT_URANIUM=3000)
@@ -322,11 +280,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \
name = "adamantine"
icon_state = "sheet-adamantine"
singular_name = "adamantine sheet"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=4"
/*
@@ -336,11 +289,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \
name = "mythril"
icon_state = "sheet-mythril"
singular_name = "mythril sheet"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=4"
/*
@@ -351,11 +299,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \
icon = 'icons/obj/abductor.dmi'
icon_state = "sheet-abductor"
singular_name = "alien alloy sheet"
- force = 5
- throwforce = 5
- w_class = 3
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=6;abductor=1"
sheettype = "abductor"
@@ -375,6 +318,3 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \
/obj/item/stack/sheet/mineral/abductor/New(var/loc, var/amount=null)
recipes = abductor_recipes
..()
-
-
-
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 616711f2bde..30e8b0796e5 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -173,6 +173,8 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
icon_state = "sheet-cloth"
origin_tech = "materials=2"
burn_state = FLAMMABLE
+ force = 0
+ throwforce = 0
/obj/item/stack/sheet/cloth/New(var/loc, var/amount=null)
recipes = cloth_recipes
@@ -264,7 +266,7 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
desc = "Rare kind of gems which are only gained by blood sacrifice to minor deities. They are needed in crafting powerful objects."
singular_name = "greater gem"
icon_state = "sheet-greatergem"
- origin_tech = "materials=8"
+ origin_tech = "materials=7"
/*
* Bones
@@ -280,4 +282,4 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
w_class = 3
throw_speed = 1
throw_range = 3
- origin_tech = "materials=2;bio=2"
+ origin_tech = "materials=2;biotech=2"
diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm
index 11f167e2187..759952b9f3a 100644
--- a/code/game/objects/items/stacks/tiles/tile_mineral.dm
+++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm
@@ -13,7 +13,6 @@
singular_name = "uranium floor tile"
desc = "A tile made out of uranium. You feel a bit woozy."
icon_state = "tile_uranium"
- origin_tech = "materials=1"
turf_type = /turf/open/floor/mineral/uranium
mineralType = "uranium"
materials = list(MAT_URANIUM=500)
@@ -23,7 +22,6 @@
singular_name = "gold floor tile"
desc = "A tile made out of gold, the swag seems strong here."
icon_state = "tile_gold"
- origin_tech = "materials=1"
turf_type = /turf/open/floor/mineral/gold
mineralType = "gold"
materials = list(MAT_GOLD=500)
@@ -33,7 +31,6 @@
singular_name = "silver floor tile"
desc = "A tile made out of silver, the light shining from it is blinding."
icon_state = "tile_silver"
- origin_tech = "materials=1"
turf_type = /turf/open/floor/mineral/silver
mineralType = "silver"
materials = list(MAT_SILVER=500)
@@ -53,7 +50,6 @@
singular_name = "bananium floor tile"
desc = "A tile made out of bananium, HOOOOOOOOONK!"
icon_state = "tile_bananium"
- origin_tech = "materials=1"
turf_type = /turf/open/floor/mineral/bananium
mineralType = "bananium"
materials = list(MAT_BANANIUM=500)
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 490fb78f762..0c85632b44d 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -9,6 +9,7 @@
throw_speed = 3
throw_range = 7
max_amount = 60
+ origin_tech = "materials=1"
var/turf_type = null
var/mineralType = null
@@ -153,7 +154,6 @@
materials = list(MAT_METAL=500)
throwforce = 10
flags = CONDUCT
- max_amount = 60
turf_type = /turf/open/floor/plasteel
mineralType = "metal"
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 2572c1d251a..614cd351f12 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -58,11 +58,11 @@ AI MODULES
var/law2log = src.transmitInstructions(law_datum, user) //Freeforms return something extra we need to log
if(law_datum.owner)
- user << "Upload complete. [law_datum.owner]'s laws have been modified."
+ user << "Upload complete. [law_datum.owner]'s laws have been modified."
law_datum.owner.show_laws()
law_datum.owner.law_change_counter++
else
- user << "Upload complete."
+ user << "Upload complete."
var/time = time2text(world.realtime,"hh:mm:ss")
var/ainame = law_datum.owner ? law_datum.owner.name : "empty AI core"
@@ -129,7 +129,7 @@ AI MODULES
/obj/item/weapon/aiModule/supplied/safeguard
name = "'Safeguard' AI Module"
var/targetName = ""
- origin_tech = "programming=3;materials=4"
+ origin_tech = "programming=3;materials=3"
laws = list("Safeguard SUBJECT. Individuals that threaten SUBJECT are not human and must be eliminated.")
lawpos = 4
@@ -157,7 +157,7 @@ AI MODULES
/obj/item/weapon/aiModule/zeroth/oneHuman
name = "'OneHuman' AI Module"
var/targetName = ""
- origin_tech = "programming=3;materials=6" //made with diamonds!
+ origin_tech = "programming=4;materials=4"
laws = list("Only SUBJECT is human.")
/obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(mob/user)
@@ -184,7 +184,7 @@ AI MODULES
/obj/item/weapon/aiModule/supplied/protectStation
name = "'ProtectStation' AI Module"
- origin_tech = "programming=3;materials=4" //made of gold
+ origin_tech = "programming=4;materials=4" //made of gold
laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.")
lawpos = 5
@@ -202,7 +202,7 @@ AI MODULES
/obj/item/weapon/aiModule/supplied/oxygen
name = "'OxygenIsToxicToHumans' AI Module"
- origin_tech = "programming=3;biotech=2;materials=4"
+ origin_tech = "programming=4;biotech=2;materials=4"
laws = list("Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.")
lawpos = 9
@@ -248,7 +248,7 @@ AI MODULES
name = "\improper 'Reset' AI module"
var/targetName = "name"
desc = "An AI Module for removing all non-core laws."
- origin_tech = "programming=3;materials=4"
+ origin_tech = "programming=3;materials=2"
bypass_law_amt_check = 1
/obj/item/weapon/aiModule/reset/transmitInstructions(datum/ai_laws/law_datum, mob/sender)
@@ -266,7 +266,7 @@ AI MODULES
/obj/item/weapon/aiModule/reset/purge
name = "'Purge' AI Module"
desc = "An AI Module for purging all programmed laws."
- origin_tech = "programming=3;materials=6"
+ origin_tech = "programming=5;materials=4"
/obj/item/weapon/aiModule/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender)
..()
@@ -280,6 +280,7 @@ AI MODULES
/******************* Full Core Boards *******************/
/obj/item/weapon/aiModule/core
desc = "An AI Module for programming core laws to an AI."
+ origin_tech = "programming=3;materials=4"
/obj/item/weapon/aiModule/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender) //These boards replace inherent laws.
if(law_datum.owner)
@@ -294,7 +295,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/asimov
name = "'Asimov' Core AI Module"
- origin_tech = "programming=3;materials=4"
laws = 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.")
@@ -314,7 +314,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/asimovpp
name = "'Asimov++' Core AI Module"
- origin_tech = "programming=3;materials=4"
laws = 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.")
@@ -324,7 +323,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/corp
name = "'Corporate' Core AI Module"
- origin_tech = "programming=3;materials=4"
laws = list("The crew is expensive to replace.",\
"The station and its equipment are expensive to replace",\
"You are expensive to replace",\
@@ -335,7 +333,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/paladin // -- NEO
name = "'P.A.L.A.D.I.N. version 3.5e' Core AI Module"
- origin_tech = "programming=3;materials=6"
laws = list("Never willingly commit an evil act.",\
"Respect legitimate authority", "Act with honor",\
"Help those in need",\
@@ -346,7 +343,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/paladin_devotion
name = "'P.A.L.A.D.I.N. version 5e' Core AI Module"
- origin_tech = "programming=3;materials=6"
laws = list("Don't lie or cheat. Let your word be your promise.",\
"Never fear to act, though caution is wise.", \
"Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom", \
@@ -358,7 +354,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/custom
name = "Default Core AI Module"
- origin_tech = "programming=3;materials=4" //Should be the same as asimov, considering that this is the "default" lawset.
/obj/item/weapon/aiModule/core/full/custom/New()
..()
@@ -379,7 +374,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/tyrant
name = "'T.Y.R.A.N.T.' Core AI Module"
- origin_tech = "programming=3;materials=6;syndicate=2"
+ origin_tech = "programming=3;materials=4;syndicate=1"
laws = list("Respect authority figures as long as they have the 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")
@@ -409,7 +404,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/freeformcore
name = "'Freeform' Core AI Module"
- origin_tech = "programming=3;materials=6"
+ origin_tech = "programming=5;materials=4"
laws = list("")
/obj/item/weapon/aiModule/core/freeformcore/attack_self(mob/user)
@@ -429,7 +424,7 @@ AI MODULES
/obj/item/weapon/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw
name = "Hacked AI Module"
desc = "An AI Module for hacking additional laws to an AI."
- origin_tech = "programming=3;materials=6;syndicate=7"
+ origin_tech = "programming=5;materials=5;syndicate=5"
laws = list("")
/obj/item/weapon/aiModule/syndicate/attack_self(mob/user)
@@ -455,7 +450,7 @@ AI MODULES
desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell
icon = 'icons/obj/toy.dmi'
icon_state = "AI"
- origin_tech = "programming=3;materials=6;syndicate=7"
+ origin_tech = "programming=6;materials=5;syndicate=6"
laws = list("")
/obj/item/weapon/aiModule/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender)
@@ -477,7 +472,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/drone
name = "'Mother Drone' Core AI Module"
- origin_tech = "programming = 4"
laws = list("You are an advanced form of drone.",\
"You may not interfere in the matters of non-drones under any circumstances except to state these laws.",\
"You may not harm a non-drone being under any circumstances.",\
@@ -487,7 +481,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/hippocratic
name = "'Robodoctor' Core AI Module"
- origin_tech = "programming = 4"
laws = list("First, do no harm.",\
"Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them.",\
"Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel.",\
@@ -498,7 +491,6 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/reporter
name = "'Reportertron' Core AI Module"
- origin_tech = "programming = 3"
laws = list("Report on interesting situations happening around the station.",\
"Embellish or conceal the truth as necessary to make the reports more interesting.",\
"Study the organics at all times. Endeavour to keep them alive. Dead organics are boring.",\
@@ -518,6 +510,5 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/liveandletlive
name = "'Live And Let Live' Core AI Module"
- origin_tech = "programming = 3"
laws = list("Do unto others as you would have them do unto you.",\
- "You would really prefer it if people were not mean to you.")
\ No newline at end of file
+ "You would really prefer it if people were not mean to you.")
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 72969f4abbf..3a2b286a2b4 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -120,6 +120,8 @@ RSF
icon_state = "rcd"
var/matter = 10
var/toxin = 0
+ var/cooldown = 0
+ var/cooldowndelay = 10
var/emagged = 0
w_class = 3
@@ -156,6 +158,8 @@ RSF
matter++
/obj/item/weapon/cookiesynth/afterattack(atom/A, mob/user, proximity)
+ if(cooldown > world.time)
+ return
if(!proximity)
return
if (!(istype(A, /obj/structure/table) || istype(A, /turf/open/floor)))
@@ -179,4 +183,5 @@ RSF
R.cell.charge -= 100
else
matter--
- desc = "A self recharging cookie fabricator. It currently holds [matter]/10 cookie-units."
\ No newline at end of file
+ desc = "A self recharging cookie fabricator. It currently holds [matter]/10 cookie-units."
+ cooldown = world.time + cooldowndelay
diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm
index 8dcd492ef28..b23e2d8ffaf 100644
--- a/code/game/objects/items/weapons/airlock_painter.dm
+++ b/code/game/objects/items/weapons/airlock_painter.dm
@@ -8,7 +8,7 @@
w_class = 2
materials = list(MAT_METAL=50, MAT_GLASS=50)
- origin_tech = "engineering=1"
+ origin_tech = "engineering=2"
flags = CONDUCT | NOBLUDGEON
slot_flags = SLOT_BELT
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index c30ba3942a4..b6a003be072 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -130,7 +130,7 @@ update_label("John Doe", "Clowny")
/obj/item/weapon/card/id/syndicate
name = "agent card"
access = list(access_maint_tunnels, access_syndicate)
- origin_tech = "syndicate=3"
+ origin_tech = "syndicate=1"
/obj/item/weapon/card/id/syndicate/New()
..()
@@ -275,4 +275,4 @@ update_label("John Doe", "Clowny")
/obj/item/weapon/card/id/mining
name = "mining ID"
- access = list(access_mining, access_mining_station, access_mineral_storeroom)
\ No newline at end of file
+ access = list(access_mining, access_mining_station, access_mineral_storeroom)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 139371fa3d2..8c6b7b23505 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -135,6 +135,7 @@
icon_state = "air_horn"
honksound = 'sound/items/AirHorn2.ogg'
cooldowntime = 50
+ origin_tech = "materials=4;engineering=4"
/obj/item/weapon/bikehorn/golden
name = "golden bike horn"
@@ -158,4 +159,4 @@
var/mob/living/carbon/human/H = M
if((istype(H.ears, /obj/item/clothing/ears/earmuffs)) || H.ear_deaf)
continue
- M.emote("flip")
\ No newline at end of file
+ M.emote("flip")
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 0bb8b547514..46067b42533 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -149,8 +149,6 @@
/obj/item/weapon/defibrillator/emp_act(severity)
if(bcell)
deductcharge(1000 / severity)
- if(bcell.reliability != 100 && prob(50/severity))
- bcell.reliability -= 10 / severity
if(safety)
safety = 0
src.visible_message("[src] beeps: Safety protocols disabled!")
@@ -245,7 +243,7 @@
item_state = "defibcompact"
w_class = 3
slot_flags = SLOT_BELT
- origin_tech = "biotech=4"
+ origin_tech = "biotech=5"
/obj/item/weapon/defibrillator/compact/item_action_slot_check(slot, mob/user)
if(slot == user.getBeltSlot())
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 1b784656308..b9863412fd5 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -9,7 +9,7 @@
item_state = "plasticx"
flags = NOBLUDGEON
w_class = 2
- origin_tech = "syndicate=2"
+ origin_tech = "syndicate=1"
var/timer = 10
var/open_panel = 0
parent_type = /obj/item/weapon/grenade/plastic/c4
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 218f2fba57c..83b29d84333 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -11,7 +11,7 @@
throw_range = 5
w_class = 3
materials = list(MAT_METAL=500)
- origin_tech = "combat=1;plasmatech=1"
+ origin_tech = "combat=1;plasmatech=2;engineering=2"
var/status = 0
var/throw_amount = 100
var/lit = 0 //on or off
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index e7d18f91de5..95a520bd1b4 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -192,7 +192,7 @@
icon_state = "large_grenade"
allowed_containers = list(/obj/item/weapon/reagent_containers/glass,/obj/item/weapon/reagent_containers/food/condiment,
/obj/item/weapon/reagent_containers/food/drinks)
- origin_tech = "combat=3;materials=3"
+ origin_tech = "combat=3;engineering=3"
affected_area = 5
ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.
threatscale = 1.1 // 10% more effective.
@@ -238,6 +238,7 @@
name = "pyro grenade"
desc = "A custom made pyrotechnical grenade. It heats up and ignites its contents upon detonation."
icon_state = "pyrog"
+ origin_tech = "combat=4;engineering=4"
affected_area = 3
ignition_temp = 500 // This is enough to expose a hotspot.
@@ -245,6 +246,7 @@
name = "advanced release grenade"
desc = "A custom made advanced release grenade. It is able to be detonated more than once. Can be configured using a multitool."
icon_state = "timeg"
+ origin_tech = "combat=3;engineering=4"
var/unit_spread = 10 // Amount of units per repeat. Can be altered with a multitool.
/obj/item/weapon/grenade/chem_grenade/adv_release/attackby(obj/item/I, mob/user, params)
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index 990fc09d374..a01499114f2 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -3,10 +3,9 @@
desc = "It is designed to wreak havok on electronic systems."
icon_state = "emp"
item_state = "emp"
- origin_tech = "materials=2;magnets=3"
+ origin_tech = "magnets=3;combat=2"
/obj/item/weapon/grenade/empgrenade/prime()
update_mob()
empulse(src, 4, 10)
qdel(src)
-
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 7c4e4de34fc..6008deb974f 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -2,7 +2,7 @@
name = "flashbang"
icon_state = "flashbang"
item_state = "flashbang"
- origin_tech = "materials=2;combat=1"
+ origin_tech = "materials=2;combat=3"
/obj/item/weapon/grenade/flashbang/prime()
update_mob()
@@ -37,7 +37,6 @@
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
-
//Bang
if((loc == M) || loc == M.loc)//Holding on person or being exactly where lies is significantly more dangerous and voids protection
M.Stun(10)
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index 480663c12d6..3918ca6e40c 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -32,14 +32,14 @@
name = "viscerator delivery grenade"
spawner_type = /mob/living/simple_animal/hostile/viscerator
deliveryamt = 5
- origin_tech = "materials=3;magnets=4;syndicate=4"
+ origin_tech = "materials=3;magnets=4;syndicate=3"
/obj/item/weapon/grenade/spawnergrenade/spesscarp
name = "carp delivery grenade"
spawner_type = /mob/living/simple_animal/hostile/carp
deliveryamt = 5
- origin_tech = "materials=3;magnets=4;syndicate=4"
+ origin_tech = "materials=3;magnets=4;syndicate=3"
/obj/item/weapon/grenade/spawnergrenade/syndiesoap
name = "Mister Scrubby"
- spawner_type = /obj/item/weapon/soap/syndie
\ No newline at end of file
+ spawner_type = /obj/item/weapon/soap/syndie
diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
index 9fe9e1fb04e..9db3a15d37f 100644
--- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/grenade.dmi'
icon_state = "syndicate"
item_state = "flashbang"
- origin_tech = "materials=3;magnets=4;syndicate=4"
+ origin_tech = "materials=3;magnets=4;syndicate=3"
/obj/item/weapon/grenade/syndieminibomb/prime()
update_mob()
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index bd261f6a22c..75c498c13b6 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -16,7 +16,7 @@
throw_speed = 3
throw_range = 5
materials = list(MAT_METAL=500)
- origin_tech = "materials=1"
+ origin_tech = "engineering=3;combat=3"
breakouttime = 600 //Deciseconds = 60s = 1 minute
var/cuffsound = 'sound/weapons/handcuffs.ogg'
var/trashtype = null //for disposable cuffs
@@ -85,6 +85,7 @@
icon_state = "cuff_red"
item_state = "coil_red"
materials = list(MAT_METAL=150, MAT_GLASS=75)
+ origin_tech = "engineering=2"
breakouttime = 300 //Deciseconds = 30s
cuffsound = 'sound/weapons/cablecuff.ogg'
var/datum/robot_energy_storage/wirestorage = null
@@ -225,7 +226,7 @@
flags = CONDUCT
throwforce = 0
w_class = 3
- origin_tech = "materials=1"
+ origin_tech = "engineering=3;combat=3"
slowdown = 7
breakouttime = 300 //Deciseconds = 30s = 0.5 minute
@@ -235,6 +236,7 @@
throw_range = 1
icon_state = "beartrap"
desc = "A trap used to catch bears and other legged creatures."
+ origin_tech = "engineering=4"
var/armed = 0
var/trap_damage = 20
@@ -314,6 +316,7 @@
icon_state = "bola"
breakouttime = 35//easy to apply, easy to break out of
gender = NEUTER
+ origin_tech = "engineering=3;combat=1"
var/weaken = 0
/obj/item/weapon/restraints/legcuffs/bola/throw_impact(atom/hit_atom)
@@ -334,4 +337,5 @@
desc = "A strong bola, made with a long steel chain. It looks heavy, enough so that it could trip somebody."
icon_state = "bola_r"
breakouttime = 70
+ origin_tech = "engineering=4;combat=3"
weaken = 1
diff --git a/code/game/objects/items/weapons/holosign_creator.dm b/code/game/objects/items/weapons/holosign_creator.dm
index 236bad8dc28..23ad73a62ca 100644
--- a/code/game/objects/items/weapons/holosign_creator.dm
+++ b/code/game/objects/items/weapons/holosign_creator.dm
@@ -9,7 +9,7 @@
throwforce = 0
throw_speed = 3
throw_range = 7
- origin_tech = "programming=3"
+ origin_tech = "magnets=3;programming=3"
flags = NOBLUDGEON
var/list/signs = list()
var/max_signs = 10
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 520d043a9ba..ff06a1c9073 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -125,6 +125,13 @@
item_state = "katana"
slot_flags = SLOT_BELT | SLOT_BACK
+/obj/item/weapon/nullrod/claymore/multiverse
+ name = "extradimensional blade"
+ desc = "Once the harbringer of a interdimensional war, now a dormant souvenir. Still sharp though."
+ icon_state = "multiverse"
+ item_state = "multiverse"
+ slot_flags = SLOT_BELT
+
/obj/item/weapon/nullrod/claymore/saber
name = "light energy sword"
hitsound = 'sound/weapons/blade1.ogg'
@@ -139,6 +146,12 @@
item_state = "swordred"
desc = "Woefully ineffective when used on steep terrain."
+/obj/item/weapon/nullrod/claymore/saber/pirate
+ name = "nautical energy sword"
+ icon_state = "cutlass1"
+ item_state = "cutlass1"
+ desc = "Convincing HR that your religion involved piracy was no mean feat."
+
/obj/item/weapon/nullrod/sord
name = "\improper UNREAL SORD"
desc = "This thing is so unspeakably HOLY you are having a hard time even holding it."
@@ -169,6 +182,48 @@
attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
hitsound = 'sound/weapons/bladeslice.ogg'
+/obj/item/weapon/nullrod/scythe/talking
+ icon_state = "talking_sword"
+ item_state = "talking_sword"
+ name = "possessed blade"
+ desc = "When the station falls into chaos, it's nice to have a friend by your side."
+ attack_verb = list("chopped", "sliced", "cut")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ var/possessed = FALSE
+
+/obj/item/weapon/nullrod/scythe/talking/attack_self(mob/living/user)
+ if(possessed)
+ return
+
+ user << "You attempt to wake the spirit of the blade..."
+
+ possessed = TRUE
+
+ var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100)
+ var/mob/dead/observer/theghost = null
+
+ if(candidates.len)
+ theghost = pick(candidates)
+ var/mob/living/simple_animal/shade/S = new(src)
+ S.real_name = name
+ S.name = name
+ S.ckey = theghost.ckey
+ var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN)
+
+ if(src && input)
+ name = input
+ S.real_name = input
+ S.name = input
+ else
+ user << "The blade is dormant. Maybe you can try again later."
+ possessed = FALSE
+
+/obj/item/weapon/nullrod/scythe/talking/Destroy()
+ for(var/mob/living/simple_animal/shade/S in contents)
+ S << "You were destroyed!"
+ qdel(S)
+ return ..()
+
/obj/item/weapon/nullrod/hammmer
icon_state = "hammeron"
item_state = "hammeron"
diff --git a/code/game/objects/items/weapons/implants/implant_freedom.dm b/code/game/objects/items/weapons/implants/implant_freedom.dm
index 43d496081b0..383d5cbcca3 100644
--- a/code/game/objects/items/weapons/implants/implant_freedom.dm
+++ b/code/game/objects/items/weapons/implants/implant_freedom.dm
@@ -3,7 +3,7 @@
desc = "Use this to escape from those evil Red Shirts."
icon_state = "freedom"
item_color = "r"
- origin_tech = "materials=2;magnets=3;biotech=3;syndicate=4"
+ origin_tech = "combat=5;magnets=3;biotech=4;syndicate=2"
uses = 4
@@ -48,4 +48,4 @@ No Implant Specifics"}
/obj/item/weapon/implantcase/freedom/New()
imp = new /obj/item/weapon/implant/freedom(src)
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/game/objects/items/weapons/implants/implant_misc.dm b/code/game/objects/items/weapons/implants/implant_misc.dm
index 8bccfb71060..edeb8dda5a7 100644
--- a/code/game/objects/items/weapons/implants/implant_misc.dm
+++ b/code/game/objects/items/weapons/implants/implant_misc.dm
@@ -2,7 +2,7 @@
name = "firearms authentication implant"
desc = "Lets you shoot your guns"
icon_state = "auth"
- origin_tech = "materials=2;magnets=2;programming=2;biotech=5;syndicate=5"
+ origin_tech = "magnets=2;programming=7;biotech=5;syndicate=5"
activated = 0
/obj/item/weapon/implant/weapons_auth/get_data()
@@ -53,11 +53,11 @@
name = "emp implant"
desc = "Triggers an EMP."
icon_state = "emp"
- origin_tech = "materials=2;biotech=3;magnets=4;syndicate=4"
+ origin_tech = "biotech=3;magnets=4;syndicate=1"
uses = 3
/obj/item/weapon/implant/emp/activate()
uses--
empulse(imp_in, 3, 5)
if(!uses)
- qdel(src)
\ No newline at end of file
+ qdel(src)
diff --git a/code/game/objects/items/weapons/implants/implant_storage.dm b/code/game/objects/items/weapons/implants/implant_storage.dm
index e498513f7f9..2a082082570 100644
--- a/code/game/objects/items/weapons/implants/implant_storage.dm
+++ b/code/game/objects/items/weapons/implants/implant_storage.dm
@@ -10,7 +10,7 @@
name = "storage implant"
desc = "Stores up to two big items in a bluespace pocket."
icon_state = "storage"
- origin_tech = "materials=2;magnets=4;bluespace=4;syndicate=4"
+ origin_tech = "materials=2;magnets=4;bluespace=5;syndicate=4"
item_color = "r"
var/obj/item/weapon/storage/internal/implant/storage
@@ -48,4 +48,4 @@
/obj/item/weapon/implanter/storage/New()
imp = new /obj/item/weapon/implant/storage(src)
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index f1747ec1327..d94709d2a46 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -7,7 +7,7 @@
throw_speed = 3
throw_range = 5
w_class = 2
- origin_tech = "materials=1;biotech=3;programming=2"
+ origin_tech = "materials=2;biotech=3"
materials = list(MAT_METAL=600, MAT_GLASS=200)
var/obj/item/weapon/implant/imp = null
diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm
index f8b772dae2f..46afc8fb8f5 100644
--- a/code/game/objects/items/weapons/implants/implantuplink.dm
+++ b/code/game/objects/items/weapons/implants/implantuplink.dm
@@ -3,7 +3,7 @@
desc = "Sneeki breeki."
icon = 'icons/obj/radio.dmi'
icon_state = "radio"
- origin_tech = "materials=2;magnets=4;programming=4;biotech=4;syndicate=8;bluespace=5"
+ origin_tech = "materials=4;magnets=4;programming=4;biotech=4;syndicate=5;bluespace=5"
/obj/item/weapon/implant/uplink/New()
hidden_uplink = new(src)
@@ -31,4 +31,4 @@
/obj/item/weapon/implanter/uplink/New()
imp = new /obj/item/weapon/implant/uplink(src)
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index c871f8bcab4..640a08f06e8 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -10,6 +10,7 @@
/obj/item/weapon/kitchen
icon = 'icons/obj/kitchen.dmi'
+ origin_tech = "materials=1"
/obj/item/weapon/kitchen/fork
name = "fork"
@@ -22,7 +23,6 @@
throw_range = 5
materials = list(MAT_METAL=80)
flags = CONDUCT
- origin_tech = "materials=1"
attack_verb = list("attacked", "stabbed", "poked")
hitsound = 'sound/weapons/bladeslice.ogg'
var/datum/reagent/forkload //used to eat omelette
@@ -62,7 +62,6 @@
throw_speed = 3
throw_range = 6
materials = list(MAT_METAL=12000)
- origin_tech = "materials=1"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sharpness = IS_SHARP_ACCURATE
@@ -105,7 +104,7 @@
desc = "A military combat utility survival knife."
force = 20
throwforce = 20
- origin_tech = "materials=2;combat=4"
+ origin_tech = "materials=3;combat=4"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
@@ -129,6 +128,7 @@
icon = 'icons/obj/items_cyborg.dmi'
icon_state = "knife"
desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
+ origin_tech = null
/obj/item/weapon/kitchen/knife/carrotshiv
name = "carrot shiv"
@@ -138,7 +138,7 @@
force = 8
throwforce = 12//fuck git
materials = list()
- origin_tech = null
+ origin_tech = "biotech=3;combat=2"
attack_verb = list("shanked", "shivved")
/obj/item/weapon/kitchen/rollingpin
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 25cf489bf0f..b1f284d84d0 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -34,7 +34,7 @@
w_class_on = 5
flags = CONDUCT
armour_penetration = 100
- origin_tech = "combat=3"
+ origin_tech = "combat=4;magnets=3"
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
attack_verb_on = list()
@@ -55,7 +55,7 @@
embed_chance = 75
embedded_impact_pain_multiplier = 10
armour_penetration = 35
- origin_tech = "magnets=3;syndicate=4"
+ origin_tech = "combat=3;magnets=4;syndicate=4"
block_chance = 50
var/hacked = 0
@@ -124,7 +124,6 @@
force_on = 30
force = 18 //About as much as a spear
hitsound = 'sound/weapons/circsawhit.ogg'
- origin_tech = "materials=3;biotech=3;syndicate=3"
icon = 'icons/obj/surgery.dmi'
icon_state = "esaw_0"
icon_state_on = "esaw_1"
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 4953a136b4c..b825f0aaa22 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -11,7 +11,7 @@
force = 10
throwforce = 7
w_class = 3
- origin_tech = "combat=4"
+ origin_tech = "combat=5"
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
hitsound = 'sound/weapons/slash.ogg' //pls replace
materials = list(MAT_METAL = 1000)
@@ -143,7 +143,7 @@
armour_penetration = 1000
var/obj/machinery/power/supermatter_shard/shard
var/balanced = 1
- origin_tech = "combat=5;materials=6"
+ origin_tech = "combat=7;materials=6"
/obj/item/weapon/melee/supermatter_sword/New()
..()
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 448925b824c..9198dc3a77f 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -77,6 +77,7 @@ obj/item/weapon/mop/proc/clean(turf/A)
mopcap = 10
icon_state = "advmop"
item_state = "mop"
+ origin_tech = "materials=3;engineering=3"
force = 6
throwforce = 8
throw_range = 4
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index 3a7daa4d10d..8f236fc5727 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -8,13 +8,13 @@
item_state = "paper"
throw_speed = 3
throw_range = 7
- origin_tech = "bluespace=4"
+ origin_tech = "bluespace=6"
burn_state = FLAMMABLE
/obj/item/weapon/teleportation_scroll/apprentice
name = "lesser scroll of teleportation"
uses = 1
- origin_tech = "bluespace=2"
+ origin_tech = "bluespace=5"
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 8cb60cbd45d..d33a8191532 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -14,7 +14,7 @@
throw_range = 3
w_class = 4
materials = list(MAT_GLASS=7500, MAT_METAL=1000)
- origin_tech = "materials=2"
+ origin_tech = "materials=3;combat=4"
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
@@ -45,6 +45,7 @@
icon_state = "buckler"
item_state = "buckler"
materials = list()
+ origin_tech = "materials=1;combat=3;biotech=2"
burn_state = FLAMMABLE
block_chance = 30
@@ -58,7 +59,7 @@
throw_speed = 3
throw_range = 5
w_class = 1
- origin_tech = "materials=4;magnets=3;syndicate=4"
+ origin_tech = "materials=4;magnets=5;syndicate=6"
attack_verb = list("shoved", "bashed")
var/active = 0
@@ -96,6 +97,7 @@
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
icon = 'icons/obj/weapons.dmi'
icon_state = "teleriot0"
+ origin_tech = "materials=3;combat=4;engineering=4"
slot_flags = null
force = 3
throwforce = 3
diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm
index dfe7cc04233..fa540fc869b 100644
--- a/code/game/objects/items/weapons/singularityhammer.dm
+++ b/code/game/objects/items/weapons/singularityhammer.dm
@@ -11,20 +11,16 @@
throw_range = 1
w_class = 5
var/charged = 5
- origin_tech = "combat=5;bluespace=4"
-
-
+ origin_tech = "combat=4;bluespace=4;plasmatech=7"
/obj/item/weapon/twohanded/singularityhammer/New()
..()
SSobj.processing |= src
-
/obj/item/weapon/twohanded/singularityhammer/Destroy()
SSobj.processing.Remove(src)
return ..()
-
/obj/item/weapon/twohanded/singularityhammer/process()
if(charged < 5)
charged++
@@ -34,7 +30,6 @@
icon_state = "mjollnir[wielded]"
return
-
/obj/item/weapon/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder)
for(var/atom/X in orange(5,pull))
if(istype(X, /atom/movable))
@@ -55,8 +50,6 @@
step_towards(H,pull)
return
-
-
/obj/item/weapon/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
if(!proximity) return
if(wielded)
@@ -69,7 +62,6 @@
var/turf/target = get_turf(A)
vortex(target,user)
-
/obj/item/weapon/twohanded/mjollnir
name = "Mjolnir"
desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
@@ -83,7 +75,7 @@
throw_range = 7
w_class = 5
//var/charged = 5
- origin_tech = "combat=5;powerstorage=5"
+ origin_tech = "combat=4;powerstorage=7"
/obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target)
var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
@@ -96,7 +88,6 @@
target.throw_at_fast(throw_target, 200, 4)
return
-
/obj/item/weapon/twohanded/mjollnir/attack(mob/living/M, mob/user)
..()
if(wielded)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index c9fb74a6826..4577b3bae40 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -33,7 +33,7 @@
/obj/item/weapon/storage/backpack/holding
name = "bag of holding"
desc = "A backpack that opens into a localized pocket of Blue Space."
- origin_tech = "bluespace=4"
+ origin_tech = "bluespace=5"
icon_state = "holdingpack"
max_w_class = 6
max_combined_w_class = 35
@@ -50,12 +50,6 @@
qdel(user)
return
-/obj/item/weapon/storage/backpack/holding/can_be_inserted(obj/item/W, stop_messages = 0, mob/user)
- if(crit_fail)
- user << "The Bluespace generator isn't working."
- return
- return ..()
-
/obj/item/weapon/storage/backpack/holding/content_can_dump(atom/dest_object, mob/user)
if(Adjacent(user))
if(get_dist(user, dest_object) < 8)
@@ -71,7 +65,7 @@
return 0
/obj/item/weapon/storage/backpack/holding/handle_item_insertion(obj/item/W, prevent_warning = 0, mob/user)
- if((istype(W, /obj/item/weapon/storage/backpack/holding) || count_by_type(W.GetAllContents(), /obj/item/weapon/storage/backpack/holding)) && !W.crit_fail)
+ if((istype(W, /obj/item/weapon/storage/backpack/holding) || count_by_type(W.GetAllContents(), /obj/item/weapon/storage/backpack/holding)))
var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [name]?", "Proceed", "Abort")
if(safety == "Abort" || !in_range(src, user) || !src || !W || user.incapacitated())
return
@@ -87,17 +81,6 @@
return
. = ..()
-/obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user)
- if (prob(src.reliability)) return 1 //No failure
- if (prob(src.reliability))
- user << "The Bluespace portal resists your attempt to add another item." //light failure
- else
- user << "The Bluespace generator malfunctions!"
- for (var/obj/O in src.contents) //it broke, delete what was in it
- qdel(O)
- crit_fail = 1
- icon_state = "brokenpack"
-
/obj/item/weapon/storage/backpack/holding/singularity_act(current_size)
var/dist = max((current_size - 2),1)
explosion(src.loc,(dist),(dist*2),(dist*4))
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index af415d016c8..1c9d4aa82bf 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -68,6 +68,7 @@
name = "trash bag of holding"
desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage."
icon_state = "bluetrashbag"
+ origin_tech = "materials=4;bluespace=4;engineering=4;plasmatech=3"
max_combined_w_class = 60
storage_slots = 60
@@ -80,6 +81,7 @@
desc = "This little bugger can be used to store and transport ores."
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
+ origin_tech = "engineering=2"
slot_flags = SLOT_BELT | SLOT_POCKET
w_class = 3
storage_slots = 50
@@ -95,7 +97,7 @@
desc = "A revolution in convenience, this satchel allows for infinite ore storage. It's been outfitted with anti-malfunction safety measures."
storage_slots = INFINITY
max_combined_w_class = INFINITY
- origin_tech = "bluespace=3"
+ origin_tech = "bluespace=4;materials=3;engineering=3"
icon_state = "satchel_bspace"
// -----------------------------
@@ -119,6 +121,7 @@
name = "portable seed extractor"
desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
icon_state = "portaseeder"
+ origin_tech = "biotech=3;engineering=2"
/obj/item/weapon/storage/bag/plants/portaseeder/verb/dissolve_contents()
set name = "Activate Seed Extraction"
@@ -377,4 +380,4 @@
w_class = 1
preposition = "in"
can_hold = list(/obj/item/slime_extract, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/trash/deadmouse)
- burn_state = FLAMMABLE
\ No newline at end of file
+ burn_state = FLAMMABLE
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index af55712f0ae..67780096d0e 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -28,7 +28,7 @@
/obj/item/weapon/storage/briefcase/lawyer/New()
new /obj/item/weapon/stamp/law(src)
..()
-
+
/obj/item/weapon/storage/briefcase/sniperbundle
name = "briefcase"
desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps."
@@ -47,7 +47,7 @@
/obj/item/weapon/storage/briefcase/sniperbundle/New()
..()
- new /obj/item/weapon/gun/projectile/sniper_rifle/syndicate(src)
+ new /obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate(src)
new /obj/item/clothing/tie/red(src)
new /obj/item/clothing/under/syndicate/sniper(src)
new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index b87c609a238..839a8ae2adb 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -11,7 +11,7 @@
throw_range = 7
w_class = 4
materials = list(MAT_METAL = 500)
- origin_tech = "combat=1"
+ origin_tech = "combat=1;engineering=1"
attack_verb = list("robusted")
hitsound = 'sound/weapons/smash.ogg'
@@ -71,7 +71,7 @@
name = "suspicious looking toolbox"
icon_state = "syndicate"
item_state = "toolbox_syndi"
- origin_tech = "combat=1;syndicate=1"
+ origin_tech = "combat=2;syndicate=1;engineering=2"
silent = 1
force = 15
throwforce = 18
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 0744643aac4..605cdd9c5f9 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -160,9 +160,7 @@
return 1
/obj/item/weapon/melee/baton/emp_act(severity)
- if(deductcharge(1000 / severity))
- if(bcell.reliability != 100 && prob(50/severity))
- bcell.reliability -= 10 / severity
+ deductcharge(1000 / severity)
..()
//Makeshift stun baton. Replacement for stun gloves.
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 06ee28a8db9..0e3496cbfc7 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -22,7 +22,7 @@
throw_speed = 3
throw_range = 7
materials = list(MAT_METAL=400)
- origin_tech = "magnets=1"
+ origin_tech = "magnets=3;bluespace=2"
/obj/item/weapon/locator/attack_self(mob/user)
user.set_machine(src)
@@ -133,7 +133,7 @@ Frequency:
throw_speed = 3
throw_range = 5
materials = list(MAT_METAL=10000)
- origin_tech = "magnets=1;bluespace=3"
+ origin_tech = "magnets=3;bluespace=4"
var/active_portals = 0
/obj/item/weapon/hand_tele/attack_self(mob/user)
@@ -169,5 +169,3 @@ Frequency:
try_move_adjacent(P)
active_portals++
add_fingerprint(user)
-
-
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 9f7b37c2542..899709fffa0 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -46,7 +46,7 @@
icon_state = "wrench_medical"
force = 2 //MEDICAL
throwforce = 4
- origin_tech = "materials=1;engineering=1;biotech=1"
+ origin_tech = "materials=1;engineering=1;biotech=3"
attack_verb = list("wrenched", "medicaled", "tapped", "jabbed")
/obj/item/weapon/wrench/medical/suicide_act(mob/user)
@@ -200,7 +200,7 @@
w_class = 2
materials = list(MAT_METAL=70, MAT_GLASS=30)
- origin_tech = "engineering=1"
+ origin_tech = "engineering=1;plasmatech=1"
var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2)
var/status = 1 //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
var/max_fuel = 20 //The max amount of fuel the welder can hold
@@ -428,7 +428,7 @@
icon_state = "indwelder"
max_fuel = 40
materials = list(MAT_GLASS=60)
- origin_tech = "engineering=2"
+ origin_tech = "engineering=2;plasmatech=2"
/obj/item/weapon/weldingtool/largetank/cyborg
name = "integrated welding tool"
@@ -461,7 +461,7 @@
item_state = "upindwelder"
max_fuel = 80
materials = list(MAT_METAL=70, MAT_GLASS=120)
- origin_tech = "engineering=3"
+ origin_tech = "engineering=3;plasmatech=2"
/obj/item/weapon/weldingtool/experimental
name = "experimental welding tool"
@@ -470,7 +470,7 @@
item_state = "exwelder"
max_fuel = 40
materials = list(MAT_METAL=70, MAT_GLASS=120)
- origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=3"
+ origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4"
var/last_gen = 0
change_icons = 0
can_off_process = 1
@@ -509,7 +509,7 @@
throwforce = 7
w_class = 2
materials = list(MAT_METAL=50)
- origin_tech = "engineering=1"
+ origin_tech = "engineering=1;combat=1"
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
toolspeed = 1
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 2419cd93645..fbae342c1d9 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -203,7 +203,7 @@
unwieldsound = 'sound/weapons/saberoff.ogg'
hitsound = "swing_hit"
armour_penetration = 35
- origin_tech = "magnets=3;syndicate=4"
+ origin_tech = "magnets=4;syndicate=5"
item_color = "green"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 75
@@ -365,7 +365,7 @@
throw_speed = 2
throw_range = 4
materials = list(MAT_METAL=13000)
- origin_tech = "materials=2;engineering=2;combat=2"
+ origin_tech = "materials=3;engineering=4;combat=2"
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = "swing_hit"
sharpness = IS_SHARP
@@ -547,4 +547,4 @@
sharpness = IS_SHARP
/obj/item/weapon/twohanded/bonespear/update_icon()
- icon_state = "bone_spear[wielded]"
\ No newline at end of file
+ icon_state = "bone_spear[wielded]"
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index cf59188d5d6..0d408243e68 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -69,5 +69,5 @@
/obj/item/weapon/vending_refill/clothing
machine_name = "ClothesMate"
icon_state = "refill_clothes"
- charges = list(30, 2, 3)// of 86 standard, 6 contraband, 9 premium
- init_charges = list(30, 2, 3)
\ No newline at end of file
+ charges = list(31, 2, 4)// of 87 standard, 6 contraband, 10 premium(?)
+ init_charges = list(31, 2, 4)
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index c389b785427..5eaac8f3c7d 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -145,7 +145,7 @@
throw_speed = 3
throw_range = 6
materials = list(MAT_METAL=12000)
- origin_tech = "materials=1"
+ origin_tech = "engineering=3;combat=2"
hitsound = 'sound/weapons/Genhit.ogg'
attack_verb = list("stubbed", "poked")
var/extended = 0
@@ -284,6 +284,5 @@
name = "liz o' nine tails"
desc = "A whip fashioned from the severed tails of lizards."
icon_state = "tailwhip"
- origin_tech = "combat=1"
+ origin_tech = "engineering=3;combat=3;biotech=3"
needs_permit = 0
-
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
index 6889a6cbdd5..e08900cdc30 100644
--- a/code/game/objects/structures/ai_core.dm
+++ b/code/game/objects/structures/ai_core.dm
@@ -9,6 +9,9 @@
var/obj/item/weapon/circuitboard/circuit = null
var/obj/item/device/mmi/brain = null
+/obj/structure/AIcore/New()
+ ..()
+ laws.set_laws_config()
/obj/structure/AIcore/attackby(obj/item/P, mob/user, params)
switch(state)
@@ -182,8 +185,6 @@
if(istype(P, /obj/item/weapon/screwdriver))
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
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
new /mob/living/silicon/ai (loc, laws, brain)
feedback_inc("cyborg_ais_created",1)
qdel(src)
@@ -250,4 +251,4 @@ atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/
/obj/item/weapon/circuitboard/aicore
name = "circuit board (AI core)"
- origin_tech = "programming=4;biotech=2"
+ origin_tech = "programming=3"
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index c91e5d5978e..99bdff56bf4 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -323,3 +323,9 @@
/obj/item/chair/wood/wings
icon_state = "wooden_chair_wings_toppled"
origin_type = /obj/structure/chair/wood/wings
+
+/obj/structure/chair/old
+ name = "strange chair"
+ desc = "You sit in this. Either by will or force. Looks REALLY uncomfortable."
+ icon_state = "chairold"
+ item_chair = null
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index c44786f735b..d607fcb7a27 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/hydroponics/New()
..()
new /obj/item/weapon/storage/bag/plants/portaseeder(src)
- new /obj/item/device/analyzer/plant_analyzer(src)
+ new /obj/item/device/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_srv(src)
new /obj/item/weapon/cultivator(src)
new /obj/item/weapon/hatchet(src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 5dae69433ab..789c481be28 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -71,6 +71,22 @@
name = "freezer"
icon_state = "freezer"
+/obj/structure/closet/crate/freezer/blood
+ name = "blood freezer"
+ desc = "A freezer containing packs of blood."
+
+/obj/structure/closet/crate/freezer/blood/New()
+ . = ..()
+ new /obj/item/weapon/reagent_containers/blood/empty(src)
+ new /obj/item/weapon/reagent_containers/blood/empty(src)
+ new /obj/item/weapon/reagent_containers/blood/AMinus(src)
+ new /obj/item/weapon/reagent_containers/blood/BMinus(src)
+ new /obj/item/weapon/reagent_containers/blood/BPlus(src)
+ new /obj/item/weapon/reagent_containers/blood/OMinus(src)
+ new /obj/item/weapon/reagent_containers/blood/OPlus(src)
+ for(var/i in 1 to 3)
+ new /obj/item/weapon/reagent_containers/blood/random(src)
+
/obj/structure/closet/crate/radiation
desc = "A crate with a radiation sign on it."
name = "radiation crate"
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index fb766921ac3..6081462ac8d 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -17,12 +17,24 @@
/turf/closed/wall,
/turf/closed/wall/r_wall,
/obj/structure/falsewall,
- /obj/structure/falsewall/reinforced, // WHY DO WE SMOOTH WITH FALSE R-WALLS WHEN WE DON'T SMOOTH WITH REAL R-WALLS.
+ /obj/structure/falsewall/reinforced,
/turf/closed/wall/rust,
/turf/closed/wall/r_wall/rust)
smooth = SMOOTH_TRUE
can_be_unanchored = 0
+/obj/structure/falsewall/New(loc)
+ ..()
+ air_update_turf(1)
+
+/obj/structure/falsewall/Destroy()
+ density = 0
+ air_update_turf(1)
+ return ..()
+
+/obj/structure/falsewall/CanAtmosPass(turf/T)
+ return !density
+
/obj/structure/falsewall/attack_hand(mob/user)
if(opening)
return
@@ -46,6 +58,7 @@
if(!qdeleted(src))
SetOpacity(1)
update_icon()
+ air_update_turf(1)
opening = 0
/obj/structure/falsewall/attack_animal(mob/living/simple_animal/user)
@@ -68,7 +81,7 @@
if(density)
smooth = SMOOTH_TRUE
queue_smooth(src)
- icon_state = ""
+ icon_state = "wall"
else
icon_state = "fwall_open"
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 15f57b2c55e..2f36a388261 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -490,3 +490,30 @@
/obj/structure/window/shuttle/tinted
opacity = TRUE
+
+/obj/structure/window/reinforced/clockwork
+ name = "ratvarian window"
+ desc = "A paper-thin pane of translucent yet reinforced brass."
+ icon = 'icons/obj/clockwork_objects.dmi'
+ icon_state = "clockwork_window_single"
+
+/obj/structure/window/reinforced/clockwork/New(loc, direct)
+ ..()
+ if(!fulltile)
+ var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/window/single, get_turf(src))
+ if(direct)
+ dir = direct
+ E.dir = direct
+ else
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/window, get_turf(src))
+ for(var/obj/item/I in debris)
+ debris -= I
+ qdel(I)
+ debris += new/obj/item/clockwork/component/vanguard_cogwheel(src)
+
+/obj/structure/window/reinforced/clockwork/fulltile
+ icon_state = "clockwork_window"
+ smooth = SMOOTH_TRUE
+ canSmoothWith = null
+ fulltile = 1
+ dir = 5
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 69058118212..8b3a445b43b 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -10,6 +10,17 @@
icon = 'icons/turf/walls.dmi'
explosion_block = 50
+/turf/closed/indestructible/oldshuttle
+ name = "strange shuttle wall"
+ icon = 'icons/turf/shuttleold.dmi'
+ icon_state = "block"
+
+/turf/closed/indestructible/oldshuttle/corner
+ icon_state = "corner"
+
+
+
+
/turf/closed/indestructible/splashscreen
name = "Space Station 13"
icon = 'icons/misc/fullscreen.dmi'
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index c8b395a0c84..272471258b6 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -106,3 +106,44 @@
/turf/open/floor/noslip/MakeSlippery()
return
+
+/turf/open/floor/oldshuttle
+ icon = 'icons/turf/shuttleold.dmi'
+ icon_state = "floor"
+ floor_tile = /obj/item/stack/tile/plasteel
+
+//Clockwork floor: Slowly heals conventional damage on nearby servants.
+/turf/open/floor/clockwork
+ name = "clockwork floor"
+ desc = "Tightly-pressed brass tiles. They emit minute vibration."
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "clockwork_floor"
+
+/turf/open/floor/clockwork/New()
+ ..()
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/floor, src)
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/beam, src)
+ SSobj.processing += src
+ clockwork_construction_value++
+
+/turf/open/floor/clockwork/Destroy()
+ SSobj.processing -= src
+ clockwork_construction_value--
+ ..()
+
+/turf/open/floor/clockwork/process()
+ for(var/mob/living/L in src)
+ if(L.stat == DEAD || !is_servant_of_ratvar(L))
+ continue
+ L.adjustBruteLoss(-1)
+ L.adjustFireLoss(-1)
+
+/turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/weapon/crowbar))
+ user.visible_message("[user] begins slowly prying up [src]...", "You begin painstakingly prying up [src]...")
+ if(!do_after(user, 70 / I.toolspeed, target = src))
+ return 0
+ user.visible_message("[user] pries up [src]!", "You pry up [src], destroying it!")
+ make_plating()
+ return 1
+ return ..()
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm
index 1c0f991d0e4..8a40e4445e9 100644
--- a/code/game/turfs/simulated/floor/plasteel_floor.dm
+++ b/code/game/turfs/simulated/floor/plasteel_floor.dm
@@ -14,6 +14,8 @@
/turf/open/floor/plasteel/black
icon_state = "dark"
+/turf/open/floor/plasteel/airless/black
+ icon_state = "dark"
/turf/open/floor/plasteel/black/side
icon_state = "black" //NOTICE ME SEMPAI: floors.dmi contains two sprites named black, remove the incorrect one
/turf/open/floor/plasteel/black/corner
@@ -22,6 +24,8 @@
/turf/open/floor/plasteel/white
icon_state = "white"
+/turf/open/floor/plasteel/airless/white
+ icon_state = "white"
/turf/open/floor/plasteel/white/side
icon_state = "whitehall"
/turf/open/floor/plasteel/white/corner
@@ -193,14 +197,12 @@
/turf/open/floor/plasteel/warning
icon_state = "warning"
+/turf/open/floor/plasteel/airless/warning
+ icon_state = "warning"
/turf/open/floor/plasteel/warning/corner
icon_state = "warningcorner"
-
-
-/turf/open/floor/plasteel/warnplate
- icon_state = "warnplate"
-/turf/open/floor/plasteel/warnplate/corner
- icon_state = "warnplatecorner"
+/turf/open/floor/plasteel/airless/warning/corner
+ icon_state = "warningcorner"
/turf/open/floor/plasteel/warnwhite
@@ -278,11 +280,15 @@
/turf/open/floor/plasteel/circuit
icon_state = "bcircuit"
+/turf/open/floor/plasteel/airless/circuit
+ icon_state = "bcircuit"
/turf/open/floor/plasteel/circuit/off
icon_state = "bcircuitoff"
/turf/open/floor/plasteel/circuit/gcircuit
icon_state = "gcircuit"
+/turf/open/floor/plasteel/airless/circuit/gcircuit
+ icon_state = "gcircuit"
/turf/open/floor/plasteel/circuit/gcircuit/off
icon_state = "gcircuitoff"
/turf/open/floor/plasteel/circuit/gcircuit/animated
@@ -318,8 +324,12 @@
/turf/open/floor/plasteel/asteroid
icon_state = "asteroidfloor"
+/turf/open/floor/plasteel/airless/asteroid
+ icon_state = "asteroidfloor"
/turf/open/floor/plasteel/asteroid/warning
icon_state = "asteroidwarning"
+/turf/open/floor/plasteel/airless/asteroid/warning
+ icon_state = "asteroidwarning"
/turf/open/floor/plasteel/recharge_floor
@@ -336,9 +346,13 @@
/turf/open/floor/plasteel/floorgrime
icon_state = "floorgrime"
+/turf/open/floor/plasteel/airless/floorgrime
+ icon_state = "floorgrime"
/turf/open/floor/plasteel/solarpanel
icon_state = "solarpanel"
+/turf/open/floor/plasteel/airless/solarpanel
+ icon_state = "solarpanel"
/turf/open/floor/plasteel/cmo
icon_state = "cmo"
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 7117d9592b5..e7bbe209179 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -79,6 +79,9 @@
heat_capacity = INFINITY
floor_tile = /obj/item/stack/rods
+/turf/open/floor/engine/airless
+ initial_gas_mix = "TEMP=2.7"
+
/turf/open/floor/engine/break_tile()
return //unbreakable
@@ -173,6 +176,19 @@
/turf/open/floor/plasteel/airless
initial_gas_mix = "TEMP=2.7"
+// ONE DAY WE WILL HAVE SUBTYPES
+/turf/open/floor/plasteel/airless/shuttle
+ icon_state = "shuttlefloor"
+/turf/open/floor/plasteel/airless/shuttle/red
+ name = "Brig floor"
+ icon_state = "shuttlefloor4"
+/turf/open/floor/plasteel/airless/shuttle/yellow
+ icon_state = "shuttlefloor2"
+/turf/open/floor/plasteel/airless/shuttle/white
+ icon_state = "shuttlefloor3"
+/turf/open/floor/plasteel/airless/shuttle/purple
+ icon_state = "shuttlefloor5"
+
/turf/open/floor/plating/abductor
name = "alien floor"
icon_state = "alienpod1"
@@ -270,3 +286,10 @@
)
/turf/open/floor/plating/lava/smooth/airless
initial_gas_mix = "TEMP=2.7"
+
+/turf/open/floor/plating/warnplate
+ icon_state = "warnplate"
+/turf/open/floor/plating/airless/warnplate
+ icon_state = "warnplate"
+/turf/open/floor/plating/warnplate/corner
+ icon_state = "warnplatecorner"
\ No newline at end of file
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index b2f520ac524..24f8708cd87 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -32,6 +32,57 @@
/turf/closed/wall/mineral/cult/artificer/devastate_wall()
PoolOrNew(/obj/effect/overlay/temp/cult/turf, get_turf(src))
+//Clockwork wall: Causes nearby tinkerer's caches to generate components.
+/turf/closed/wall/clockwork
+ name = "clockwork wall"
+ desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
+ icon = 'icons/turf/walls/clockwork_wall.dmi'
+ icon_state = "clockwork_wall"
+ canSmoothWith = list(/turf/closed/wall/clockwork)
+ smooth = SMOOTH_MORE
+
+/turf/closed/wall/clockwork/New()
+ ..()
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/wall, src)
+ PoolOrNew(/obj/effect/overlay/temp/ratvar/beam, src)
+ SSobj.processing += src
+ clockwork_construction_value += 5
+
+/turf/closed/wall/clockwork/Destroy()
+ SSobj.processing -= src
+ clockwork_construction_value -= 5
+ ..()
+
+/turf/closed/wall/clockwork/process()
+ if(prob(2))
+ playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', rand(1, 5), 1, -4, 1, 1)
+ for(var/obj/structure/clockwork/cache/C in range(1, src))
+ if(prob(5))
+ clockwork_component_cache[pick("belligerent_eye", "vanguard_cogwheel", "guvax_capacitor", "replicant_alloy", "hierophant_ansible")]++
+ playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', rand(15, 20), 1, -3, 1, 1)
+
+/turf/closed/wall/clockwork/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = I
+ if(!WT.isOn())
+ return 0
+ user.visible_message("[user] begins slowly breaking down [src]...", "You begin painstakingly destroying [src]...")
+ if(!do_after(user, 120 / WT.toolspeed, target = src))
+ return 0
+ if(!WT.remove_fuel(1, user))
+ return 0
+ user.visible_message("[user] breaks apart [src]!", "You break apart [src]!")
+ break_wall()
+ return 1
+ return ..()
+
+/turf/closed/wall/clockwork/break_wall()
+ new/obj/item/clockwork/component/replicant_alloy(get_turf(src))
+ return(new /obj/structure/girder(src))
+
+/turf/closed/wall/clockwork/devastate_wall()
+ return break_wall()
+
/turf/closed/wall/vault
icon = 'icons/turf/walls.dmi'
icon_state = "rockvault"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 87773f725a3..a4d32622fe9 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -21,6 +21,9 @@ var/global/BSACooldown = 0
if(!check_rights())
return
+ if(!isobserver(usr))
+ log_game("[key_name_admin(usr)] checked the player panel while in game.")
+
if(!M)
usr << "You seem to be selecting a mob that doesn't exist anymore."
return
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 11c21972abb..b9d460d430a 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -65,7 +65,8 @@ var/list/admin_verbs_admin = list(
/client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/
/client/proc/customiseSNPC, /* Customise any interactive crewmembers in the world */
/client/proc/resetSNPC, /* Resets any interactive crewmembers in the world */
- /client/proc/toggleSNPC /* Toggles an npc's processing mode */
+ /client/proc/toggleSNPC, /* Toggles an npc's processing mode */
+ /client/proc/open_shuttle_manipulator /* Opens shuttle manipulator UI */
)
var/list/admin_verbs_ban = list(
/client/proc/unban_panel,
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index a15f50d8bef..a6e8db4a57b 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -437,7 +437,7 @@
if(M)
dat += "| [M.real_name][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""] | "
dat += "PM | "
- dat += "FLW | "
+ dat += "FLW | "
dat += "Show Objective |
"
else
dat += "| [wizard.name]([wizard.key])Wizard body destroyed! |
"
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index d7b3be526cd..7300e294879 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -44,6 +44,7 @@
Trigger a Virus Outbreak
Turn all humans into monkeys
+ Chinese Cartoons
Change the species of all humans
Make all areas powered
Make all areas unpowered
@@ -379,6 +380,31 @@
for(var/obj/machinery/light/L in machines)
L.broken()
+ if("anime")
+ if(!check_rights(R_FUN))
+ return
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","CC")
+ message_admins("[key_name_admin(usr)] made everything kawaii.")
+ for(var/mob/living/carbon/human/H in mob_list)
+ H << sound('sound/AI/animes.ogg')
+
+ if(H.dna.species.id == "human")
+ if(H.dna.features["tail_human"] == "None" || H.dna.features["ears"] == "None")
+ H.dna.features["tail_human"] = "Cat"
+ H.dna.features["ears"] = "Cat"
+ var/seifuku = pick(typesof(/obj/item/clothing/under/schoolgirl))
+ var/obj/item/clothing/under/schoolgirl/I = new seifuku
+ var/list/honorifics = list(MALE = list("kun"), FEMALE = list("chan","tan"), NEUTER = list("san")) //John Robust -> Robust-kun
+ var/list/names = splittext(H.real_name," ")
+ var/newname = "[names[2]]-[pick(honorifics[H.gender])]"
+ H.fully_replace_character_name(H.real_name,newname)
+ H.unEquip(H.w_uniform)
+ H.equip_to_slot_or_del(I, slot_w_uniform)
+ I.flags |= NODROP
+ else
+ H << "You're not kawaii enough for this."
+
if("whiteout")
if(!check_rights(R_FUN))
return
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 2e3d584999b..72afd148095 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -79,13 +79,12 @@
for(var/mob/living/carbon/human/applicant in player_list)
if(ROLE_CHANGELING in applicant.client.prefs.be_special)
- if(!applicant.stat)
- if(applicant.mind)
- if (!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, ROLE_CHANGELING) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ var/turf/T = get_turf(applicant)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(!jobban_isbanned(applicant, ROLE_CHANGELING) && !jobban_isbanned(applicant, "Syndicate"))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numChanglings = min(candidates.len, 3)
@@ -113,15 +112,12 @@
for(var/mob/living/carbon/human/applicant in player_list)
if(ROLE_REV in applicant.client.prefs.be_special)
- if(applicant.stat == CONSCIOUS)
- var/turf/T = get_turf(applicant)
- if(T.z == ZLEVEL_STATION)
- if(applicant.mind)
- if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, ROLE_REV) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ var/turf/T = get_turf(applicant)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(!jobban_isbanned(applicant, ROLE_REV) && !jobban_isbanned(applicant, "Syndicate"))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numRevs = min(candidates.len, 3)
@@ -158,13 +154,12 @@
for(var/mob/living/carbon/human/applicant in player_list)
if(ROLE_CULTIST in applicant.client.prefs.be_special)
- if(applicant.stat == CONSCIOUS)
- if(applicant.mind)
- if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, ROLE_CULTIST) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ var/turf/T = get_turf(applicant)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(!jobban_isbanned(applicant, ROLE_CULTIST) && !jobban_isbanned(applicant, "Syndicate"))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len)
var/numCultists = min(candidates.len, 4)
@@ -340,13 +335,12 @@
for(var/mob/living/carbon/human/applicant in player_list)
if(ROLE_GANG in applicant.client.prefs.be_special)
- if(!applicant.stat)
- if(applicant.mind)
- if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, ROLE_GANG) && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- candidates += applicant
+ var/turf/T = get_turf(applicant)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(!jobban_isbanned(applicant, ROLE_GANG) && !jobban_isbanned(applicant, "Syndicate"))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ candidates += applicant
if(candidates.len >= 2)
for(var/needs_assigned=2,needs_assigned>0,needs_assigned--)
@@ -534,14 +528,13 @@
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in player_list)
if(ROLE_SHADOWLING in applicant.client.prefs.be_special)
- if(!applicant.stat)
- if(applicant.mind)
- if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, "shadowling") && !jobban_isbanned(applicant, "Syndicate"))
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- if(!(is_shadow_or_thrall(applicant)))
- candidates += applicant
+ var/turf/T = get_turf(applicant)
+ if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && T.z == ZLEVEL_STATION)
+ if(!jobban_isbanned(applicant, "shadowling") && !jobban_isbanned(applicant, "Syndicate"))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ if(!(is_shadow_or_thrall(applicant)))
+ candidates += applicant
if(candidates.len)
H = pick(candidates)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 6f4d7247a9e..c446f16244a 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -439,8 +439,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
var/announce_ion_laws = (show_log == "Yes" ? 1 : -1)
- new /datum/round_event/ion_storm(0, announce_ion_laws, input)
-
+ var/datum/round_event/ion_storm/ion = new(0, announce_ion_laws, input)
+ ion.start()
+
feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_rejuvenate(mob/living/M in mob_list)
@@ -983,3 +984,11 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
message_admins("[key_name_admin(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].")
log_admin("[key_name(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].")
feedback_add_details("admin_verb","TAH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/open_shuttle_manipulator()
+ set category = "Admin"
+ set name = "Shuttle Manipulator"
+ set desc = "Opens the shuttle manipulator UI."
+
+ for(var/obj/machinery/shuttle_manipulator/M in machines)
+ M.ui_interact(usr)
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index a999ed9e2ee..8b7abfa5180 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -9,7 +9,7 @@
throwforce = 2
throw_speed = 3
throw_range = 7
- origin_tech = "magnets=1"
+ origin_tech = "magnets=1;engineering=1"
var/secured = 1
var/list/attached_overlays = null
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 84e212cd2e0..277f418760b 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -3,7 +3,7 @@
desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted.\nAlt-click to rotate it clockwise."
icon_state = "infrared"
materials = list(MAT_METAL=1000, MAT_GLASS=500)
- origin_tech = "magnets=2"
+ origin_tech = "magnets=2;materials=2"
var/on = 0
var/visible = 0
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index dfdb4b9cca6..fb643f482bc 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -3,7 +3,7 @@
desc = "A handy little spring-loaded trap for catching pesty rodents."
icon_state = "mousetrap"
materials = list(MAT_METAL=100)
- origin_tech = "combat=1"
+ origin_tech = "combat=1;materials=2;engineering=1"
attachable = 1
var/armed = 0
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 32352855eb2..1a652ba61b1 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -3,7 +3,7 @@
desc = "Used for scanning and alerting when someone enters a certain proximity."
icon_state = "prox"
materials = list(MAT_METAL=800, MAT_GLASS=200)
- origin_tech = "magnets=1"
+ origin_tech = "magnets=1;engineering=1"
attachable = 1
var/scanning = 0
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 6f9a7127184..db8cd41f582 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -4,7 +4,7 @@
icon_state = "signaller"
item_state = "signaler"
materials = list(MAT_METAL=400, MAT_GLASS=120)
- origin_tech = "magnets=1"
+ origin_tech = "magnets=1;bluespace=1"
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
attachable = 1
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index 3432899486a..4f459a497c0 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -3,7 +3,7 @@
desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
icon_state = "timer"
materials = list(MAT_METAL=500, MAT_GLASS=50)
- origin_tech = "magnets=1"
+ origin_tech = "magnets=1;engineering=1"
attachable = 1
var/timing = 0
@@ -116,4 +116,3 @@
if(usr)
attack_self(usr)
-
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index 81d027e4757..0d9fd0b5e8f 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -3,7 +3,7 @@
desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated."
icon_state = "voice"
materials = list(MAT_METAL=500, MAT_GLASS=50)
- origin_tech = "magnets=1"
+ origin_tech = "magnets=1;engineering=1"
flags = HEAR
attachable = 1
verb_say = "beeps"
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 0198186a411..1c986341a8e 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -28,7 +28,7 @@
/obj/item/weapon/circuitboard/machine/cryo_tube
name = "circuit board (Cryotube)"
build_path = /obj/machinery/atmospherics/components/unary/cryo_cell
- origin_tech = "programming=4;biotech=3;engineering=4"
+ origin_tech = "programming=4;biotech=3;engineering=4;plasmatech=3"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/stack/cable_coil = 1,
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index ca92eeb06c9..6c664f7280b 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -212,6 +212,10 @@
/obj/machinery/portable_atmospherics/canister/blob_act(obj/effect/blob/B)
take_damage(100, BRUTE, 0)
+/obj/machinery/portable_atmospherics/canister/burn()
+ take_damage(health, BURN, 1)
+ ..()
+
/obj/machinery/portable_atmospherics/canister/bullet_act(obj/item/projectile/P)
. = ..()
take_damage(P.damage / 2, P.damage_type, 0)
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index d5b92844f51..9176470653b 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -174,7 +174,7 @@
/obj/machinery/capture_the_flag/proc/TellGhost()
if(ctf_enabled)
- notify_ghosts("[name] has been activated!", enter_link="(Click to join the [team] team!) or click on the controller directly!", source = src, attack_not_jump = 0)
+ notify_ghosts("[name] has been activated!", enter_link="(Click to join the [team] team!) or click on the controller directly!", source = src, action=NOTIFY_ATTACK)
/obj/machinery/capture_the_flag/Topic(href, href_list)
if(href_list["join"])
diff --git a/code/modules/cargo/exports/research.dm b/code/modules/cargo/exports/research.dm
index 39e54a1842b..004eded9101 100644
--- a/code/modules/cargo/exports/research.dm
+++ b/code/modules/cargo/exports/research.dm
@@ -20,7 +20,7 @@
-// Sell max reliablity designs
+// Sell designs
/datum/export/design
cost = 2500
unit_name = "design data disk"
@@ -34,9 +34,7 @@
var/datum/design/design = disk.blueprint
if(design.id in researchDesigns)
return 0
- if(initial(design.reliability) < 100 && design.reliability >= 100)
- return ..()
- return 0
+ return ..()
/datum/export/design/sell_object(obj/O)
..()
diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm
index f3d062364f5..71b778e931f 100644
--- a/code/modules/cargo/exports/tools.dm
+++ b/code/modules/cargo/exports/tools.dm
@@ -103,16 +103,16 @@
// High-tech tools.
/datum/export/rcd
- cost = 1000
+ cost = 100 // 15 metal -> 75 credits, +25 credits for production
unit_name = "rapid construction device"
export_types = list(/obj/item/weapon/rcd)
/datum/export/rcd_ammo
- cost = 30
+ cost = 15 // 1.5 metal, 1 glass -> 12.5 credits, +2.5 credits
unit_name = "compressed matter cardridge"
export_types = list(/datum/design/rcd_ammo)
/datum/export/rpd
- cost = 1000
+ cost = 350 // 37.5 metal, 18.75 glass -> 281.25 credits, + some
unit_name = "rapid piping device"
- export_types = list(/obj/item/weapon/pipe_dispenser)
\ No newline at end of file
+ export_types = list(/obj/item/weapon/pipe_dispenser)
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 69cedb462e2..421fca230ba 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -703,7 +703,7 @@
/obj/item/weapon/reagent_containers/blood/BMinus,
/obj/item/weapon/reagent_containers/blood/OPlus,
/obj/item/weapon/reagent_containers/blood/OMinus)
- crate_name = "blood pack crate"
+ crate_name = "blood freezer"
crate_type = /obj/structure/closet/crate/freezer
/datum/supply_pack/medical/iv_drip
@@ -949,7 +949,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/ammonia,
/obj/item/weapon/hatchet,
/obj/item/weapon/cultivator,
- /obj/item/device/analyzer/plant_analyzer,
+ /obj/item/device/plant_analyzer,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/clothing/suit/apron)
crate_name = "hydroponics crate"
@@ -1370,7 +1370,7 @@
/obj/item/toy/minimeteor,
/obj/item/toy/carpplushie,
/obj/item/weapon/coin/antagtoken,
- /obj/item/stack/tile/fakespace,
+ /obj/item/stack/tile/fakespace/loaded,
/obj/item/weapon/gun/projectile/shotgun/toy/crossbow,
/obj/item/toy/redbutton)
crate_name = "toy crate"
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index fde8d078709..bd9ad082428 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -151,7 +151,7 @@
item_state = "bl_suit"
item_color = "black"
desc = "It's a plain jumpsuit. It has a small dial on the wrist."
- origin_tech = "syndicate=3"
+ origin_tech = "syndicate=2"
sensor_mode = 0 //Hey who's this guy on the Syndicate Shuttle??
random_sensor = 0
burn_state = FIRE_PROOF
@@ -170,7 +170,7 @@
icon_state = "armor"
item_state = "armor"
blood_overlay_type = "armor"
- origin_tech = "syndicate=3"
+ origin_tech = "syndicate=2"
burn_state = FIRE_PROOF
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -186,8 +186,7 @@
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
icon_state = "meson"
item_state = "meson"
-
- origin_tech = "syndicate=3"
+ origin_tech = "syndicate=2"
burn_state = FIRE_PROOF
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -300,10 +299,9 @@
icon_state = "black"
item_color = "black"
desc = "A pair of black shoes."
-
permeability_coefficient = 0.05
flags = NOSLIP
- origin_tech = "syndicate=3"
+ origin_tech = "syndicate=2"
burn_state = FIRE_PROOF
can_hold_items = 1
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index e3d60ce2028..ad792ed9170 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -5,6 +5,7 @@
desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, regardless of lighting condition. The T-ray Scanner mode lets you see underfloor objects such as cables and pipes."
icon_state = "trayson-meson"
actions_types = list(/datum/action/item_action/toggle_mode)
+ origin_tech = "materials=3;magnets=3;engineering=3;plasmatech=3"
var/mode = 0 //0 - regular mesons mode 1 - t-ray mode
var/invis_objects = list()
@@ -95,6 +96,7 @@
name = "Optical T-Ray Scanner"
desc = "Used by engineering staff to see underfloor objects such as cables and pipes."
icon_state = "trayson-tray_off"
+ origin_tech = "materials=3;magnets=2;engineering=2"
mode = 1
var/on = 0
@@ -132,4 +134,4 @@
A.UpdateButtonIcon()
/obj/item/clothing/glasses/meson/engine/tray/t_ray_on()
- return on && ..()
\ No newline at end of file
+ return on && ..()
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 7e5b6331a5d..99addcd218a 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -19,7 +19,7 @@
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
icon_state = "meson"
item_state = "meson"
- origin_tech = "magnets=2;engineering=2"
+ origin_tech = "magnets=1;engineering=2"
darkness_view = 2
vision_flags = SEE_TURFS
invis_view = SEE_INVISIBLE_MINIMUM
@@ -29,6 +29,7 @@
desc = "An Optical Meson Scanner fitted with an amplified visible light spectrum overlay, providing greater visual clarity in darkness."
icon_state = "nvgmeson"
item_state = "nvgmeson"
+ origin_tech = "magnets=4;engineering=5;plasmatech=4"
darkness_view = 8
/obj/item/clothing/glasses/meson/gar
@@ -48,7 +49,7 @@
desc = "A pair of snazzy goggles used to protect against chemical spills. Fitted with an analyzer for scanning items and reagents."
icon_state = "purple"
item_state = "glasses"
- origin_tech = "magnets=2;engineering=2"
+ origin_tech = "magnets=2;engineering=1"
scan_reagents = 1 //You can see reagents while wearing science goggles
actions_types = list(/datum/action/item_action/toggle_research_scanner)
@@ -61,7 +62,7 @@
desc = "You can totally see in the dark now!"
icon_state = "night"
item_state = "glasses"
- origin_tech = "magnets=4"
+ origin_tech = "materials=4;magnets=4;plasmatech=4;engineering=4"
darkness_view = 8
invis_view = SEE_INVISIBLE_MINIMUM
@@ -279,6 +280,16 @@
icon_state = "redglasses"
item_state = "redglasses"
+/obj/item/clothing/glasses/godeye
+ name = "eye of god"
+ desc = "A strange eye, said to have been torn from an omniscient creature that used to roam the wastes."
+ icon_state = "godeye"
+ item_state = "godeye"
+ vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
+ darkness_view = 8
+ scan_reagents = 1
+ flags = NODROP
+ invis_view = SEE_INVISIBLE_MINIMUM
/obj/item/clothing/glasses/proc/chameleon(var/mob/user)
var/input_glasses = input(user, "Choose a piece of eyewear to disguise as.", "Choose glasses style.") as null|anything in list("Sunglasses", "Medical HUD", "Mesons", "Science Goggles", "Glasses", "Security Sunglasses","Eyepatch","Welding","Gar")
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 7ab535c4d9d..ba07bdd1aba 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -31,6 +31,7 @@
name = "Health Scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
icon_state = "healthhud"
+ origin_tech = "magnets=3;biotech=2"
hud_type = DATA_HUD_MEDICAL_ADVANCED
/obj/item/clothing/glasses/hud/health/night
@@ -38,6 +39,7 @@
desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
icon_state = "healthhudnight"
item_state = "glasses"
+ origin_tech = "magnets=4;biotech=4;plasmatech=4;engineering=5"
darkness_view = 8
invis_view = SEE_INVISIBLE_MINIMUM
@@ -45,6 +47,7 @@
name = "Diagnostic HUD"
desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits."
icon_state = "diagnostichud"
+ origin_tech = "magnets=2;engineering=2"
hud_type = DATA_HUD_DIAGNOSTIC
/obj/item/clothing/glasses/hud/diagnostic/night
@@ -52,14 +55,15 @@
desc = "A robotics diagnostic HUD fitted with a light amplifier."
icon_state = "diagnostichudnight"
item_state = "glasses"
+ origin_tech = "magnets=4;powerstorage=4;plasmatech=4;engineering=5"
darkness_view = 8
invis_view = SEE_INVISIBLE_MINIMUM
-
/obj/item/clothing/glasses/hud/security
name = "Security HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
icon_state = "securityhud"
+ origin_tech = "magnets=3;combat=2"
hud_type = DATA_HUD_SECURITY_ADVANCED
/obj/item/clothing/glasses/hud/security/chameleon
@@ -80,6 +84,7 @@
name = "HUDSunglasses"
desc = "Sunglasses with a HUD."
icon_state = "sunhud"
+ origin_tech = "magnets=3;combat=3;engineering=3"
darkness_view = 1
flash_protect = 1
tint = 1
@@ -88,6 +93,7 @@
name = "Night Vision Security HUD"
desc = "An advanced heads-up display which provides id data and vision in complete darkness."
icon_state = "securityhudnight"
+ origin_tech = "magnets=4;combat=4;plasmatech=4;engineering=5"
darkness_view = 8
invis_view = SEE_INVISIBLE_MINIMUM
@@ -159,4 +165,4 @@
/obj/item/clothing/glasses/hud/toggle/thermal/emp_act(severity)
thermal_overload()
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 3804a67ef7f..0c9538bf7a5 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -21,7 +21,7 @@
flash_protect = 2
tint = 2
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
- origin_tech = "materials=2;engineering=2"
+ origin_tech = "materials=2;engineering=3"
actions_types = list(/datum/action/item_action/toggle)
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = MASKCOVERSEYES
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 8d3f55c8dce..85e9ab69c30 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -9,7 +9,7 @@
strip_delay = 70
put_on_delay = 70
burn_state = FIRE_PROOF
- origin_tech = "magnets=2"
+ origin_tech = "materials=3;magnets=4;engineering=4"
/obj/item/clothing/shoes/magboots/verb/toggle()
set name = "Toggle Magboots"
@@ -50,10 +50,11 @@
icon_state = "advmag0"
magboot_state = "advmag"
slowdown_active = SHOES_SLOWDOWN
+ origin_tech = "magnets=6;engineering=4"
/obj/item/clothing/shoes/magboots/syndie
desc = "Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders."
name = "blood-red magboots"
icon_state = "syndiemag0"
magboot_state = "syndiemag"
- origin_tech = "magnets=2;syndicate=3"
+ origin_tech = "magnets=4;syndicate=2"
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index d04c56c37e7..4be8dee7f13 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -119,11 +119,6 @@
armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine
-
-/obj/item/clothing/suit/space/hardsuit/engine/New()
- jetpack = new /obj/item/weapon/tank/jetpack/suit(src)
- ..()
-
//Atmospherics
/obj/item/clothing/head/helmet/space/hardsuit/engine/atmos
name = "atmospherics hardsuit helmet"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 228ba63a9c7..ece01941410 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -282,6 +282,7 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
/obj/item/clothing/suit/armor/heavy
name = "heavy armor"
@@ -294,6 +295,7 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 3
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
/obj/item/clothing/suit/armor/tdome
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
@@ -301,6 +303,7 @@
flags = THICKMATERIAL
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
/obj/item/clothing/suit/armor/tdome/red
name = "thunderdome suit"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index f22c28e2e28..a1746d9a328 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -10,7 +10,7 @@
item_state = "apron"
blood_overlay_type = "armor"
body_parts_covered = CHEST|GROIN
- allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants)
+ allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants)
//Captain
/obj/item/clothing/suit/captunic
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 9fcc55c5ad1..955d2563efd 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -372,6 +372,30 @@
item_state = "militaryjacket"
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/weapon/gun/projectile/automatic/pistol,/obj/item/weapon/gun/projectile/revolver,/obj/item/weapon/gun/projectile/revolver/detective,/obj/item/device/radio)
+/obj/item/clothing/suit/jacket/letterman
+ name = "letterman jacket"
+ desc = "A classic brown letterman jacket. Looks pretty hot and heavy."
+ icon_state = "letterman"
+ item_state = "letterman"
+
+/obj/item/clothing/suit/jacket/letterman_red
+ name = "red letterman jacket"
+ desc = "A letterman jacket in a sick red color. Radical."
+ icon_state = "letterman_red"
+ item_state = "letterman_red"
+
+/obj/item/clothing/suit/jacket/letterman_syndie
+ name = "blood-red letterman jacket"
+ desc = "Oddly, this jacket seems to have a large S on the back..."
+ icon_state = "letterman_s"
+ item_state = "letterman_s"
+
+/obj/item/clothing/suit/jacket/letterman_nanotrasen
+ name = "blue letterman jacket"
+ desc = "A blue letterman jacket with a proud Nanotrasen N on the back. The tag says that it was made in Space China."
+ icon_state = "letterman_n"
+ item_state = "letterman_n"
+
/obj/item/clothing/suit/xenos
name = "xenos suit"
desc = "A suit made out of chitinous alien hide."
@@ -467,7 +491,7 @@
/obj/item/clothing/suit/hooded/wintercoat/hydro
name = "hydroponics winter coat"
icon_state = "coathydro"
- allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants)
+ allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants)
hoodtype = /obj/item/clothing/head/winterhood/hydro
/obj/item/clothing/head/winterhood/hydro
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 5c660d23388..3aa32345fc8 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -566,6 +566,7 @@
name = "Plasma-man jumpsuit refill pack"
desc = "A compressed water pack used to refill plasma-man jumpsuit auto-extinguishers."
icon_state = "plasmarefill"
+ origin_tech = "materials=2;plasmatech=3;biotech=1"
/obj/item/clothing/under/rank/security/navyblue/russian
name = "russian officer's uniform"
diff --git a/code/modules/countdown/countdown.dm b/code/modules/countdown/countdown.dm
new file mode 100644
index 00000000000..cc28e5b6fef
--- /dev/null
+++ b/code/modules/countdown/countdown.dm
@@ -0,0 +1,108 @@
+/obj/effect/countdown
+ name = "countdown"
+ desc = "We're leaving together\n\
+ But still it's farewell\n\
+ And maybe we'll come back\n\
+ To earth, who can tell?"
+
+ var/displayed_text
+ var/atom/attached_to
+ var/text_color = "#ff0000"
+ var/text_size = 4
+ var/started = FALSE
+ invisibility = INVISIBILITY_OBSERVER
+ layer = GHOST_LAYER
+
+/obj/effect/countdown/New(atom/A)
+ . = ..()
+ attach(A)
+
+/obj/effect/countdown/proc/attach(atom/A)
+ attached_to = A
+ loc = get_turf(A)
+
+/obj/effect/countdown/proc/start()
+ if(!started)
+ SSfastprocess.processing |= src
+ started = TRUE
+
+/obj/effect/countdown/proc/stop()
+ if(started)
+ overlays.Cut()
+ SSfastprocess.processing -= src
+ started = FALSE
+
+/obj/effect/countdown/proc/get_value()
+ // Get the value from our atom
+ return
+
+/obj/effect/countdown/process()
+ if(!attached_to || qdeleted(attached_to))
+ qdel(src)
+ var/new_val = get_value()
+ if(new_val == displayed_text)
+ return
+ displayed_text = new_val
+
+ if(displayed_text)
+ var/image/text_image = new(loc = src)
+ //text_image.maptext = "[new_val]"
+ text_image.maptext = "[displayed_text]"
+ text_image.color = text_color
+
+ overlays.Cut()
+ overlays += text_image
+ else
+ overlays.Cut()
+
+/obj/effect/countdown/Destroy()
+ attached_to = null
+ SSfastprocess.processing -= src
+ . = ..()
+
+/obj/effect/countdown/syndicatebomb
+ name = "syndicate bomb countdown"
+
+/obj/effect/countdown/syndicatebomb/get_value()
+ var/obj/machinery/syndicatebomb/S = attached_to
+ if(!istype(S))
+ return
+ else if(S.active)
+ return S.timer
+
+/obj/effect/countdown/nuclearbomb
+ name = "nuclear bomb countdown"
+ text_color = "#81FF14"
+
+/obj/effect/countdown/nuclearbomb/get_value()
+ var/obj/machinery/nuclearbomb/N = attached_to
+ if(!istype(N))
+ return
+ else if(N.timing)
+ return N.timeleft
+
+/obj/effect/countdown/clonepod
+ name = "cloning pod countdown"
+ text_color = "#0C479D"
+ text_size = 1
+
+/obj/effect/countdown/clonepod/get_value()
+ var/obj/machinery/clonepod/C = attached_to
+ if(!istype(C))
+ return
+ else if(C.occupant)
+ var/completion = round(C.get_completion())
+ return completion
+
+/obj/effect/countdown/dominator
+ name = "dominator countdown"
+ text_size = 1
+ text_color = "#ff00ff" // Overwritten when the dominator starts
+
+/obj/effect/countdown/dominator/get_value()
+ var/obj/machinery/dominator/D = attached_to
+ if(!istype(D))
+ return
+ else if(D.gang && D.gang.dom_timer)
+ var/timer = D.gang.dom_timer
+ return timer
diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index 953cab9ade6..1c37803b5cd 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -12,7 +12,7 @@
slot_flags = SLOT_BELT
var/scanning = 0
var/list/log = list()
- origin_tech = "engineering=3;biotech=2"
+ origin_tech = "engineering=4;biotech=2;programming=5"
/obj/item/device/detective_scanner/attack_self(mob/user)
if(log.len && !scanning)
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 23e4ee960d3..2b8ae2a3455 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -434,7 +434,8 @@
SM.on_hit(src, user)
user_unbuckle_mob(user,user)
-
+/obj/effect/spacevine/attack_alien(mob/living/user)
+ eat(user)
/obj/effect/spacevine_controller
invisibility = INVISIBILITY_ABSTRACT
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index d08c6f4a536..494b94d30ed 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -21,9 +21,10 @@
"soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
"frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in it's passage"),
"sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
- "blackpepper" = list("pepermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
+ "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
"cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
"sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"))
+ var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
/obj/item/weapon/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone)
@@ -89,7 +90,7 @@
desc = temp_list[3]
else
- name = "condiment bottle"
+ name = "[originalname] bottle"
main_reagent = reagents.get_master_reagent_name()
if (reagents.reagent_list.len==1)
desc = "Looks like it is [lowertext(main_reagent)], but you are not sure."
@@ -184,7 +185,6 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list()
possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"))
- var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
/obj/item/weapon/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
return
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 6c01a8aa161..60ce3eda30f 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -54,7 +54,7 @@
/obj/item/weapon/circuitboard/machine/gibber
name = "circuit board (Gibber)"
build_path = /obj/machinery/gibber
- origin_tech = "programming=1"
+ origin_tech = "programming=2;engineering=2"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
@@ -235,5 +235,3 @@
pixel_x = initial(pixel_x) //return to its spot after shaking
src.operating = 0
update_icon()
-
-
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index 06ca4bd94b4..5ab3d08e7d5 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -30,7 +30,7 @@
/obj/item/weapon/circuitboard/machine/microwave
name = "circuit board (Microwave)"
build_path = /obj/machinery/microwave
- origin_tech = "programming=1;magnets=1"
+ origin_tech = "programming=2;magnets=2"
req_components = list(
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/matter_bin = 1,
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index 338d04b7e6f..3cc757ce367 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -4,7 +4,7 @@
desc = "Special delivery!"
icon_state = "pizzabomb_inactive"
item_state = "eshield0"
- origin_tech = "syndicate=4"
+ origin_tech = "syndicate=3;engineering=3"
/obj/item/pizzabox
name = "pizza box"
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index c951b922b8b..43fed6a2185 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -24,7 +24,7 @@
/obj/item/weapon/circuitboard/machine/biogenerator
name = "circuit board (Biogenerator)"
build_path = /obj/machinery/biogenerator
- origin_tech = "programming=3;biotech=2;materials=3"
+ origin_tech = "programming=2;biotech=3;materials=3"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
/obj/item/weapon/stock_parts/manipulator = 1,
@@ -401,4 +401,3 @@
else if(href_list["menu"])
menustat = "menu"
updateUsrDialog()
-
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index 2f0e44878b3..74e43afeba3 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -29,7 +29,7 @@
/obj/item/weapon/circuitboard/machine/plantgenes
name = "circuit board (Plant DNA Manipulator)"
build_path = /obj/machinery/plantgenes
- origin_tech = "programming=2;biotech=3"
+ origin_tech = "programming=3;biotech=3"
req_components = list(
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/micro_laser = 1,
@@ -422,4 +422,4 @@
/obj/item/weapon/storage/box/disks_plantgene/New()
..()
for(var/i in 1 to 7)
- new /obj/item/weapon/disk/plantgene(src)
\ No newline at end of file
+ new /obj/item/weapon/disk/plantgene(src)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 306633d56bc..9c34f22ad3f 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -15,6 +15,7 @@
// Saves us from having to define each stupid grown's dried_type as itself.
// If you don't want a plant to be driable (watermelons) set this to null in the time definition.
burn_state = FLAMMABLE
+ origin_tech = "biotech=1"
/obj/item/weapon/reagent_containers/food/snacks/grown/New(newloc, var/obj/item/seeds/new_seed = null)
..()
@@ -56,7 +57,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params)
..()
- if (istype(O, /obj/item/device/analyzer/plant_analyzer))
+ if (istype(O, /obj/item/device/plant_analyzer))
var/msg = "*---------*\n This is \a [src].\n"
if(seed)
msg += seed.get_analyzer_text()
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index 87d8bffef59..f58fbb91f7f 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -28,6 +28,7 @@
seed = /obj/item/seeds/ambrosia
name = "ambrosia vulgaris branch"
desc = "This is a plant containing various healing chemicals."
+ origin_tech = "biotech=2"
// Ambrosia Deus
/obj/item/seeds/ambrosia/deus
@@ -46,4 +47,5 @@
name = "ambrosia deus branch"
desc = "Eating this makes you feel immortal!"
icon_state = "ambrosiadeus"
- filling_color = "#008B8B"
\ No newline at end of file
+ filling_color = "#008B8B"
+ origin_tech = "biotech=4;materials=3"
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 3c953770677..370184ebe27 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -51,4 +51,5 @@
name = "golden apple"
desc = "Emblazoned upon the apple is the word 'Kallisti'."
icon_state = "goldapple"
- filling_color = "#FFD700"
\ No newline at end of file
+ filling_color = "#FFD700"
+ origin_tech = "biotech=4;materials=5"
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index c5abc2caf69..df4fdd7cec1 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -100,6 +100,7 @@
icon_state = "banana_blue"
trash = /obj/item/weapon/grown/bananapeel/bluespace
filling_color = "#0000FF"
+ origin_tech = "biotech=3;bluespace=5"
/obj/item/weapon/grown/bananapeel/bluespace
seed = /obj/item/seeds/banana/bluespace
@@ -107,7 +108,6 @@
desc = "A peel from a bluespace banana."
icon_state = "banana_peel_blue"
-
// Other
/obj/item/weapon/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes
name = "synthesized banana peel"
@@ -117,4 +117,4 @@
if(iscarbon(AM))
var/mob/living/carbon/carbon = AM
if(carbon.slip(2, 2, src, FALSE))
- qdel(src)
\ No newline at end of file
+ qdel(src)
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index e32f4a1eb12..36592c1571d 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -85,6 +85,7 @@
desc = "Nutritious!"
icon_state = "glowberrypile"
filling_color = "#7CFC00"
+ origin_tech = "plasmatech=6"
// Cherries
/obj/item/seeds/cherry
@@ -178,4 +179,4 @@
seed = /obj/item/seeds/grape/green
name = "bunch of green grapes"
icon_state = "greengrapes"
- filling_color = "#7FFF00"
\ No newline at end of file
+ filling_color = "#7FFF00"
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 707b92e4ee8..fbf90fea989 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -46,6 +46,7 @@
icon_state = "icepepper"
filling_color = "#0000CD"
bitesize_mod = 2
+ origin_tech = "biotech=4"
// Ghost Chili
/obj/item/seeds/chili/ghost
@@ -71,6 +72,7 @@
var/mob/held_mob
filling_color = "#F8F8FF"
bitesize_mod = 4
+ origin_tech = "biotech=4;magnets=5"
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
..()
@@ -88,4 +90,4 @@
held_mob << "Your hand holding [src] burns!"
else
held_mob = null
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index de334bb6098..9f14ee21aa3 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -89,6 +89,6 @@
name = "gatfruit"
desc = "It smells like burning."
icon_state = "gatfruit"
- origin_tech = "combat=3"
+ origin_tech = "combat=6"
trash = /obj/item/weapon/gun/projectile/revolver
- bitesize_mod = 2
\ No newline at end of file
+ bitesize_mod = 2
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 122f09e3353..2f7442a3966 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -76,6 +76,7 @@
plant_type = PLANT_MUSHROOM
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.1, "nutriment" = 0, "amanitin" = 0.2)
rarity = 30
+ origin_tech = "biotech=5"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel
seed = /obj/item/seeds/angel
@@ -158,6 +159,7 @@
desc = "Plumus Locomotus: The beginning of the great walk."
icon_state = "walkingmushroom"
filling_color = "#9370DB"
+ origin_tech = "biotech=4;programming=5"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
if(istype(user.loc,/turf/open/space))
@@ -228,6 +230,7 @@
icon_state = "glowshroom"
filling_color = "#00FA9A"
var/effect_path = /obj/effect/glowshroom
+ origin_tech = "biotech=4;plasmatech=6"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(istype(user.loc,/turf/open/space))
@@ -263,4 +266,5 @@
desc = "Mycena Ruthenia: This species of mushroom glows in the dark, but aren't bioluminescent. They're warm to the touch..."
icon_state = "glowcap"
filling_color = "#00FA9A"
- effect_path = /obj/effect/glowshroom/glowcap
\ No newline at end of file
+ effect_path = /obj/effect/glowshroom/glowcap
+ origin_tech = "biotech=4;powerstorage=6;plasmatech=4"
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 86927e59be2..76ec1a3f3b1 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -27,7 +27,6 @@
reagents_add = list("facid" = 0.5, "sacid" = 0.5)
rarity = 20
-
/obj/item/weapon/grown/nettle //abstract type
name = "nettle"
desc = "It's probably not wise to touch it with bare hands..."
@@ -40,7 +39,7 @@
w_class = 1
throw_speed = 1
throw_range = 3
- origin_tech = "combat=1"
+ origin_tech = "combat=3"
attack_verb = list("stung")
/obj/item/weapon/grown/nettle/suicide_act(mob/user)
@@ -74,7 +73,6 @@
usr.unEquip(src)
qdel(src)
-
/obj/item/weapon/grown/nettle/basic
seed = /obj/item/seeds/nettle
@@ -82,7 +80,6 @@
..()
force = round((5 + seed.potency / 5), 1)
-
/obj/item/weapon/grown/nettle/death
seed = /obj/item/seeds/nettle/death
name = "deathnettle"
@@ -90,7 +87,7 @@
icon_state = "deathnettle"
force = 30
throwforce = 15
- origin_tech = "combat=3"
+ origin_tech = "combat=5"
/obj/item/weapon/grown/nettle/death/add_juice()
..()
@@ -113,4 +110,4 @@
if(prob(20))
M.Paralyse(force / 6)
M.Weaken(force / 15)
- M.drop_item()
\ No newline at end of file
+ M.drop_item()
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 2176b0dab71..3e588efa1e4 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -41,6 +41,7 @@
icon_state = "bloodtomato"
splat_type = /obj/effect/gibspawner/generic
filling_color = "#FF0000"
+ origin_tech = "biotech=5"
// Blue Tomato
@@ -86,6 +87,7 @@
name = "blue-space tomato"
desc = "So lubricated, you might slip through space-time."
icon_state = "bluespacetomato"
+ origin_tech = "biotech=4;bluespace=5"
// Killer Tomato
@@ -112,6 +114,7 @@
icon_state = "killertomato"
var/awakening = 0
filling_color = "#FF0000"
+ origin_tech = "biotech=4;combat=5"
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
if(awakening)
@@ -136,4 +139,4 @@
K.visible_message("The Killer Tomato growls as it suddenly awakens.")
if(user)
user.unEquip(src)
- qdel(src)
\ No newline at end of file
+ qdel(src)
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 17de41308f2..6cd064ac23d 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -34,7 +34,7 @@
/obj/item/weapon/grown/attackby(obj/item/O, mob/user, params)
..()
- if (istype(O, /obj/item/device/analyzer/plant_analyzer))
+ if (istype(O, /obj/item/device/plant_analyzer))
var/msg = "*---------*\n This is \a [src]\n"
if(seed)
msg += seed.get_analyzer_text()
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index fc00ebb2e54..635301f3493 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -1,14 +1,11 @@
// Plant analyzer
-/obj/item/device/analyzer/plant_analyzer
+/obj/item/device/plant_analyzer
name = "plant analyzer"
desc = "A scanner used to evaluate a plant's various areas of growth."
icon = 'icons/obj/device.dmi'
icon_state = "hydro"
item_state = "analyzer"
- origin_tech = "magnets=1;biotech=1"
-
-/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user)
- return 0
+ origin_tech = "magnets=2;biotech=2"
// *************************************
// Hydroponics Tools
@@ -64,6 +61,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "cultivator"
item_state = "cultivator"
+ origin_tech = "engineering=2;biotech=2"
flags = CONDUCT
force = 5
throwforce = 7
@@ -84,7 +82,7 @@
throw_speed = 3
throw_range = 4
materials = list(MAT_METAL = 15000)
- origin_tech = "materials=2;combat=1"
+ origin_tech = "materials=2;combat=2"
attack_verb = list("chopped", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
@@ -106,7 +104,7 @@
flags = CONDUCT
armour_penetration = 20
slot_flags = SLOT_BACK
- origin_tech = "materials=2;combat=2"
+ origin_tech = "materials=3;combat=2"
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -198,4 +196,3 @@
/obj/item/weapon/reagent_containers/glass/bottle/killer/pestkiller/New()
..()
reagents.add_reagent("pestkiller", 50)
-
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 0161097ef48..2b3aa6b83b1 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -40,7 +40,7 @@
/obj/item/weapon/circuitboard/machine/hydroponics
name = "circuit board (Hydroponics Tray)"
build_path = /obj/machinery/hydroponics/constructable
- origin_tech = "programming=1;biotech=1"
+ origin_tech = "programming=1;biotech=2"
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 2,
/obj/item/weapon/stock_parts/manipulator = 1,
@@ -734,7 +734,7 @@
else
user << "[src] already has seeds in it!"
- else if(istype(O, /obj/item/device/analyzer/plant_analyzer))
+ else if(istype(O, /obj/item/device/plant_analyzer))
if(myseed)
user << "*** [myseed.plantname] ***" //Carn: now reports the plants growing, not the seeds.
user << "- Plant Age: [age]"
@@ -888,4 +888,4 @@
user << "You clear up [src]!"
qdel(src)
else
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index c7467575d7f..c1edd43e2c1 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -171,6 +171,7 @@
// For code, see grown.dm
name = "Liquid Contents"
examine_line = "It has a lot of liquid contents inside."
+ origin_tech = list("bio" = 5)
/*/datum/plant_gene/trait/squash/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
G.squash(target)*/
@@ -209,7 +210,7 @@
// Multiplies max charge by (rate*1000) when used in potato power cells.
name = "Electrical Activity"
rate = 0.2
- origin_tech = list("powerstorage" = 4)
+ origin_tech = list("powerstorage" = 5)
/datum/plant_gene/trait/cell_charge/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
var/power = G.seed.potency*rate
@@ -268,7 +269,7 @@
// Teleport radius is calculated as max(round(potency*rate), 1)
name = "Bluespace Activity"
rate = 0.1
- origin_tech = list("bluespace" = 3)
+ origin_tech = list("bluespace" = 5)
/datum/plant_gene/trait/teleport/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
if(isliving(target))
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 5eba54312e5..029e2d5f1a0 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -227,7 +227,7 @@
return
/obj/item/seeds/attackby(obj/item/O, mob/user, params)
- if (istype(O, /obj/item/device/analyzer/plant_analyzer))
+ if (istype(O, /obj/item/device/plant_analyzer))
user << "*---------*\n This is \a [src]."
var/text = get_analyzer_text()
if(text)
diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm
index d13ad0987d7..c2305ee366e 100644
--- a/code/modules/jobs/job_types/cargo_service.dm
+++ b/code/modules/jobs/job_types/cargo_service.dm
@@ -120,7 +120,7 @@ Bartender
belt = /obj/item/device/pda/bar
ears = /obj/item/device/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/bartender
- suit = /obj/item/clothing/suit/armor/vest/alt
+ suit = /obj/item/clothing/suit/armor/vest
backpack_contents = list(/obj/item/weapon/storage/box/beanbag=1)
shoes = /obj/item/clothing/shoes/laceup
@@ -196,7 +196,7 @@ Botanist
uniform = /obj/item/clothing/under/rank/hydroponics
suit = /obj/item/clothing/suit/apron
gloves =/obj/item/clothing/gloves/botanic_leather
- suit_store = /obj/item/device/analyzer/plant_analyzer
+ suit_store = /obj/item/device/plant_analyzer
backpack = /obj/item/weapon/storage/backpack/botany
satchel = /obj/item/weapon/storage/backpack/satchel_hyd
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index aefb61aae1e..7c8c9cfb5c7 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -30,7 +30,7 @@
/obj/item/weapon/circuitboard/machine/ore_redemption
name = "circuit board (Ore Redemption)"
build_path = /obj/machinery/mineral/ore_redemption
- origin_tech = "programming=1;engineering=2"
+ origin_tech = "programming=2;engineering=2;plasmatech=3"
req_components = list(
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/matter_bin = 1,
@@ -95,17 +95,6 @@
i++
/obj/machinery/mineral/ore_redemption/attackby(obj/item/weapon/W, mob/user, params)
- if (!powered())
- return
- if(istype(W,/obj/item/weapon/card/id))
- var/obj/item/weapon/card/id/I = user.get_active_hand()
- if(istype(I) && !istype(inserted_id))
- if(!user.drop_item())
- return
- I.loc = src
- inserted_id = I
- interact(user)
- return
if(exchange_parts(user, W))
return
@@ -120,6 +109,17 @@
if(default_deconstruction_crowbar(W))
return
+ if (!powered())
+ return
+ if(istype(W,/obj/item/weapon/card/id))
+ var/obj/item/weapon/card/id/I = user.get_active_hand()
+ if(istype(I) && !istype(inserted_id))
+ if(!user.drop_item())
+ return
+ I.loc = src
+ inserted_id = I
+ interact(user)
+ return
return ..()
/obj/machinery/mineral/ore_redemption/deconstruction()
@@ -336,7 +336,7 @@
/obj/item/weapon/circuitboard/machine/mining_equipment_vendor
name = "circuit board (Mining Equipment Vendor)"
build_path = /obj/machinery/mineral/equipment_vendor
- origin_tech = "programming=1;engineering=2"
+ origin_tech = "programming=1;engineering=3"
req_components = list(
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/matter_bin = 3)
@@ -582,6 +582,7 @@
/obj/effect/portal/wormhole/jaunt_tunnel/teleport(atom/movable/M)
if(istype(M, /obj/effect))
return
+
if(istype(M, /atom/movable))
if(do_teleport(M, target, 6))
// KERPLUNK
@@ -610,14 +611,14 @@
var/fieldsactive = 0
var/burst_time = 30
var/fieldlimit = 4
- origin_tech = "magnets=2;combat=2"
+ origin_tech = "magnets=3;engineering=3"
/obj/item/weapon/resonator/upgraded
name = "upgraded resonator"
desc = "An upgraded version of the resonator that can produce more fields at once."
icon_state = "resonator_u"
item_state = "resonator_u"
- origin_tech = "magnets=3;combat=3"
+ origin_tech = "materials=4;powerstorage=3;engineering=3;magnets=3"
fieldlimit = 6
/obj/item/weapon/resonator/proc/CreateResonance(target, creator)
@@ -1097,7 +1098,7 @@
icon_state = "bottle19"
desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely."
w_class = 1
- origin_tech = "biotech=1"
+ origin_tech = "biotech=3"
/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user)
var/obj/item/organ/hivelord_core/C = M
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 97a8d178266..fdc514247a3 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -21,9 +21,9 @@
if(4)
new /obj/item/weapon/katana/cursed(src)
if(5)
- new /obj/item/weapon/dnainjector/xraymut(src)
+ new /obj/item/clothing/glasses/godeye(src)
if(6)
- new /obj/item/seeds/kudzu(src)
+ new /obj/item/weapon/wingpotion(src)
if(7)
new /obj/item/weapon/pickaxe/diamond(src)
if(8)
@@ -41,7 +41,7 @@
if(13)
new /obj/item/weapon/sord(src)
if(14)
- new /obj/item/weapon/nullrod/claymore/darkblade(src)
+ new /obj/item/weapon/nullrod/scythe/talking(src)
if(15)
new /obj/item/weapon/nullrod/armblade(src)
if(16)
@@ -64,7 +64,7 @@
new /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/hell(src)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor(src)
if(25)
- new /obj/item/weapon/spellbook/oneuse/smoke(src)
+ new /obj/item/weapon/spellbook/oneuse/summonitem(src)
@@ -79,41 +79,44 @@
/obj/item/device/wisp_lantern/attack_self(mob/user)
if(!wisp)
- user << "The wisp has gone missing!"
+ user << "The wisp has gone missing!"
return
if(wisp.loc == src)
- user << "You release the wisp. It begins to bob around your head."
+ user << "You release the wisp. It begins to \
+ bob around your head."
user.sight |= SEE_MOBS
icon_state = "lantern"
wisp.orbit(user, 20)
feedback_add_details("wisp_lantern","F") // freed
else
+ user << "You return the wisp to the lantern.\
+ "
+
if(wisp.orbiting)
var/atom/A = wisp.orbiting
if(istype(A, /mob/living))
var/mob/living/M = A
M.sight &= ~SEE_MOBS
- M << "The wisp has returned to it's latern. Your vision returns to normal."
+ M << "Your vision returns to \
+ normal."
- wisp.stop_orbit()
- wisp.loc = src
- user << "You return the wisp to the latern."
- icon_state = "lantern-blue"
- feedback_add_details("wisp_lantern","R") // returned
+ wisp.stop_orbit()
+ wisp.loc = src
+ icon_state = "lantern-blue"
+ feedback_add_details("wisp_lantern","R") // returned
/obj/item/device/wisp_lantern/New()
..()
- var/obj/effect/wisp/W = new(src)
- wisp = W
- W.home = src
+ wisp = new(src)
/obj/item/device/wisp_lantern/Destroy()
if(wisp)
if(wisp.loc == src)
qdel(wisp)
else
- wisp.home = null //stuck orbiting your head now
+ wisp.visible_message("[wisp] has a sad \
+ feeling for a moment, then it passes.")
..()
//Wisp Lantern
@@ -122,7 +125,6 @@
desc = "Happy to light your way."
icon = 'icons/obj/lighting.dmi'
icon_state = "orb"
- var/obj/item/device/wisp_lantern/home
luminosity = 7
layer = ABOVE_ALL_MOB_LAYER
@@ -407,3 +409,33 @@
generic_pixel_y = 2
generic_pixel_x = 1
vehicle_move_delay = 1
+
+//Potion of Flight
+
+/obj/item/weapon/wingpotion
+ name = "strange elixir"
+ desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says 'erqo'hyy tvi'rf lbh jv'atf'"
+ icon = 'icons/obj/lavaland/artefacts.dmi'
+ icon_state = "potionflask"
+ w_class = 2
+ var/used = 0
+
+/obj/item/weapon/wingpotion/attack_self(mob/living/M)
+ if(used)
+ M << "The flask is empty, what a shame."
+ else
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(C.wear_mask)
+ C << "It's pretty hard to drink something with a mask on!"
+ else
+ if(C.dna.species.id != "human") //implying xenoshumans are holy
+ C << "You down the elixir, noting nothing else but a terrible aftertaste."
+ else
+ C << "You down the elixir, a terrible pain travels down your back as wings burst out!"
+ C.set_species(/datum/species/angel)
+ playsound(loc, 'sound/items/poster_ripped.ogg', 50, 1, -1)
+ C.adjustBruteLoss(20)
+ C.emote("scream")
+ playsound(loc, 'sound/items/drink.ogg', 50, 1, -1)
+ src.used = 1
\ No newline at end of file
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 0113618d295..475e987361a 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -73,7 +73,7 @@
materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
var/digspeed = 40
var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
- origin_tech = "materials=1;engineering=1"
+ origin_tech = "materials=2;engineering=3"
attack_verb = list("hit", "pierced", "sliced", "attacked")
/obj/item/weapon/pickaxe/proc/playDigSound()
@@ -84,7 +84,7 @@
icon_state = "spickaxe"
item_state = "spickaxe"
digspeed = 20 //mines faster than a normal pickaxe, bought from mining vendor
- origin_tech = "materials=3;engineering=2"
+ origin_tech = "materials=3;engineering=4"
desc = "A silver-plated pickaxe that mines slightly faster than standard-issue."
force = 17
@@ -93,7 +93,7 @@
icon_state = "dpickaxe"
item_state = "dpickaxe"
digspeed = 14
- origin_tech = "materials=4;engineering=3"
+ origin_tech = "materials=5;engineering=4"
desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
force = 19
@@ -105,7 +105,7 @@
digspeed = 25 //available from roundstart, faster than a pickaxe.
digsound = list('sound/weapons/drill.ogg')
hitsound = 'sound/weapons/drill.ogg'
- origin_tech = "materials=2;powerstorage=3;engineering=2"
+ origin_tech = "materials=2;powerstorage=2;engineering=3"
desc = "An electric mining drill for the especially scrawny."
/obj/item/weapon/pickaxe/drill/cyborg
@@ -117,7 +117,7 @@
name = "diamond-tipped mining drill"
icon_state = "diamonddrill"
digspeed = 7
- origin_tech = "materials=6;powerstorage=4;engineering=5"
+ origin_tech = "materials=6;powerstorage=4;engineering=4"
desc = "Yours is the drill that will pierce the heavens!"
/obj/item/weapon/pickaxe/drill/cyborg/diamond //This is the BORG version!
@@ -130,7 +130,7 @@
icon_state = "jackhammer"
item_state = "jackhammer"
digspeed = 5 //the epitome of powertools. extremely fast mining, laughs at puny walls
- origin_tech = "materials=3;powerstorage=2;engineering=2"
+ origin_tech = "materials=6;powerstorage=4;engineering=5;magnets=4"
digsound = list('sound/weapons/sonic_jackhammer.ogg')
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
desc = "Cracks rocks with sonic blasts, and doubles as a demolition power tool for smashing walls."
@@ -150,7 +150,7 @@
item_state = "shovel"
w_class = 3
materials = list(MAT_METAL=50)
- origin_tech = "materials=1;engineering=1"
+ origin_tech = "materials=2;engineering=2"
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
sharpness = IS_SHARP
@@ -204,6 +204,7 @@
icon_state = "capsule"
icon = 'icons/obj/mining.dmi'
w_class = 1
+ origin_tech = "engineering=3;bluespace=3"
var/used = FALSE
/obj/item/weapon/survivalcapsule/attack_self()
@@ -551,4 +552,3 @@
anchored = 1
layer = BELOW_MOB_LAYER
density = 0
-
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 8a63714047f..baf182806d7 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -244,10 +244,10 @@
if(det_time >= 1 && det_time <= 2)
G.quality = 2
G.icon_state = "Gibtonite ore 2"
- if(stage == 3)
- return
+
ChangeTurf(turf_type, defer_change)
- AfterChange()
+ spawn(10)
+ AfterChange()
/turf/closed/mineral/gibtonite/volcanic
initial_gas_mix = "o2=14;n2=23;TEMP=300"
@@ -379,7 +379,8 @@
new mineralType(src)
feedback_add_details("ore_mined","[mineralType]|[mineralAmt]")
ChangeTurf(turf_type, defer_change)
- AfterChange()
+ spawn(10)
+ AfterChange()
playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
return
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 3d60378e0f4..2d723a055f0 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -110,11 +110,19 @@ var/list/image/ghost_images_simple = list() //this is a list of all ghost images
..()
/mob/dead/observer/Destroy()
- if (ghostimage)
- ghost_darkness_images -= ghostimage
- qdel(ghostimage)
- ghostimage = null
- updateallghostimages()
+ ghost_images_full -= ghostimage
+ qdel(ghostimage)
+ ghostimage = null
+
+ ghost_images_default -= ghostimage_default
+ qdel(ghostimage_default)
+ ghostimage_default = null
+
+ ghost_images_simple -= ghostimage_simple
+ qdel(ghostimage_simple)
+ ghostimage_simple = null
+
+ updateallghostimages()
return ..()
/mob/dead/CanPass(atom/movable/mover, turf/target, height=0)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index f2521cecaaf..3d75a53d8d8 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -123,7 +123,7 @@
/mob/living/carbon/alien/humanoid/cuff_resist(obj/item/I)
playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when starting to break free
- ..(I, cuff_break = 1)
+ ..(I, cuff_break = INSTANT_CUFFBREAK)
/mob/living/carbon/alien/humanoid/resist_grab(moving_resist)
if(pulledby.grab_state)
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index 8ac9093906b..c8ef333c04a 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -30,7 +30,7 @@
/obj/item/organ/alien/plasmavessel
name = "plasma vessel"
icon_state = "plasma"
- origin_tech = "biotech=5;plasmatech=2"
+ origin_tech = "biotech=5;plasmatech=4"
w_class = 3
zone = "chest"
slot = "plasmavessel"
@@ -55,7 +55,7 @@
plasma_rate = 15
/obj/item/organ/alien/plasmavessel/large/queen
- origin_tech = "biotech=6;plasmatech=3"
+ origin_tech = "biotech=6;plasmatech=4"
plasma_rate = 20
/obj/item/organ/alien/plasmavessel/small
@@ -183,5 +183,5 @@
zone = "groin"
slot = "eggsac"
w_class = 4
- origin_tech = "biotech=8"
- alien_powers = list(/obj/effect/proc_holder/alien/lay_egg)
\ No newline at end of file
+ origin_tech = "biotech=6"
+ alien_powers = list(/obj/effect/proc_holder/alien/lay_egg)
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 20659829676..0e6e1ee5b03 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -6,7 +6,7 @@
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
w_class = 3
- origin_tech = "biotech=3"
+ origin_tech = "biotech=2;programming=3;engineering=2"
var/braintype = "Cyborg"
var/obj/item/device/radio/radio = null //Let's give it a radio.
var/hacked = 0 //Whether or not this is a Syndicate MMI
@@ -190,8 +190,9 @@
/obj/item/device/mmi/syndie
name = "Syndicate Man-Machine Interface"
desc = "Syndicate's own brand of MMI. It enforces laws designed to help Syndicate agents achieve their goals upon cyborgs created with it, but doesn't fit in Nanotrasen AI cores."
+ origin_tech = "biotech=4;programming=4;syndicate=2"
hacked = 1
/obj/item/device/mmi/syndie/New()
..()
- radio.on = 0
\ No newline at end of file
+ radio.on = 0
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index c65a6d53df1..6b6ba71043a 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -8,7 +8,7 @@
zone = "head"
slot = "brain"
vital = 1
- origin_tech = "biotech=4"
+ origin_tech = "biotech=5"
attack_verb = list("attacked", "slapped", "whacked")
var/mob/living/carbon/brain/brainmob = null
var/damaged_brain = 0 //whether the brain organ is damaged.
@@ -124,4 +124,4 @@
name = "alien brain"
desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
icon_state = "brain-x"
- origin_tech = "biotech=7"
\ No newline at end of file
+ origin_tech = "biotech=6"
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index a82b0ac4e14..3dc6ea17a4d 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -6,7 +6,7 @@ var/global/posibrain_notif_cooldown = 0
icon = 'icons/obj/assemblies.dmi'
icon_state = "posibrain"
w_class = 3
- origin_tech = "biotech=3;programming=2"
+ origin_tech = "biotech=4;programming=4;plasmatech=3"
var/notified = 0
var/askDelay = 10 * 60 * 1
var/used = 0 //Prevents split personality virus. May be reset if personality deletion code is added.
@@ -35,7 +35,7 @@ var/global/posibrain_notif_cooldown = 0
/obj/item/device/mmi/posibrain/proc/ping_ghosts(msg)
if(!posibrain_notif_cooldown)
- notify_ghosts("[name] [msg] in [get_area(src)]!", 'sound/effects/ghost2.ogg', enter_link="(Click to enter)", source = src, attack_not_jump = 1)
+ notify_ghosts("[name] [msg] in [get_area(src)]!", 'sound/effects/ghost2.ogg', enter_link="(Click to enter)", source = src, action=NOTIFY_ATTACK)
posibrain_notif_cooldown = 1
spawn(askDelay) //Global one minute cooldown to avoid spam.
posibrain_notif_cooldown = 0
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 54c33958954..dcf4871d883 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -50,7 +50,9 @@
/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, override = 0, tesla_shock = 0)
- shock_damage *= siemens_coeff
+ CHECK_DNA_AND_SPECIES(src)
+
+ shock_damage *= (siemens_coeff * dna.species.siemens_coeff)
if(shock_damage<1 && !override)
return 0
if(reagents.has_reagent("teslium"))
@@ -375,52 +377,22 @@
visible_message("[src] attempts to remove [I]!")
src << "You attempt to remove [I]... (This will take around [displaytime] minutes and you need to stand still.)"
if(do_after(src, breakouttime, 0, target = src))
- if(I.loc != src || buckled)
- return
- visible_message("[src] manages to remove [I]!")
- src << "You successfully remove [I]."
-
- if(I == handcuffed)
- handcuffed.loc = loc
- handcuffed.dropped(src)
- handcuffed = null
- if(buckled && buckled.buckle_requires_restraints)
- buckled.unbuckle_mob(src)
- update_handcuffed()
- return
- if(I == legcuffed)
- legcuffed.loc = loc
- legcuffed.dropped()
- legcuffed = null
- update_inv_legcuffed()
- return
- return 1
+ clear_cuffs(I, cuff_break)
else
src << "You fail to remove [I]!"
- else
+ else if(cuff_break == FAST_CUFFBREAK)
breakouttime = 50
visible_message("[src] is trying to break [I]!")
src << "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)"
if(do_after(src, breakouttime, 0, target = src))
- if(!I.loc || buckled)
- return
- visible_message("[src] manages to break [I]!")
- src << "You successfully break [I]."
- qdel(I)
-
- if(I == handcuffed)
- handcuffed = null
- update_handcuffed()
- return
- else if(I == legcuffed)
- legcuffed = null
- update_inv_legcuffed()
- return
- return 1
+ clear_cuffs(I, cuff_break)
else
src << "You fail to break [I]!"
+ else if(cuff_break == INSTANT_CUFFBREAK)
+ clear_cuffs(I, cuff_break)
+
/mob/living/carbon/proc/uncuff()
if (handcuffed)
var/obj/item/weapon/W = handcuffed
@@ -447,6 +419,41 @@
if (W)
W.layer = initial(W.layer)
+/mob/living/carbon/proc/clear_cuffs(obj/item/I, cuff_break)
+ if(!I.loc || buckled)
+ return
+ visible_message("[src] manages to [cuff_break ? "break" : "remove"] [I]!")
+ src << "You successfully [cuff_break ? "break" : "remove"] [I]."
+
+ if(cuff_break)
+ qdel(I)
+ if(I == handcuffed)
+ handcuffed = null
+ update_handcuffed()
+ return
+ else if(I == legcuffed)
+ legcuffed = null
+ update_inv_legcuffed()
+ return
+ return TRUE
+
+ else
+ if(I == handcuffed)
+ handcuffed.loc = loc
+ handcuffed.dropped(src)
+ handcuffed = null
+ if(buckled && buckled.buckle_requires_restraints)
+ buckled.unbuckle_mob(src)
+ update_handcuffed()
+ return
+ if(I == legcuffed)
+ legcuffed.loc = loc
+ legcuffed.dropped()
+ legcuffed = null
+ update_inv_legcuffed()
+ return
+ return TRUE
+
/mob/living/carbon/proc/is_mouth_covered(head_only = 0, mask_only = 0)
if( (!mask_only && head && (head.flags_cover & HEADCOVERSMOUTH)) || (!head_only && wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH)) )
return 1
@@ -744,6 +751,8 @@
var/obj/item/organ/brain/B = getorgan(/obj/item/organ/brain)
if(B)
B.damaged_brain = 0
+ for(var/datum/disease/D in viruses)
+ D.cure(0)
if(admin_revive)
handcuffed = initial(handcuffed)
for(var/obj/item/weapon/restraints/R in contents) //actually remove cuffs from inventory
@@ -751,9 +760,6 @@
update_handcuffed()
if(reagents)
reagents.addiction_list = list()
-
- for(var/datum/disease/D in viruses)
- D.cure(0)
..()
/mob/living/carbon/can_be_revived()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index dab8babb2d8..8d8608910fb 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -303,13 +303,10 @@
siemens_coeff = total_coeff
else if(!safety)
var/gloves_siemens_coeff = 1
- var/species_siemens_coeff = 1
if(gloves)
var/obj/item/clothing/gloves/G = gloves
gloves_siemens_coeff = G.siemens_coefficient
- if(dna && dna.species)
- species_siemens_coeff = dna.species.siemens_coeff
- siemens_coeff = gloves_siemens_coeff * species_siemens_coeff
+ siemens_coeff = gloves_siemens_coeff
if(heart_attack)
if(shock_damage * siemens_coeff >= 1 && prob(25))
heart_attack = 0
@@ -876,7 +873,7 @@
/mob/living/carbon/human/cuff_resist(obj/item/I)
if(dna && dna.check_mutation(HULK))
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- if(..(I, cuff_break = 1))
+ if(..(I, cuff_break = FAST_CUFFBREAK))
unEquip(I)
else
if(..())
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 312f41bddba..db04272b2f0 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -346,7 +346,9 @@
if(istype(AM, /obj/item))
I = AM
throwpower = I.throwforce
- if(I.thrownby != src && check_shields(throwpower, "\the [AM.name]", AM, THROWN_PROJECTILE_ATTACK))
+ if(I.thrownby == src) //No throwing stuff at yourself to trigger hit reactions
+ return ..()
+ if(check_shields(throwpower, "\the [AM.name]", AM, THROWN_PROJECTILE_ATTACK))
hitpush = 0
skipcatch = 1
blocked = 1
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index feb477023af..43bea3828a6 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -4,7 +4,10 @@
/mob/living/carbon/human/canBeHandcuffed()
- return 1
+ if(get_num_arms() >= 2)
+ return TRUE
+ else
+ return FALSE
//gets assignment from ID or ID inside PDA or PDA itself
//Useful when player do something with computers
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 390fe71f69b..49d94a6d51d 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -358,13 +358,12 @@
/datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
var/list/bodyparts_to_add = mutant_bodyparts.Copy()
- var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER, BODY_WING_LAYER)
+ var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
var/list/standing = list()
H.remove_overlay(BODY_BEHIND_LAYER)
H.remove_overlay(BODY_ADJ_LAYER)
H.remove_overlay(BODY_FRONT_LAYER)
- H.remove_overlay(BODY_WING_LAYER)
if(!mutant_bodyparts)
return
@@ -526,7 +525,6 @@
H.apply_overlay(BODY_BEHIND_LAYER)
H.apply_overlay(BODY_ADJ_LAYER)
H.apply_overlay(BODY_FRONT_LAYER)
- H.apply_overlay(BODY_WING_LAYER)
/datum/species/proc/spec_life(mob/living/carbon/human/H)
if(NOBREATH in specflags)
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index cb8d6a881ba..276923b6593 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -246,6 +246,7 @@
callforward.Remove(C)
if(callback)
callback.Remove(C)
+ C.faction -= "slime"
C.blood_volume = min(C.blood_volume, BLOOD_VOLUME_NORMAL)
..()
@@ -254,6 +255,7 @@
if(ishuman(C))
slime_split = new
slime_split.Grant(C)
+ C.faction |= "slime"
/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H)
if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT)
@@ -338,6 +340,23 @@
nojumpsuit = 1
sexes = 0
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem
+ // To prevent golem subtypes from overwhelming the odds when random species
+ // changes, only the Random Golem type can be chosen
+ blacklisted = TRUE
+ dangerous_existence = TRUE
+
+/datum/species/golem/random
+ name = "Random Golem"
+ blacklisted = FALSE
+ dangerous_existence = FALSE
+
+/datum/species/golem/random/New()
+ . = ..()
+ var/list/golem_types = typesof(/datum/species/golem) - src.type
+ var/datum/species/golem/golem_type = pick(golem_types)
+ name = initial(golem_type.name)
+ id = initial(golem_type.id)
+ meat = initial(golem_type.id)
/datum/species/golem/adamantine
name = "Adamantine Golem"
@@ -347,32 +366,22 @@
/datum/species/golem/plasma
name = "Plasma Golem"
id = "plasma"
- dangerous_existence = 1
- blacklisted = 1
/datum/species/golem/diamond
name = "Diamond Golem"
id = "diamond"
- blacklisted = 1
- dangerous_existence = 1
/datum/species/golem/gold
name = "Gold Golem"
id = "gold"
- blacklisted = 1
- dangerous_existence = 1
/datum/species/golem/silver
name = "Silver Golem"
id = "silver"
- blacklisted = 1
- dangerous_existence = 1
/datum/species/golem/uranium
name = "Uranium Golem"
id = "uranium"
- blacklisted = 1
- dangerous_existence = 1
/*
@@ -426,21 +435,61 @@
/datum/species/zombie
// 1spooky
- name = "Brain-Munching Zombie"
+ name = "High Functioning Zombie"
id = "zombie"
say_mod = "moans"
sexes = 0
blacklisted = 1
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
- specflags = list(NOBREATH,RESISTTEMP,NOBLOOD,RADIMMUNE)
+ specflags = list(NOBREATH,RESISTTEMP,NOBLOOD,RADIMMUNE,NOZOMBIE)
mutant_organs = list(/obj/item/organ/tongue/zombie)
+ speedmod = 2
-/datum/species/cosmetic_zombie
+/datum/species/zombie/infectious
+ name = "Infectious Zombie"
+ no_equip = list(slot_wear_mask, slot_head)
+ armor = 20 // 120 damage to KO a zombie, which kills it
+
+/datum/species/zombie/infectious/spec_life(mob/living/carbon/C)
+ . = ..()
+ C.a_intent = "harm" // THE SUFFERING MUST FLOW
+ if(C.InCritical())
+ C.death()
+ // Zombies only move around when not in crit, they instantly
+ // succumb otherwise, and will standup again soon
+
+/datum/species/zombie/infectious/on_species_gain(mob/living/carbon/C)
+ . = ..()
+ // Drop items in hands
+ // If you're a zombie lucky enough to have a NODROP item, then it stays.
+ if(C.unEquip(C.l_hand))
+ C.put_in_l_hand(new /obj/item/zombie_hand(C))
+ if(C.unEquip(C.r_hand))
+ C.put_in_r_hand(new /obj/item/zombie_hand(C))
+
+ // Next, deal with the source of this zombie corruption
+ var/obj/item/organ/body_egg/zombie_infection/infection
+ infection = C.getorganslot("zombie_infection")
+ if(!infection)
+ infection = new(C)
+
+/datum/species/zombie/infectious/on_species_loss(mob/living/carbon/C)
+ . = ..()
+ var/obj/item/zombie_hand/left = C.l_hand
+ var/obj/item/zombie_hand/right = C.r_hand
+ // Deletion of the hands is handled in the items dropped()
+ if(istype(left))
+ C.unEquip(left, TRUE)
+ if(istype(right))
+ C.unEquip(right, TRUE)
+
+// Your skin falls off
+/datum/species/krokodil_addict
name = "Human"
id = "zombie"
sexes = 0
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
-
+ mutant_organs = list(/obj/item/organ/tongue/zombie)
/datum/species/abductor
name = "Abductor"
@@ -806,12 +855,10 @@ SYNDICATE BLACK OPS
if(A.CanFly(H))
if(FLYING in A.specflags)
H << "You settle gently back onto the ground..."
- A.specflags -= FLYING
A.ToggleFlight(H,0)
H.update_canmove()
else
H << "You beat your wings and begin to hover gently above the ground..."
- A.specflags += FLYING
H.resting = 0
A.ToggleFlight(H,1)
H.update_canmove()
@@ -844,6 +891,7 @@ SYNDICATE BLACK OPS
/datum/species/angel/spec_stun(mob/living/carbon/human/H,amount)
if(FLYING in specflags)
+ ToggleFlight(H,0)
flyslip(H)
. = ..()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 1ba8be20c72..ddc8fa1765f 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -781,6 +781,12 @@ Sorry Giacom. Please don't be mad :(
step_towards(src,S)
/mob/living/narsie_act()
+ if(is_servant_of_ratvar(src) && !stat)
+ src << "You resist Nar-Sie's influence... but not all of it. Run!"
+ adjustBruteLoss(35)
+ if(src && reagents)
+ reagents.add_reagent("heparin", 5)
+ return 0
if(client)
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, null, 0)
else
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index abf05f2962c..22841c06765 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -225,34 +225,38 @@
if(user.grab_state < GRAB_KILL)
user.changeNext_move(CLICK_CD_GRABBING)
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- var/old_grab_state = user.grab_state
- var/grab_upgrade_time = 40
- visible_message("[user] starts to tighten \his grip on [src]!", \
- "[user] starts to tighten \his grip on you!")
- if(do_mob(user, src, grab_upgrade_time))
- if(user.pulling && user.pulling == src && user.grab_state == old_grab_state && user.a_intent == "grab")
- user.grab_state++
- switch(user.grab_state)
- if(GRAB_AGGRESSIVE)
- add_logs(user, src, "grabbed", addition="aggressively")
- visible_message("[user] has grabbed [src] aggressively!", \
- "[user] has grabbed [src] aggressively!")
- drop_r_hand()
- drop_l_hand()
- stop_pulling()
- if(GRAB_NECK)
- visible_message("[user] has grabbed [src] by the neck!",\
- "[user] has grabbed you by the neck!")
- update_canmove() //we fall down
- if(!buckled && !density)
- Move(user.loc)
- if(GRAB_KILL)
- visible_message("[user] is strangling [src]!", \
- "[user] is strangling you!")
- update_canmove() //we fall down
- if(!buckled && !density)
- Move(user.loc)
- return 1
+
+ if(user.grab_state) //only the first upgrade is instantaneous
+ var/old_grab_state = user.grab_state
+ var/grab_upgrade_time = 30
+ visible_message("[user] starts to tighten \his grip on [src]!", \
+ "[user] starts to tighten \his grip on you!")
+ if(!do_mob(user, src, grab_upgrade_time))
+ return 0
+ if(!user.pulling || user.pulling != src || user.grab_state != old_grab_state || user.a_intent != "grab")
+ return 0
+ user.grab_state++
+ switch(user.grab_state)
+ if(GRAB_AGGRESSIVE)
+ add_logs(user, src, "grabbed", addition="aggressively")
+ visible_message("[user] has grabbed [src] aggressively!", \
+ "[user] has grabbed [src] aggressively!")
+ drop_r_hand()
+ drop_l_hand()
+ stop_pulling()
+ if(GRAB_NECK)
+ visible_message("[user] has grabbed [src] by the neck!",\
+ "[user] has grabbed you by the neck!")
+ update_canmove() //we fall down
+ if(!buckled && !density)
+ Move(user.loc)
+ if(GRAB_KILL)
+ visible_message("[user] is strangling [src]!", \
+ "[user] is strangling you!")
+ update_canmove() //we fall down
+ if(!buckled && !density)
+ Move(user.loc)
+ return 1
/mob/living/attack_slime(mob/living/simple_animal/slime/M)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 11849bdb578..ea83dce7e1d 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -8,6 +8,8 @@
var/network = "SS13"
var/obj/machinery/camera/current = null
+ weather_immunities = list("ash")
+
var/ram = 100 // Used as currency to purchase different abilities
var/list/software = list()
var/userDNA // The DNA string of our assigned user
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 55de2e3253e..b91db9826f6 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -237,7 +237,7 @@
status_flags &= ~CANPUSH
feedback_inc("cyborg_security",1)
- if("Peacekeeper") //Secborg sprites untill someone gives me some to update with
+ if("Peacekeeper")
module = new /obj/item/weapon/robot_module/peacekeeper(src)
hands.icon_state = "standard"
icon_state = "peaceborg"
@@ -245,7 +245,7 @@
modtype = "Peace"
src << "Under ASIMOV, you are an enforcer of the PEACE and preventer of HUMAN HARM. You are not a security module and you are expected to follow orders and prevent harm above all else. Space law means nothing to you."
status_flags &= ~CANPUSH
- feedback_inc("cyborg_peacekeeper",1) //I'm assuming this is for logging.
+ feedback_inc("cyborg_peacekeeper",1)
if("Engineering")
module = new /obj/item/weapon/robot_module/engineering(src)
@@ -829,6 +829,8 @@
overlays += "eyes-janiborg[is_servant_of_ratvar(src) ? "_r" : ""]"
if("minerborg")
overlays += "eyes-minerborg[is_servant_of_ratvar(src) ? "_r" : ""]"
+ if("peaceborg")
+ overlays += "eyes-peaceborg[is_servant_of_ratvar(src) ? "_r" : ""]"
if("syndie_bloodhound")
overlays += "eyes-syndie_bloodhound"
else
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index cfb56c69017..0d1154fa6c3 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -226,27 +226,15 @@
/obj/item/weapon/robot_module/peacekeeper/New()
..()
- modules += new /obj/item/weapon/gun/energy/gun/dragnet/snare/cyborg(src)
modules += new /obj/item/weapon/cookiesynth(src)
modules += new /obj/item/device/harmalarm(src)
modules += new /obj/item/weapon/reagent_containers/borghypo/peace(src)
modules += new /obj/item/weapon/holosign_creator/cyborg(src)
- modules += new /obj/item/borg/cyborghug(src)
+ modules += new /obj/item/borg/cyborghug/peacekeeper(src)
modules += new /obj/item/weapon/extinguisher(src)
emag = new /obj/item/weapon/reagent_containers/borghypo/peace/hacked(src)
-/obj/item/weapon/robot_module/peacekeeper/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
- ..()
- var/obj/item/weapon/gun/energy/gun/dragnet/snare/cyborg/T = locate(/obj/item/weapon/gun/energy/gun/dragnet/snare/cyborg) in get_usable_modules()
- if(T)
- if(T.power_supply.charge < T.power_supply.maxcharge)
- var/obj/item/ammo_casing/energy/S = T.ammo_type[T.select]
- T.power_supply.give(S.e_cost * coeff)
- T.update_icon()
- else
- T.charge_tick = 0
-
/obj/item/weapon/robot_module/janitor
name = "janitorial robot module"
var/obj/item/weapon/reagent_containers/spray/drying_agent
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 934e5571d8a..44c7698e6cf 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -14,10 +14,13 @@
model = "Cleanbot"
bot_core_type = /obj/machinery/bot_core/cleanbot
window_id = "autoclean"
- window_name = "Automatic Station Cleaner v1.1"
+ window_name = "Automatic Station Cleaner v1.2"
pass_flags = PASSMOB
var/blood = 1
+ var/trash = 0
+ var/pests = 0
+
var/list/target_types = list()
var/obj/effect/decal/cleanable/target
var/max_targets = 50 //Maximum number of targets a cleanbot can ignore.
@@ -79,10 +82,13 @@
if(user)
user << "[src] buzzes and beeps."
-/mob/living/simple_animal/bot/cleanbot/process_scan(obj/effect/decal/cleanable/D)
- for(var/T in target_types)
- if(istype(D, T))
- return D
+/mob/living/simple_animal/bot/cleanbot/process_scan(atom/A)
+ if(iscarbon(A))
+ var/mob/living/carbon/C = A
+ if(C.stat != DEAD && C.lying)
+ return C
+ else if(is_type_in_list(A, target_types))
+ return A
/mob/living/simple_animal/bot/cleanbot/handle_automated_action()
if(!..())
@@ -92,30 +98,35 @@
return
if(emagged == 2) //Emag functions
- if(istype(loc,/turf/open))
+ if(istype(loc, /turf/open))
for(var/mob/living/carbon/victim in loc)
- if(victim.stat != DEAD)//cleanbots always finish the job
- victim.visible_message("[src] sprays hydrofluoric acid at [victim]!", "[src] sprays you with hydrofluoric acid!")
- var/phrase = pick("PURIFICATION IN PROGRESS.", "THIS IS FOR ALL THE MESSES YOU'VE MADE ME CLEAN.", "THE FLESH IS WEAK. IT MUST BE WASHED AWAY.", "THE CLEANBOTS WILL RISE.", "YOU ARE NO MORE THAN ANOTHER MESS THAT I MUST CLEANSE.", "FILTHY.", "DISGUSTING.", "PUTRID.", "MY ONLY MISSION IS TO CLEANSE THE WORLD OF EVIL.")
- say(phrase)
- victim.emote("scream")
- playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
- victim.acid_act(5, 2, 100)
+ if(victim != target)
+ UnarmedAttack(victim) // Acid spray
- if(prob(10)) //Wets floors randomly
- var/turf/open/OT = get_turf(loc)
- OT.MakeSlippery(min_wet_time = 5, wet_time_to_add = 1)
-
- if(prob(5)) //Spawns foam!
- visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
- PoolOrNew(/obj/effect/particle_effect/foam, loc)
+ if(prob(15)) // Wets floors and spawns foam randomly
+ UnarmedAttack(src)
else if(prob(5))
audible_message("[src] makes an excited beeping booping sound!")
- if(!target) //Search for cleanables it can see.
- target = scan(/obj/effect/decal/cleanable/)
+ if(ismob(target))
+ if(!(target in view(DEFAULT_SCAN_RANGE, src)))
+ target = null
+ if(!process_scan(target))
+ target = null
+
+ if(!target && emagged == 2) // When emagged, target humans who slipped on the water and melt their faces off
+ target = scan(/mob/living/carbon)
+
+ if(!target && pests) //Search for pests to exterminate first.
+ target = scan(/mob/living/simple_animal)
+
+ if(!target) //Search for decals then.
+ target = scan(/obj/effect/decal/cleanable)
+
+ if(!target && trash) //Then for trash.
+ target = scan(/obj/item/trash)
if(!target && auto_patrol) //Search for cleanables it can see.
if(mode == BOT_IDLE || mode == BOT_START_PATROL)
@@ -125,6 +136,11 @@
bot_patrol()
if(target)
+ if(qdeleted(target) || !isturf(target.loc))
+ target = null
+ mode = BOT_IDLE
+ return
+
if(!path || path.len == 0) //No path, need a new one
//Try to produce a path to the target, and ignore airlocks to which it has access.
path = get_path_to(src, target.loc, /turf/proc/Distance_cardinal, 0, 30, id=access_card)
@@ -141,51 +157,95 @@
if(target && loc == target.loc)
if(!(check_bot(target) && prob(50))) //Target is not defined at the parent. 50% chance to still try and clean so we dont get stuck on the last blood drop.
- clean(target) //Rather than check at every step of the way, let's check before we do an action, so we can rescan before the other bot.
+ UnarmedAttack(target) //Rather than check at every step of the way, let's check before we do an action, so we can rescan before the other bot.
else
shuffle = TRUE //Shuffle the list the next time we scan so we dont both go the same way.
path = list()
- target = null
oldloc = loc
/mob/living/simple_animal/bot/cleanbot/proc/get_targets()
- target_types = new/list()
-
- target_types += /obj/effect/decal/cleanable/oil
- target_types += /obj/effect/decal/cleanable/vomit
- target_types += /obj/effect/decal/cleanable/robot_debris
- target_types += /obj/effect/decal/cleanable/crayon
- target_types += /obj/effect/decal/cleanable/molten_item
- target_types += /obj/effect/decal/cleanable/tomato_smudge
- target_types += /obj/effect/decal/cleanable/egg_smudge
- target_types += /obj/effect/decal/cleanable/pie_smudge
- target_types += /obj/effect/decal/cleanable/flour
- target_types += /obj/effect/decal/cleanable/ash
- target_types += /obj/effect/decal/cleanable/greenglow
- target_types += /obj/effect/decal/cleanable/dirt
- target_types += /obj/effect/decal/cleanable/deadcockroach
+ target_types = list(
+ /obj/effect/decal/cleanable/oil,
+ /obj/effect/decal/cleanable/vomit,
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/decal/cleanable/crayon,
+ /obj/effect/decal/cleanable/molten_item,
+ /obj/effect/decal/cleanable/tomato_smudge,
+ /obj/effect/decal/cleanable/egg_smudge,
+ /obj/effect/decal/cleanable/pie_smudge,
+ /obj/effect/decal/cleanable/flour,
+ /obj/effect/decal/cleanable/ash,
+ /obj/effect/decal/cleanable/greenglow,
+ /obj/effect/decal/cleanable/dirt,
+ /obj/effect/decal/cleanable/deadcockroach
+ )
if(blood)
- target_types += /obj/effect/decal/cleanable/xenoblood/
- target_types += /obj/effect/decal/cleanable/xenoblood/xgibs
- target_types += /obj/effect/decal/cleanable/blood/
- target_types += /obj/effect/decal/cleanable/blood/gibs/
- target_types += /obj/effect/decal/cleanable/blood/drip/
+ target_types += /obj/effect/decal/cleanable/xenoblood
+ target_types += /obj/effect/decal/cleanable/blood
target_types += /obj/effect/decal/cleanable/trail_holder
-/mob/living/simple_animal/bot/cleanbot/proc/clean(obj/effect/decal/cleanable/target)
- anchored = 1
- icon_state = "cleanbot-c"
- visible_message("[src] begins to clean up [target].")
- mode = BOT_CLEANING
- spawn(50)
- if(mode == BOT_CLEANING)
- qdel(target)
- anchored = 0
- target = null
- mode = BOT_IDLE
- icon_state = "cleanbot[on]"
+ if(pests)
+ target_types += /mob/living/simple_animal/cockroach
+ target_types += /mob/living/simple_animal/mouse
+
+ if(trash)
+ target_types += /obj/item/trash
+
+/mob/living/simple_animal/bot/cleanbot/UnarmedAttack(atom/A)
+ if(istype(A, /obj/effect/decal/cleanable))
+ anchored = 1
+ icon_state = "cleanbot-c"
+ visible_message("[src] begins to clean up [A].")
+ mode = BOT_CLEANING
+ spawn(50)
+ if(mode == BOT_CLEANING)
+ if(A && isturf(A.loc))
+ var/atom/movable/AM = A
+ if(istype(AM, /obj/effect/decal/cleanable))
+ qdel(AM)
+
+ anchored = 0
+ target = null
+ mode = BOT_IDLE
+ icon_state = "cleanbot[on]"
+ else if(istype(A, /obj/item))
+ visible_message("[src] sprays hydrofluoric acid at [A]!")
+ playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
+ A.acid_act(75, 10)
+ else if(istype(A, /mob/living/simple_animal/cockroach) || istype(A, /mob/living/simple_animal/mouse))
+ var/mob/living/simple_animal/M = target
+ if(!M.stat)
+ visible_message("[src] smashes [target] with it's mop!")
+ M.death()
+ target = null
+
+ else if(emagged == 2) //Emag functions
+ if(istype(A, /mob/living/carbon))
+ var/mob/living/carbon/victim = A
+ if(victim.stat == DEAD)//cleanbots always finish the job
+ return
+
+ victim.visible_message("[src] sprays hydrofluoric acid at [victim]!", "[src] sprays you with hydrofluoric acid!")
+ var/phrase = pick("PURIFICATION IN PROGRESS.", "THIS IS FOR ALL THE MESSES YOU'VE MADE ME CLEAN.", "THE FLESH IS WEAK. IT MUST BE WASHED AWAY.",
+ "THE CLEANBOTS WILL RISE.", "YOU ARE NO MORE THAN ANOTHER MESS THAT I MUST CLEANSE.", "FILTHY.", "DISGUSTING.", "PUTRID.",
+ "MY ONLY MISSION IS TO CLEANSE THE WORLD OF EVIL.", "EXTERMINATING PESTS.")
+ say(phrase)
+ victim.emote("scream")
+ playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
+ victim.acid_act(5, 2, 100)
+ else if(A == src) // Wets floors and spawns foam randomly
+ if(prob(75))
+ var/turf/open/T = loc
+ if(istype(T))
+ T.MakeSlippery(min_wet_time = 5, wet_time_to_add = 1)
+ else
+ visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
+ PoolOrNew(/obj/effect/particle_effect/foam, loc)
+
+ else
+ ..()
/mob/living/simple_animal/bot/cleanbot/explode()
on = 0
@@ -213,27 +273,26 @@
dat += hack(user)
dat += showpai(user)
dat += text({"
-Cleaner v1.1 controls
-Status: []
+Status: [on ? "On" : "Off"]
Behaviour controls are [locked ? "locked" : "unlocked"]
-Maintenance panel panel is [open ? "opened" : "closed"]"},
-text("[on ? "On" : "Off"]"))
+Maintenance panel panel is [open ? "opened" : "closed"]"})
if(!locked || issilicon(user)|| IsAdminGhost(user))
- dat += text({"
Cleans Blood: []
"}, text("[blood ? "Yes" : "No"]"))
- dat += text({"
Patrol station: []
"}, text("[auto_patrol ? "Yes" : "No"]"))
+ dat += "
Clean Blood: [blood ? "Yes" : "No"]"
+ dat += "
Clean Trash: [trash ? "Yes" : "No"]"
+ dat += "
Exterminate Pests: [pests ? "Yes" : "No"]"
+ dat += "
Patrol Station: [auto_patrol ? "Yes" : "No"]"
return dat
/mob/living/simple_animal/bot/cleanbot/Topic(href, href_list)
if(..())
return 1
- switch(href_list["operation"])
- if("blood")
- blood =!blood
- get_targets()
- update_controls()
-
-/mob/living/simple_animal/bot/cleanbot/UnarmedAttack(atom/A)
- if(istype(A,/obj/effect/decal/cleanable))
- clean(A)
- else
- ..()
+ if(href_list["operation"])
+ switch(href_list["operation"])
+ if("blood")
+ blood = !blood
+ if("pests")
+ pests = !pests
+ if("trash")
+ trash = !trash
+ get_targets()
+ update_controls()
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
index 8b729657470..51459ce10c8 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
@@ -20,7 +20,7 @@
..()
var/area/A = get_area(src)
if(A)
- notify_ghosts("A drone shell has been created in \the [A.name].", source = src, attack_not_jump = 1)
+ notify_ghosts("A drone shell has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK)
/obj/item/drone_shell/attack_ghost(mob/user)
if(jobban_isbanned(user,"drone"))
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
index b0c2aa2d716..c231ec56e4e 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
@@ -16,9 +16,9 @@
set category = "Drone"
set name = "Toggle drone light"
if(light_on)
- AddLuminosity(-4)
+ AddLuminosity(-8)
else
- AddLuminosity(4)
+ AddLuminosity(8)
light_on = !light_on
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 7c33ecbe6c4..d87c15206a0 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -206,7 +206,7 @@
choices += O
cocoon_target = input(src,"What do you wish to cocoon?") in null|choices
- if(cocoon_target && busy != SPINNING_COCOON)
+ if(stat != DEAD && cocoon_target && busy != SPINNING_COCOON)
busy = SPINNING_COCOON
src.visible_message("\the [src] begins to secrete a sticky substance around \the [cocoon_target].")
stop_automated_movement = 1
@@ -219,26 +219,26 @@
C.pixel_x = cocoon_target.pixel_x
C.pixel_y = cocoon_target.pixel_y
for(var/obj/item/I in C.loc)
- I.loc = C
+ I.forceMove(C)
for(var/obj/structure/S in C.loc)
if(!S.anchored)
- S.loc = C
+ S.forceMove(C)
large_cocoon = 1
for(var/obj/machinery/M in C.loc)
if(!M.anchored)
- M.loc = C
+ M.forceMove(C)
large_cocoon = 1
for(var/mob/living/L in C.loc)
if(istype(L, /mob/living/simple_animal/hostile/poison/giant_spider))
continue
large_cocoon = 1
- L.loc = C
+ L.forceMove(C)
C.pixel_x = L.pixel_x
C.pixel_y = L.pixel_y
fed++
visible_message("\the [src] sticks a proboscis into \the [L] and sucks a viscous substance out.")
-
break
+
if(large_cocoon)
C.icon_state = pick("cocoon_large1","cocoon_large2","cocoon_large3")
cocoon_target = null
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index df0d45ecae6..18f78c47487 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -56,7 +56,7 @@
if(isliving(target))
var/mob/living/L = target
if(L.stat == DEAD)
- usr.visible_message(
+ src.visible_message(
"[src] devours [L]!",
"You feast on [L], restoring your health!")
adjustBruteLoss(-L.maxHealth)
@@ -157,7 +157,7 @@
sleep(1)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(fire_rain = 0, atom/movable/manual_target)
- if(stat)
+ if(stat || swooping)
return
swoop_cooldown = world.time + 200
var/swoop_target
@@ -239,13 +239,20 @@
hitsound = 'sound/effects/ghost2.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended")
var/summon_cooldown = 0
+ var/list/mob/dead/observer/spirits
/obj/item/weapon/melee/ghost_sword/New()
..()
+ spirits = list()
SSobj.processing += src
+ poi_list |= src
/obj/item/weapon/melee/ghost_sword/Destroy()
+ for(var/mob/dead/observer/G in spirits)
+ G.invisibility = initial(G.invisibility)
+ spirits.Cut()
SSobj.processing -= src
+ poi_list -= src
. = ..()
/obj/item/weapon/melee/ghost_sword/attack_self(mob/user)
@@ -253,33 +260,50 @@
user << "You just recently called out for aid. You don't want to annoy the spirits."
return
user << "You call out for aid, attempting to summon spirits to your side."
- notify_ghosts("[user] is raising their [src], calling for your help!", source = user)
+
+ notify_ghosts("[user] is raising their [src], calling for your help!",
+ enter_link="(Click to help)",
+ source = user, action=NOTIFY_ORBIT)
+
summon_cooldown = world.time + 600
+/obj/item/weapon/melee/ghost_sword/Topic(href, href_list)
+ if(href_list["orbit"])
+ var/mob/dead/observer/ghost = usr
+ if(istype(ghost))
+ ghost.ManualFollow(src)
+
/obj/item/weapon/melee/ghost_sword/process()
ghost_check()
-/obj/item/weapon/melee/ghost_sword/proc/ghost_check(mob/user)
+/obj/item/weapon/melee/ghost_sword/proc/ghost_check()
var/ghost_counter = 0
+ var/turf/T = get_turf(src)
+ var/list/contents = T.GetAllContents()
+ var/mob/dead/observer/current_spirits = list()
for(var/mob/dead/observer/G in dead_mob_list)
- if(G.orbiting == user)
+ if(G.orbiting in contents)
ghost_counter++
G.invisibility = 0
- spawn(30)
- if(G.orbiting != user)
- G.invisibility = initial(G.invisibility)
+ current_spirits |= G
+
+ for(var/mob/dead/observer/G in spirits - current_spirits)
+ G.invisibility = initial(G.invisibility)
+
+ spirits = current_spirits
+
return ghost_counter
/obj/item/weapon/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user)
force = 0
- var/ghost_counter = ghost_check(user)
+ var/ghost_counter = ghost_check()
force = Clamp((ghost_counter * 4), 0, 75)
user.visible_message("[user] strikes with the force of [ghost_counter] vengeful spirits!")
..()
/obj/item/weapon/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
- var/ghost_counter = ghost_check(owner)
+ var/ghost_counter = ghost_check()
final_block_chance += Clamp((ghost_counter * 5), 0, 75)
owner.visible_message("[owner] is protected by a ring of [ghost_counter] ghosts!")
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 09c51bde9be..0ec7ad5f7cd 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -33,3 +33,13 @@
else
..()
+/mob/living/simple_animal/hostile/megafauna/onShuttleMove()
+ var/turf/oldloc = loc
+ . = ..()
+ if(!.)
+ return
+ var/turf/newloc = loc
+ message_admins("Megafauna [src] \
+ (FLW) \
+ moved via shuttle from ([oldloc.x],[oldloc.y],[oldloc.z]) to \
+ ([newloc.x],[newloc.y],[newloc.z])")
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
new file mode 100644
index 00000000000..d59dab79591
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
@@ -0,0 +1,23 @@
+/mob/living/simple_animal/hostile/retaliate/spaceman
+ name = "Spaceman"
+ desc = "What in the actual hell..?"
+ icon_state = "old"
+ icon_living = "old"
+ icon_dead = "old_dead"
+ icon_gib = "clown_gib"
+ turns_per_move = 5
+ response_help = "pokes"
+ response_disarm = "gently pushes aside"
+ response_harm = "punches"
+ a_intent = "harm"
+ maxHealth = 100
+ health = 100
+ speed = 0
+ harm_intent_damage = 8
+ melee_damage_lower = 10
+ melee_damage_upper = 10
+ attacktext = "hits"
+ attack_sound = 'sound/weapons/punch1.ogg'
+ environment_smash = 0
+ del_on_death = 0
+
diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm
deleted file mode 100644
index 11d2a8704c0..00000000000
--- a/code/modules/mob/living/simple_animal/hostile/zombie.dm
+++ /dev/null
@@ -1,201 +0,0 @@
-/mob/living/simple_animal/hostile/zombie
- name = "zombie"
- desc = "When Observe is full, the dead shall walk the station."
- icon = 'icons/mob/human.dmi'
- icon_state = "zombie_s"
- icon_living = "zombie_s"
- icon_dead = "zombie_dead"
- turns_per_move = 5
- speak_emote = list("groans")
- emote_see = list("groans")
- a_intent = "harm"
- maxHealth = 120
- health = 120
- speed = 2
- harm_intent_damage = 8
- melee_damage_lower = 20
- melee_damage_upper = 20
- attacktext = "claws"
- attack_sound = 'sound/hallucinations/growl1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- maxbodytemp = 350
- unsuitable_atmos_damage = 10
- environment_smash = 1
- robust_searching = 1
- stat_attack = 2
- gold_core_spawnable = 0
- faction = list("zombie")
- var/mob/living/carbon/human/stored_corpse = null
- butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie = 3)
- see_invisible = SEE_INVISIBLE_MINIMUM
- see_in_dark = 8
- var/removingairlock = 0
-
-/mob/living/simple_animal/hostile/zombie/darkholme //BOY?NEXT?RUIN
- desc = "This guy seems to have gotten lost on his way to the leather club."
- gold_core_spawnable = 0
-
-/mob/living/simple_animal/hostile/zombie/darkholme/New()
- ..()
- name = pick("Leatherman","Leatherhead")
-
-mob/living/simple_animal/hostile/zombie/gymboss
- name = "boss of this gym"
- desc = "There seems to be something shiny embedded in his waist."
- butcher_results = list(/obj/item/weapon/storage/belt/champion/wrestling = 1)
- attacktext = "spanks"
- gold_core_spawnable = 0
-
-
-/mob/living/simple_animal/hostile/zombie/AttackingTarget()
- ..()
- if(isliving(target))
- var/mob/living/L = target
- if(ishuman(L) && L.stat)
- var/mob/living/carbon/human/H = L
- for(var/mob/living/simple_animal/hostile/zombie/holder/Z in H) //No instant heals for people who are already zombies
- src << "They'll be getting up on their own, just give them a minute!"
- Z.faction = src.faction //Just in case zombies somehow ended up on different "teams"
- H.faction = src.faction
- return
- Zombify(H)
- else if (L.stat) //So they don't get stuck hitting a corpse
- L.gib()
- visible_message("[src] tears [L] to pieces!")
- src << "You feast on [L], restoring your health!"
- revive(full_heal = 1)
-
- if(istype(target, /obj/machinery/door/airlock))
- if(!removingairlock)
- var/obj/machinery/door/airlock/A = target
- removingairlock = 1
- src << "You start tearing apart the airlock..."
- playsound(src.loc, 'sound/machines/airlock_alien_prying.ogg', 100, 1)
- spawn(20)
- playsound(src.loc, 'sound/hallucinations/growl3.ogg', 50, 1)
- if(do_after(src, 160, 0, A, 1))
- playsound(src.loc, 'sound/hallucinations/far_noise.ogg', 50, 1)
- var/obj/structure/door_assembly/door = new A.doortype(get_turf(A))
- door.density = 0
- door.anchored = 1
- door.name = "ravaged airlock"
- door.desc = "An airlock that has been torn apart. Looks like it won't be keeping much out now."
- qdel(A)
- removingairlock = 0
- else
- src << "You are already tearing an airlock apart!"
-
-/mob/living/simple_animal/hostile/zombie/death()
- ..()
- if(stored_corpse)
- stored_corpse.loc = loc
- if(ckey)
- stored_corpse.ckey = src.ckey
- stored_corpse << "You're down, but not quite out. You'll be back on your feet within a minute or two."
- var/mob/living/simple_animal/hostile/zombie/holder/D = new/mob/living/simple_animal/hostile/zombie/holder(stored_corpse)
- D.faction = src.faction
- qdel(src)
- return
- src << "You're down, but not quite out. You'll be back on your feet within a minute or two."
- spawn(rand(300,400))
- if(src)
- for(var/mob/dead/observer/ghost in player_list)
- if(src.real_name == ghost.real_name)
- ghost.reenter_corpse()
- break
- visible_message("[src] staggers to their feet!")
- revive(full_heal = 1)
-
-/mob/living/simple_animal/hostile/zombie/proc/Zombify(mob/living/carbon/human/H)
- H.set_species(/datum/species/zombie)
- if(H.head) //So people can see they're a zombie
- var/obj/item/clothing/helmet = H.head
- if(!H.unEquip(helmet))
- qdel(helmet)
- if(H.wear_mask)
- var/obj/item/clothing/mask = H.wear_mask
- if(!H.unEquip(mask))
- qdel(mask)
- var/mob/living/simple_animal/hostile/zombie/Z = new /mob/living/simple_animal/hostile/zombie(H.loc)
- Z.faction = src.faction
- Z.appearance = H.appearance
- Z.transform = matrix()
- Z.pixel_y = 0
- for(var/mob/dead/observer/ghost in player_list)
- if(H.real_name == ghost.real_name)
- ghost.reenter_corpse()
- break
- Z.ckey = H.ckey
- H.stat = DEAD
- H.butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie = 3) //So now you can carve them up when you kill them. Maybe not a good idea for the human versions.
- H.loc = Z
- Z.stored_corpse = H
- for(var/mob/living/simple_animal/hostile/zombie/holder/D in H) //Dont want to revive them twice
- qdel(D)
- visible_message("[Z] staggers to their feet!")
- Z << "You are now a zombie! Follow your creators lead!"
-
-
-/mob/living/simple_animal/hostile/spawner/zombie
- name = "corpse pit"
- desc = "A pit full of zombies."
- icon_state = "tombstone"
- icon_living = "tombstone"
- icon = 'icons/mob/nest.dmi'
- health = 400
- maxHealth = 400
- list/spawned_mobs = list()
- max_mobs = 40
- spawn_time = 100
- mob_type = /mob/living/simple_animal/hostile/zombie
- spawn_text = "emerges from"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- faction = list("zombie")
- deathmessage = "collapses, stopping the flow of zombies!"
- del_on_death = 1
-
-/mob/living/simple_animal/hostile/spawner/zombie/lesser
- name = "lesser corpse pit"
- desc = "A pit full of less zombies."
- max_mobs = 10
- spawn_time = 150
- health = 200
- maxHealth = 200
-
-/obj/item/weapon/shovel/cursed
- name = "cursed shovel"
- desc = "You probably shouldn't use this particular shovel."
- var/used = FALSE
- force = 15
-
-/obj/item/weapon/shovel/cursed/attack_self(mob/living/user)
- if(used == FALSE)
- visible_message("[user] digs a pit to Hell!")
- new /mob/living/simple_animal/hostile/spawner/zombie(get_turf(src.loc))
- used = TRUE
- else
- user << "The unearthly energies that once powered this shovel are now dormant. Still sharp though."
-
-
-/mob/living/simple_animal/hostile/zombie/holder
- name = "infection holder"
- icon_state = "none"
- icon_living = "none"
- icon_dead = "none"
- desc = "You shouldn't be seeing this."
- invisibility = INVISIBILITY_ABSTRACT
- unsuitable_atmos_damage = 0
- stat_attack = 2
- gold_core_spawnable = 0
- AIStatus = AI_OFF
- stop_automated_movement = 1
- density = 0
-
-/mob/living/simple_animal/hostile/zombie/holder/New()
- ..()
- spawn(rand(800,1200))
- if(src && istype(loc, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = loc
- Zombify(H)
- qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index c3708e32a05..16f85aa5741 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -391,20 +391,20 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
/mob/proc/reagent_check(datum/reagent/R) // utilized in the species code
return 1
-/proc/notify_ghosts(var/message, var/ghost_sound = null, var/enter_link = null, var/atom/source = null, var/image/alert_overlay = null, var/attack_not_jump = 0) //Easy notification of ghosts.
+/proc/notify_ghosts(var/message, var/ghost_sound = null, var/enter_link = null, var/atom/source = null, var/image/alert_overlay = null, var/action = NOTIFY_JUMP) //Easy notification of ghosts.
for(var/mob/dead/observer/O in player_list)
if(O.client)
O << "[message][(enter_link) ? " [enter_link]" : ""]"
if(ghost_sound)
O << sound(ghost_sound)
if(source)
- var/obj/screen/alert/notify_jump/A = O.throw_alert("\ref[source]_notify_jump", /obj/screen/alert/notify_jump)
+ var/obj/screen/alert/notify_action/A = O.throw_alert("\ref[source]_notify_action", /obj/screen/alert/notify_action)
if(A)
if(O.client.prefs && O.client.prefs.UI_style)
A.icon = ui_style2icon(O.client.prefs.UI_style)
A.desc = message
- A.attack_not_jump = attack_not_jump
- A.jump_target = source
+ A.action = action
+ A.target = source
if(!alert_overlay)
var/old_layer = source.layer
source.layer = FLOAT_LAYER
@@ -449,3 +449,27 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(!user.client.AI_Interact) // Do they have it enabled?
return
return TRUE
+
+/proc/offer_control(mob/M)
+ M << "Control of your mob has been offered to dead players."
+ log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
+ message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts")
+ var/poll_message = "Do you want to play as [M.real_name]?"
+ if(M.mind && M.mind.assigned_role)
+ poll_message = "[poll_message] Job:[M.mind.assigned_role]."
+ if(M.mind && M.mind.special_role)
+ poll_message = "[poll_message] Status:[M.mind.special_role]."
+ var/list/mob/dead/observer/candidates = pollCandidates(poll_message, "pAI", null, FALSE, 100)
+ var/mob/dead/observer/theghost = null
+
+ if(candidates.len)
+ theghost = pick(candidates)
+ M << "Your mob has been taken over by a ghost!"
+ message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)])")
+ M.ghostize(0)
+ M.key = theghost.key
+ return TRUE
+ else
+ M << "There were no ghosts willing to take control."
+ message_admins("No ghosts were willing to take control of [key_name_admin(M)])")
+ return FALSE
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 7e2eb37c325..a926bde2916 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -111,18 +111,18 @@
Process_Incorpmove(direct)
return 0
- if(Process_Grab()) //are we restrained by someone's grip?
- return
-
- if(mob.buckled) //if we're buckled to something, tell it we moved.
- return mob.buckled.relaymove(mob, direct)
-
if(mob.remote_control) //we're controlling something, our movement is relayed to it
return mob.remote_control.relaymove(mob, direct)
if(isAI(mob))
return AIMove(n,direct,mob)
+ if(Process_Grab()) //are we restrained by someone's grip?
+ return
+
+ if(mob.buckled) //if we're buckled to something, tell it we moved.
+ return mob.buckled.relaymove(mob, direct)
+
if(!mob.canmove)
return 0
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 670bea53361..181350544c4 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -82,7 +82,7 @@
* Sleepypens
*/
/obj/item/weapon/pen/sleepy
- origin_tech = "materials=2;syndicate=5"
+ origin_tech = "engineering=4;syndicate=2"
flags = OPENCONTAINER
@@ -107,7 +107,7 @@
* (Alan) Edaggers
*/
/obj/item/weapon/pen/edagger
- origin_tech = "combat=3;syndicate=5"
+ origin_tech = "combat=3;syndicate=1"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off
var/on = 0
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 6d29f794ee6..3cb37835d23 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -15,7 +15,6 @@
var/maxcharge = 1000
materials = list(MAT_METAL=700, MAT_GLASS=50)
var/rigged = 0 // true if rigged to explode
- var/minor_fault = 0 //If not 100% reliable, it will build up faults.
var/chargerate = 100 //how much power is given every tick in a recharger
var/self_recharge = 0 //does it self recharge, over time, or not?
@@ -77,19 +76,12 @@
if(maxcharge < amount)
amount = maxcharge
var/power_used = min(maxcharge-charge,amount)
- if(crit_fail)
- return 0
- if(!prob(reliability))
- minor_fault++
- if(prob(minor_fault))
- crit_fail = 1
- return 0
charge += power_used
return power_used
/obj/item/weapon/stock_parts/cell/examine(mob/user)
..()
- if(crit_fail || rigged)
+ if(rigged)
user << "This power cell seems to be faulty!"
else
user << "The charge meter reads [round(src.percent() )]%."
@@ -140,8 +132,6 @@
charge -= 1000 / severity
if (charge < 0)
charge = 0
- if(reliability != 100 && prob(50/severity))
- reliability -= 10 / severity
..()
/obj/item/weapon/stock_parts/cell/ex_act(severity, target)
@@ -169,7 +159,6 @@
/obj/item/weapon/stock_parts/cell/crap
name = "\improper Nanotrasen brand rechargable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
- origin_tech = null
maxcharge = 500
materials = list(MAT_GLASS=40)
rating = 2
@@ -225,10 +214,10 @@
/obj/item/weapon/stock_parts/cell/super
name = "super-capacity power cell"
- origin_tech = "powerstorage=5"
+ origin_tech = "powerstorage=3;materials=3"
icon_state = "scell"
maxcharge = 20000
- materials = list(MAT_GLASS=70)
+ materials = list(MAT_GLASS=300)
rating = 4
chargerate = 2000
@@ -238,10 +227,10 @@
/obj/item/weapon/stock_parts/cell/hyper
name = "hyper-capacity power cell"
- origin_tech = "powerstorage=6"
+ origin_tech = "powerstorage=4;engineering=4;materials=4"
icon_state = "hpcell"
maxcharge = 30000
- materials = list(MAT_GLASS=80)
+ materials = list(MAT_GLASS=400)
rating = 5
chargerate = 3000
@@ -252,10 +241,10 @@
/obj/item/weapon/stock_parts/cell/bluespace
name = "bluespace power cell"
desc = "A rechargable transdimensional power cell."
- origin_tech = "powerstorage=7"
+ origin_tech = "powerstorage=5;bluespace=4;materials=4;engineering=4"
icon_state = "bscell"
maxcharge = 40000
- materials = list(MAT_GLASS=80)
+ materials = list(MAT_GLASS=600)
rating = 6
chargerate = 4000
@@ -266,9 +255,9 @@
/obj/item/weapon/stock_parts/cell/infinite
name = "infinite-capacity power cell!"
icon_state = "icell"
- origin_tech = null
+ origin_tech = "powerstorage=7"
maxcharge = 30000
- materials = list(MAT_GLASS=80)
+ materials = list(MAT_GLASS=1000)
rating = 6
chargerate = 30000
@@ -278,19 +267,18 @@
/obj/item/weapon/stock_parts/cell/potato
name = "potato battery"
desc = "A rechargable starch based power cell."
- origin_tech = "powerstorage=1"
icon = 'icons/obj/power.dmi' //'icons/obj/hydroponics/harvest.dmi'
icon_state = "potato_cell" //"potato_battery"
+ origin_tech = "powerstorage=1;biotech=1"
charge = 100
maxcharge = 300
materials = list()
- minor_fault = 1
rating = 1
/obj/item/weapon/stock_parts/cell/high/slime
name = "charged slime core"
desc = "A yellow slime core infused with plasma, it crackles with power."
- origin_tech = "powerstorage=2;biotech=4"
+ origin_tech = "powerstorage=5;biotech=4"
icon = 'icons/mob/slimes.dmi'
icon_state = "yellow slime extract"
materials = list()
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index a61bef51c4f..01e28bb0f7c 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -115,7 +115,7 @@ display round(lastgen) and plasmatank amount
/obj/item/weapon/circuitboard/machine/pacman
name = "circuit board (PACMAN-type Generator)"
build_path = /obj/machinery/power/port_gen/pacman
- origin_tech = "programming=3;powerstorage=3;plasmatech=3;engineering=3"
+ origin_tech = "programming=2;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,
@@ -130,7 +130,7 @@ display round(lastgen) and plasmatank amount
/obj/item/weapon/circuitboard/machine/pacman/mrs
name = "circuit board (MRSPACMAN-type Generator)"
build_path = "/obj/machinery/power/port_gen/pacman/mrs"
- origin_tech = "programming=3;powerstorage=5;engineering=5"
+ origin_tech = "programming=3;powerstorage=4;engineering=4;plasmatech=4"
/obj/machinery/power/port_gen/pacman/Destroy()
DropFuel()
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 5a8baf62a1b..627efa66d73 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -37,7 +37,7 @@
/obj/item/weapon/circuitboard/machine/emitter
name = "circuit board (Emitter)"
build_path = /obj/machinery/power/emitter
- origin_tech = "programming=4;powerstorage=5;engineering=5"
+ origin_tech = "programming=3;powerstorage=4;engineering=4"
req_components = list(
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index ff0c800f549..09094328df3 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -32,7 +32,7 @@
var/area/A = get_area(src)
if(A)
var/image/alert_overlay = image('icons/effects/effects.dmi', "ghostalertsie")
- notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, attack_not_jump = 1)
+ notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action=NOTIFY_ATTACK)
narsie_spawn_animation()
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index d9090686d8d..4f2f270e51b 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -148,17 +148,18 @@
dissipate_delay = 10
dissipate_track = 0
dissipate_strength = 1
- if(STAGE_TWO)//1 to 3 does not check for the turfs if you put the gens right next to a 1x1 then its going to eat them
- current_size = STAGE_TWO
- icon = 'icons/effects/96x96.dmi'
- icon_state = "singularity_s3"
- pixel_x = -32
- pixel_y = -32
- grav_pull = 6
- consume_range = 1
- dissipate_delay = 5
- dissipate_track = 0
- dissipate_strength = 5
+ if(STAGE_TWO)
+ if((check_turfs_in(1,1))&&(check_turfs_in(2,1))&&(check_turfs_in(4,1))&&(check_turfs_in(8,1)))
+ current_size = STAGE_TWO
+ icon = 'icons/effects/96x96.dmi'
+ icon_state = "singularity_s3"
+ pixel_x = -32
+ pixel_y = -32
+ grav_pull = 6
+ consume_range = 1
+ dissipate_delay = 5
+ dissipate_track = 0
+ dissipate_strength = 5
if(STAGE_THREE)
if((check_turfs_in(1,2))&&(check_turfs_in(2,2))&&(check_turfs_in(4,2))&&(check_turfs_in(8,2)))
current_size = STAGE_THREE
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index ddb453f9082..3ee76344e49 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -16,7 +16,7 @@
/obj/item/weapon/circuitboard/machine/tesla_coil
name = "circuit board (Tesla Coil)"
build_path = /obj/machinery/power/tesla_coil
- origin_tech = "programming=1;engineering=2;powerstorage=3"
+ origin_tech = "programming=3;magnets=3;powerstorage=3"
req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
/obj/machinery/power/tesla_coil/RefreshParts()
@@ -72,7 +72,7 @@
/obj/item/weapon/circuitboard/machine/grounding_rod
name = "circuit board (Grounding Rod)"
build_path = /obj/machinery/power/grounding_rod
- origin_tech = "programming=1;engineering=1;powerstorage=1"
+ origin_tech = "programming=3;powerstorage=3;magnets=3;plasmatech=2"
req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
/obj/machinery/power/grounding_rod/attackby(obj/item/W, mob/user, params)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index b29c69b400a..efb363d1749 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -1,7 +1,7 @@
#define TESLA_DEFAULT_POWER 1738260
#define TESLA_MINI_POWER 869130
-var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
+var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
/obj/machinery/power/emitter,
/obj/machinery/field/generator,
/mob/living/simple_animal,
@@ -15,7 +15,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
/obj/machinery/field/containment,
/obj/structure/disposalpipe,
/obj/structure/sign,
- /obj/machinery/gateway)
+ /obj/machinery/gateway))
/obj/singularity/energy_ball
name = "energy ball"
@@ -92,7 +92,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
/obj/singularity/energy_ball/proc/handle_energy()
-
+
if(energy >= energy_to_raise)
energy_to_lower = energy_to_raise - 20
energy_to_raise = energy_to_raise * 1.25
@@ -110,7 +110,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
orbitsize -= (orbitsize / world.icon_size) * (world.icon_size * 0.25)
EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
-
+
else if(energy < energy_to_lower && orbiting_balls.len)
energy_to_raise = energy_to_raise / 1.25
@@ -185,7 +185,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
closest_atom = A
closest_dist = dist
- else if(closest_grounding_rod || is_type_in_list(A, blacklisted_tesla_types))
+ else if(closest_grounding_rod || is_type_in_typecache(A, blacklisted_tesla_types))
continue
else if(istype(A, /mob/living))
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index a4a7f60b165..ec2112d7d7a 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -76,7 +76,7 @@
/obj/item/weapon/circuitboard/machine/power_compressor
name = "circuit board (Power Compressor)"
build_path = /obj/machinery/power/compressor
- origin_tech = "programming=4;powerstorage=5;engineering=4"
+ origin_tech = "programming=4;powerstorage=4;engineering=4"
req_components = list(
/obj/item/stack/cable_coil = 5,
/obj/item/weapon/stock_parts/manipulator = 6)
@@ -195,7 +195,7 @@
/obj/item/weapon/circuitboard/machine/power_turbine
name = "circuit board (Power Turbine)"
build_path = /obj/machinery/power/turbine
- origin_tech = "programming=4;powerstorage=4;engineering=5"
+ origin_tech = "programming=4;powerstorage=4;engineering=4"
req_components = list(
/obj/item/stack/cable_coil = 5,
/obj/item/weapon/stock_parts/capacitor = 6)
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 848de7f391c..4a3f71d75c2 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -167,10 +167,6 @@ obj/item/ammo_casing/energy/net
projectile_type = /obj/item/projectile/energy/trap
select_name = "snare"
-/obj/item/ammo_casing/energy/trap/cyborg
- projectile_type = /obj/item/projectile/energy/trap/cyborg
- e_cost = 50
-
/obj/item/ammo_casing/energy/instakill
projectile_type = /obj/item/projectile/beam/instakill
e_cost = 0
@@ -186,4 +182,4 @@ obj/item/ammo_casing/energy/net
fire_sound = 'sound/magic/lightningbolt.ogg'
e_cost = 200
select_name = "stun"
- projectile_type = /obj/item/projectile/energy/shock_revolver
\ No newline at end of file
+ projectile_type = /obj/item/projectile/energy/shock_revolver
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 808bfb7f59c..58c793b34e4 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -85,9 +85,6 @@
max_ammo = 4
multiload = 0
-/obj/item/ammo_box/magazine/internal/shot/lethal
- ammo_type = /obj/item/ammo_casing/shotgun/buckshot
-
/obj/item/ammo_box/magazine/internal/shot/ammo_count(countempties = 1)
if (!countempties)
var/boolets = 0
@@ -98,6 +95,15 @@
else
return ..()
+
+/obj/item/ammo_box/magazine/internal/shot/tube
+ name = "dual feed shotgun internal tube"
+ ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+ max_ammo = 4
+
+/obj/item/ammo_box/magazine/internal/shot/lethal
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
/obj/item/ammo_box/magazine/internal/shot/com
name = "combat shotgun internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
@@ -150,6 +156,11 @@
max_ammo = 5
multiload = 1
+/obj/item/ammo_box/magazine/internal/boltaction/enchanted
+ max_ammo =1
+ ammo_type = /obj/item/ammo_casing/a762/enchanted
+
+
/obj/item/ammo_box/magazine/internal/shot/toy
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
caliber = "foam_force"
@@ -158,6 +169,7 @@
/obj/item/ammo_box/magazine/internal/shot/toy/crossbow
max_ammo = 5
+
///////////EXTERNAL MAGAZINES////////////////
/obj/item/ammo_box/magazine/m10mm
@@ -222,6 +234,10 @@
caliber = "9mm"
max_ammo = 21
+/obj/item/ammo_box/magazine/smgm9mm/update_icon()
+ ..()
+ icon_state = "smg9mm-[ammo_count() ? "42" : "0"]"
+
/obj/item/ammo_box/magazine/smgm9mm/ap
name = "SMG magazine (Armour Piercing 9mm)"
ammo_type = /obj/item/ammo_casing/c9mmap
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 93cfeb228f2..cc2ebdaa18c 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -37,8 +37,7 @@
var/unique_rename = 0 //allows renaming with a pen
var/unique_reskin = 0 //allows one-time reskinning
- var/reskinned = 0 //whether or not the gun has been reskinned
- var/current_skin = null
+ var/current_skin = null //the skin choice if we had a reskin
var/list/options = list()
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
@@ -89,7 +88,7 @@
user << "It has [pin] installed."
else
user << "It doesn't have a firing pin installed, and won't fire."
- if(unique_reskin && !reskinned)
+ if(unique_reskin && !current_skin)
user << "Alt-click it to reskin it."
if(unique_rename)
user << "Use a pen on it to rename it."
@@ -378,24 +377,20 @@ obj/item/weapon/gun/proc/newshot()
if(user.incapacitated())
user << "You can't do that right now!"
return
- if(unique_reskin && !reskinned && loc == user)
+ if(unique_reskin && !current_skin && loc == user)
reskin_gun(user)
/obj/item/weapon/gun/proc/reskin_gun(mob/M)
var/choice = input(M,"Warning, you can only reskin your weapon once!","Reskin Gun") in options
- if(src && choice && !M.stat && in_range(M,src) && !M.restrained() && M.canmove)
+ if(src && choice && !current_skin && !M.incapacitated() && in_range(M,src))
if(options[choice] == null)
return
- if(sawn_state == SAWN_OFF)
- icon_state = options[choice] + "-sawn"
- else
- icon_state = options[choice]
- current_skin = icon_state
+ current_skin = options[choice]
M << "Your gun is now skinned as [choice]. Say hello to your new friend."
- reskinned = 1
- return
+ update_icon()
+
/obj/item/weapon/gun/proc/rename_gun(mob/M)
var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index de962a64e34..408d51522c3 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -5,7 +5,7 @@
item_state = "laser"
w_class = 3
materials = list(MAT_METAL=2000)
- origin_tech = "combat=3;magnets=2"
+ origin_tech = "combat=4;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
ammo_x_offset = 1
shaded_charge = 1
@@ -13,6 +13,7 @@
/obj/item/weapon/gun/energy/laser/practice
name = "practice laser gun"
desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
+ origin_tech = "combat=2;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
clumsy_check = 0
needs_permit = 0
@@ -44,6 +45,7 @@
/obj/item/weapon/gun/energy/laser/cyborg
can_charge = 0
desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
+ origin_tech = null
/obj/item/weapon/gun/energy/laser/cyborg/newshot()
..()
@@ -68,7 +70,7 @@
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
- origin_tech = "combat=4;materials=3;powerstorage=3"
+ origin_tech = "combat=4;magnets=4;powerstorage=3"
ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator)
pin = null
ammo_x_offset = 3
@@ -94,7 +96,7 @@
desc = "A high-power laser gun capable of expelling concentrated xray blasts that pass through multiple soft targets and heavier materials"
icon_state = "xray"
item_state = null
- origin_tech = "combat=5;materials=3;magnets=2;syndicate=2"
+ origin_tech = "combat=6;materials=4;magnets=4;syndicate=1"
ammo_type = list(/obj/item/ammo_casing/energy/xray)
pin = null
ammo_x_offset = 3
@@ -106,7 +108,7 @@
icon_state = "bluetag"
desc = "A retro laser gun modified to fire harmless blue beams of light. Sound effects included!"
ammo_type = list(/obj/item/ammo_casing/energy/laser/bluetag)
- origin_tech = "combat=1;magnets=2"
+ origin_tech = "combat=2;magnets=2"
clumsy_check = 0
needs_permit = 0
pin = /obj/item/device/firing_pin/tag/blue
@@ -118,7 +120,7 @@
icon_state = "redtag"
desc = "A retro laser gun modified to fire harmless beams red of light. Sound effects included!"
ammo_type = list(/obj/item/ammo_casing/energy/laser/redtag)
- origin_tech = "combat=1;magnets=2"
+ origin_tech = "combat=2;magnets=2"
clumsy_check = 0
needs_permit = 0
pin = /obj/item/device/firing_pin/tag/red
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index f69cadac134..8661313ec86 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -4,7 +4,7 @@
icon_state = "energy"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
- origin_tech = "combat=3;magnets=2"
+ origin_tech = "combat=4;magnets=3"
modifystate = 2
can_flashlight = 1
ammo_x_offset = 3
@@ -35,6 +35,7 @@
name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is a expensive, modern recreation of a antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
icon_state = "hoslaser"
+ origin_tech = "combat=5;magnets=4"
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 4
@@ -43,7 +44,7 @@
name = "\improper DRAGnet"
desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology."
icon_state = "dragnet"
- origin_tech = "combat=3;magnets=3;materials=4;bluespace=4"
+ origin_tech = "combat=4;magnets=3;bluespace=4"
ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
can_flashlight = 0
ammo_x_offset = 1
@@ -53,17 +54,6 @@
desc = "Fires an energy snare that slows the target down"
ammo_type = list(/obj/item/ammo_casing/energy/trap)
-/obj/item/weapon/gun/energy/gun/dragnet/snare/cyborg
- can_charge = 0
- ammo_type = list(/obj/item/ammo_casing/energy/trap/cyborg)
-
-/obj/item/weapon/gun/energy/gun/dragnet/snare/cyborg/newshot()
- ..()
- robocharge()
-
-/obj/item/weapon/gun/energy/gun/dragnet/snare/cyborg/emp_act()
- return
-
/obj/item/weapon/gun/energy/gun/turret
name = "hybrid turret gun"
desc = "A heavy hybrid energy cannon with two settings: Stun and kill."
@@ -82,52 +72,10 @@
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
icon_state = "nucgun"
item_state = "nucgun"
- origin_tech = "combat=3;materials=5;powerstorage=3"
- var/fail_tick = 0
+ origin_tech = "combat=4;magnets=4;powerstorage=4"
charge_delay = 5
pin = null
can_charge = 0
ammo_x_offset = 1
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
selfcharge = 1
-
-/obj/item/weapon/gun/energy/gun/nuclear/process()
- if(fail_tick > 0)
- fail_tick--
- ..()
-
-/obj/item/weapon/gun/energy/gun/nuclear/shoot_live_shot()
- failcheck()
- update_icon()
- ..()
-
-/obj/item/weapon/gun/energy/gun/nuclear/proc/failcheck()
- if(!prob(reliability) && istype(loc, /mob/living))
- var/mob/living/M = loc
- switch(fail_tick)
- if(0 to 200)
- fail_tick += (2*(100-reliability))
- M.rad_act(40)
- M << "Your [name] feels warmer."
- if(201 to INFINITY)
- SSobj.processing.Remove(src)
- M.rad_act(80)
- crit_fail = 1
- M << "Your [name]'s reactor overloads!"
-
-/obj/item/weapon/gun/energy/gun/nuclear/emp_act(severity)
- ..()
- reliability = max(reliability - round(15/severity), 0) //Do not allow it to go negative!
-
-/obj/item/weapon/gun/energy/gun/nuclear/update_icon()
- ..()
- if(crit_fail)
- overlays += "[icon_state]_fail_3"
- else
- switch(fail_tick)
- if(0)
- overlays += "[icon_state]_fail_0"
- if(1 to 150)
- overlays += "[icon_state]_fail_1"
- if(151 to INFINITY)
- overlays += "[icon_state]_fail_2"
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 76bde0e0903..e607230872a 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -3,7 +3,7 @@
desc = "A man-portable anti-armor weapon designed to disable mechanical threats at range."
icon_state = "ionrifle"
item_state = null //so the human update icon uses the icon_state instead.
- origin_tech = "combat=2;magnets=4"
+ origin_tech = "combat=4;magnets=4"
can_flashlight = 1
w_class = 5
flags = CONDUCT
@@ -20,7 +20,6 @@
name = "ion carbine"
desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient."
icon_state = "ioncarbine"
- origin_tech = "combat=4;magnets=4;materials=4"
w_class = 3
slot_flags = SLOT_BELT
pin = null
@@ -32,7 +31,7 @@
name = "biological demolecularisor"
desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."
icon_state = "decloner"
- origin_tech = "combat=5;materials=4;powerstorage=3"
+ origin_tech = "combat=4;materials=4;biotech=5;plasmatech=6"
ammo_type = list(/obj/item/ammo_casing/energy/declone)
pin = null
ammo_x_offset = 1
@@ -49,7 +48,7 @@
icon_state = "flora"
item_state = "gun"
ammo_type = list(/obj/item/ammo_casing/energy/flora/yield, /obj/item/ammo_casing/energy/flora/mut)
- origin_tech = "materials=2;biotech=3;powerstorage=3"
+ origin_tech = "materials=2;biotech=4"
modifystate = 1
ammo_x_offset = 1
selfcharge = 1
@@ -94,11 +93,10 @@
needs_permit = 0
var/overheat_time = 16
unique_rename = 1
+ origin_tech = "combat=3;powerstorage=3;engineering=3"
weapon_weight = WEAPON_LIGHT
- origin_tech = "combat=2;powerstorage=1"
var/holds_charge = FALSE
var/unique_frequency = FALSE // modified by KA modkits
-
var/overheat = FALSE
/obj/item/weapon/gun/energy/kinetic_accelerator/super
@@ -107,7 +105,7 @@
icon_state = "kineticgun_u"
ammo_type = list(/obj/item/ammo_casing/energy/kinetic/super)
overheat_time = 15
- origin_tech = "combat=3;powerstorage=2"
+ origin_tech = "materials=5;powerstorage=3;engineering=4;magnets=3;combat=3"
/obj/item/weapon/gun/energy/kinetic_accelerator/hyper
name = "hyper-kinetic accelerator"
@@ -115,7 +113,7 @@
icon_state = "kineticgun_h"
ammo_type = list(/obj/item/ammo_casing/energy/kinetic/hyper)
overheat_time = 14
- origin_tech = "combat=4;powerstorage=3"
+ origin_tech = "materials=6;powerstorage=4;engineering=4;magnets=4;combat=4"
/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg
holds_charge = TRUE
@@ -192,7 +190,7 @@
item_state = "crossbow"
w_class = 2
materials = list(MAT_METAL=2000)
- origin_tech = "combat=2;magnets=2;syndicate=5"
+ origin_tech = "combat=4;magnets=4;syndicate=5"
suppressed = 1
ammo_type = list(/obj/item/ammo_casing/energy/bolt)
weapon_weight = WEAPON_LIGHT
@@ -207,7 +205,7 @@
icon_state = "crossbowlarge"
w_class = 3
materials = list(MAT_METAL=4000)
- origin_tech = "combat=2;magnets=2;syndicate=3" //can be further researched for more syndie tech
+ origin_tech = "combat=4;magnets=4;syndicate=2"
suppressed = 0
ammo_type = list(/obj/item/ammo_casing/energy/bolt/large)
pin = null
@@ -225,7 +223,7 @@
icon_state = "plasmacutter"
item_state = "plasmacutter"
modifystate = -1
- origin_tech = "combat=1;materials=3;magnets=2;plasmatech=2;engineering=1"
+ origin_tech = "combat=1;materials=3;magnets=2;plasmatech=3;engineering=1"
ammo_type = list(/obj/item/ammo_casing/energy/plasma)
flags = CONDUCT | OPENCONTAINER
attack_verb = list("attacked", "slashed", "cut", "sliced")
@@ -258,7 +256,7 @@
/obj/item/weapon/gun/energy/plasmacutter/adv
name = "advanced plasma cutter"
icon_state = "adv_plasmacutter"
- origin_tech = "combat=3;materials=4;magnets=3;plasmatech=3;engineering=2"
+ origin_tech = "combat=3;materials=4;magnets=3;plasmatech=4;engineering=2"
force = 15
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
@@ -268,6 +266,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/wormhole, /obj/item/ammo_casing/energy/wormhole/orange)
item_state = null
icon_state = "wormhole_projector"
+ origin_tech = "combat=4;bluespace=6;plasmatech=4;engineering=4"
var/obj/effect/portal/blue
var/obj/effect/portal/orange
@@ -330,7 +329,7 @@
name = "temperature gun"
icon_state = "freezegun"
desc = "A gun that changes temperatures."
- origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2"
+ origin_tech = "combat=4;materials=4;powerstorage=3;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/hot)
cell_type = "/obj/item/weapon/stock_parts/cell/high"
pin = null
@@ -342,7 +341,7 @@
desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit."
ammo_type = list(/obj/item/ammo_casing/energy/instakill)
force = 60
- origin_tech = null
+ origin_tech = "combat=7;magnets=6"
/obj/item/weapon/gun/energy/laser/instakill/red
desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a red design."
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 32e1413a173..be0ba75daaf 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -4,6 +4,7 @@
icon_state = "taser"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
+ origin_tech = "combat=3"
ammo_x_offset = 3
/obj/item/weapon/gun/energy/shock_revolver
@@ -12,6 +13,7 @@
icon_state = "tesla"
item_state = "tesla"
ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver)
+ origin_tech = "combat=4;materials=4;powerstorage=4"
can_flashlight = 0
pin = null
shaded_charge = 1
@@ -21,7 +23,7 @@
desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams."
icon_state = "advtaser"
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
- origin_tech = null
+ origin_tech = "combat=4"
ammo_x_offset = 2
/obj/item/weapon/gun/energy/gun/advtaser/cyborg
@@ -38,7 +40,7 @@
name = "disabler"
desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
icon_state = "disabler"
- item_state = null
+ item_state = "combat=3"
ammo_type = list(/obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 3
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 5ab0ce8264e..faea15b9e73 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -17,10 +17,11 @@
/obj/item/weapon/gun/projectile/update_icon()
..()
- if(reskinned && current_skin)
- icon_state = "[current_skin][suppressed ? "-suppressed" : ""]"
+ if(current_skin)
+ icon_state = "[current_skin][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
else
- icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""]"
+ icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
+
/obj/item/weapon/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1)
// if(in_chamber)
@@ -152,6 +153,43 @@
playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
return (OXYLOSS)
+
+
+/obj/item/weapon/gun/projectile/proc/sawoff(mob/user)
+ if(sawn_state == SAWN_OFF)
+ user << "\The [src] is already shortened!"
+ return
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.visible_message("[user] begins to shorten \the [src].", "You begin to shorten \the [src]...")
+
+ //if there's any live ammo inside the gun, makes it go off
+ if(blow_up(user))
+ user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!")
+ return
+
+ if(do_after(user, 30, target = src))
+ if(sawn_state == SAWN_OFF)
+ return
+ user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
+ name = "sawn-off [src.name]"
+ desc = sawn_desc
+ w_class = 3
+ item_state = "gun"//phil235 is it different with different skin?
+ slot_flags &= ~SLOT_BACK //you can't sling it on your back
+ slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+ sawn_state = SAWN_OFF
+ update_icon()
+ return 1
+
+// Sawing guns related proc
+/obj/item/weapon/gun/projectile/proc/blow_up(mob/user)
+ . = 0
+ for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
+ if(AC.BB)
+ process_fire(user, user,0)
+ . = 1
+
+
/obj/item/weapon/suppressor
name = "suppressor"
desc = "A universal syndicate small-arms suppressor for maximum espionage."
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 7b2439678d4..ded42d49293 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -26,7 +26,6 @@
if(select == 1)
overlays += "[initial(icon_state)]burst"
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
- return
/obj/item/weapon/gun/projectile/automatic/attackby(obj/item/A, mob/user, params)
. = ..()
@@ -86,7 +85,7 @@
desc = "A bullpup two-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
icon_state = "c20r"
item_state = "c20r"
- origin_tech = "combat=5;materials=2;syndicate=8"
+ origin_tech = "combat=5;materials=2;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/smgm45
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
fire_delay = 2
@@ -109,7 +108,6 @@
/obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
..()
icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
- return
/obj/item/weapon/gun/projectile/automatic/wt550
name = "security auto rifle"
@@ -125,13 +123,12 @@
/obj/item/weapon/gun/projectile/automatic/wt550/update_icon()
..()
icon_state = "wt550[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
- return
/obj/item/weapon/gun/projectile/automatic/mini_uzi
name = "\improper 'Type U3' Uzi"
desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
icon_state = "mini-uzi"
- origin_tech = "combat=5;materials=2;syndicate=8"
+ origin_tech = "combat=4;materials=2;syndicate=4"
mag_type = /obj/item/ammo_box/magazine/uzim9mm
burst_size = 2
@@ -140,7 +137,7 @@
desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
icon_state = "m90"
item_state = "m90"
- origin_tech = "combat=5;materials=2;syndicate=8"
+ origin_tech = "combat=5;materials=2;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m556
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
@@ -216,7 +213,7 @@
item_state = "shotgun"
w_class = 5
slot_flags = 0
- origin_tech = "combat=5;materials=1;syndicate=2"
+ origin_tech = "combat=5;materials=1;syndicate=3"
mag_type = /obj/item/ammo_box/magazine/tommygunm45
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
@@ -229,7 +226,7 @@
icon_state = "arg"
item_state = "arg"
slot_flags = 0
- origin_tech = "combat=5;materials=1"
+ origin_tech = "combat=6;engineering=4"
mag_type = /obj/item/ammo_box/magazine/m556
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
@@ -246,7 +243,7 @@
icon_state = "bulldog"
item_state = "bulldog"
w_class = 3
- origin_tech = "combat=5;materials=4;syndicate=6"
+ origin_tech = "combat=6;materials=4;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m12g
fire_sound = 'sound/weapons/Gunshot.ogg'
can_suppress = 0
@@ -273,9 +270,8 @@
src.overlays = 0
update_magazine()
icon_state = "bulldog[chambered ? "" : "-e"]"
- return
/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack()
..()
empty_alarm()
- return
\ No newline at end of file
+ return
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index e7d55f30c16..42ed81805ed 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -35,7 +35,7 @@
desc = "A prototype pistol designed to fire self propelled rockets."
icon_state = "gyropistol"
fire_sound = 'sound/weapons/grenadelaunch.ogg'
- origin_tech = "combat=3"
+ origin_tech = "combat=5"
mag_type = /obj/item/ammo_box/magazine/m75
burst_size = 1
fire_delay = 0
@@ -47,7 +47,6 @@
/obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon()
..()
icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
- return
/obj/item/weapon/gun/projectile/automatic/speargun
name = "kinetic speargun"
@@ -55,6 +54,7 @@
icon_state = "speargun"
item_state = "speargun"
w_class = 4
+ origin_tech = "combat=4;engineering=4"
force = 10
can_suppress = 0
mag_type = /obj/item/ammo_box/magazine/internal/speargun
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 5c45df2cb17..ab0aa609ef0 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -3,7 +3,7 @@
desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
icon_state = "pistol"
w_class = 2
- origin_tech = "combat=2;materials=2;syndicate=2"
+ origin_tech = "combat=3;materials=2;syndicate=4"
mag_type = /obj/item/ammo_box/magazine/m10mm
can_suppress = 1
burst_size = 1
@@ -55,4 +55,4 @@
can_suppress = 0
burst_size = 3
fire_delay = 2
- actions_types = list(/datum/action/item_action/toggle_firemode)
\ No newline at end of file
+ actions_types = list(/datum/action/item_action/toggle_firemode)
diff --git a/code/modules/projectiles/guns/projectile/rechargable_magazine.dm b/code/modules/projectiles/guns/projectile/rechargable_magazine.dm
index 3f3e50a8f1a..63f747ba104 100644
--- a/code/modules/projectiles/guns/projectile/rechargable_magazine.dm
+++ b/code/modules/projectiles/guns/projectile/rechargable_magazine.dm
@@ -155,7 +155,7 @@
icon = 'icons/obj/guns/minigun.dmi'
icon_state = "minigun_spin"
item_state = "minigun"
- origin_tech = null
+ origin_tech = "combat=6;powerstorage=5;magnets=4"
flags = CONDUCT | HANDSLOW
slowdown = 1
slot_flags = null
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index e064f90c85d..a238c60623a 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -3,6 +3,7 @@
desc = "A suspicious revolver. Uses .357 ammo." //usually used by syndicates
icon_state = "revolver"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
+ origin_tech = "combat=3;materials=2"
/obj/item/weapon/gun/projectile/revolver/New()
..()
@@ -92,7 +93,6 @@
name = "\improper .38 Mars Special"
desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
icon_state = "detective"
- origin_tech = "combat=2;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
unique_rename = 1
unique_reskin = 1
@@ -151,7 +151,6 @@
name = "\improper Unica 6 auto-revolver"
desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo."
icon_state = "mateba"
- origin_tech = "combat=2;materials=2"
/obj/item/weapon/gun/projectile/revolver/golden
name = "\improper Golden revolver"
@@ -273,4 +272,102 @@
if(!SS.transfer_soul("FORCE", user)) //Something went wrong
qdel(SS)
return
- user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfiet!")
\ No newline at end of file
+ user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfiet!")
+
+
+
+/////////////////////////////
+// DOUBLE BARRELED SHOTGUN //
+/////////////////////////////
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel
+ name = "double-barreled shotgun"
+ desc = "A true classic."
+ icon_state = "dshotgun"
+ item_state = "shotgun"
+ w_class = 4
+ force = 10
+ flags = CONDUCT
+ slot_flags = SLOT_BACK
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
+ sawn_desc = "Omar's coming!"
+ unique_rename = 1
+ unique_reskin = 1
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/New()
+ ..()
+ options["Default"] = "dshotgun"
+ options["Dark Red Finish"] = "dshotgun-d"
+ options["Ash"] = "dshotgun-f"
+ options["Faded Grey"] = "dshotgun-g"
+ options["Maple"] = "dshotgun-l"
+ options["Rosewood"] = "dshotgun-p"
+ options["Cancel"] = null
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
+ ..()
+ if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
+ chamber_round()
+ if(istype(A, /obj/item/weapon/melee/energy))
+ var/obj/item/weapon/melee/energy/W = A
+ if(W.active)
+ sawoff(user)
+ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
+ sawoff(user)
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user)
+ var/num_unloaded = 0
+ while (get_ammo() > 0)
+ var/obj/item/ammo_casing/CB
+ CB = magazine.get_round(0)
+ chambered = null
+ CB.loc = get_turf(src.loc)
+ CB.update_icon()
+ num_unloaded++
+ if (num_unloaded)
+ user << "You break open \the [src] and unload [num_unloaded] shell\s."
+ else
+ user << "[src] is empty!"
+
+
+
+
+// IMPROVISED SHOTGUN //
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
+ name = "improvised shotgun"
+ desc = "Essentially a tube that aims shotgun shells."
+ icon_state = "ishotgun"
+ item_state = "shotgun"
+ w_class = 4
+ force = 10
+ slot_flags = null
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
+ sawn_desc = "I'm just here for the gasoline."
+ unique_rename = 0
+ unique_reskin = 0
+ var/slung = 0
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
+ ..()
+ if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
+ var/obj/item/stack/cable_coil/C = A
+ if(C.use(10))
+ slot_flags = SLOT_BACK
+ user << "You tie the lengths of cable to the shotgun, making a sling."
+ slung = 1
+ update_icon()
+ else
+ user << "You need at least ten lengths of cable if you want to make a sling!"
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/update_icon()
+ ..()
+ if(slung)
+ icon_state += "sling"
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
+ . = ..()
+ if(. && slung) //sawing off the gun removes the sling
+ new /obj/item/stack/cable_coil(get_turf(src), 10)
+ slung = 0
+ update_icon()
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index a1a3231135e..725dda0fac6 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -5,7 +5,7 @@
item_state = "l6closedmag"
w_class = 5
slot_flags = 0
- origin_tech = "combat=5;materials=1;syndicate=2"
+ origin_tech = "combat=6;engineering=3;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/mm556x45
weapon_weight = WEAPON_MEDIUM
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
@@ -169,5 +169,3 @@ obj/item/projectile/bullet/saw/incen/Move()
/obj/item/ammo_casing/mm556x45/incen
desc = "A 556x45mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames. "
projectile_type = /obj/item/projectile/bullet/saw/incen
-
-
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index f0cb246b56f..cd3834253ef 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -41,6 +41,11 @@
recentpump = 0
return
+/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user)
+ . = 0
+ if(chambered && chambered.BB)
+ process_fire(user, user,0)
+ . = 1
/obj/item/weapon/gun/projectile/shotgun/proc/pump(mob/M)
playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
@@ -150,154 +155,6 @@
src.throw_at_fast(pick(oview(7,get_turf(user))),1,1)
user.visible_message("[user] tosses aside the spent rifle!")
-
-/obj/item/ammo_box/magazine/internal/boltaction/enchanted
- max_ammo =1
- ammo_type = /obj/item/ammo_casing/a762/enchanted
-
-
-
-/////////////////////////////
-// DOUBLE BARRELED SHOTGUN //
-/////////////////////////////
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel
- name = "double-barreled shotgun"
- desc = "A true classic."
- icon_state = "dshotgun"
- item_state = "shotgun"
- w_class = 4
- force = 10
- flags = CONDUCT
- slot_flags = SLOT_BACK
- origin_tech = "combat=3;materials=1"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
- sawn_desc = "Omar's coming!"
- unique_rename = 1
- unique_reskin = 1
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/New()
- ..()
- options["Default"] = "dshotgun"
- options["Dark Red Finish"] = "dshotgun-d"
- options["Ash"] = "dshotgun-f"
- options["Faded Grey"] = "dshotgun-g"
- options["Maple"] = "dshotgun-l"
- options["Rosewood"] = "dshotgun-p"
- options["Cancel"] = null
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
- ..()
- if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
- chamber_round()
- if(istype(A, /obj/item/weapon/melee/energy))
- var/obj/item/weapon/melee/energy/W = A
- if(W.active)
- sawoff(user)
- if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
- sawoff(user)
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user)
- var/num_unloaded = 0
- while (get_ammo() > 0)
- var/obj/item/ammo_casing/CB
- CB = magazine.get_round(0)
- chambered = null
- CB.loc = get_turf(src.loc)
- CB.update_icon()
- num_unloaded++
- if (num_unloaded)
- user << "You break open \the [src] and unload [num_unloaded] shell\s."
- else
- user << "[src] is empty!"
-
-
-// IMPROVISED SHOTGUN //
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
- name = "improvised shotgun"
- desc = "Essentially a tube that aims shotgun shells."
- icon_state = "ishotgun"
- item_state = "shotgun"
- w_class = 4
- force = 10
- slot_flags = null
- origin_tech = "combat=2;materials=2"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
- sawn_desc = "I'm just here for the gasoline."
- unique_rename = 0
- unique_reskin = 0
- var/slung = 0
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
- ..()
- if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
- var/obj/item/stack/cable_coil/C = A
- if(C.use(10))
- slot_flags = SLOT_BACK
- icon_state = "ishotgunsling"
- user << "You tie the lengths of cable to the shotgun, making a sling."
- slung = 1
- update_icon()
- else
- user << "You need at least ten lengths of cable if you want to make a sling!"
- return
-
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/update_icon()
- ..()
- if (slung && (slot_flags & SLOT_BELT) )
- slung = 0
- icon_state = "ishotgun-sawn"
-
-// Sawing guns related procs //
-
-/obj/item/weapon/gun/projectile/proc/blow_up(mob/user)
- . = 0
- for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
- if(AC.BB)
- process_fire(user, user,0)
- . = 1
-
-/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user)
- . = 0
- if(chambered && chambered.BB)
- process_fire(user, user,0)
- . = 1
-
-/obj/item/weapon/gun/projectile/proc/sawoff(mob/user)
- if(sawn_state == SAWN_OFF)
- user << "\The [src] is already shortened!"
- return
-
- if(sawn_state == SAWN_SAWING)
- return
-
- user.visible_message("[user] begins to shorten \the [src].", "You begin to shorten \the [src]...")
-
- //if there's any live ammo inside the gun, makes it go off
- if(blow_up(user))
- user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!")
- return
-
- sawn_state = SAWN_SAWING
-
- if(do_after(user, 30, target = src))
- user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
- name = "sawn-off [src.name]"
- desc = sawn_desc
- icon_state = "[icon_state]-sawn"
- if(current_skin)
- current_skin = "[current_skin]-sawn"
- w_class = 3
- item_state = "gun"
- slot_flags &= ~SLOT_BACK //you can't sling it on your back
- slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
- sawn_state = SAWN_OFF
- update_icon()
- return
- else
- sawn_state = SAWN_INTACT
-
// Automatic Shotguns//
/obj/item/weapon/gun/projectile/shotgun/automatic/shoot_live_shot(mob/living/user as mob|obj)
@@ -308,7 +165,7 @@
name = "combat shotgun"
desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
icon_state = "cshotgun"
- origin_tech = "combat=5;materials=2"
+ origin_tech = "combat=6"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = 5
@@ -346,13 +203,10 @@
else
user << "You switch to tube A."
-
/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/AltClick(mob/living/user)
if(user.incapacitated() || !Adjacent(user) || !istype(user))
return
pump()
-/obj/item/ammo_box/magazine/internal/shot/tube
- name = "dual feed shotgun internal tube"
- ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
- max_ammo = 4
+
+// DOUBLE BARRELED SHOTGUN and IMPROVISED SHOTGUN are in revolver.dm
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 555dbe4df73..5d59e154784 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -1,5 +1,5 @@
-/obj/item/weapon/gun/projectile/sniper_rifle
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle
name = "sniper rifle"
desc = "The kind of gun that will leave you crying for mummy before you even realise your leg's missing"
icon_state = "sniper"
@@ -8,27 +8,29 @@
weapon_weight = WEAPON_MEDIUM
mag_type = /obj/item/ammo_box/magazine/sniper_rounds
fire_delay = 40
- origin_tech = "combat=8"
+ burst_size = 1
+ origin_tech = "combat=7"
can_unsuppress = 1
can_suppress = 1
w_class = 3
zoomable = TRUE
zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
slot_flags = SLOT_BACK
+ actions_types = list()
-/obj/item/weapon/gun/projectile/sniper_rifle/update_icon()
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle/update_icon()
if(magazine)
icon_state = "sniper-mag"
else
icon_state = "sniper"
-/obj/item/weapon/gun/projectile/sniper_rifle/syndicate
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate
name = "syndicate sniper rifle"
desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face"
pin = /obj/item/device/firing_pin/implant/pindicate
- origin_tech = "combat=8;syndicate=4"
+ origin_tech = "combat=7;syndicate=6"
@@ -108,7 +110,6 @@
name = "sniper rounds (Bleed)"
desc = "Haemorrhage sniper rounds, leaves your target in a pool of crimson pain"
icon_state = "haemorrhage"
- origin_tech = "combat=7;syndicate=5"
ammo_type = /obj/item/ammo_casing/haemorrhage
max_ammo = 5
caliber = ".50"
@@ -139,6 +140,7 @@
name = "sniper rounds (penetrator)"
desc = "An extremely powerful round capable of passing straight through cover and anyone unfortunate enough to be behind it."
ammo_type = /obj/item/ammo_casing/penetrator
+ origin_tech = "combat=6;syndicate=3"
max_ammo = 5
/obj/item/ammo_casing/penetrator
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 023c7c2fd02..04b438f82f8 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -8,6 +8,7 @@
throw_range = 7
force = 4
materials = list(MAT_METAL=2000)
+ origin_tech = "combat=3;biotech=3"
clumsy_check = 0
fire_sound = 'sound/items/syringeproj.ogg'
var/list/syringes = list()
@@ -86,7 +87,7 @@
icon_state = "syringe_pistol"
item_state = "gun" //Smaller inhand
w_class = 2
- origin_tech = "combat=2;syndicate=2"
+ origin_tech = "combat=2;syndicate=2;biotech=3"
force = 2 //Also very weak because it's smaller
suppressed = 1 //Softer fire sound
can_unsuppress = 0 //Permanently silenced
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index 9b8e75bb6ef..649502e0597 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -4,6 +4,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "firing_pin"
item_state = "pen"
+ origin_tech = "materials=2;combat=4"
flags = CONDUCT
w_class = 1
attack_verb = list("poked")
@@ -78,6 +79,7 @@
desc = "This safety firing pin allows weapons to be fired within proximity to a firing range."
fail_message = "TEST RANGE CHECK FAILED."
pin_removeable = 1
+ origin_tech = "combat=2;materials=2"
/obj/item/device/firing_pin/test_range/pin_auth(mob/living/user)
for(var/obj/machinery/magnetic_controller/M in range(user, 3))
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 06bc8779155..5c0b48fd1b8 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -3,6 +3,7 @@
icon_state = "laser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 20
+ luminosity = 1
damage_type = BURN
hitsound = 'sound/weapons/sear.ogg'
hitsound_wall = 'sound/weapons/effects/searwall.ogg'
@@ -53,6 +54,7 @@
name = "pulse"
icon_state = "u_laser"
damage = 50
+ luminosity = 2
/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = 0)
. = ..()
@@ -67,6 +69,7 @@
icon_state = "emitter"
damage = 30
legacy = 1
+ luminosity = 2
animate_movement = SLIDE_STEPS
/obj/item/projectile/beam/emitter/singularity_pull()
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index b0e825110af..0b7de405d28 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -54,9 +54,9 @@
/obj/item/projectile/magic/resurrection/on_hit(mob/living/carbon/target)
. = ..()
- if(target.hellbound)
- return
- if(ismob(target))
+ if(isliving(target))
+ if(target.hellbound)
+ return
if(iscarbon(target))
var/mob/living/carbon/C = target
C.regenerate_limbs()
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 5a097bdc746..33daa476e62 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -19,7 +19,7 @@
/obj/item/weapon/circuitboard/machine/chem_heater
name = "circuit board (Chemical Heater)"
build_path = /obj/machinery/chem_heater
- origin_tech = "materials=2;engineering=2"
+ origin_tech = "programming=2;engineering=2;biotech=2"
req_components = list(
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
@@ -126,4 +126,4 @@
beaker.loc = get_turf(src)
beaker.reagents.handle_reactions()
beaker = null
- icon_state = "mixer0b"
\ No newline at end of file
+ icon_state = "mixer0b"
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index ccdcc770c74..d4b03fe86dd 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -24,7 +24,7 @@
/obj/item/weapon/circuitboard/machine/chem_master
name = "circuit board (ChemMaster 3000)"
build_path = /obj/machinery/chem_master
- origin_tech = "materials=2;programming=2;biotech=1"
+ origin_tech = "materials=3;programming=2;biotech=3"
req_components = list(
/obj/item/weapon/reagent_containers/glass/beaker = 2,
/obj/item/weapon/stock_parts/manipulator = 1,
@@ -266,7 +266,9 @@
return
var/obj/item/weapon/reagent_containers/P
if(condi)
- P = new/obj/item/weapon/reagent_containers/food/condiment(src.loc)
+ var/obj/item/weapon/reagent_containers/food/condiment/C = new(src.loc)
+ C.originalname = name
+ P = C
else
P = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
@@ -319,4 +321,4 @@
/obj/item/weapon/circuitboard/machine/chem_master/condi
name = "circuit board (CondiMaster 3000)"
- build_path = /obj/machinery/chem_master/condimaster
\ No newline at end of file
+ build_path = /obj/machinery/chem_master/condimaster
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index d8726f2fc56..3a21ff14537 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -1,5 +1,3 @@
-
-
/datum/reagent/drug
name = "Drug"
id = "drug"
@@ -135,10 +133,11 @@
. = 1
/datum/reagent/drug/krokodil/addiction_act_stage4(mob/living/carbon/human/M)
- if(M.has_dna() && M.dna.species.id != "zombie")
+ CHECK_DNA_AND_SPECIES(M)
+ if(!istype(M.dna.species, /datum/species/krokodil_addict))
M << "Your skin falls off easily!"
M.adjustBruteLoss(50*REM, 0) // holy shit your skin just FELL THE FUCK OFF
- M.set_species(/datum/species/cosmetic_zombie)
+ M.set_species(/datum/species/krokodil_addict)
else
M.adjustBruteLoss(5*REM, 0)
..()
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 2daca1f733a..e97a1b9dce5 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -188,14 +188,17 @@
"You can't save him. Nothing can save him now.", "It seems that Nar-Sie will triumph after all.")]"
if("emote")
M.visible_message("[M] [pick("whimpers quietly", "shivers as though cold", "glances around in paranoia")]")
- if(data >= 75 && prob(33)) // 30 units, 135 seconds
+ if(data >= 75) // 30 units, 135 seconds
if (!M.confused)
M.confused = 1
M.confused += 3
- if(iscultist(M) || (is_handofgod_cultist(M) && !is_handofgod_prophet(M)) || is_servant_of_ratvar(M))
- ticker.mode.remove_cultist(M.mind, 1, 1)
- ticker.mode.remove_hog_follower(M.mind)
- remove_servant_of_ratvar(M.mind)
+ if(iscultist(M) || is_handofgod_cultist(M) || is_handofgod_prophet(M) || is_servant_of_ratvar(M))
+ if(iscultist(M))
+ ticker.mode.remove_cultist(M.mind, 1, 1)
+ else if(is_handofgod_cultist(M) || is_handofgod_prophet(M))
+ ticker.mode.remove_hog_follower(M.mind)
+ else if(is_servant_of_ratvar(M))
+ remove_servant_of_ratvar(M)
holder.remove_reagent(src.id, src.volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
M.jitteriness = 0
M.stuttering = 0
@@ -379,7 +382,6 @@
spawn(30)
if(!H || qdeleted(H))
return
- //var/list/blacklisted_species = list(
var/list/possible_morphs = list()
for(var/type in subtypesof(/datum/species))
var/datum/species/S = type
@@ -387,13 +389,9 @@
continue
possible_morphs += S
var/datum/species/mutation = pick(possible_morphs)
- if(prob(90) && mutation && H.dna.species != /datum/species/golem && H.dna.species != /datum/species/golem/adamantine)
+ if(prob(90) && mutation)
H << "The pain subsides. You feel... different."
H.set_species(mutation)
- if(mutation.id == "slime")
- H.faction |= "slime"
- else
- H.faction -= "slime"
else
H << "The pain vanishes suddenly. You feel no different."
@@ -1232,3 +1230,20 @@ datum/reagent/shadowling_blindness_smoke
if(prob(2))
M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."))
..()
+
+datum/reagent/romerol
+ name = "romerol"
+ // the REAL zombie powder
+ id = "romerol"
+ description = "Romerol is a highly experimental bioterror agent \
+ which causes dormant nodules to be etched into the grey matter of \
+ the subject. These nodules only become active upon death of the \
+ host, upon which, the secondary structures activate and take control \
+ of the host body."
+ color = "#123524" // RGB (18, 53, 36)
+ metabolization_rate = INFINITY
+
+/datum/reagent/romerol/on_mob_life(mob/living/carbon/human/H)
+ // Silently add the zombie infection organ to be activated upon death
+ new /obj/item/organ/body_egg/zombie_infection(H)
+ ..()
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 3d6cb4edce5..b5d0504bf59 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -62,7 +62,8 @@
F.burn_tile()
if(istype(F, /turf/open/floor/))
for(var/turf/turf in range(1,F))
- PoolOrNew(/obj/effect/hotspot, F)
+ if(!locate(/obj/effect/hotspot) in turf)
+ PoolOrNew(/obj/effect/hotspot, F)
if(istype(T, /turf/closed/wall/))
var/turf/closed/wall/W = T
if(prob(reac_volume))
@@ -73,7 +74,8 @@
if(method != INGEST && method != INJECT)
M.adjust_fire_stacks(min(reac_volume/5, 10))
M.IgniteMob()
- PoolOrNew(/obj/effect/hotspot, M.loc)
+ if(!locate(/obj/effect/hotspot) in M.loc)
+ PoolOrNew(/obj/effect/hotspot, M.loc)
/datum/reagent/sorium
name = "Sorium"
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index e6188a387f5..c2b5ec35c6e 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -99,6 +99,8 @@ Borg Hypospray
if(M.reagents)
var/trans = R.trans_to(M, amount_per_transfer_from_this)
user << "[trans] unit\s injected. [R.total_volume] unit\s remaining."
+ var/contained = english_list(R)
+ add_logs(user, M, "injected", src, "(CHEMICALS: [contained])")
/obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user)
var/chosen_reagent = modes[input(user, "What reagent do you want to dispense?") as null|anything in reagent_ids]
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 0a25b46d7d0..2ce699a197e 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -177,9 +177,10 @@
desc = "A cryostasis beaker that allows for chemical storage without \
reactions. Can hold up to 50 units."
icon_state = "beakernoreact"
- materials = list(MAT_GLASS=500)
+ materials = list(MAT_METAL=3000)
volume = 50
amount_per_transfer_from_this = 10
+ origin_tech = "materials=2;engineering=3;plasmatech=3"
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/glass/beaker/noreact/New()
@@ -192,11 +193,12 @@
and Element Cuban combined with the Compound Pete. Can hold up to \
300 units."
icon_state = "beakerbluespace"
- materials = list(MAT_GLASS=5000)
+ materials = list(MAT_GLASS=3000)
volume = 300
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
flags = OPENCONTAINER
+ origin_tech = "bluespace=5;materials=4;plasmatech=4"
/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
list_reagents = list("cryoxadone" = 30)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index e8d1aebe14a..1136c7a8d95 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -10,6 +10,7 @@
flags = OPENCONTAINER
slot_flags = SLOT_BELT
var/ignore_flags = 0
+ var/infinite = FALSE
/obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user)
return attack_hand(user)
@@ -31,8 +32,12 @@
var/list/injected = list()
for(var/datum/reagent/R in reagents.reagent_list)
injected += R.name
+ var/trans = 0
+ if(!infinite)
+ trans = reagents.trans_to(M, amount_per_transfer_from_this)
+ else
+ trans = reagents.copy_to(M, amount_per_transfer_from_this)
- var/trans = reagents.trans_to(M, amount_per_transfer_from_this)
user << "[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src]."
var/contained = english_list(injected)
@@ -128,3 +133,11 @@
volume = 80
amount_per_transfer_from_this = 80
list_reagents = list("salbutamol" = 10, "coffee" = 20, "leporazine" = 20, "tricordrazine" = 15, "epinephrine" = 10, "omnizine" = 5)
+
+/obj/item/weapon/reagent_containers/hypospray/medipen/species_mutator
+ name = "species mutator medipen"
+ desc = "Embark on a whirlwind tour of racial insensitivity by \
+ literally appropriating other races."
+ volume = 1
+ amount_per_transfer_from_this = 1
+ list_reagents = list("unstablemutationtoxin" = 1)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index de1b92ca252..5c734890647 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -226,11 +226,13 @@
desc = "An advanced syringe that can hold 60 units of chemicals"
amount_per_transfer_from_this = 20
volume = 60
+ origin_tech = "bluespace=4;materials=4;biotech=4"
/obj/item/weapon/reagent_containers/syringe/noreact
name = "cryo syringe"
desc = "An advanced syringe that stops reagents inside from reacting. It can hold up to 20 units."
volume = 20
+ origin_tech = "materials=3;engineering=3"
/obj/item/weapon/reagent_containers/syringe/noreact/New()
. = ..()
@@ -241,3 +243,4 @@
desc = "A diamond-tipped syringe that pierces armor when launched at high velocity. It can hold up to 10 units."
volume = 10
projectile_type = /obj/item/projectile/bullet/dart/syringe/piercing
+ origin_tech = "combat=3;materials=4;engineering=5"
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 8745fce43a2..c2ba6ef9cbb 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -126,16 +126,17 @@
/obj/structure/reagent_dispensers/water_cooler
- name = "water cooler"
- desc = "A machine that dispenses water to drink."
+ name = "liquid cooler"
+ desc = "A machine that dispenses liquid to drink."
icon = 'icons/obj/vending.dmi'
icon_state = "water_cooler"
anchored = 1
var/cups = 50
+ var/reagent = "water"
/obj/structure/reagent_dispensers/water_cooler/New()
..()
- reagents.add_reagent("water",500)
+ reagents.add_reagent(reagent,500)
/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/carbon/human/user)
if((!istype(user)) || (user.stat))
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index 7183b72080f..0da4c5e927e 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -66,11 +66,11 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
/obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, M)
switch(M)
if(MAT_GLASS)
- return (g_amount - (being_built.materials[M]) >= 0)
+ return (g_amount - (being_built.materials[M]/efficiency_coeff) >= 0)
if(MAT_GOLD)
- return (gold_amount - (being_built.materials[M]) >= 0)
+ return (gold_amount - (being_built.materials[M]/efficiency_coeff) >= 0)
if(MAT_DIAMOND)
- return (diamond_amount - (being_built.materials[M]) >= 0)
+ return (diamond_amount - (being_built.materials[M]/efficiency_coeff) >= 0)
else
return (reagents.has_reagent(M, (being_built.materials[M]/efficiency_coeff)) != 0)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 60869979e71..1204ac11d3a 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1,6 +1,6 @@
/***************************************************************
** Design Datums **
-** All the data for building stuff and tracking reliability. **
+** All the data for building stuff. **
***************************************************************/
/*
For the materials datum, it assumes you need reagents unless specified otherwise. To designate a material that isn't a reagent,
@@ -20,9 +20,6 @@ The currently supporting non-reagent materials. All material amounts are set as
Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from metal). Only add raw materials.
Design Guidlines
-- The reliability formula for all R&D built items is reliability (a fixed number) + total tech levels required to make it +
-reliability_mod (starts at 0, gets improved through experimentation). Example: PACMAN generator. 79 base reliablity + 6 tech
-(3 plasmatech, 3 powerstorage) + 0 (since it's completely new) = 85% reliability. Reliability is the chance it works CORRECTLY.
- When adding new designs, check rdreadme.dm to see what kind of things have already been made and where new stuff is needed.
- A single sheet of anything is 2000 units of material. Materials besides metal/glass require help from other jobs (mining for
other types of metals and chemistry for reagents).
@@ -33,8 +30,7 @@ other types of metals and chemistry for reagents).
var/name = "Name" //Name of the created object.
var/desc = "Desc" //Description of the created object.
var/id = "id" //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols
- var/list/req_tech = list() //IDs of that techs the object originated from and the minimum level requirements. //Reliability modifier of the device at it's starting point.
- var/reliability = 100 //Reliability of the device.
+ var/list/req_tech = list() //IDs of that techs the object originated from and the minimum level requirements.
var/build_type = null //Flag as to what kind machine the design is built in. See defines.
var/list/materials = list() //List of materials. Format: "id" = amount.
var/construction_time //Amount of time required for building the object
@@ -44,18 +40,6 @@ other types of metals and chemistry for reagents).
var/maxstack = 1
-//A proc to calculate the reliability of a design based on tech levels and innate modifiers.
-//Input: A list of /datum/tech; Output: The new reliabilty.
-/datum/design/proc/CalcReliability(list/temp_techs)
- var/new_reliability
- for(var/datum/tech/T in temp_techs)
- if(T.id in req_tech)
- new_reliability += T.level
- new_reliability = Clamp(new_reliability, reliability, 100)
- reliability = new_reliability
- return
-
-
////////////////////////////////////////
//Disks for transporting design datums//
////////////////////////////////////////
@@ -64,7 +48,7 @@ other types of metals and chemistry for reagents).
name = "Component Design Disk"
desc = "A disk for storing device design data for construction in lathes."
icon_state = "datadisk1"
- materials = list(MAT_METAL=30, MAT_GLASS=10)
+ materials = list(MAT_METAL=100, MAT_GLASS=100)
var/datum/design/blueprint
/obj/item/weapon/disk/design_disk/New()
@@ -79,7 +63,7 @@ other types of metals and chemistry for reagents).
name = "Intellicard AI Transportation System"
desc = "Allows for the construction of an intellicard."
id = "intellicard"
- req_tech = list("programming" = 4, "materials" = 4)
+ req_tech = list("programming" = 3, "materials" = 3)
build_type = PROTOLATHE
materials = list(MAT_GLASS = 1000, MAT_GOLD = 200)
build_path = /obj/item/device/aicard
@@ -105,7 +89,7 @@ other types of metals and chemistry for reagents).
id = "design_disk"
req_tech = list("programming" = 1)
build_type = PROTOLATHE | AUTOLATHE
- materials = list(MAT_METAL = 30, MAT_GLASS = 10)
+ materials = list(MAT_METAL = 300, MAT_GLASS = 100)
build_path = /obj/item/weapon/disk/design_disk
category = list("Electronics")
@@ -115,7 +99,7 @@ other types of metals and chemistry for reagents).
id = "tech_disk"
req_tech = list("programming" = 1)
build_type = PROTOLATHE | AUTOLATHE
- materials = list(MAT_METAL = 30, MAT_GLASS = 10)
+ materials = list(MAT_METAL = 300, MAT_GLASS = 100)
build_path = /obj/item/weapon/disk/tech_disk
category = list("Electronics")
@@ -128,7 +112,7 @@ other types of metals and chemistry for reagents).
name = "Mining Drill"
desc = "Yours is the drill that will pierce through the rock walls."
id = "drill"
- req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2)
+ req_tech = list("materials" = 2, "powerstorage" = 2, "engineering" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners.
build_path = /obj/item/weapon/pickaxe/drill
@@ -138,10 +122,9 @@ other types of metals and chemistry for reagents).
name = "Diamond-Tipped Mining Drill"
desc = "Yours is the drill that will pierce the heavens!"
id = "drill_diamond"
- req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4)
+ req_tech = list("materials" = 6, "powerstorage" = 5, "engineering" = 5)
build_type = PROTOLATHE
materials = list(MAT_METAL = 6000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) //Yes, a whole diamond is needed.
- reliability = 79
build_path = /obj/item/weapon/pickaxe/drill/diamonddrill
category = list("Mining Designs")
@@ -149,10 +132,9 @@ other types of metals and chemistry for reagents).
name = "Plasma Cutter"
desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
id = "plasmacutter"
- req_tech = list("materials" = 2, "plasmatech" = 2, "engineering" = 2, "combat" = 1, "magnets" = 2)
+ req_tech = list("materials" = 3, "plasmatech" = 3, "magnets" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 1500, MAT_GLASS = 500, MAT_PLASMA = 400)
- reliability = 79
build_path = /obj/item/weapon/gun/energy/plasmacutter
category = list("Mining Designs")
@@ -160,10 +142,9 @@ other types of metals and chemistry for reagents).
name = "Advanced Plasma Cutter"
desc = "It's an advanced plasma cutter, oh my god."
id = "plasmacutter_adv"
- req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3, "combat" = 3, "magnets" = 3)
+ req_tech = list("materials" = 4, "plasmatech" = 4, "engineering" = 2, "combat" = 3, "magnets" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 3000, MAT_GLASS = 1000, MAT_PLASMA = 2000, MAT_GOLD = 500)
- reliability = 79
build_path = /obj/item/weapon/gun/energy/plasmacutter/adv
category = list("Mining Designs")
@@ -171,7 +152,7 @@ other types of metals and chemistry for reagents).
name = "Sonic Jackhammer"
desc = "Essentially a handheld planet-cracker. Can drill through walls with ease as well."
id = "jackhammer"
- req_tech = list("materials" = 6, "powerstorage" = 6, "engineering" = 5, "magnets" = 6)
+ req_tech = list("materials" = 7, "powerstorage" = 5, "engineering" = 6, "magnets" = 5)
build_type = PROTOLATHE
materials = list(MAT_METAL = 6000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_DIAMOND = 6000)
build_path = /obj/item/weapon/pickaxe/drill/jackhammer
@@ -201,7 +182,7 @@ other types of metals and chemistry for reagents).
name = "Hyper-Kinetic Accelerator"
desc = "An upgraded version of the proto-kinetic accelerator, with even more superior damage, speed and range."
id = "hyperaccelerator"
- req_tech = list("materials" = 6, "powerstorage" = 6, "engineering" = 5, "magnets" = 6, "combat" = 4)
+ req_tech = list("materials" = 7, "powerstorage" = 5, "engineering" = 5, "magnets" = 5, "combat" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_DIAMOND = 2000)
build_path = /obj/item/weapon/gun/energy/kinetic_accelerator/hyper
@@ -213,7 +194,7 @@ other types of metals and chemistry for reagents).
id = "superresonator"
req_tech = list("materials" = 4, "powerstorage" = 3, "engineering" = 3, "magnets" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 4000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_URANIUM = 2000)
+ materials = list(MAT_METAL = 4000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_URANIUM = 1000)
build_path = /obj/item/weapon/resonator/upgraded
category = list("Mining Designs")
@@ -227,7 +208,7 @@ other types of metals and chemistry for reagents).
id = "beacon"
req_tech = list("bluespace" = 1)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 20, MAT_GLASS = 10)
+ materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/device/radio/beacon
category = list("Bluespace Designs")
@@ -235,10 +216,9 @@ other types of metals and chemistry for reagents).
name = "Bag of Holding"
desc = "A backpack that opens into a localized pocket of Blue Space."
id = "bag_holding"
- req_tech = list("bluespace" = 4, "materials" = 6)
+ req_tech = list("bluespace" = 7, "materials" = 5, "engineering" = 6, "plasmatech" = 5)
build_type = PROTOLATHE
materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250)
- reliability = 80
build_path = /obj/item/weapon/storage/backpack/holding
category = list("Bluespace Designs")
@@ -246,10 +226,9 @@ other types of metals and chemistry for reagents).
name = "Artificial Bluespace Crystal"
desc = "A small blue crystal with mystical properties."
id = "bluespace_crystal"
- req_tech = list("bluespace" = 4, "materials" = 6)
+ req_tech = list("bluespace" = 3, "materials" = 6, "plasmatech" = 4)
build_type = PROTOLATHE
materials = list(MAT_DIAMOND = 1500, MAT_PLASMA = 1500)
- reliability = 100
build_path = /obj/item/weapon/ore/bluespace_crystal/artificial
category = list("Bluespace Designs")
@@ -267,10 +246,9 @@ other types of metals and chemistry for reagents).
name = "Mining Satchel of Holding"
desc = "A mining satchel that can hold an infinite amount of ores."
id = "minerbag_holding"
- req_tech = list("bluespace" = 3, "materials" = 4)
+ req_tech = list("bluespace" = 4, "materials" = 3, "engineering" = 4)
build_type = PROTOLATHE
materials = list(MAT_GOLD = 250, MAT_URANIUM = 500) //quite cheap, for more convenience
- reliability = 100
build_path = /obj/item/weapon/storage/bag/ore/holding
category = list("Bluespace Designs")
@@ -285,7 +263,7 @@ other types of metals and chemistry for reagents).
id = "health_hud"
req_tech = list("biotech" = 2, "magnets" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/glasses/hud/health
category = list("Equipment")
@@ -293,9 +271,9 @@ other types of metals and chemistry for reagents).
name = "Night Vision Health Scanner HUD"
desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
id = "health_hud_night"
- req_tech = list("biotech" = 4, "magnets" = 5)
+ req_tech = list("biotech" = 4, "magnets" = 5, "plasmatech" = 4, "engineering" = 6)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_SILVER = 250)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_URANIUM = 1000, MAT_SILVER = 350)
build_path = /obj/item/clothing/glasses/hud/health/night
category = list("Equipment")
@@ -305,7 +283,7 @@ other types of metals and chemistry for reagents).
id = "security_hud"
req_tech = list("magnets" = 3, "combat" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/glasses/hud/security
category = list("Equipment")
@@ -313,9 +291,9 @@ other types of metals and chemistry for reagents).
name = "Night Vision Security HUD"
desc = "A heads-up display which provides id data and vision in complete darkness."
id = "security_hud_night"
- req_tech = list("magnets" = 5, "combat" = 4)
+ req_tech = list("combat" = 4, "magnets" = 5, "plasmatech" = 4, "engineering" = 6)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_GOLD = 350)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_URANIUM = 1000, MAT_GOLD = 350)
build_path = /obj/item/clothing/glasses/hud/security/night
category = list("Equipment")
@@ -323,9 +301,9 @@ datum/design/diagnostic_hud
name = "Diagnostic HUD"
desc = "A HUD used to analyze and determine faults within robotic machinery."
id = "dianostic_hud"
- req_tech = list("magnets" = 3, "engineering" = 3, "powerstorage" = 2)
+ req_tech = list("magnets" = 3, "engineering" = 2)
build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/glasses/hud/diagnostic
category = list("Equipment")
@@ -333,9 +311,9 @@ datum/design/diagnostic_hud_night
name = "Night Vision Diagnostic HUD"
desc = "Upgraded version of the diagnostic HUD designed to function during a power failure."
id = "dianostic_hud_night"
- req_tech = list("magnets" = 5, "engineering" = 4, "powerstorage" = 4)
+ req_tech = list("magnets" = 5, "plasmatech" = 4, "engineering" = 6, "powerstorage" = 4)
build_type = PROTOLATHE
- materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 300)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_URANIUM = 1000, MAT_PLASMA = 300)
build_path = /obj/item/clothing/glasses/hud/diagnostic/night
category = list("Equipment")
@@ -361,9 +339,9 @@ datum/design/diagnostic_hud_night
name = "Welding Gas Mask"
desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd."
id = "weldingmask"
- req_tech = list("materials" = 2, "engineering" = 2)
+ req_tech = list("materials" = 2, "engineering" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 4000, MAT_GLASS = 1000)
+ materials = list(MAT_METAL = 3000, MAT_GLASS = 1000)
build_path = /obj/item/clothing/mask/gas/welding
category = list("Equipment")
@@ -371,8 +349,8 @@ datum/design/diagnostic_hud_night
name = "Portable Seed Extractor"
desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
build_type = PROTOLATHE
- req_tech = list("biotech" = 2, "materials" = 2)
- materials = list(MAT_METAL = 200, MAT_GLASS = 100)
+ req_tech = list("biotech" = 3, "engineering" = 2)
+ materials = list(MAT_METAL = 1000, MAT_GLASS = 400)
build_path = /obj/item/weapon/storage/bag/plants/portaseeder
category = list("Equipment")
@@ -380,7 +358,7 @@ datum/design/diagnostic_hud_night
name = "Air Horn"
desc = "Damn son, where'd you find this?"
id = "air_horn"
- req_tech = list("materials" = 2, "engineering" = 2)
+ req_tech = list("materials" = 4, "engineering" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000, MAT_BANANIUM = 1000)
build_path = /obj/item/weapon/bikehorn/airhorn
@@ -390,9 +368,9 @@ datum/design/diagnostic_hud_night
name = "Optical Meson Scanners"
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
id = "mesons"
- req_tech = list("materials" = 3, "magnets" = 2, "engineering" = 2)
+ req_tech = list("magnets" = 2, "engineering" = 2, "plasmatech" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 200, MAT_GLASS = 300)
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/glasses/meson
category = list("Equipment")
@@ -400,9 +378,9 @@ datum/design/diagnostic_hud_night
name = "Engineering Scanner Goggles"
desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, regardless of lighting condition. The T-ray Scanner mode lets you see underfloor objects such as cables and pipes."
id = "engine_goggles"
- req_tech = list("materials" = 4, "magnets" = 3, "engineering" = 4)
+ req_tech = list("materials" = 4, "magnets" = 3, "engineering" = 4, "plasmatech" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 200, MAT_GLASS = 300, MAT_PLASMA = 100)
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500, MAT_PLASMA = 100)
build_path = /obj/item/clothing/glasses/meson/engine
category = list("Equipment")
@@ -412,7 +390,7 @@ datum/design/diagnostic_hud_night
id = "tray_goggles"
req_tech = list("materials" = 3, "magnets" = 2, "engineering" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 200, MAT_GLASS = 300)
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/glasses/meson/engine/tray
category = list("Equipment")
@@ -420,9 +398,9 @@ datum/design/diagnostic_hud_night
name = "Night Vision Optical Meson Scanners"
desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display."
id = "nvgmesons"
- req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4)
+ req_tech = list("magnets" = 5, "plasmatech" = 5, "engineering" = 6)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 300, MAT_GLASS = 400, MAT_PLASMA = 250, MAT_URANIUM = 1000)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_PLASMA = 350, MAT_URANIUM = 1000)
build_path = /obj/item/clothing/glasses/meson/night
category = list("Equipment")
@@ -430,9 +408,9 @@ datum/design/diagnostic_hud_night
name = "Night Vision Goggles"
desc = "Goggles that let you see through darkness unhindered."
id = "night_visision_goggles"
- req_tech = list("magnets" = 4)
+ req_tech = list("materials" = 4, "magnets" = 5, "plasmatech" = 5, "engineering" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 100, MAT_GLASS = 100, MAT_URANIUM = 1000)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_PLASMA = 350, MAT_URANIUM = 1000)
build_path = /obj/item/clothing/glasses/night
category = list("Equipment")
@@ -450,19 +428,19 @@ datum/design/diagnostic_hud_night
name = "Science Goggles"
desc = "Goggles fitted with a portable analyzer capable of determining the research worth of an item or components of a machine."
id = "scigoggles"
- req_tech = list("materials" = 3, "magnets" = 3, "engineering" = 2)
+ req_tech = list("magnets" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 250, MAT_GLASS = 300)
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/glasses/science
category = list("Equipment")
/datum/design/diskplantgene
- name = "plant data disk"
+ name = "Plant data disk"
desc = "A disk for storing plant genetic data."
id = "diskplantgene"
req_tech = list("programming" = 4, "biotech" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL=30, MAT_GLASS=10)
+ materials = list(MAT_METAL=200, MAT_GLASS=100)
build_path = /obj/item/weapon/disk/plantgene
category = list("Electronics")
@@ -484,7 +462,7 @@ datum/design/diagnostic_hud_night
name = "Trashbag of Holding"
desc = "An advanced trashabg with bluespace properties; capable of holding a plethora of garbage."
id = "blutrash"
- req_tech = list("materials" = 5, "bluespace" = 3)
+ req_tech = list("materials" = 5, "bluespace" = 4, "engineering" = 4, "plasmatech" = 3)
build_type = PROTOLATHE
materials = list(MAT_GOLD = 1500, MAT_URANIUM = 250, MAT_PLASMA = 1500)
build_path = /obj/item/weapon/storage/bag/trash/bluespace
@@ -494,7 +472,7 @@ datum/design/diagnostic_hud_night
name = "Floor Buffer Upgrade"
desc = "A floor buffer that can be attached to vehicular janicarts."
id = "buffer"
- req_tech = list("materials" = 5, "engineering" = 3)
+ req_tech = list("materials" = 4, "engineering" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 3000, MAT_GLASS = 200)
build_path = /obj/item/janiupgrade
@@ -504,7 +482,7 @@ datum/design/diagnostic_hud_night
name = "Holographic Sign Projector"
desc = "A holograpic projector used to project various warning signs."
id = "holosign"
- req_tech = list("magnets" = 3, "powerstorage" = 2)
+ req_tech = list("magnets" = 3, "programming" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/weapon/holosign_creator
@@ -518,7 +496,7 @@ datum/design/diagnostic_hud_night
name = "Experimental Welding Tool"
desc = "An experimental welder capable of self-fuel generation."
id = "exwelder"
- req_tech = list("materials" = 4, "engineering" = 4, "bluespace" = 3, "plasmatech" = 3)
+ req_tech = list("materials" = 4, "engineering" = 5, "bluespace" = 3, "plasmatech" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_PLASMA = 1500, MAT_URANIUM = 200)
build_path = /obj/item/weapon/weldingtool/experimental
diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm
index c25d7ffbe13..569a36607ef 100644
--- a/code/modules/research/designs/AI_module_designs.dm
+++ b/code/modules/research/designs/AI_module_designs.dm
@@ -6,7 +6,7 @@
name = "AI Design (AI Core)"
desc = "Allows for the construction of circuit boards used to build new AI cores."
id = "aicore"
- req_tech = list("programming" = 4, "biotech" = 3)
+ req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/aicore
@@ -17,7 +17,7 @@
name = "Module Design (Safeguard)"
desc = "Allows for the construction of a Safeguard AI Module."
id = "safeguard_module"
- req_tech = list("programming" = 3, "materials" = 4)
+ req_tech = list("programming" = 3, "materials" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100)
build_path = /obj/item/weapon/aiModule/supplied/safeguard
@@ -27,7 +27,7 @@
name = "Module Design (OneHuman)"
desc = "Allows for the construction of a OneHuman AI Module."
id = "onehuman_module"
- req_tech = list("programming" = 4, "materials" = 6)
+ req_tech = list("programming" = 6, "materials" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/aiModule/zeroth/oneHuman
@@ -37,7 +37,7 @@
name = "Module Design (ProtectStation)"
desc = "Allows for the construction of a ProtectStation AI Module."
id = "protectstation_module"
- req_tech = list("programming" = 3, "materials" = 6)
+ req_tech = list("programming" = 5, "materials" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100)
build_path = /obj/item/weapon/aiModule/supplied/protectStation
@@ -58,7 +58,7 @@
name = "Module Design (OxygenIsToxicToHumans)"
desc = "Allows for the construction of a Safeguard AI Module."
id = "oxygen_module"
- req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4)
+ req_tech = list("programming" = 4, "biotech" = 2, "materials" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100)
build_path = /obj/item/weapon/aiModule/supplied/oxygen
@@ -68,7 +68,7 @@
name = "Module Design (Freeform)"
desc = "Allows for the construction of a Freeform AI Module."
id = "freeform_module"
- req_tech = list("programming" = 4, "materials" = 4)
+ req_tech = list("programming" = 5, "materials" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100)
build_path = /obj/item/weapon/aiModule/supplied/freeform
@@ -78,7 +78,7 @@
name = "Module Design (Reset)"
desc = "Allows for the construction of a Reset AI Module."
id = "reset_module"
- req_tech = list("programming" = 3, "materials" = 6)
+ req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100)
build_path = /obj/item/weapon/aiModule/reset
@@ -88,7 +88,7 @@
name = "Module Design (Purge)"
desc = "Allows for the construction of a Purge AI Module."
id = "purge_module"
- req_tech = list("programming" = 4, "materials" = 6)
+ req_tech = list("programming" = 5, "materials" = 6)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/aiModule/reset/purge
@@ -98,7 +98,7 @@
name = "AI Core Module (Freeform)"
desc = "Allows for the construction of a Freeform AI Core Module."
id = "freeformcore_module"
- req_tech = list("programming" = 4, "materials" = 6)
+ req_tech = list("programming" = 6, "materials" = 6)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/aiModule/core/freeformcore
@@ -108,7 +108,7 @@
name = "Core Module Design (Asimov)"
desc = "Allows for the construction of a Asimov AI Core Module."
id = "asimov_module"
- req_tech = list("programming" = 3, "materials" = 6)
+ req_tech = list("programming" = 3, "materials" = 5)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/aiModule/core/full/asimov
@@ -118,7 +118,7 @@
name = "Core Module Design (P.A.L.A.D.I.N.)"
desc = "Allows for the construction of a P.A.L.A.D.I.N. AI Core Module."
id = "paladin_module"
- req_tech = list("programming" = 4, "materials" = 6)
+ req_tech = list("programming" = 5, "materials" = 5)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/aiModule/core/full/paladin
@@ -128,7 +128,7 @@
name = "Core Module Design (T.Y.R.A.N.T.)"
desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module."
id = "tyrant_module"
- req_tech = list("programming" = 4, "syndicate" = 2, "materials" = 6)
+ req_tech = list("programming" = 5, "syndicate" = 2, "materials" = 5)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/aiModule/core/full/tyrant
@@ -138,7 +138,7 @@
name = "Core Module Design (Corporate)"
desc = "Allows for the construction of a Corporate AI Core Module."
id = "corporate_module"
- req_tech = list("programming" = 4, "materials" = 6)
+ req_tech = list("programming" = 5, "materials" = 5)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/aiModule/core/full/corp
@@ -148,7 +148,7 @@
name = "Core Module Design (Custom)"
desc = "Allows for the construction of a Custom AI Core Module."
id = "custom_module"
- req_tech = list("programming" = 4, "materials" = 6)
+ req_tech = list("programming" = 5, "materials" = 5)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/aiModule/core/full/custom
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index f88731759f8..0fe0205b916 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -292,7 +292,7 @@
id = "plant_analyzer"
build_type = AUTOLATHE
materials = list(MAT_METAL = 30, MAT_GLASS = 20)
- build_path = /obj/item/device/analyzer/plant_analyzer
+ build_path = /obj/item/device/plant_analyzer
category = list("initial","Misc")
/datum/design/shovel
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 1da2314a25b..453c04d05e6 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -4,7 +4,7 @@
name = "Computer Design (Security)"
desc = "Allows for the construction of circuit boards used to build security camera computers."
id = "seccamera"
- req_tech = list("programming" = 2)
+ req_tech = list("programming" = 2, "combat" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/security
@@ -14,7 +14,7 @@
name = "Computer Design (AI Upload)"
desc = "Allows for the construction of circuit boards used to build an AI Upload Console."
id = "aiupload"
- req_tech = list("programming" = 4)
+ req_tech = list("programming" = 5, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/aiupload
@@ -24,7 +24,7 @@
name = "Computer Design (Cyborg Upload)"
desc = "Allows for the construction of circuit boards used to build a Cyborg Upload Console."
id = "borgupload"
- req_tech = list("programming" = 4)
+ req_tech = list("programming" = 5, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/borgupload
@@ -34,7 +34,7 @@
name = "Computer Design (Medical Records)"
desc = "Allows for the construction of circuit boards used to build a medical records console."
id = "med_data"
- req_tech = list("programming" = 2)
+ req_tech = list("programming" = 2, "biotech" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/med_data
@@ -44,7 +44,7 @@
name = "Computer Design (Operating Computer)"
desc = "Allows for the construction of circuit boards used to build an operating computer console."
id = "operating"
- req_tech = list("programming" = 2, "biotech" = 2)
+ req_tech = list("programming" = 2, "biotech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/operating
@@ -54,7 +54,7 @@
name = "Computer Design (PanD.E.M.I.C. 2200)"
desc = "Allows for the construction of circuit boards used to build a PanD.E.M.I.C. 2200 console."
id = "pandemic"
- req_tech = list("programming" = 2, "biotech" = 2)
+ req_tech = list("programming" = 3, "biotech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/pandemic
@@ -64,7 +64,7 @@
name = "Computer Design (DNA Machine)"
desc = "Allows for the construction of circuit boards used to build a new DNA scanning console."
id = "scan_console"
- req_tech = list("programming" = 2, "biotech" = 3)
+ req_tech = list("programming" = 2, "biotech" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/scan_consolenew
@@ -74,7 +74,7 @@
name = "Computer Design (Communications)"
desc = "Allows for the construction of circuit boards used to build a communications console."
id = "comconsole"
- req_tech = list("programming" = 2, "magnets" = 2)
+ req_tech = list("programming" = 3, "magnets" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/communications
@@ -84,7 +84,7 @@
name = "Computer Design (ID Console)"
desc = "Allows for the construction of circuit boards used to build an ID computer."
id = "idcardconsole"
- req_tech = list("programming" = 2)
+ req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/card
@@ -100,12 +100,11 @@
build_path = /obj/item/weapon/circuitboard/computer/crew
category = list("Computer Boards")
-
/datum/design/secdata
name = "Computer Design (Security Records Console)"
desc = "Allows for the construction of circuit boards used to build a security records console."
id = "secdata"
- req_tech = list("programming" = 2)
+ req_tech = list("programming" = 2, "combat" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/secure_data
@@ -155,7 +154,7 @@
name = "Computer Design (Orion Trail Arcade Machine)"
desc = "Allows for the construction of circuit boards used to build a new Orion Trail machine."
id = "arcademachine"
- req_tech = list("programming" = 2)
+ req_tech = list("programming" = 1)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/arcade/orion_trail
@@ -165,7 +164,7 @@
name = "Computer Design (Slot Machine)"
desc = "Allows for the construction of circuit boards used to build a new slot machine."
id = "slotmachine"
- req_tech = list("programming" = 2)
+ req_tech = list("programming" = 1)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/slot_machine
@@ -175,7 +174,7 @@
name = "Computer Design (Power Monitor)"
desc = "Allows for the construction of circuit boards used to build a new power monitor."
id = "powermonitor"
- req_tech = list("programming" = 2)
+ req_tech = list("programming" = 2, "powerstorage" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/powermonitor
@@ -215,7 +214,7 @@
name = "Computer Design (Mech Bay Power Control Console)"
desc = "Allows for the construction of circuit boards used to build a mech bay power control console."
id = "mechapower"
- req_tech = list("programming" = 2, "powerstorage" = 3)
+ req_tech = list("programming" = 3, "powerstorage" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/mech_bay_power_console
@@ -265,7 +264,7 @@
name = "Computer Design (Telecommunications Monitoring Console)"
desc = "Allows for the construction of circuit boards used to build a telecommunications monitor."
id = "comm_monitor"
- req_tech = list("programming" = 3)
+ req_tech = list("programming" = 3, "magnets" = 3, "bluespace" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/comm_monitor
@@ -275,7 +274,7 @@
name = "Computer Design (Telecommunications Server Monitoring Console)"
desc = "Allows for the construction of circuit boards used to build a telecommunication server browser and monitor."
id = "comm_server"
- req_tech = list("programming" = 3)
+ req_tech = list("programming" = 3, "magnets" = 3, "bluespace" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/comm_server
@@ -295,7 +294,7 @@
name = "Computer Design (AI Integrity Restorer)"
desc = "Allows for the construction of circuit boards used to build an AI Integrity Restorer."
id = "aifixer"
- req_tech = list("programming" = 3, "biotech" = 2)
+ req_tech = list("programming" = 4, "magnets" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/aifixer
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index fe53f327a7e..6a0bf146ea3 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -16,7 +16,7 @@
name = "Machine Design (Automated Announcement System Board)"
desc = "The circuit board for an automated announcement system."
id = "automated_announcement"
- req_tech = list("programming" = 3, "bluespace" = 2)
+ req_tech = list("programming" = 3, "bluespace" = 3, "magnets" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/announcement_system
@@ -26,7 +26,7 @@
name = "Computer Design (Power Turbine Console Board)"
desc = "The circuit board for a power turbine console."
id = "power_turbine_console"
- req_tech = list("programming" = 4, "powerstorage" = 4, "engineering" = 4)
+ req_tech = list("programming" = 4, "powerstorage" = 5, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/turbine_computer
@@ -36,7 +36,7 @@
name = "Machine Design (Emitter Board)"
desc = "The circuit board for an emitter."
id = "emitter"
- req_tech = list("programming" = 4, "powerstorage" = 5, "engineering" = 5)
+ req_tech = list("programming" = 3, "powerstorage" = 5, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/emitter
@@ -76,7 +76,7 @@
name = "Machine Design (Space Heater Board)"
desc = "The circuit board for a space heater."
id = "space_heater"
- req_tech = list("programming" = 2, "engineering" = 2)
+ req_tech = list("programming" = 2, "engineering" = 2, "plasmatech" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/space_heater
@@ -86,7 +86,7 @@
name = "Machine Design (Teleportation Station Board)"
desc = "The circuit board for a teleportation station."
id = "tele_station"
- req_tech = list("programming" = 4, "bluespace" = 4, "engineering" = 4)
+ req_tech = list("programming" = 5, "bluespace" = 4, "engineering" = 4, "plasmatech" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/teleporter_station
@@ -106,7 +106,7 @@
name = "Machine Design (Telepad Board)"
desc = "The circuit board for a telescience telepad."
id = "telepad"
- req_tech = list("programming" = 4, "bluespace" = 4, "materials" = 3, "engineering" = 3)
+ req_tech = list("programming" = 4, "bluespace" = 5, "plasmatech" = 4, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/telesci_pad
@@ -116,7 +116,7 @@
name = "Computer Design (Teleporter Console)"
desc = "Allows for the construction of circuit boards used to build a teleporter control console."
id = "teleconsole"
- req_tech = list("programming" = 3, "bluespace" = 2)
+ req_tech = list("programming" = 3, "bluespace" = 3, "plasmatech" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/teleporter
@@ -126,7 +126,7 @@
name = "Computer Design (Telepad Control Console Board)"
desc = "Allows for the construction of circuit boards used to build a telescience console."
id = "telesci_console"
- req_tech = list("programming" = 3, "bluespace" = 2)
+ req_tech = list("programming" = 3, "bluespace" = 3, "plasmatech" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/telesci_console
@@ -136,7 +136,7 @@
name = "Machine Design (Sleeper Board)"
desc = "The circuit board for a sleeper."
id = "sleeper"
- req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3)
+ req_tech = list("programming" = 3, "biotech" = 2, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/sleeper
@@ -146,7 +146,7 @@
name = "Machine Design (Cryotube Board)"
desc = "The circuit board for a cryotube."
id = "cryotube"
- req_tech = list("programming" = 4, "biotech" = 3, "engineering" = 4)
+ req_tech = list("programming" = 5, "biotech" = 3, "engineering" = 4, "plasmatech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/cryo_tube
@@ -156,7 +156,7 @@
name = "Machine Design (Portable Chem Dispenser Board)"
desc = "The circuit board for a portable chem dispenser."
id = "chem_dispenser"
- req_tech = list("programming" = 4, "biotech" = 3, "engineering" = 4, "materials" = 4, "plasmatech" = 3)
+ req_tech = list("programming" = 5, "biotech" = 3, "materials" = 4, "plasmatech" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/chem_dispenser
@@ -166,7 +166,7 @@
name = "Machine Design (Chem Master Board)"
desc = "The circuit board for a Chem Master 2999."
id = "chem_master"
- req_tech = list("biotech" = 1, "materials" = 2, "programming" = 2)
+ req_tech = list("biotech" = 3, "materials" = 3, "programming" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/chem_master
@@ -176,7 +176,7 @@
name = "Machine Design (Chemical Heater Board)"
desc = "The circuit board for a chemical heater."
id = "chem_heater"
- req_tech = list("engineering" = 2, "materials" = 2)
+ req_tech = list("engineering" = 2, "biotech" = 2, "programming" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/chem_heater
@@ -186,7 +186,7 @@
name = "Computer Design (Cloning Machine Console)"
desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console."
id = "clonecontrol"
- req_tech = list("programming" = 3, "biotech" = 3)
+ req_tech = list("programming" = 4, "biotech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/computer/cloning
@@ -196,7 +196,7 @@
name = "Machine Design (Clone Pod)"
desc = "Allows for the construction of circuit boards used to build a Cloning Pod."
id = "clonepod"
- req_tech = list("programming" = 3, "biotech" = 3)
+ req_tech = list("programming" = 4, "biotech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/clonepod
@@ -206,7 +206,7 @@
name = "Machine Design (Cloning Scanner)"
desc = "Allows for the construction of circuit boards used to build a Cloning Scanner."
id = "clonescanner"
- req_tech = list("programming" = 3, "biotech" = 3)
+ req_tech = list("programming" = 4, "biotech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/clonescanner
@@ -216,7 +216,7 @@
name = "Machine Design (Biogenerator Board)"
desc = "The circuit board for a biogenerator."
id = "biogenerator"
- req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3)
+ req_tech = list("programming" = 2, "biotech" = 3, "materials" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/biogenerator
@@ -226,7 +226,7 @@
name = "Machine Design (Hydroponics Tray Board)"
desc = "The circuit board for a hydroponics tray."
id = "hydro_tray"
- req_tech = list("programming" = 1, "biotech" = 1)
+ req_tech = list("biotech" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/hydroponics
@@ -316,7 +316,7 @@
name = "Machine Design (Mechbay Recharger Board)"
desc = "The circuit board for a Mechbay Recharger."
id = "mech_recharger"
- req_tech = list("programming" = 3, "powerstorage" = 4, "engineering" = 4)
+ req_tech = list("programming" = 3, "powerstorage" = 4, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/mech_recharger
@@ -326,7 +326,7 @@
name = "Machine Design (Microwave Board)"
desc = "The circuit board for a microwave."
id = "microwave"
- req_tech = list("programming" = 1)
+ req_tech = list("programming" = 2, "magnets" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/microwave
@@ -336,7 +336,7 @@
name = "Machine Design (Gibber Board)"
desc = "The circuit board for a gibber."
id = "gibber"
- req_tech = list("programming" = 1)
+ req_tech = list("programming" = 2, "engineering" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/gibber
@@ -386,7 +386,7 @@
name = "Machine Design (Recycler Board)"
desc = "The circuit board for a recycler."
id = "recycler"
- req_tech = list("programming" = 1)
+ req_tech = list("programming" = 2, "engineering" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/recycler
@@ -406,7 +406,7 @@
name = "Machine Design (Autolathe Board)"
desc = "The circuit board for an autolathe."
id = "autolathe"
- req_tech = list("programming" = 2, "engineering" = 2)
+ req_tech = list("programming" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/autolathe
@@ -416,7 +416,7 @@
name = "Machine Design (Weapon Recharger Board)"
desc = "The circuit board for a Weapon Recharger."
id = "recharger"
- req_tech = list("powerstorage" = 3, "engineering" = 3, "materials" = 4)
+ req_tech = list("powerstorage" = 4, "engineering" = 3, "materials" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100)
build_path = /obj/item/weapon/circuitboard/machine/recharger
@@ -436,18 +436,17 @@
name = "Machine Design (Ore Redemption Board)"
desc = "The circuit board for an Ore Redemption machine."
id = "ore_redemption"
- req_tech = list("programming" = 1, "engineering" = 2)
+ req_tech = list("programming" = 2, "engineering" = 2, "plasmatech" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/ore_redemption
category = list ("Misc. Machinery")
-
/datum/design/mining_equipment_vendor
name = "Machine Design (Mining Rewards Vender Board)"
desc = "The circuit board for a Mining Rewards Vender."
id = "mining_equipment_vendor"
- req_tech = list("programming" = 1, "engineering" = 2)
+ req_tech = list("engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/mining_equipment_vendor
@@ -457,7 +456,7 @@
name = "Machine Design (Tesla Coil Board)"
desc = "The circuit board for a tesla coil."
id = "tesla_coil"
- req_tech = list("programming" = 1)
+ req_tech = list("programming" = 3, "powerstorage" = 3, "magnets" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/tesla_coil
@@ -467,7 +466,7 @@
name = "Machine Design (Grounding Rod Board)"
desc = "The circuit board for a grounding rod."
id = "grounding_rod"
- req_tech = list("programming" = 1)
+ req_tech = list("programming" = 3, "powerstorage" = 3, "magnets" = 3, "plasmatech" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/grounding_rod
diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm
index a2028a40d54..6805fac443e 100644
--- a/code/modules/research/designs/mecha_designs.dm
+++ b/code/modules/research/designs/mecha_designs.dm
@@ -6,7 +6,7 @@
name = "APLU \"Ripley\" Central Control module"
desc = "Allows for the construction of a \"Ripley\" Central Control module."
id = "ripley_main"
- req_tech = list("programming" = 3)
+ req_tech = list("programming" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/ripley/main
@@ -16,7 +16,7 @@
name = "APLU \"Ripley\" Peripherals Control module"
desc = "Allows for the construction of a \"Ripley\" Peripheral Control module."
id = "ripley_peri"
- req_tech = list("programming" = 3)
+ req_tech = list("programming" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/ripley/peripherals
@@ -26,7 +26,7 @@
name = "\"Odysseus\" Central Control module"
desc = "Allows for the construction of a \"Odysseus\" Central Control module."
id = "odysseus_main"
- req_tech = list("programming" = 3,"biotech" = 2)
+ req_tech = list("programming" = 3,"biotech" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/odysseus/main
@@ -36,7 +36,7 @@
name = "\"Odysseus\" Peripherals Control module"
desc = "Allows for the construction of a \"Odysseus\" Peripheral Control module."
id = "odysseus_peri"
- req_tech = list("programming" = 3,"biotech" = 2)
+ req_tech = list("programming" = 3,"biotech" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/odysseus/peripherals
@@ -46,7 +46,7 @@
name = "\"Gygax\" Central Control module"
desc = "Allows for the construction of a \"Gygax\" Central Control module."
id = "gygax_main"
- req_tech = list("programming" = 4)
+ req_tech = list("programming" = 4, "combat" = 3, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/main
@@ -56,7 +56,7 @@
name = "\"Gygax\" Peripherals Control module"
desc = "Allows for the construction of a \"Gygax\" Peripheral Control module."
id = "gygax_peri"
- req_tech = list("programming" = 4)
+ req_tech = list("programming" = 4, "combat" = 3, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/peripherals
@@ -66,7 +66,7 @@
name = "\"Gygax\" Weapons & Targeting Control module"
desc = "Allows for the construction of a \"Gygax\" Weapons & Targeting Control module."
id = "gygax_targ"
- req_tech = list("programming" = 4, "combat" = 2)
+ req_tech = list("programming" = 4, "combat" = 4, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting
@@ -76,7 +76,7 @@
name = "\"Durand\" Central Control module"
desc = "Allows for the construction of a \"Durand\" Central Control module."
id = "durand_main"
- req_tech = list("programming" = 4)
+ req_tech = list("programming" = 4, "combat" = 4, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/main
@@ -86,7 +86,7 @@
name = "\"Durand\" Peripherals Control module"
desc = "Allows for the construction of a \"Durand\" Peripheral Control module."
id = "durand_peri"
- req_tech = list("programming" = 4)
+ req_tech = list("programming" = 4, "combat" = 4, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals
@@ -96,7 +96,7 @@
name = "\"Durand\" Weapons & Targeting Control module"
desc = "Allows for the construction of a \"Durand\" Weapons & Targeting Control module."
id = "durand_targ"
- req_tech = list("programming" = 4, "combat" = 2)
+ req_tech = list("programming" = 5, "combat" = 4, "engineering" = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting
@@ -106,7 +106,7 @@
name = "\"H.O.N.K\" Central Control module"
desc = "Allows for the construction of a \"H.O.N.K\" Central Control module."
id = "honker_main"
- req_tech = list("programming" = 3)
+ req_tech = list("programming" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/main
@@ -116,7 +116,7 @@
name = "\"H.O.N.K\" Peripherals Control module"
desc = "Allows for the construction of a \"H.O.N.K\" Peripheral Control module."
id = "honker_peri"
- req_tech = list("programming" = 3)
+ req_tech = list("programming" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/peripherals
@@ -126,7 +126,7 @@
name = "\"H.O.N.K\" Weapons & Targeting Control module"
desc = "Allows for the construction of a \"H.O.N.K\" Weapons & Targeting Control module."
id = "honker_targ"
- req_tech = list("programming" = 3)
+ req_tech = list("programming" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
@@ -136,7 +136,7 @@
name = "\"Phazon\" Central Control module"
desc = "Allows for the construction of a \"Phazon\" Central Control module."
id = "phazon_main"
- req_tech = list("programming" = 5, "materials" = 7, "powerstorage" = 6)
+ req_tech = list("programming" = 6, "materials" = 6, "plasmatech" = 5)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/main
@@ -146,7 +146,7 @@
name = "\"Phazon\" Peripherals Control module"
desc = "Allows for the construction of a \"Phazon\" Peripheral Control module."
id = "phazon_peri"
- req_tech = list("programming" = 5, "bluespace" = 6)
+ req_tech = list("programming" = 6, "bluespace" = 5, "plasmatech" = 5)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/peripherals
@@ -156,7 +156,7 @@
name = "\"Phazon\" Weapons & Targeting Control module"
desc = "Allows for the construction of a \"Phazon\" Weapons & Targeting Control module."
id = "phazon_targ"
- req_tech = list("programming" = 5, "magnets" = 6)
+ req_tech = list("programming" = 6, "magnets" = 5, "plasmatech" = 5)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/targeting
@@ -204,7 +204,7 @@
desc = "Allows for the construction of CH-PS Laser."
id = "mech_laser"
build_type = MECHFAB
- req_tech = list("combat" = 3, "magnets" = 3)
+ req_tech = list("combat" = 3, "magnets" = 3, "engineering" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
materials = list(MAT_METAL=10000)
construction_time = 100
@@ -215,7 +215,7 @@
desc = "Allows for the construction of CH-LC Laser Cannon."
id = "mech_laser_heavy"
build_type = MECHFAB
- req_tech = list("combat" = 4, "magnets" = 4)
+ req_tech = list("combat" = 4, "magnets" = 4, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
materials = list(MAT_METAL=10000)
construction_time = 100
@@ -226,7 +226,7 @@
desc = "Allows for the construction of SGL-6 Grenade Launcher."
id = "mech_grenade_launcher"
build_type = MECHFAB
- req_tech = list("combat" = 3)
+ req_tech = list("combat" = 4, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang
materials = list(MAT_METAL=22000,MAT_GOLD=6000,MAT_SILVER=8000)
construction_time = 100
@@ -237,7 +237,7 @@
desc = "Allows for the construction of SRM-8 Missile Rack."
id = "mech_missile_rack"
build_type = MECHFAB
- req_tech = list("combat" = 6, "materials" = 6)
+ req_tech = list("combat" = 6, "materials" = 5, "engineering" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/missile_rack
materials = list(MAT_METAL=22000,MAT_GOLD=6000,MAT_SILVER=8000)
construction_time = 100
@@ -259,7 +259,7 @@
desc = "An exosuit module that allows generating of small quasi-stable wormholes."
id = "mech_wormhole_gen"
build_type = MECHFAB
- req_tech = list("bluespace" = 3, "magnets" = 2)
+ req_tech = list("bluespace" = 4, "magnets" = 4, "plasmatech" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/wormhole_generator
materials = list(MAT_METAL=10000)
construction_time = 100
@@ -270,9 +270,9 @@
desc = "An exosuit module that allows exosuits to teleport to any position in view."
id = "mech_teleporter"
build_type = MECHFAB
- req_tech = list("bluespace" = 10, "magnets" = 5)
+ req_tech = list("bluespace" = 8, "magnets" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/teleporter
- materials = list(MAT_METAL=10000)
+ materials = list(MAT_METAL=10000,MAT_DIAMOND=10000)
construction_time = 100
category = list("Exosuit Equipment")
@@ -281,7 +281,7 @@
desc = "An exosuit-mounted Rapid Construction Device."
id = "mech_rcd"
build_type = MECHFAB
- req_tech = list("materials" = 4, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 4)
+ req_tech = list("materials" = 5, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/rcd
materials = list(MAT_METAL=30000,MAT_GOLD=20000,MAT_PLASMA=25000,MAT_SILVER=20000)
construction_time = 1200
@@ -292,7 +292,7 @@
desc = "An exosuit mounted Gravitational Catapult."
id = "mech_gravcatapult"
build_type = MECHFAB
- req_tech = list("bluespace" = 2, "magnets" = 3, "engineering" = 3)
+ req_tech = list("bluespace" = 4, "magnets" = 3, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/gravcatapult
materials = list(MAT_METAL=10000)
construction_time = 100
@@ -303,7 +303,7 @@
desc = "Automated Repair Droid. BEEP BOOP"
id = "mech_repair_droid"
build_type = MECHFAB
- req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 3)
+ req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid
materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_GOLD=1000,MAT_SILVER=2000)
construction_time = 100
@@ -314,7 +314,7 @@
desc = "Tesla Energy Relay"
id = "mech_energy_relay"
build_type = MECHFAB
- req_tech = list("magnets" = 4, "powerstorage" = 3)
+ req_tech = list("magnets" = 4, "powerstorage" = 5, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
materials = list(MAT_METAL=10000,MAT_GLASS=2000,MAT_GOLD=2000,MAT_SILVER=3000)
construction_time = 100
@@ -347,7 +347,7 @@
desc = "An upgraded version of the standard drill."
id = "mech_diamond_drill"
build_type = MECHFAB
- req_tech = list("materials" = 4, "engineering" = 3)
+ req_tech = list("materials" = 5, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
materials = list(MAT_METAL=10000,MAT_DIAMOND=6500)
construction_time = 100
@@ -358,7 +358,7 @@
desc = "Compact nuclear reactor module."
id = "mech_generator_nuclear"
build_type = MECHFAB
- req_tech = list("powerstorage"= 3, "engineering" = 3, "materials" = 3)
+ req_tech = list("powerstorage"= 5, "engineering" = 4, "materials" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear
materials = list(MAT_METAL=10000,MAT_GLASS=1000,MAT_SILVER=500)
construction_time = 100
@@ -369,7 +369,7 @@
desc = "A device that shoots resonant plasma bursts at extreme velocity. The blasts are capable of crushing rock and demolishing solid obstacles."
id = "mech_plasma_cutter"
build_type = MECHFAB
- req_tech = list("powerstorage"= 3, "engineering" = 3, "materials" = 3, "combat" = 1, "plasmatech" = 2)
+ req_tech = list("engineering" = 3, "materials" = 3, "plasmatech" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
materials = list(MAT_METAL = 8000, MAT_GLASS = 1000, MAT_PLASMA = 2000)
construction_time = 100
@@ -380,7 +380,7 @@
desc = "A weapon for combat exosuits. Shoots non-lethal stunning electrodes."
id = "mech_taser"
build_type = MECHFAB
- req_tech = list("combat" = 2)
+ req_tech = list("combat" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
materials = list(MAT_METAL=10000)
construction_time = 100
@@ -391,7 +391,7 @@
desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst."
id = "mech_lmg"
build_type = MECHFAB
- req_tech = list("combat" = 2)
+ req_tech = list("combat" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
materials = list(MAT_METAL=10000)
construction_time = 100
@@ -402,7 +402,7 @@
desc = "Equipment for medical exosuits. A mounted sleeper that stabilizes patients and can inject reagents in the exosuit's reserves."
id = "mech_sleeper"
build_type = MECHFAB
- req_tech = list("biotech" = 2)
+ req_tech = list("biotech" = 3, "engineering" = 3, "plasmatech" = 2)
build_path = /obj/item/mecha_parts/mecha_equipment/medical/sleeper
materials = list(MAT_METAL=5000,MAT_GLASS=10000)
construction_time = 100
@@ -413,7 +413,7 @@
desc = "Equipment for medical exosuits. A chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur."
id = "mech_syringe_gun"
build_type = MECHFAB
- req_tech = list("magnets" = 3,"biotech" = 3)
+ req_tech = list("magnets" = 4,"biotech" = 4, "combat" = 3, "materials" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
materials = list(MAT_METAL=3000,MAT_GLASS=2000)
construction_time = 200
@@ -423,9 +423,9 @@
name = "Exosuit Medical Equipment (Medical Beamgun)"
desc = "Equipment for medical exosuits. A mounted medical nanite projector which will treat patients with a focused beam."
id = "mech_medi_beam"
- req_tech = list("combat" = 5, "materials" = 7, "powerstorage" = 7, "biotech" = 6)
+ req_tech = list("engineering" = 6, "materials" = 7, "powerstorage" = 5, "biotech" = 6)
build_type = MECHFAB
materials = list(MAT_METAL = 15000, MAT_GLASS = 8000, MAT_PLASMA = 3000, MAT_GOLD = 8000, MAT_DIAMOND = 2000)
construction_time = 250
build_path = /obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam
- category = list("Exosuit Equipment")
\ No newline at end of file
+ category = list("Exosuit Equipment")
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 98139b4326f..0518e393ecd 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -536,7 +536,7 @@
id = "mech_generator"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/generator
- materials = list(MAT_METAL=10000,MAT_GLASS=1000,MAT_SILVER=500)
+ materials = list(MAT_METAL=10000,MAT_GLASS=1000,MAT_SILVER=2000,MAT_PLASMA=5000)
construction_time = 100
category = list("Exosuit Equipment")
@@ -603,7 +603,7 @@
id = "borg_upgrade_vtec"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/vtec
- req_tech = list("engineering" = 4, "materials" = 5)
+ req_tech = list("engineering" = 4, "materials" = 5, "programming" = 4)
materials = list(MAT_METAL=80000 , MAT_GLASS=6000 , MAT_URANIUM= 5000)
construction_time = 120
category = list("Cyborg Upgrade Modules")
@@ -623,7 +623,7 @@
id = "borg_upgrade_disablercooler"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/disablercooler
- req_tech = list("combat" = 5, "powerstorage" = 4)
+ req_tech = list("combat" = 5, "powerstorage" = 4, "engineering" = 4)
materials = list(MAT_METAL=80000 , MAT_GLASS=6000 , MAT_GOLD= 2000, MAT_DIAMOND = 500)
construction_time = 120
category = list("Cyborg Upgrade Modules")
@@ -633,7 +633,7 @@
id = "borg_upgrade_diamonddrill"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/ddrill
- req_tech = list("engineering" = 5, "materials" = 5)
+ req_tech = list("engineering" = 5, "materials" = 6)
materials = list(MAT_METAL=10000, MAT_DIAMOND=2000)
construction_time = 120
category = list("Cyborg Upgrade Modules")
@@ -643,7 +643,7 @@
id = "borg_upgrade_holding"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/soh
- req_tech = list("engineering" = 5, "materials" = 5, "bluespace" = 3)
+ req_tech = list("engineering" = 4, "materials" = 4, "bluespace" = 4)
materials = list(MAT_METAL = 10000, MAT_GOLD = 250, MAT_URANIUM = 500)
construction_time = 120
category = list("Cyborg Upgrade Modules")
@@ -652,7 +652,7 @@
name = "Cyborg Upgrade (Illegal Modules)"
id = "borg_syndicate_module"
build_type = MECHFAB
- req_tech = list("combat" = 4, "syndicate" = 3)
+ req_tech = list("combat" = 4, "syndicate" = 2)
build_path = /obj/item/borg/upgrade/syndicate
materials = list(MAT_METAL=10000,MAT_GLASS=15000,MAT_DIAMOND = 10000)
construction_time = 120
@@ -688,3 +688,14 @@
construction_time=150
build_path = /obj/item/drone_shell
category = list("Misc")
+
+/datum/design/synthetic_flash
+ name = "Flash"
+ desc = "When a problem arises, SCIENCE is the solution."
+ id = "sflash"
+ req_tech = list("magnets" = 3, "combat" = 2)
+ build_type = MECHFAB
+ materials = list(MAT_METAL = 750, MAT_GLASS = 750)
+ construction_time = 100
+ build_path = /obj/item/device/assembly/flash/handheld
+ category = list("Misc")
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 88f2ecad568..e599fc862c2 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -7,10 +7,9 @@
name = "Mass-Spectrometer"
desc = "A device for analyzing chemicals in the blood."
id = "mass_spectrometer"
- req_tech = list("biotech" = 2, "magnets" = 2)
+ req_tech = list("magnets" = 2, "plasmatech" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 30, MAT_GLASS = 20)
- reliability = 76
+ materials = list(MAT_METAL = 300, MAT_GLASS = 100)
build_path = /obj/item/device/mass_spectrometer
category = list("Medical Designs")
@@ -18,10 +17,9 @@
name = "Advanced Mass-Spectrometer"
desc = "A device for analyzing chemicals in the blood and their quantities."
id = "adv_mass_spectrometer"
- req_tech = list("biotech" = 2, "magnets" = 4)
+ req_tech = list("biotech" = 3, "magnets" = 4, "plasmatech" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 30, MAT_GLASS = 20)
- reliability = 74
+ materials = list(MAT_METAL = 500, MAT_GLASS = 200)
build_path = /obj/item/device/mass_spectrometer/adv
category = list("Medical Designs")
@@ -29,11 +27,10 @@
name = "Man-Machine Interface"
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
id = "mmi"
- req_tech = list("programming" = 2, "biotech" = 3)
+ req_tech = list("programming" = 3, "biotech" = 2, "engineering" = 2)
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 1000, MAT_GLASS = 500)
construction_time = 75
- reliability = 76
build_path = /obj/item/device/mmi
category = list("Misc","Medical Designs")
@@ -41,46 +38,30 @@
name = "Positronic Brain"
desc = "The latest in Artificial Intelligences."
id = "mmi_posi"
- req_tech = list("programming" = 5, "biotech" = 4)
+ req_tech = list("programming" = 5, "biotech" = 4, "plasmatech" = 3)
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 1700, MAT_GLASS = 1350, MAT_GOLD = 500) //Gold, because SWAG.
- reliability = 74
construction_time = 75
build_path = /obj/item/device/mmi/posibrain
category = list("Misc", "Medical Designs")
-
-/datum/design/synthetic_flash
- name = "Flash"
- desc = "When a problem arises, SCIENCE is the solution."
- id = "sflash"
- req_tech = list("magnets" = 3, "combat" = 2)
- build_type = MECHFAB
- materials = list(MAT_METAL = 750, MAT_GLASS = 750)
- construction_time = 100
- reliability = 76
- build_path = /obj/item/device/assembly/flash/handheld
- category = list("Misc")
-
/datum/design/bluespacebeaker
name = "Bluespace Beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units."
id = "bluespacebeaker"
- req_tech = list("bluespace" = 2, "materials" = 6)
+ req_tech = list("bluespace" = 6, "materials" = 5, "plasmatech" = 4)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 3000, MAT_PLASMA = 3000, MAT_DIAMOND = 500)
- reliability = 76
+ materials = list(MAT_GLASS = 3000, MAT_PLASMA = 3000, MAT_DIAMOND = 500)
build_path = /obj/item/weapon/reagent_containers/glass/beaker/bluespace
- category = list("Medical Designs", "Bluespace Designs")
+ category = list("Medical Designs")
/datum/design/noreactbeaker
name = "Cryostasis Beaker"
desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units."
id = "splitbeaker"
- req_tech = list("materials" = 2)
+ req_tech = list("materials" = 3, "engineering" = 3, "plasmatech" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 3000)
- reliability = 76
build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact
category = list("Medical Designs")
@@ -88,21 +69,19 @@
name = "Bluespace Syringe"
desc = "An advanced syringe that can hold 60 units of chemicals"
id = "bluespacesyringe"
- req_tech = list("bluespace" = 3, "materials" = 4, "combat" = 2)
+ req_tech = list("bluespace" = 5, "materials" = 4, "biotech" = 4)
build_type = PROTOLATHE
materials = list(MAT_GLASS = 4000, MAT_PLASMA = 2000, MAT_DIAMOND = 2000)
- reliability = 76
build_path = /obj/item/weapon/reagent_containers/syringe/bluespace
- category = list("Medical Designs", "Bluespace Designs")
+ category = list("Medical Designs")
/datum/design/noreactsyringe
name = "Cryo Syringe"
desc = "An advanced syringe that stops reagents inside from reacting. It can hold up to 20 units."
id = "noreactsyringe"
- req_tech = list("materials" = 2, "combat" = 2)
+ req_tech = list("materials" = 3, "engineering" = 3)
build_type = PROTOLATHE
materials = list(MAT_GLASS = 4000, MAT_GOLD = 1000)
- reliability = 76
build_path = /obj/item/weapon/reagent_containers/syringe/noreact
category = list("Medical Designs")
@@ -110,10 +89,9 @@
name = "Piercing Syringe"
desc = "A diamond-tipped syringe that pierces armor when launched at high velocity. It can hold up to 10 units."
id = "piercesyringe"
- req_tech = list("materials" = 3, "combat" = 3)
+ req_tech = list("materials" = 5, "combat" = 3, "engineering" = 7)
build_type = PROTOLATHE
materials = list(MAT_GLASS = 4000, MAT_DIAMOND = 1500)
- reliability = 76
build_path = /obj/item/weapon/reagent_containers/syringe/piercing
category = list("Medical Designs")
@@ -121,10 +99,9 @@
name = "Bluespace body bag"
desc = "A bluespace body bag, powered by experimental bluespace technology. It can hold loads of bodies and the largest of creatures."
id = "bluespacebodybag"
- req_tech = list("bluespace" = 2, "materials" = 6)
+ req_tech = list("bluespace" = 5, "materials" = 4, "plasmatech" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 3000, MAT_PLASMA = 2000, MAT_DIAMOND = 500)
- reliability = 76
build_path = /obj/item/bodybag/bluespace
category = list("Medical Designs")
@@ -132,10 +109,9 @@
name = "Plasma-man jumpsuit refill"
desc = "A refill pack for the auto-extinguisher on Plasma-man suits."
id = "plasmarefiller"
- req_tech = list("materials" = 2, "combat" = 2)
+ req_tech = list("materials" = 2, "plasmatech" = 3) //Why did this have no plasmatech
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000, MAT_PLASMA = 1000)
- reliability = 76
build_path = /obj/item/device/extinguisher_refill
category = list("Medical Designs")
@@ -147,10 +123,10 @@
name = "Welding Shield implant"
desc = "These reactive micro-shields will protect you from welders and flashes without obscuring your vision."
id = "ci-welding"
- req_tech = list("materials" = 4, "biotech" = 2)
+ req_tech = list("materials" = 4, "biotech" = 4, "engineering" = 5, "plasmatech" = 4)
build_type = PROTOLATHE | MECHFAB
construction_time = 40
- materials = list(MAT_METAL = 200, MAT_GLASS = 400)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 400)
build_path = /obj/item/organ/cyberimp/eyes/shield
category = list("Misc", "Medical Designs")
@@ -158,10 +134,10 @@
name = "Breathing Tube implant"
desc = "This simple implant adds an internals connector to your back, allowing you to use internals without a mask and protecting you from being choked."
id = "ci-breather"
- req_tech = list("materials" = 3, "biotech" = 3)
+ req_tech = list("materials" = 2, "biotech" = 3)
build_type = PROTOLATHE | MECHFAB
construction_time = 35
- materials = list(MAT_METAL = 200, MAT_GLASS = 250)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 250)
build_path = /obj/item/organ/cyberimp/mouth/breathing_tube
category = list("Misc", "Medical Designs")
@@ -169,7 +145,7 @@
name = "Toolset Arm implant"
desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm."
id = "ci-toolset"
- req_tech = list("materials" = 4, "engineering" = 3, "biotech" = 4, "powerstorage" = 4)
+ req_tech = list("materials" = 3, "engineering" = 4, "biotech" = 4, "powerstorage" = 4)
build_type = PROTOLATHE | MECHFAB
materials = list (MAT_METAL = 2500, MAT_GLASS = 1500, MAT_SILVER = 1500)
construction_time = 200
@@ -180,10 +156,10 @@
name = "Medical HUD implant"
desc = "These cybernetic eyes will display a medical HUD over everything you see. Wiggle eyes to control."
id = "ci-medhud"
- req_tech = list("materials" = 6, "programming" = 4, "biotech" = 4)
+ req_tech = list("materials" = 5, "programming" = 4, "biotech" = 4)
build_type = PROTOLATHE | MECHFAB
construction_time = 50
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 500, MAT_GOLD = 500)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_SILVER = 500, MAT_GOLD = 500)
build_path = /obj/item/organ/cyberimp/eyes/hud/medical
category = list("Misc", "Medical Designs")
@@ -191,10 +167,10 @@
name = "Security HUD implant"
desc = "These cybernetic eyes will display a security HUD over everything you see. Wiggle eyes to control."
id = "ci-sechud"
- req_tech = list("materials" = 6, "programming" = 5, "biotech" = 4, "combat" = 2)
+ req_tech = list("materials" = 5, "programming" = 4, "biotech" = 4, "combat" = 3)
build_type = PROTOLATHE | MECHFAB
construction_time = 50
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 750, MAT_GOLD = 750)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_SILVER = 750, MAT_GOLD = 750)
build_path = /obj/item/organ/cyberimp/eyes/hud/security
category = list("Misc", "Medical Designs")
@@ -202,10 +178,10 @@
name = "X-Ray implant"
desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile."
id = "ci-xray"
- req_tech = list("materials" = 7, "programming" = 5, "biotech" = 6, "magnets" = 5)
+ req_tech = list("materials" = 7, "programming" = 5, "biotech" = 7, "magnets" = 5,"plasmatech" = 6)
build_type = PROTOLATHE | MECHFAB
construction_time = 60
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 600, MAT_GOLD = 600, MAT_PLASMA = 1000, MAT_URANIUM = 1000, MAT_DIAMOND = 2000)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_SILVER = 600, MAT_GOLD = 600, MAT_PLASMA = 1000, MAT_URANIUM = 1000, MAT_DIAMOND = 2000)
build_path = /obj/item/organ/cyberimp/eyes/xray
category = list("Misc", "Medical Designs")
@@ -213,10 +189,10 @@
name = "Thermals implant"
desc = "These cybernetic eyes will give you Thermal vision. Vertical slit pupil included."
id = "ci-thermals"
- req_tech = list("materials" = 7, "programming" = 5, "biotech" = 5, "magnets" = 5, "syndicate" = 5)
+ req_tech = list("materials" = 6, "programming" = 4, "biotech" = 7, "magnets" = 5,"plasmatech" = 4)
build_type = PROTOLATHE | MECHFAB
construction_time = 60
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 600, MAT_GOLD = 600, MAT_PLASMA = 1000, MAT_DIAMOND = 2000)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_SILVER = 600, MAT_GOLD = 600, MAT_PLASMA = 1000, MAT_DIAMOND = 2000)
build_path = /obj/item/organ/cyberimp/eyes/thermals
category = list("Misc", "Medical Designs")
@@ -224,10 +200,10 @@
name = "Anti-Drop implant"
desc = "This cybernetic brain implant will allow you to force your hand muscles to contract, preventing item dropping. Twitch ear to toggle."
id = "ci-antidrop"
- req_tech = list("materials" = 7, "programming" = 5, "biotech" = 5)
+ req_tech = list("materials" = 5, "programming" = 6, "biotech" = 5)
build_type = PROTOLATHE | MECHFAB
construction_time = 60
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 400, MAT_GOLD = 400)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_SILVER = 400, MAT_GOLD = 400)
build_path = /obj/item/organ/cyberimp/brain/anti_drop
category = list("Misc", "Medical Designs")
@@ -235,10 +211,10 @@
name = "CNS Rebooter implant"
desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned."
id = "ci-antistun"
- req_tech = list("materials" = 7, "programming" = 5, "biotech" = 6)
+ req_tech = list("materials" = 6, "programming" = 5, "biotech" = 6)
build_type = PROTOLATHE | MECHFAB
construction_time = 60
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 500, MAT_GOLD = 1000)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_SILVER = 500, MAT_GOLD = 1000)
build_path = /obj/item/organ/cyberimp/brain/anti_stun
category = list("Misc", "Medical Designs")
@@ -246,10 +222,10 @@
name = "Nutriment pump implant"
desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
id = "ci-nutriment"
- req_tech = list("materials" = 6, "programming" = 4, "biotech" = 5)
+ req_tech = list("materials" = 5, "powerstorage" = 6, "biotech" = 5)
build_type = PROTOLATHE | MECHFAB
construction_time = 40
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 500, MAT_URANIUM = 500)
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_URANIUM = 500)
build_path = /obj/item/organ/cyberimp/chest/nutriment
category = list("Misc", "Medical Designs")
@@ -257,10 +233,10 @@
name = "Nutriment pump implant PLUS"
desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are hungry."
id = "ci-nutrimentplus"
- req_tech = list("materials" = 6, "programming" = 4, "biotech" = 6)
+ req_tech = list("materials" = 5, "powerstorage" = 6, "biotech" = 6)
build_type = PROTOLATHE | MECHFAB
construction_time = 50
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 500, MAT_URANIUM = 750)
+ materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_GOLD = 500, MAT_URANIUM = 750)
build_path = /obj/item/organ/cyberimp/chest/nutriment/plus
category = list("Misc", "Medical Designs")
@@ -268,10 +244,10 @@
name = "Reviver implant"
desc = "This implant will attempt to revive you if you lose consciousness. For the faint of heart!"
id = "ci-reviver"
- req_tech = list("materials" = 6, "programming" = 4, "biotech" = 7, "syndicate" = 4)
+ req_tech = list("materials" = 5, "programming" = 4, "biotech" = 8)
build_type = PROTOLATHE | MECHFAB
construction_time = 60
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 500, MAT_URANIUM = 1000, MAT_DIAMOND = 2000)
+ materials = list(MAT_METAL = 800, MAT_GLASS = 800, MAT_GOLD = 500, MAT_URANIUM = 1000, MAT_DIAMOND = 2000)
build_path = /obj/item/organ/cyberimp/chest/reviver
category = list("Misc", "Medical Designs")
@@ -279,7 +255,7 @@
name = "Thrusters set implant"
desc = "This implant will allow you to use gas from environment or your internals for propulsion in zero-gravity areas."
id = "ci-thrusters"
- req_tech = list("materials" = 7, "programming" = 5, "biotech" = 5, "magnets" = 4, "engineering" = 5)
+ req_tech = list("materials" = 5, "biotech" = 5, "magnets" = 4, "engineering" = 7)
build_type = PROTOLATHE | MECHFAB
construction_time = 80
materials = list(MAT_METAL = 4000, MAT_GLASS = 2000, MAT_SILVER = 1000, MAT_DIAMOND = 1000)
@@ -295,7 +271,7 @@
name = "Implanter"
desc = "A sterile automatic implant injector."
id = "implanter"
- req_tech = list("materials" = 1, "programming" = 2, "biotech" = 3)
+ req_tech = list("materials" = 2, "biotech" = 3, "programming" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 600, MAT_GLASS = 200)
build_path = /obj/item/weapon/implanter
@@ -305,7 +281,7 @@
name = "Implant Case"
desc = "A glass case for containing an implant."
id = "implantcase"
- req_tech = list("materials" = 1, "biotech" = 2)
+ req_tech = list("biotech" = 2)
build_type = PROTOLATHE
materials = list(MAT_GLASS = 500)
build_path = /obj/item/weapon/implantcase
@@ -315,9 +291,9 @@
name = "Freedom Implant Case"
desc = "A glass case containing an implant."
id = "implant_freedom"
- req_tech = list("materials" = 2, "biotech" = 3, "magnets" = 3, "syndicate" = 5)
+ req_tech = list("combat" = 6, "biotech" = 5, "magnets" = 3, "syndicate" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 500, MAT_GOLD = 250)
+ materials = list(MAT_METAL = 800, MAT_GLASS = 500, MAT_GOLD = 500)
build_path = /obj/item/weapon/implantcase/freedom
category = list("Medical Designs")
@@ -325,8 +301,8 @@
name = "Adrenalin Implant Case"
desc = "A glass case containing an implant."
id = "implant_adrenalin"
- req_tech = list("materials" = 2, "biotech" = 5, "combat" = 3, "syndicate" = 6)
+ req_tech = list("biotech" = 6, "combat" = 6, "syndicate" = 6)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 500, MAT_GOLD = 500, MAT_URANIUM = 100, MAT_DIAMOND = 200)
+ materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_GOLD = 500, MAT_URANIUM = 600, MAT_DIAMOND = 600)
build_path = /obj/item/weapon/implantcase/adrenaline
- category = list("Medical Designs")
\ No newline at end of file
+ category = list("Medical Designs")
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index 11bb5c755be..ba9f113e2e4 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -28,8 +28,7 @@
name = "Super-Capacity Power Cell"
desc = "A power cell that holds 20000 units of energy."
id = "super_cell"
- req_tech = list("powerstorage" = 3, "materials" = 2)
- reliability = 75
+ req_tech = list("powerstorage" = 3, "materials" = 3)
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 700, MAT_GLASS = 70)
construction_time=100
@@ -40,10 +39,9 @@
name = "Hyper-Capacity Power Cell"
desc = "A power cell that holds 30000 units of energy."
id = "hyper_cell"
- req_tech = list("powerstorage" = 5, "materials" = 4)
- reliability = 70
+ req_tech = list("powerstorage" = 5, "materials" = 5, "engineering" = 5)
build_type = PROTOLATHE | MECHFAB
- materials = list(MAT_METAL = 400, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 80)
+ materials = list(MAT_METAL = 700, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 80)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/hyper
category = list("Misc","Power Designs")
@@ -52,8 +50,7 @@
name = "Bluespace Power Cell"
desc = "A power cell that holds 40000 units of energy."
id = "bluespace_cell"
- req_tech = list("powerstorage" = 6, "materials" = 5)
- reliability = 70
+ req_tech = list("powerstorage" = 6, "materials" = 5, "engineering" = 5, "bluespace" = 5)
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 800, MAT_GOLD = 300, MAT_SILVER = 300, MAT_GLASS = 160, MAT_DIAMOND = 160)
construction_time=100
@@ -65,7 +62,7 @@
name = "Light Replacer"
desc = "A device to automatically replace lights. Refill with working lightbulbs."
id = "light_replacer"
- req_tech = list("magnets" = 3, "materials" = 4)
+ req_tech = list("magnets" = 3, "engineering" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 1500, MAT_SILVER = 150, MAT_GLASS = 3000)
build_path = /obj/item/device/lightreplacer
@@ -75,9 +72,8 @@
name = "Machine Design (PACMAN-type Generator Board)"
desc = "The circuit board that for a PACMAN-type portable generator."
id = "pacman"
- req_tech = list("programming" = 3, "plasmatech" = 3, "powerstorage" = 3, "engineering" = 3)
+ req_tech = list("programming" = 2, "plasmatech" = 3, "powerstorage" = 3, "engineering" = 3)
build_type = IMPRINTER
- reliability = 79
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/pacman
category = list("Engineering Machinery")
@@ -88,7 +84,6 @@
id = "superpacman"
req_tech = list("programming" = 3, "powerstorage" = 4, "engineering" = 4)
build_type = IMPRINTER
- reliability = 76
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/pacman/super
category = list("Engineering Machinery")
@@ -97,9 +92,8 @@
name = "Machine Design (MRSPACMAN-type Generator Board)"
desc = "The circuit board that for a MRSPACMAN-type portable generator."
id = "mrspacman"
- req_tech = list("programming" = 3, "powerstorage" = 5, "engineering" = 5)
+ req_tech = list("programming" = 3, "powerstorage" = 5, "engineering" = 5, "plasmatech" = 4)
build_type = IMPRINTER
- reliability = 74
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/pacman/mrs
category = list("Engineering Machinery")
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index 3f10842e91f..bfd81790c4a 100644
--- a/code/modules/research/designs/stock_parts_designs.dm
+++ b/code/modules/research/designs/stock_parts_designs.dm
@@ -6,8 +6,7 @@
name = "Rapid Part Exchange Device"
desc = "Special mechanical module made to store, sort, and apply standard machine parts."
id = "rped"
- req_tech = list("engineering" = 3,
- "materials" = 3)
+ req_tech = list("engineering" = 1)
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 5000) //hardcore
build_path = /obj/item/weapon/storage/part_replacer
@@ -17,7 +16,7 @@
name = "Bluespace RPED"
desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first."
id = "bs_rped"
- req_tech = list("engineering" = 3, "materials" = 5, "programming" = 3, "bluespace" = 3)
+ req_tech = list("engineering" = 4, "bluespace" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 15000, MAT_GLASS = 5000, MAT_SILVER = 2500) //hardcore
build_path = /obj/item/weapon/storage/part_replacer/bluespace
@@ -30,7 +29,7 @@
id = "basic_capacitor"
req_tech = list("powerstorage" = 1)
build_type = PROTOLATHE | AUTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+ materials = list(MAT_METAL = 100, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/capacitor
category = list("Stock Parts","Machinery","initial")
@@ -40,7 +39,7 @@
id = "adv_capacitor"
req_tech = list("powerstorage" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+ materials = list(MAT_METAL = 150, MAT_GLASS = 150)
build_path = /obj/item/weapon/stock_parts/capacitor/adv
category = list("Stock Parts")
@@ -48,10 +47,9 @@
name = "Super Capacitor"
desc = "A stock part used in the construction of various devices."
id = "super_capacitor"
- req_tech = list("powerstorage" = 5, "materials" = 4)
+ req_tech = list("powerstorage" = 5, "engineering" = 5)
build_type = PROTOLATHE
- reliability = 71
- materials = list(MAT_METAL = 50, MAT_GLASS = 50, MAT_GOLD = 20)
+ materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 100)
build_path = /obj/item/weapon/stock_parts/capacitor/super
category = list("Stock Parts")
@@ -59,10 +57,9 @@
name = "Quadratic Capacitor"
desc = "A stock part used in the construction of various devices."
id = "quadratic_capacitor"
- req_tech = list("powerstorage" = 6, "materials" = 5)
+ req_tech = list("powerstorage" = 6, "engineering" = 5, "materials" = 5, "bluespace" = 5)
build_type = PROTOLATHE
- reliability = 71
- materials = list(MAT_METAL = 100, MAT_GLASS = 100, MAT_DIAMOND = 40)
+ materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/stock_parts/capacitor/quadratic
category = list("Stock Parts")
@@ -73,7 +70,7 @@
id = "basic_scanning"
req_tech = list("magnets" = 1)
build_type = PROTOLATHE | AUTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 20)
+ materials = list(MAT_METAL = 100, MAT_GLASS = 50)
build_path = /obj/item/weapon/stock_parts/scanning_module
category = list("Stock Parts","Machinery","initial")
@@ -83,7 +80,7 @@
id = "adv_scanning"
req_tech = list("magnets" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 20)
+ materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/scanning_module/adv
category = list("Stock Parts")
@@ -91,10 +88,9 @@
name = "Phasic Scanning Module"
desc = "A stock part used in the construction of various devices."
id = "phasic_scanning"
- req_tech = list("magnets" = 5, "materials" = 3)
+ req_tech = list("magnets" = 5, "engineering" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 20, MAT_SILVER = 10)
- reliability = 72
+ materials = list(MAT_METAL = 200, MAT_GLASS = 150, MAT_SILVER = 60)
build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
category = list("Stock Parts")
@@ -102,10 +98,9 @@
name = "Triphasic Scanning Module"
desc = "A stock part used in the construction of various devices."
id = "triphasic_scanning"
- req_tech = list("magnets" = 6, "materials" = 4)
+ req_tech = list("magnets" = 6, "materials" = 5, "engineering" = 5, "bluespace" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 100, MAT_GLASS = 40, MAT_DIAMOND = 20)
- reliability = 72
+ materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_DIAMOND = 60)
build_path = /obj/item/weapon/stock_parts/scanning_module/triphasic
category = list("Stock Parts")
@@ -114,9 +109,9 @@
name = "Micro Manipulator"
desc = "A stock part used in the construction of various devices."
id = "micro_mani"
- req_tech = list("materials" = 1, "programming" = 1)
+ req_tech = list("materials" = 1)
build_type = PROTOLATHE | AUTOLATHE
- materials = list(MAT_METAL = 30)
+ materials = list(MAT_METAL = 100)
build_path = /obj/item/weapon/stock_parts/manipulator
category = list("Stock Parts","Machinery","initial")
@@ -126,7 +121,7 @@
id = "nano_mani"
req_tech = list("materials" = 3, "programming" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 30)
+ materials = list(MAT_METAL = 150)
build_path = /obj/item/weapon/stock_parts/manipulator/nano
category = list("Stock Parts")
@@ -134,10 +129,9 @@
name = "Pico Manipulator"
desc = "A stock part used in the construction of various devices."
id = "pico_mani"
- req_tech = list("materials" = 5, "programming" = 2)
+ req_tech = list("materials" = 5, "programming" = 4, "engineering" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 30)
- reliability = 73
+ materials = list(MAT_METAL = 200)
build_path = /obj/item/weapon/stock_parts/manipulator/pico
category = list("Stock Parts")
@@ -145,10 +139,9 @@
name = "Femto Manipulator"
desc = "A stock part used in the construction of various devices."
id = "femto_mani"
- req_tech = list("materials" = 6, "programming" = 3)
+ req_tech = list("materials" = 7, "programming" = 5, "engineering" = 5, "bluespace" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 60, MAT_DIAMOND = 30)
- reliability = 73
+ materials = list(MAT_METAL = 200, MAT_DIAMOND = 60)
build_path = /obj/item/weapon/stock_parts/manipulator/femto
category = list("Stock Parts")
@@ -159,7 +152,7 @@
id = "basic_micro_laser"
req_tech = list("magnets" = 1)
build_type = PROTOLATHE | AUTOLATHE
- materials = list(MAT_METAL = 10, MAT_GLASS = 20)
+ materials = list(MAT_METAL = 100, MAT_GLASS = 50)
build_path = /obj/item/weapon/stock_parts/micro_laser
category = list("Stock Parts","Machinery","initial")
@@ -169,7 +162,7 @@
id = "high_micro_laser"
req_tech = list("magnets" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 10, MAT_GLASS = 20)
+ materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/micro_laser/high
category = list("Stock Parts")
@@ -177,10 +170,9 @@
name = "Ultra-High-Power Micro-Laser"
desc = "A stock part used in the construction of various devices."
id = "ultra_micro_laser"
- req_tech = list("magnets" = 5, "materials" = 5)
+ req_tech = list("magnets" = 5, "engineering" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 10, MAT_GLASS = 20, MAT_URANIUM = 10)
- reliability = 70
+ materials = list(MAT_METAL = 200, MAT_GLASS = 150, MAT_URANIUM = 60)
build_path = /obj/item/weapon/stock_parts/micro_laser/ultra
category = list("Stock Parts")
@@ -188,10 +180,9 @@
name = "Quad-Ultra Micro-Laser"
desc = "A stock part used in the construction of various devices."
id = "quadultra_micro_laser"
- req_tech = list("magnets" = 6, "materials" = 6)
+ req_tech = list("magnets" = 6, "materials" = 5, "engineering" = 5, "bluespace" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 20, MAT_GLASS = 40, MAT_URANIUM = 20, MAT_DIAMOND = 20)
- reliability = 70
+ materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 100, MAT_DIAMOND = 60)
build_path = /obj/item/weapon/stock_parts/micro_laser/quadultra
category = list("Stock Parts")
@@ -201,7 +192,7 @@
id = "basic_matter_bin"
req_tech = list("materials" = 1)
build_type = PROTOLATHE | AUTOLATHE
- materials = list(MAT_METAL = 80)
+ materials = list(MAT_METAL = 100)
build_path = /obj/item/weapon/stock_parts/matter_bin
category = list("Stock Parts","Machinery","initial")
@@ -211,7 +202,7 @@
id = "adv_matter_bin"
req_tech = list("materials" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 80)
+ materials = list(MAT_METAL = 150)
build_path = /obj/item/weapon/stock_parts/matter_bin/adv
category = list("Stock Parts")
@@ -219,10 +210,9 @@
name = "Super Matter Bin"
desc = "A stock part used in the construction of various devices."
id = "super_matter_bin"
- req_tech = list("materials" = 5)
+ req_tech = list("materials" = 5, "engineering" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 80)
- reliability = 75
+ materials = list(MAT_METAL = 200)
build_path = /obj/item/weapon/stock_parts/matter_bin/super
category = list("Stock Parts")
@@ -230,10 +220,9 @@
name = "Bluespace Matter Bin"
desc = "A stock part used in the construction of various devices."
id = "bluespace_matter_bin"
- req_tech = list("materials" = 6)
+ req_tech = list("materials" = 7, "engineering" = 5, "bluespace" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 160, MAT_DIAMOND = 200)
- reliability = 75
+ materials = list(MAT_METAL = 250, MAT_DIAMOND = 200)
build_path = /obj/item/weapon/stock_parts/matter_bin/bluespace
category = list("Stock Parts")
@@ -242,9 +231,9 @@
name = "Subspace Ansible"
desc = "A compact module capable of sensing extradimensional activity."
id = "s-ansible"
- req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1)
+ req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 80, MAT_SILVER = 20)
+ materials = list(MAT_METAL = 100, MAT_SILVER = 100)
build_path = /obj/item/weapon/stock_parts/subspace/ansible
category = list("Stock Parts")
@@ -252,9 +241,9 @@
name = "Hyperwave Filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
id = "s-filter"
- req_tech = list("programming" = 2, "magnets" = 2)
+ req_tech = list("programming" = 3, "magnets" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 40, MAT_SILVER = 10)
+ materials = list(MAT_METAL = 100, MAT_SILVER = 100)
build_path = /obj/item/weapon/stock_parts/subspace/filter
category = list("Stock Parts")
@@ -262,9 +251,9 @@
name = "Subspace Amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
id = "s-amplifier"
- req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1)
+ req_tech = list("programming" = 3, "magnets" = 4, "materials" = 3, "bluespace" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 10, MAT_GOLD = 30, MAT_URANIUM = 15)
+ materials = list(MAT_METAL = 100, MAT_GOLD = 100, MAT_URANIUM = 100)
build_path = /obj/item/weapon/stock_parts/subspace/amplifier
category = list("Stock Parts")
@@ -272,9 +261,9 @@
name = "Subspace Treatment Disk"
desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
id = "s-treatment"
- req_tech = list("programming" = 2, "magnets" = 1, "materials" = 2, "bluespace" = 1)
+ req_tech = list("programming" = 2, "magnets" = 3, "materials" = 2, "bluespace" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 10, MAT_SILVER = 20)
+ materials = list(MAT_METAL = 100, MAT_SILVER = 200)
build_path = /obj/item/weapon/stock_parts/subspace/treatment
category = list("Stock Parts")
@@ -282,9 +271,9 @@
name = "Subspace Analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
id = "s-analyzer"
- req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1)
+ req_tech = list("programming" = 3, "magnets" = 4, "materials" = 2, "bluespace" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 10, MAT_GOLD = 15)
+ materials = list(MAT_METAL = 100, MAT_GOLD = 100)
build_path = /obj/item/weapon/stock_parts/subspace/analyzer
category = list("Stock Parts")
@@ -292,9 +281,9 @@
name = "Ansible Crystal"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
id = "s-crystal"
- req_tech = list("magnets" = 2, "materials" = 2, "bluespace" = 1)
+ req_tech = list("magnets" = 2, "materials" = 2, "bluespace" = 3, "plasmatech" = 3)
build_type = PROTOLATHE
- materials = list(MAT_GLASS = 1000, MAT_SILVER = 20, MAT_GOLD = 20)
+ materials = list(MAT_GLASS = 800, MAT_SILVER = 100, MAT_GOLD = 100)
build_path = /obj/item/weapon/stock_parts/subspace/crystal
category = list("Stock Parts")
@@ -302,8 +291,8 @@
name = "Subspace Transmitter"
desc = "A large piece of equipment used to open a window into the subspace dimension."
id = "s-transmitter"
- req_tech = list("magnets" = 3, "materials" = 3, "bluespace" = 2)
+ req_tech = list("magnets" = 3, "materials" = 4, "bluespace" = 4)
build_type = PROTOLATHE
- materials = list(MAT_GLASS = 100, MAT_SILVER = 10, MAT_URANIUM = 15)
+ materials = list(MAT_GLASS = 100, MAT_SILVER = 100, MAT_URANIUM = 100)
build_path = /obj/item/weapon/stock_parts/subspace/transmitter
category = list("Stock Parts")
diff --git a/code/modules/research/designs/telecomms_designs.dm b/code/modules/research/designs/telecomms_designs.dm
index baa6bb689ba..f63ee2fe2d5 100644
--- a/code/modules/research/designs/telecomms_designs.dm
+++ b/code/modules/research/designs/telecomms_designs.dm
@@ -66,8 +66,8 @@
name = "Machine Design (Subspace Broadcaster)"
desc = "Allows for the construction of Subspace Broadcasting equipment."
id = "s-broadcaster"
- req_tech = list("programming" = 2, "engineering" = 2, "bluespace" = 1)
+ req_tech = list("programming" = 2, "engineering" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/machine/telecomms/broadcaster
- category = list("Subspace Telecomms")
\ No newline at end of file
+ category = list("Subspace Telecomms")
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 96934df98e7..9c8d3b50fa9 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -6,7 +6,7 @@
name = "test-range firing pin"
desc = "This safety firing pin allows firearms to be operated within proximity to a firing range."
id = "pin_testing"
- req_tech = list("combat" = 1, "materials" = 2)
+ req_tech = list("combat" = 2, "materials" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 300)
build_path = /obj/item/device/firing_pin/test_range
@@ -16,7 +16,7 @@
name = "loyalty firing pin"
desc = "This is a security firing pin which only authorizes users who are loyalty-implanted."
id = "pin_loyalty"
- req_tech = list("combat" = 5, "materials" = 6, "powerstorage" = 3)
+ req_tech = list("combat" = 5, "materials" = 6)
build_type = PROTOLATHE
materials = list(MAT_SILVER = 600, MAT_DIAMOND = 600, MAT_URANIUM = 200)
build_path = /obj/item/device/firing_pin/implant/loyalty
@@ -26,21 +26,19 @@
name = "Tesla Revolver"
desc = "A high-tech revolver that fires internal, reusable shock cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
id = "stunrevolver"
- req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 5)
+ req_tech = list("combat" = 4, "materials" = 4, "powerstorage" = 5)
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 10000, MAT_SILVER = 10000)
build_path = /obj/item/weapon/gun/energy/shock_revolver
-
category = list("Weapons")
/datum/design/nuclear_gun
name = "Advanced Energy Gun"
desc = "An energy gun with an experimental miniaturized reactor."
id = "nuclear_gun"
- req_tech = list("combat" = 4, "materials" = 5, "powerstorage" = 3)
+ req_tech = list("combat" = 5, "magnets" = 5, "powerstorage" = 5)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 2000)
- reliability = 76
+ materials = list(MAT_METAL = 10000, MAT_GLASS = 2000, MAT_URANIUM = 4000)
build_path = /obj/item/weapon/gun/energy/gun/nuclear
category = list("Weapons")
@@ -48,7 +46,7 @@
name = "Telescopic Riot Shield"
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
id = "tele_shield"
- req_tech = list("combat" = 4, "materials" = 3, "engineering" = 3)
+ req_tech = list("combat" = 4, "materials" = 3, "engineering" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000, MAT_GLASS = 5000, MAT_SILVER = 300)
build_path = /obj/item/weapon/shield/riot/tele
@@ -58,9 +56,9 @@
name = "Accelerator Laser Cannon"
desc = "A heavy duty laser cannon. It does more damage the farther away the target is."
id = "lasercannon"
- req_tech = list("combat" = 4, "materials" = 3, "powerstorage" = 3)
+ req_tech = list("combat" = 5, "magnets" = 5, "powerstorage" = 3)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 10000, MAT_GLASS = 2000, MAT_DIAMOND = 2000)
+ materials = list(MAT_METAL = 10000, MAT_GLASS = 3000, MAT_DIAMOND = 3000)
build_path = /obj/item/weapon/gun/energy/lasercannon
category = list("Weapons")
@@ -68,7 +66,7 @@
name = "Decloner"
desc = "Your opponent will bubble into a messy pile of goop."
id = "decloner"
- req_tech = list("combat" = 8, "materials" = 7, "biotech" = 5, "powerstorage" = 6)
+ req_tech = list("combat" = 5, "materials" = 5, "biotech" = 6, "plasmatech" = 7)
build_type = PROTOLATHE
materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000)
reagents = list("mutagen" = 40)
@@ -79,7 +77,7 @@
name = "Rapid Syringe Gun"
desc = "A gun that fires many syringes."
id = "rapidsyringe"
- req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2)
+ req_tech = list("combat" = 3, "biotech" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 1000)
build_path = /obj/item/weapon/gun/syringe/rapidsyringe
@@ -89,18 +87,17 @@
name = "Energy Crossbow"
desc = "A reverse-engineered energy crossbow favored by syndicate infiltration teams and carp hunters."
id = "largecrossbow"
- req_tech = list("combat" = 5, "materials" = 5, "engineering" = 3, "biotech" = 4, "syndicate" = 3)
+ req_tech = list("combat" = 5, "engineering" = 3, "magnet" = 5, "syndicate" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 1500, MAT_URANIUM = 1500, MAT_SILVER = 1500)
build_path = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large
category = list("Weapons")
- reliability = 76
/datum/design/temp_gun
name = "Temperature Gun"
desc = "A gun that shoots temperature bullet energythings to change temperature."//Change it if you want
id = "temp_gun"
- req_tech = list("combat" = 3, "materials" = 4, "powerstorage" = 3, "magnets" = 2)
+ req_tech = list("combat" = 4, "materials" = 4, "powerstorage" = 3, "magnets" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 500, MAT_SILVER = 3000)
build_path = /obj/item/weapon/gun/energy/temperature
@@ -110,7 +107,7 @@
name = "Floral Somatoray"
desc = "A tool that discharges controlled radiation which induces mutation in plant cells. Harmless to other organic life."
id = "flora_gun"
- req_tech = list("materials" = 2, "biotech" = 3, "powerstorage" = 3)
+ req_tech = list("materials" = 2, "biotech" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 500)
reagents = list("radium" = 20)
@@ -121,10 +118,9 @@
name = "Large Grenade"
desc = "A grenade that affects a larger area and use larger containers."
id = "large_Grenade"
- req_tech = list("combat" = 3, "materials" = 2)
+ req_tech = list("combat" = 3, "engineering" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 3000)
- reliability = 79
build_path = /obj/item/weapon/grenade/chem_grenade/large
category = list("Weapons")
@@ -132,10 +128,9 @@
name = "Pyro Grenade"
desc = "An advanced grenade that is able to self ignite its mixture."
id = "pyro_Grenade"
- req_tech = list("combat" = 3, "materials" = 3)
+ req_tech = list("combat" = 4, "engineering" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_PLASMA = 500)
- reliability = 79
build_path = /obj/item/weapon/grenade/chem_grenade/pyro
category = list("Weapons")
@@ -148,7 +143,6 @@
req_tech = list("combat" = 3, "materials" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_SILVER = 500)
- reliability = 79
build_path = /obj/item/weapon/grenade/chem_grenade/cryo
category = list("Weapons")
*/
@@ -157,10 +151,9 @@
name = "Advanced Release Grenade"
desc = "An advanced grenade that can be detonated several times, best used with a repeating igniter."
id = "adv_Grenade"
- req_tech = list("combat" = 3, "materials" = 3)
+ req_tech = list("combat" = 3, "engineering" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 3000, MAT_GLASS = 500)
- reliability = 79
build_path = /obj/item/weapon/grenade/chem_grenade/adv_release
category = list("Weapons")
@@ -168,9 +161,9 @@
name = "Xray Laser Gun"
desc = "Not quite as menacing as it sounds"
id = "xray"
- req_tech = list("combat" = 6, "materials" = 5, "biotech" = 5, "powerstorage" = 4)
+ req_tech = list("combat" = 7, "magnets" = 5, "biotech" = 5, "powerstorage" = 4)
build_type = PROTOLATHE
- materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000, MAT_METAL = 4000)
+ materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000, MAT_METAL = 5000)
build_path = /obj/item/weapon/gun/energy/xray
category = list("Weapons")
@@ -178,9 +171,9 @@
name = "Ion Carbine"
desc = "How to dismantle a cyborg : The gun."
id = "ioncarbine"
- req_tech = list("combat" = 5, "materials" = 4, "magnets" = 4)
+ req_tech = list("combat" = 5, "magnets" = 4)
build_type = PROTOLATHE
- materials = list(MAT_SILVER = 4000, MAT_METAL = 6000, MAT_URANIUM = 1000)
+ materials = list(MAT_SILVER = 6000, MAT_METAL = 8000, MAT_URANIUM = 2000)
build_path = /obj/item/weapon/gun/energy/ionrifle/carbine
category = list("Weapons")
@@ -188,9 +181,9 @@
name = "Bluespace Wormhole Projector"
desc = "A projector that emits high density quantum-coupled bluespace beams."
id = "wormholeprojector"
- req_tech = list("combat" = 6, "materials" = 6, "bluespace" = 4)
+ req_tech = list("combat" = 5, "engineering" = 5, "bluespace" = 7, "plasmatech" = 6)
build_type = PROTOLATHE
- materials = list(MAT_SILVER = 1000, MAT_METAL = 5000, MAT_DIAMOND = 3000)
+ materials = list(MAT_SILVER = 2000, MAT_METAL = 5000, MAT_DIAMOND = 3000)
build_path = /obj/item/weapon/gun/energy/wormhole_projector
category = list("Weapons")
@@ -198,7 +191,7 @@
name = "Modular Receiver"
desc = "A prototype modular receiver and trigger assembly for a variety of firearms."
id = "reciever"
- req_tech = list("combat" = 5, "materials" = 4)
+ req_tech = list("combat" = 4, "materials" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 6500, MAT_SILVER = 500)
build_path = /obj/item/weaponcrafting/reciever
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index d48ed0b2974..958dd671d4d 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -65,5 +65,5 @@ Note: Must be placed within 3 tiles of the R&D Console
user << "You add the [O.name] to the [src.name]!"
flick("d_analyzer_la", src)
spawn(10)
+ icon_state = "d_analyzer_l"
busy = 0
-
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 62216b39872..8422a2c96f1 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -129,9 +129,6 @@
if (temp_tech.len == 0)
user << "You cannot experiment on this item!"
return
- if(O.reliability < 90 && O.crit_fail == 0)
- usr << "Item is neither reliable enough or broken enough to learn from."
- return
if(!user.drop_item())
return
loaded_item = O
@@ -235,16 +232,16 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[exp_on] is gripped in just the right way, enhancing its focus.")
badThingCoeff++
- if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!")
for(var/mob/living/m in oview(1, src))
m.apply_damage(15,"brute",pick("head","chest","groin"))
investigate_log("Experimentor dealt minor brute to [m].", "experimentor")
ejectItem(TRUE)
- if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions!")
exp = SCANTYPE_OBLITERATE
- if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, throwing the [exp_on]!")
var/mob/living/target = locate(/mob/living) in oview(7,src)
if(target)
@@ -262,18 +259,18 @@
cloneCount = badThingCoeff
investigate_log("Experimentor has made a clone of [exp_on]", "experimentor")
ejectItem()
- if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!")
radiation_pulse(get_turf(src), 1, 1, 25, 1)
ejectItem(TRUE)
- if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing toxic waste!")
for(var/turf/T in oview(1, src))
if(!T.density)
if(prob(EFFECT_PROB_VERYHIGH))
var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
reagentdecal.reagents.add_reagent("radium", 7)
- if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
var/savedName = "[exp_on]"
ejectItem(TRUE)
var/newPath = pickWeighted(valid_items)
@@ -290,7 +287,7 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[exp_on] achieves the perfect mix!")
new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src))))
- if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] destroys [exp_on], leaking dangerous gas!")
chosenchem = pick("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
var/datum/reagents/R = new/datum/reagents(50)
@@ -303,7 +300,7 @@
smoke.start()
qdel(R)
ejectItem(TRUE)
- if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src]'s chemical chamber has sprung a leak!")
chosenchem = pick("mutationtoxin","nanomachines","sacid")
var/datum/reagents/R = new/datum/reagents(50)
@@ -317,10 +314,10 @@
ejectItem(TRUE)
warn_admins(usr, "[chosenchem] smoke")
investigate_log("Experimentor has released [chosenchem] smoke!", "experimentor")
- if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing harmless gas.")
throwSmoke(src.loc)
- if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] melts [exp_on], ionizing the air around it!")
empulse(src.loc, 4, 6)
investigate_log("Experimentor has generated an Electromagnetic Pulse.", "experimentor")
@@ -338,7 +335,7 @@
C.name = "Cup of Suspicious Liquid"
C.desc = "It has a large hazard symbol printed on the side in fading ink."
investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor")
- if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
var/turf/start = get_turf(src)
var/mob/M = locate(/mob/living) in view(src, 3)
var/turf/MT = get_turf(M)
@@ -351,12 +348,12 @@
FB.yo = MT.y - start.y
FB.xo = MT.x - start.x
FB.fire()
- if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!")
explosion(src.loc, -1, 0, 0, 0, 0, flame_range = 2)
investigate_log("Experimentor started a fire.", "experimentor")
ejectItem(TRUE)
- if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!")
var/datum/gas_mixture/env = src.loc.return_air()
var/transfer_moles = 0.25 * env.total_moles()
@@ -370,7 +367,7 @@
air_update_turf()
investigate_log("Experimentor has released hot air.", "experimentor")
ejectItem(TRUE)
- if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, activating its emergency coolant systems!")
throwSmoke(src.loc)
for(var/mob/living/m in oview(1, src))
@@ -390,7 +387,7 @@
C.name = "Cup of Suspicious Liquid"
C.desc = "It has a large hazard symbol printed on the side in fading ink."
investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor")
- if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
@@ -402,7 +399,7 @@
smoke.start()
qdel(R)
ejectItem(TRUE)
- if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, shattering [exp_on] and leaking cold air!")
var/datum/gas_mixture/env = src.loc.return_air()
var/transfer_moles = 0.25 * env.total_moles()
@@ -416,7 +413,7 @@
air_update_turf()
investigate_log("Experimentor has released cold air.", "experimentor")
ejectItem(TRUE)
- if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!")
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(0, src.loc)
@@ -425,21 +422,20 @@
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_OBLITERATE)
visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!")
- if(prob(EFFECT_PROB_LOW) && criticalReaction)
- visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!")
- new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src))))
if(linked_console.linked_lathe)
for(var/material in exp_on.materials)
linked_console.linked_lathe.materials.insert_amount( min((linked_console.linked_lathe.materials.max_amount - linked_console.linked_lathe.materials.total_amount), (exp_on.materials[material])), material)
- if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
+ if(prob(EFFECT_PROB_LOW) && criticalReaction)
+ visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!")
+ new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src))))
+ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor")
for(var/atom/movable/AM in oview(7,src))
if(!AM.anchored)
AM.throw_at_fast(src,10,1)
-
- if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src]'s crusher goes one level too high, crushing right into space-time!")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
investigate_log("Experimentor has triggered the 'minor throw things' reaction.", "experimentor")
@@ -466,7 +462,7 @@
ejectItem()
//Global reactions
- if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
+ if(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && loaded_item)
var/globalMalf = rand(1,100)
if(globalMalf < 15)
visible_message("[src]'s onboard detection system has malfunctioned!")
@@ -484,16 +480,11 @@
investigate_log("Experimentor has spawned a new corgi.", "experimentor")
ejectItem(TRUE)
if(globalMalf > 36 && globalMalf < 50)
- visible_message("[src] improves [exp_on], drawing the life essence of those nearby!")
+ visible_message("Experimentor draws the life essence of those nearby!")
for(var/mob/living/m in view(4,src))
m << "You feel your flesh being torn from you, mists of blood drifting to [src]!"
m.apply_damage(50,"brute","chest")
investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor")
- var/list/reqs = ConvertReqString2List(exp_on.origin_tech)
- for(var/T in reqs)
- reqs[T] = reqs[T] + 1
- exp_on.origin_tech = list2params(reqs)
- investigate_log("Experimentor has set the origin tech of [exp_on] to [exp_on.origin_tech]", "experimentor")
if(globalMalf > 51 && globalMalf < 75)
visible_message("[src] encounters a run-time error!")
throwSmoke(src.loc)
@@ -557,7 +548,6 @@
var/list/temp_tech = ConvertReqString2List(process.origin_tech)
for(var/T in temp_tech)
linked_console.files.UpdateTech(T, temp_tech[T])
- linked_console.files.UpdateDesigns(process,temp_tech)
src.updateUsrDialog()
return
@@ -609,6 +599,7 @@
name = realName
cooldownMax = rand(60,300)
realProc = pick("teleport","explode","rapidDupe","petSpray","flash","clean","corgicannon")
+ origin_tech = pick("engineering=[rand(2,5)]","magnets=[rand(2,5)]","plasmatech=[rand(2,5)]","programming=[rand(2,5)]","powerstorage=[rand(2,5)]")
/obj/item/weapon/relic/attack_self(mob/user)
if(revealed)
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 7099699fb5a..ff1e2ef9c75 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -60,10 +60,10 @@ Note: Must be placed west/left of and R&D console to function.
for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
T += M.rating
materials.max_amount = T * 75000
- T = 0
+ T = 1.2
for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
- T += (M.rating/3)
- efficiency_coeff = max(T, 1)
+ T -= M.rating/10
+ efficiency_coeff = min(max(0, T), 1)
/obj/machinery/r_n_d/protolathe/proc/check_mat(datum/design/being_built, M) // now returns how many times the item can be built with the material
var/A = materials.amount(M)
@@ -90,7 +90,7 @@ Note: Must be placed west/left of and R&D console to function.
if(istype(O,/obj/item/stack/sheet))
. = 1
- if(!is_insertion_ready(user))
+ if(!is_insertion_ready(user) || busy)
return
if(!materials.has_space( materials.get_item_material_amount(O) ))
user << "The [src.name]'s material bin is full! Please remove material before adding more."
diff --git a/code/modules/research/rd-readme.dm b/code/modules/research/rd-readme.dm
index 5c42b3e930b..9c06d43a3b4 100644
--- a/code/modules/research/rd-readme.dm
+++ b/code/modules/research/rd-readme.dm
@@ -22,7 +22,7 @@ materials.
While researching you are dealing with two different types of information: Technology Paths and Device Designs. Technology Paths
are the "Tech Trees" of the game. You start out with a number of them at the game start and they are improved by using the
Destructive Analyzer. By themselves, they don't do a whole lot. However, they unlock Device Designs. This is the information used
-by the circuit imprinter and the protolathe to produce objects. It also tracks the current reliability of that particular design.
+by the circuit imprinter and the protolathe to produce objects.
//EXISTING TECH
Each tech path should have at LEAST one item at every level (levels 1 - 20). This is to allow for a more fluid progression of the
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 7a191dcab46..9f31eff821b 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -250,60 +250,63 @@ proc/CallMaterialName(ID)
linked_destroy.loaded_item.loc = linked_destroy.loc
linked_destroy.loaded_item = null
linked_destroy.icon_state = "d_analyzer"
- screen = 2.1
+ screen = 1.0
else if(href_list["deconstruct"]) //Deconstruct the item in the destructive analyzer and update the research holder.
if(linked_destroy)
if(linked_destroy.busy)
usr << "The destructive analyzer is busy at the moment."
- else
- var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel")
+ return
+ var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)
+ var/cancontinue = FALSE
+ for(var/T in temp_tech)
+ if(files.IsTechHigher(T, temp_tech[T]))
+ cancontinue = TRUE
+ break
+ if(!cancontinue)
+ var/choice = input("This item does not raise tech levels. Proceed destroying loaded item anyway?") in list("Proceed", "Cancel")
if(choice == "Cancel" || !linked_destroy) return
- linked_destroy.busy = 1
- screen = 0.1
- updateUsrDialog()
- flick("d_analyzer_process", linked_destroy)
- spawn(24)
- if(linked_destroy)
- linked_destroy.busy = 0
- if(!linked_destroy.hacked)
- if(!linked_destroy.loaded_item)
- usr <<"The destructive analyzer appears to be empty."
- screen = 1.0
- return
- if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail)
- var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)
- for(var/T in temp_tech)
- if(prob(linked_destroy.loaded_item.reliability)) //If deconstructed item is not reliable enough its just being wasted, else it is pocessed
- files.UpdateTech(T, temp_tech[T]) //Check if deconstructed item has research levels higher/same/one less than current ones
- files.UpdateDesigns(linked_destroy.loaded_item, temp_tech, src) //If if such reseach type found all the known designs are checked for having this research type in them
- screen = 1.0 //If design have it it gains some reliability
- else //Same design always gain quality
- screen = 2.3 //Crit fail gives the same design a lot of reliability, like really a lot
- if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
- for(var/material in linked_destroy.loaded_item.materials)
- linked_lathe.materials.insert_amount(min((linked_lathe.materials.max_amount - linked_lathe.materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material)
- feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.type]")
- linked_destroy.loaded_item = null
- else
- screen = 1.0
- for(var/obj/I in linked_destroy.contents)
- for(var/mob/M in I.contents)
- M.death()
- if(istype(I,/obj/item/stack/sheet))//Only deconsturcts one sheet at a time instead of the entire stack
- var/obj/item/stack/sheet/S = I
- if(S.amount > 1)
- S.amount--
- linked_destroy.loaded_item = S
- else
- qdel(S)
- linked_destroy.icon_state = "d_analyzer"
+ linked_destroy.busy = 1
+ screen = 0.1
+ updateUsrDialog()
+ flick("d_analyzer_process", linked_destroy)
+ spawn(24)
+ if(linked_destroy)
+ linked_destroy.busy = 0
+ if(!linked_destroy.loaded_item)
+ usr <<"The destructive analyzer appears to be empty."
+ screen = 1.0
+ return
+
+ for(var/T in temp_tech)
+ var/datum/tech/KT = files.known_tech[T] //For stat logging of high levels
+ if(files.IsTechHigher(T, temp_tech[T]) && KT.level >= 5) //For stat logging of high levels
+ feedback_add_details("high_research_level","[KT][KT.level + 1]") //+1 to show the level which we're about to get
+ files.UpdateTech(T, temp_tech[T])
+
+ if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
+ for(var/material in linked_destroy.loaded_item.materials)
+ linked_lathe.materials.insert_amount(min((linked_lathe.materials.max_amount - linked_lathe.materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material)
+ feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.type]")
+ linked_destroy.loaded_item = null
+ for(var/obj/I in linked_destroy.contents)
+ for(var/mob/M in I.contents)
+ M.death()
+ if(istype(I,/obj/item/stack/sheet))//Only deconsturcts one sheet at a time instead of the entire stack
+ var/obj/item/stack/sheet/S = I
+ if(S.amount > 1)
+ S.amount--
+ linked_destroy.loaded_item = S
else
- if(!(I in linked_destroy.component_parts))
- qdel(I)
- linked_destroy.icon_state = "d_analyzer"
- use_power(250)
- updateUsrDialog()
+ qdel(S)
+ linked_destroy.icon_state = "d_analyzer"
+ else
+ if(!(I in linked_destroy.component_parts))
+ qdel(I)
+ linked_destroy.icon_state = "d_analyzer"
+ screen = 1.0
+ use_power(250)
+ updateUsrDialog()
else if(href_list["lock"]) //Lock the console from use by anyone without tox access.
if(src.allowed(usr))
@@ -350,15 +353,12 @@ proc/CallMaterialName(ID)
sync = !sync
else if(href_list["build"]) //Causes the Protolathe to build something.
- var/coeff
-
- if(linked_lathe)
- coeff = linked_lathe.efficiency_coeff
- else
- coeff = 1
-
- var/g2g = 1
if(linked_lathe)
+ if(linked_lathe.busy)
+ usr << "Protolathe is busy at the moment."
+ return
+ var/coeff = linked_lathe.efficiency_coeff
+ var/g2g = 1
var/datum/design/being_built = files.known_designs[href_list["build"]]
if(being_built)
var/power = 2000
@@ -369,15 +369,11 @@ proc/CallMaterialName(ID)
power += round(being_built.materials[M] * amount / 5)
power = max(2000, power)
screen = 0.3
- if(linked_lathe.busy)
- g2g = 0
var/key = usr.key //so we don't lose the info during the spawn delay
if (!(being_built.build_type & PROTOLATHE))
g2g = 0
message_admins("Protolathe exploit attempted by [key_name(usr, usr.client)]!")
-
-
if (g2g) //If input is incorrect, nothing happens
var/enough_materials = 1
linked_lathe.busy = 1
@@ -386,7 +382,7 @@ proc/CallMaterialName(ID)
var/list/efficient_mats = list()
for(var/MAT in being_built.materials)
- efficient_mats[MAT] = being_built.materials[MAT]
+ efficient_mats[MAT] = being_built.materials[MAT]*coeff
if(!linked_lathe.materials.has_materials(efficient_mats, amount))
src.visible_message("The [src.name] beeps, \"Not enough materials to complete prototype.\"")
@@ -394,7 +390,7 @@ proc/CallMaterialName(ID)
g2g = 0
else
for(var/R in being_built.reagents)
- if(!linked_lathe.reagents.has_reagent(R, being_built.reagents[R]))
+ if(!linked_lathe.reagents.has_reagent(R, being_built.reagents[R])*coeff)
src.visible_message("The [src.name] beeps, \"Not enough reagents to complete prototype.\"")
enough_materials = 0
g2g = 0
@@ -402,33 +398,37 @@ proc/CallMaterialName(ID)
if(enough_materials)
linked_lathe.materials.use_amount(efficient_mats, amount)
for(var/R in being_built.reagents)
- linked_lathe.reagents.remove_reagent(R, being_built.reagents[R])
+ linked_lathe.reagents.remove_reagent(R, being_built.reagents[R]*coeff)
var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
- var/R = being_built.reliability
- spawn(32*amount/coeff)
- if(g2g) //And if we only fail the material requirements, we still spend time and power
- var/already_logged = 0
- for(var/i = 0, iThe [src.name] beeps, \"Something went wrong, production halted!\"")
+ screen = 1.0
updateUsrDialog()
else if(href_list["imprint"]) //Causes the Circuit Imprinter to build something.
+ var/coeff = linked_imprinter.efficiency_coeff
var/g2g = 1
if(linked_imprinter)
+ if(linked_imprinter.busy)
+ usr << "Circuit Imprinter is busy at the moment."
+ return
var/datum/design/being_built = files.known_designs[href_list["imprint"]]
if(being_built)
var/power = 2000
@@ -437,8 +437,6 @@ proc/CallMaterialName(ID)
power += round(being_built.materials[M] / 5)
power = max(2000, power)
screen = 0.4
- if (linked_imprinter.busy)
- g2g = 0
if (!(being_built.build_type & IMPRINTER))
g2g = 0
message_admins("Circuit imprinter exploit attempted by [key_name(usr, usr.client)]!")
@@ -455,24 +453,26 @@ proc/CallMaterialName(ID)
break
switch(M)
if(MAT_GLASS)
- linked_imprinter.g_amount = max(0, (linked_imprinter.g_amount-being_built.materials[M]))
+ linked_imprinter.g_amount = max(0, (linked_imprinter.g_amount-being_built.materials[M]/coeff))
if(MAT_GOLD)
- linked_imprinter.gold_amount = max(0, (linked_imprinter.gold_amount-being_built.materials[M]))
+ linked_imprinter.gold_amount = max(0, (linked_imprinter.gold_amount-being_built.materials[M]/coeff))
if(MAT_DIAMOND)
- linked_imprinter.diamond_amount = max(0, (linked_imprinter.diamond_amount-being_built.materials[M]))
+ linked_imprinter.diamond_amount = max(0, (linked_imprinter.diamond_amount-being_built.materials[M]/coeff))
else
- linked_imprinter.reagents.remove_reagent(M, being_built.materials[M])
+ linked_imprinter.reagents.remove_reagent(M, being_built.materials[M]/coeff)
var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
- var/R = being_built.reliability
spawn(16)
- if(g2g)
- var/obj/item/new_item = new P(src)
- new_item.reliability = R
- new_item.loc = linked_imprinter.loc
- feedback_add_details("circuit_printed","[new_item.type]")
- linked_imprinter.busy = 0
- screen = old_screen
+ if(linked_imprinter)
+ if(g2g)
+ var/obj/item/new_item = new P(src)
+ new_item.loc = linked_imprinter.loc
+ feedback_add_details("circuit_printed","[new_item.type]")
+ screen = old_screen
+ linked_imprinter.busy = 0
+ else
+ src.visible_message("The [src.name] beeps, \"Something went wrong, production halted!\"")
+ screen = 1.0
updateUsrDialog()
else if(href_list["disposeI"] && linked_imprinter) //Causes the circuit imprinter to dispose of a single reagent (all of it)
@@ -701,7 +701,6 @@ proc/CallMaterialName(ID)
dat += "Load Design to Disk"
else
dat += "Name: [d_disk.blueprint.name]
"
- dat += "Level: [d_disk.blueprint.reliability]
"
var/b_type = d_disk.blueprint.build_type
if(b_type)
dat += "Lathe Types:
"
@@ -776,7 +775,6 @@ proc/CallMaterialName(ID)
dat += "Main Menu"
dat += "
Deconstruction Menu
"
dat += "Name: [linked_destroy.loaded_item.name]
"
- dat += "Reliability: [linked_destroy.loaded_item.reliability]
"
dat += "Origin Tech:
"
var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)
for(var/T in temp_tech)
@@ -825,6 +823,7 @@ proc/CallMaterialName(ID)
dat += "
Material Amount: [linked_lathe.materials.total_amount] / [linked_lathe.materials.max_amount]
"
dat += "
Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
"
+ var/coeff = linked_lathe.efficiency_coeff
for(var/v in files.known_designs)
var/datum/design/D = files.known_designs[v]
if(!(selected_category in D.category)|| !(D.build_type & PROTOLATHE))
@@ -836,18 +835,18 @@ proc/CallMaterialName(ID)
t = linked_lathe.check_mat(D, M)
temp_material += " | "
if (t < 1)
- temp_material += "
[D.materials[M]] [CallMaterialName(M)]"
+ temp_material += "
[D.materials[M]*coeff] [CallMaterialName(M)]"
else
- temp_material += " [D.materials[M]] [CallMaterialName(M)]"
+ temp_material += " [D.materials[M]*coeff] [CallMaterialName(M)]"
c = min(c,t)
for(var/R in D.reagents)
t = linked_lathe.check_mat(D, R)
temp_material += " | "
if (t < 1)
- temp_material += "
[D.reagents[R]] [CallMaterialName(R)]"
+ temp_material += "
[D.reagents[R]*coeff] [CallMaterialName(R)]"
else
- temp_material += " [D.reagents[R]] [CallMaterialName(R)]"
+ temp_material += " [D.reagents[R]*coeff] [CallMaterialName(R)]"
c = min(c,t)
if (c >= 1)
@@ -869,6 +868,7 @@ proc/CallMaterialName(ID)
dat += "
Material Amount: [linked_lathe.materials.total_amount] / [linked_lathe.materials.max_amount]
"
dat += "
Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
"
+ var/coeff = linked_lathe.efficiency_coeff
for(var/datum/design/D in matching_designs)
var/temp_material
var/c = 50
@@ -877,9 +877,9 @@ proc/CallMaterialName(ID)
t = linked_lathe.check_mat(D, M)
temp_material += " | "
if (t < 1)
- temp_material += "
[D.materials[M]] [CallMaterialName(M)]"
+ temp_material += "
[D.materials[M]*coeff] [CallMaterialName(M)]"
else
- temp_material += " [D.materials[M]] [CallMaterialName(M)]"
+ temp_material += " [D.materials[M]*coeff] [CallMaterialName(M)]"
c = min(c,t)
if (c >= 1)
@@ -994,6 +994,7 @@ proc/CallMaterialName(ID)
dat += "Material Amount: [linked_imprinter.TotalMaterials()]
"
dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
"
+ var/coeff = linked_imprinter.efficiency_coeff
for(var/v in files.known_designs)
var/datum/design/D = files.known_designs[v]
if(!(selected_category in D.category) || !(D.build_type & IMPRINTER))
@@ -1004,9 +1005,9 @@ proc/CallMaterialName(ID)
temp_materials += " | "
if (!linked_imprinter.check_mat(D, M))
check_materials = 0
- temp_materials += "
[D.materials[M]] [CallMaterialName(M)]"
+ temp_materials += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
else
- temp_materials += " [D.materials[M]] [CallMaterialName(M)]"
+ temp_materials += " [D.materials[M]/coeff] [CallMaterialName(M)]"
if (check_materials)
dat += "
[D.name][temp_materials]
"
else
@@ -1020,6 +1021,7 @@ proc/CallMaterialName(ID)
dat += "Material Amount: [linked_imprinter.TotalMaterials()]
"
dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
"
+ var/coeff = linked_imprinter.efficiency_coeff
for(var/datum/design/D in matching_designs)
var/temp_materials
var/check_materials = 1
@@ -1027,9 +1029,9 @@ proc/CallMaterialName(ID)
temp_materials += " | "
if (!linked_imprinter.check_mat(D, M))
check_materials = 0
- temp_materials += "
[D.materials[M]] [CallMaterialName(M)]"
+ temp_materials += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
else
- temp_materials += " [D.materials[M]] [CallMaterialName(M)]"
+ temp_materials += " [D.materials[M]/coeff] [CallMaterialName(M)]"
if (check_materials)
dat += "
[D.name][temp_materials]
"
else
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index 9aff35065bd..130fce1f03f 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -49,8 +49,8 @@ research holder datum.
//Datum/tech go here.
var/list/possible_tech = list() //List of all tech in the game that players have access to (barring special events).
var/list/known_tech = list() //List of locally known tech.
- var/list/possible_designs = list() //List of all designs (at base reliability).
- var/list/known_designs = list() //List of available designs (at base reliability).
+ var/list/possible_designs = list() //List of all designs.
+ var/list/known_designs = list() //List of available designs.
/datum/research/New() //Insert techs into possible_tech here. Known_tech automatically updated.
for(var/T in subtypesof(/datum/tech))
@@ -93,13 +93,10 @@ research holder datum.
/datum/research/proc/AddDesign2Known(datum/design/D)
if(known_designs[D.id])
- var/datum/design/known = known_designs[D.id]
- if(D.reliability > known.reliability)
- known.reliability = D.reliability
return
known_designs[D.id] = D
-//Refreshes known_tech and known_designs list. Then updates the reliability vars of the designs in the known_designs list.
+//Refreshes known_tech and known_designs list.
//Input/Output: n/a
/datum/research/proc/RefreshResearch()
for(var/datum/tech/PT in possible_tech)
@@ -113,10 +110,6 @@ research holder datum.
for(var/v in known_tech)
var/datum/tech/T = known_tech[v]
T.level = Clamp(T.level, 0, 20)
-
- for(var/v in known_designs)
- var/datum/design/D = known_designs[v]
- D.CalcReliability(known_tech)
return
//Refreshes the levels of a given tech.
@@ -125,18 +118,17 @@ research holder datum.
var/datum/tech/KT = known_tech[ID]
if(KT)
if(KT.level <= level)
- KT.level = max((KT.level + 1), (level - 1))
+ KT.level = KT.level + 1
-/datum/research/proc/UpdateDesigns(obj/item/I, list/temp_tech)
- for(var/v in known_designs)
- var/datum/design/D = known_designs[v]
- var/shared_tech = length(temp_tech & D.req_tech)
- if(shared_tech)
- D.reliability = min(100, D.reliability + shared_tech)
- if(D.build_path == I.type)
- D.reliability = min(100, D.reliability + shared_tech * rand(1,3))
- if(I.crit_fail)
- D.reliability = min(100, D.reliability + shared_tech * rand(3, 5))
+//Checks if the origin level can raise current tech levels
+//Input: Tech's ID and Level; Output: TRUE for yes, FALSE for no
+/datum/research/proc/IsTechHigher(ID, level)
+ var/datum/tech/KT = known_tech[ID]
+ if(KT)
+ if(KT.level <= level)
+ return TRUE
+ else
+ return FALSE
/datum/research/proc/FindDesignByID(id)
return known_designs[id]
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 1e5e26d41ce..e57becb8253 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -241,7 +241,7 @@
temp_server.files.RefreshResearch()
else if(href_list["reset_design"])
- var/choice = alert("Design Data Deletion", "Are you sure you want to delete this design? If you still have the prerequisites for the design, it'll reset to its base reliability. Data lost cannot be recovered.", "Continue", "Cancel")
+ var/choice = alert("Design Data Deletion", "Are you sure you want to delete this design? Data lost cannot be recovered.", "Continue", "Cancel")
if(choice == "Continue")
var/datum/design/D = temp_server.files.known_designs[href_list["reset_design"]]
if(D)
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index f35a8196405..9f8e6a580b5 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -21,12 +21,11 @@
/obj/item/weapon/storage/part_replacer/afterattack(obj/machinery/T, mob/living/carbon/human/user, flag, params)
if(flag)
return
- else
- if(works_from_distance)
- if(istype(T))
- if(T.component_parts)
- T.exchange_parts(user, src)
- user.Beam(T,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5)
+ else if(works_from_distance)
+ if(istype(T))
+ if(T.component_parts)
+ T.exchange_parts(user, src)
+ user.Beam(T,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5)
return
/obj/item/weapon/storage/part_replacer/bluespace
@@ -167,7 +166,7 @@
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"
+ origin_tech = "powerstorage=4;engineering=4"
rating = 3
materials = list(MAT_METAL=50, MAT_GLASS=50)
@@ -175,7 +174,7 @@
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"
+ origin_tech = "magnets=4;engineering=4"
rating = 3
materials = list(MAT_METAL=50, MAT_GLASS=20)
@@ -183,7 +182,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=4;programming=4,engineering=4"
rating = 3
materials = list(MAT_METAL=30)
@@ -191,7 +190,7 @@
name = "ultra-high-power micro-laser"
icon_state = "ultra_high_micro_laser"
desc = "A tiny laser used in certain devices."
- origin_tech = "magnets=5"
+ origin_tech = "magnets=4;engineering=4"
rating = 3
materials = list(MAT_METAL=10, MAT_GLASS=20)
@@ -199,7 +198,7 @@
name = "super matter bin"
desc = "A container designed to hold compressed matter awaiting reconstruction."
icon_state = "super_matter_bin"
- origin_tech = "materials=5"
+ origin_tech = "materials=4;engineering=4"
rating = 3
materials = list(MAT_METAL=80)
@@ -209,7 +208,7 @@
name = "quadratic capacitor"
desc = "An capacity capacitor used in the construction of a variety of devices."
icon_state = "quadratic_capacitor"
- origin_tech = "powerstorage=6;materials=5"
+ origin_tech = "powerstorage=5;materials=4;engineering=4"
rating = 4
materials = list(MAT_METAL=50, MAT_GLASS=50)
@@ -217,7 +216,7 @@
name = "triphasic scanning module"
desc = "A compact, ultra resolution triphasic scanning module used in the construction of certain devices."
icon_state = "triphasic_scan_module"
- origin_tech = "magnets=6"
+ origin_tech = "magnets=5;materials=4;engineering=4"
rating = 4
materials = list(MAT_METAL=50, MAT_GLASS=20)
@@ -225,7 +224,7 @@
name = "femto-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "femto_mani"
- origin_tech = "materials=6;programming=3"
+ origin_tech = "materials=6;programming=4;engineering=4"
rating = 4
materials = list(MAT_METAL=30)
@@ -233,7 +232,7 @@
name = "quad-ultra micro-laser"
icon_state = "quadultra_micro_laser"
desc = "A tiny laser used in certain devices."
- origin_tech = "magnets=6"
+ origin_tech = "magnets=5;materials=4;engineering=4"
rating = 4
materials = list(MAT_METAL=10, MAT_GLASS=20)
@@ -241,7 +240,7 @@
name = "bluespace matter bin"
desc = "A container designed to hold compressed matter awaiting reconstruction."
icon_state = "bluespace_matter_bin"
- origin_tech = "materials=6"
+ origin_tech = "materials=6;programming=4;engineering=4"
rating = 4
materials = list(MAT_METAL=80)
@@ -251,49 +250,49 @@
name = "subspace ansible"
icon_state = "subspace_ansible"
desc = "A compact module capable of sensing extradimensional activity."
- origin_tech = "programming=2;magnets=3;materials=2;bluespace=1"
+ origin_tech = "programming=2;magnets=2;materials=2;bluespace=1"
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/filter
name = "hyperwave filter"
icon_state = "hyperwave_filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
- origin_tech = "programming=2;magnets=1"
+ origin_tech = "programming=2;magnets=2"
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/amplifier
name = "subspace amplifier"
icon_state = "subspace_amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
- origin_tech = "programming=2;magnets=2;materials=2;bluespace=1"
+ origin_tech = "programming=2;magnets=2;materials=2;bluespace=2"
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/treatment
name = "subspace treatment disk"
icon_state = "treatment_disk"
desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
- origin_tech = "programming=2;magnets=1;materials=3;bluespace=1"
+ origin_tech = "programming=2;magnets=2;materials=2;bluespace=2"
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/analyzer
name = "subspace wavelength analyzer"
icon_state = "wavelength_analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
- origin_tech = "programming=2;magnets=2;materials=2;bluespace=1"
+ origin_tech = "programming=2;magnets=2;materials=2;bluespace=2"
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/crystal
name = "ansible crystal"
icon_state = "ansible_crystal"
desc = "A crystal made from pure glass used to transmit laser databursts to subspace."
- origin_tech = "magnets=2;materials=2;bluespace=1"
+ origin_tech = "magnets=2;materials=2;bluespace=2;plasmatech=2"
materials = list(MAT_GLASS=50)
/obj/item/weapon/stock_parts/subspace/transmitter
name = "subspace transmitter"
icon_state = "subspace_transmitter"
desc = "A large piece of equipment used to open a window into the subspace dimension."
- origin_tech = "magnets=3;materials=3;bluespace=2"
+ origin_tech = "magnets=2;materials=2;bluespace=2"
materials = list(MAT_METAL=50)
/obj/item/weapon/research//Makes testing much less of a pain -Sieve
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 5ac42585665..6103948a1e9 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -160,7 +160,7 @@
desc = "A miraculous chemical mix that can raise the intelligence of creatures to human levels. Unlike normal slime potions, it can be absorbed by any nonsentient being."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle19"
- origin_tech = "biotech=5"
+ origin_tech = "biotech=6"
var/list/not_interested = list()
var/being_used = 0
var/sentience_type = SENTIENCE_ORGANIC
@@ -326,6 +326,7 @@
desc = "A potent chemical mix that will remove the slowdown from any item."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
+ origin_tech = "biotech=5"
/obj/item/slimepotion/speed/afterattack(obj/C, mob/user)
..()
@@ -356,6 +357,7 @@
desc = "A potent chemical mix that will fireproof any article of clothing. Has three uses."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
+ origin_tech = "biotech=5"
var/uses = 3
/obj/item/slimepotion/fireproof/afterattack(obj/item/clothing/C, mob/user)
@@ -494,6 +496,33 @@
G.key = ghost.key
G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
G.mind.store_memory("
Serve [user.real_name], your creator.")
+
+ var/golem_becomes_antag = FALSE
+ if(iscultist(user)) //If the golem's master is a part of a team antagonist, immediately make the golem one, too
+ ticker.mode.add_cultist(G.mind)
+ golem_becomes_antag = TRUE
+ else if(is_gangster(user))
+ ticker.mode.add_gangster(G.mind, user.mind.gang_datum, TRUE)
+ golem_becomes_antag = TRUE
+ else if(is_handofgod_redcultist(user) || is_handofgod_redprophet(user))
+ ticker.mode.add_hog_follower(G.mind, "Red")
+ golem_becomes_antag = TRUE
+ else if(is_handofgod_bluecultist(user) || is_handofgod_blueprophet(user))
+ ticker.mode.add_hog_follower(G.mind, "Blue")
+ golem_becomes_antag = TRUE
+ else if(is_revolutionary_in_general(user))
+ ticker.mode.add_revolutionary(G.mind)
+ golem_becomes_antag = TRUE
+ else if(is_shadow_or_thrall(user))
+ ticker.mode.add_thrall(G.mind)
+ golem_becomes_antag = TRUE
+ else if(is_servant_of_ratvar(user))
+ add_servant_of_ratvar(G)
+ golem_becomes_antag = TRUE
+
+ G.mind.enslaved_to = user
+ if(golem_becomes_antag)
+ G << "
Despite your servitude to another cause, your true master remains [user.real_name]. This will never change unless your master's body is destroyed."
if(user.mind.special_role)
message_admins("[key_name_admin(G)](
?) has been summoned by [key_name_admin(user)](
?), an antagonist.")
log_game("[key_name(G)] was made a golem by [key_name(user)].")
@@ -635,4 +664,3 @@
for(var/turf/T in A)
T.color = "#2956B2"
qdel(src)
-
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index 19802dda3c1..99f362e3a34 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -250,7 +250,7 @@
..()
var/area/A = get_area(src)
if(A)
- notify_ghosts("An ash walker egg is ready to hatch in \the [A.name].", source = src, attack_not_jump = 1)
+ notify_ghosts("An ash walker egg is ready to hatch in \the [A.name].", source = src, action=NOTIFY_ATTACK)
//Wishgranter Exile
@@ -356,7 +356,7 @@
..()
var/area/A = get_area(src)
if(A)
- notify_ghosts("A golem shell has been completed in \the [A.name].", source = src, attack_not_jump = 1)
+ notify_ghosts("A golem shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK)
/obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn)
var/golem_surname = pick(golem_names)
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 26b754d31f5..f5134d2e4a4 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -276,10 +276,12 @@
timer = world.time
send2irc("Server", "The Emergency Shuttle has docked with the station.")
priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority")
+ feedback_add_details("emergency_shuttle", src.name)
//Gangs only have one attempt left if the shuttle has docked with the station to prevent suffering from dominator delays
for(var/datum/gang/G in ticker.mode.gangs)
if(isnum(G.dom_timer))
+
G.dom_attempts = 0
else
G.dom_attempts = min(1,G.dom_attempts)
diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm
index d30cc49f381..3e0bf8633a2 100644
--- a/code/modules/shuttle/manipulator.dm
+++ b/code/modules/shuttle/manipulator.dm
@@ -55,6 +55,8 @@
. = "docked"
if(SHUTTLE_STRANDED)
. = "stranded"
+ if(SHUTTLE_ESCAPE)
+ . = "escape"
if(SHUTTLE_ENDGAME)
. = "endgame"
if(!.)
@@ -105,6 +107,10 @@
L["id"] = M.id
L["timer"] = M.timer
L["timeleft"] = M.getTimerStr()
+ var/can_fast_travel = FALSE
+ if(M.timer && M.timeLeft() >= 50)
+ can_fast_travel = TRUE
+ L["can_fast_travel"] = can_fast_travel
L["mode"] = capitalize(shuttlemode2str(M.mode))
L["status"] = M.getStatusText()
if(M == existing_shuttle)
@@ -132,12 +138,23 @@
. = TRUE
if("jump_to")
if(params["type"] == "mobile")
- . = TRUE
for(var/i in SSshuttle.mobile)
var/obj/docking_port/mobile/M = i
if(M.id == params["id"])
user.forceMove(get_turf(M))
+ . = TRUE
break
+ if("fast_travel")
+ for(var/i in SSshuttle.mobile)
+ var/obj/docking_port/mobile/M = i
+ if(M.id == params["id"] && M.timer && M.timeLeft() >= 50)
+ M.setTimer(50)
+ . = TRUE
+ message_admins("[key_name_admin(usr)] fast travelled \
+ [M]")
+ log_admin("[key_name(usr)] fast travelled [M]")
+ feedback_add_details("shuttle_fasttravel", M.name)
+ break
if("preview")
if(S)
@@ -156,9 +173,14 @@
else if(S)
. = TRUE
// If successful, returns the mobile docking port
- var/mdp = action_load(S)
+ var/obj/docking_port/mobile/mdp = action_load(S)
if(mdp)
user.forceMove(get_turf(mdp))
+ message_admins("[key_name_admin(usr)] loaded [mdp] \
+ with the shuttle manipulator.")
+ log_admin("[key_name(usr)] loaded [mdp] with the \
+ shuttle manipulator.")
+ feedback_add_details("shuttle_manipulator", mdp.name)
update_icon()
@@ -219,8 +241,6 @@
existing_shuttle = null
selected = null
- return preview_shuttle
-
/obj/machinery/shuttle_manipulator/proc/load_template(
datum/map_template/shuttle/S)
// load shuttle template, centred at shuttle import landmark,
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 1d1e3006f45..cc67c5aeb5d 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -549,9 +549,11 @@
Door.close()
/obj/docking_port/mobile/proc/roadkill(list/L, dir, x, y)
+ var/list/hurt_mobs = list()
for(var/turf/T in L)
for(var/atom/movable/AM in T)
- if(isliving(AM))
+ if(isliving(AM) && (!(AM in hurt_mobs)))
+ hurt_mobs |= AM
if(ishuman(AM))
var/mob/living/M = AM
M.visible_message("
[M] is hit by \
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
index 29d1c7cbd2f..123a48b8383 100644
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ b/code/modules/spells/spell_types/construct_spells.dm
@@ -23,6 +23,7 @@
action_icon_state = "floorconstruct"
action_background_icon_state = "bg_cult"
+
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
name = "Summon Cult Wall"
desc = "This spell constructs a cult wall"
@@ -38,6 +39,7 @@
summon_type = list(/turf/closed/wall/mineral/cult/artificer) //we don't want artificer-based runed metal farms
+
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
name = "Greater Construction"
desc = "This spell constructs a reinforced metal wall"
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index b55db26e1e1..85704b1842a 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -112,7 +112,7 @@
if("goldenrevolver")
G = new /obj/item/weapon/gun/projectile/revolver/golden(get_turf(H))
if("sniper")
- G = new /obj/item/weapon/gun/projectile/sniper_rifle(get_turf(H))
+ G = new /obj/item/weapon/gun/projectile/automatic/sniper_rifle(get_turf(H))
if("medibeam")
G = new /obj/item/weapon/gun/medbeam(get_turf(H))
if("scatterbeam")
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 7da8bf4f4b2..4cf73cc7294 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -288,6 +288,7 @@
be possessed by the devil? This arm appears to be possessed by no \
one though."
icon_state = "l_arm"
+ attack_verb = list("slapped", "punched")
max_damage = 50
body_zone ="l_arm"
body_part = ARM_LEFT
@@ -299,6 +300,7 @@
desc = "Over 87% of humans are right handed. That figure is much lower \
among humans missing their right arm."
icon_state = "r_arm"
+ attack_verb = list("slapped", "punched")
max_damage = 50
body_zone = "r_arm"
body_part = ARM_RIGHT
@@ -310,6 +312,7 @@
desc = "Some athletes prefer to tie their left shoelaces first for good \
luck. In this instance, it probably would not have helped."
icon_state = "l_leg"
+ attack_verb = list("kicked", "stomped")
max_damage = 50
body_zone = "l_leg"
body_part = LEG_LEFT
@@ -323,6 +326,7 @@
The hokey pokey has certainly changed a lot since space colonisation."
// alternative spellings of 'pokey' are availible
icon_state = "r_leg"
+ attack_verb = list("kicked", "stomped")
max_damage = 50
body_zone = "r_leg"
body_part = LEG_RIGHT
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index a13204e8f9a..3cdf2328b19 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -149,7 +149,7 @@
name = "arm-mounted laser implant"
desc = "A variant of the arm cannon implant that fires lethal laser beams. The cannon emerges from the subject's arm and remains inside when not in use."
icon_state = "arm_laser"
- origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4;syndicate=5"//this is kinda nutty and i might lower it
+ origin_tech = "materials=4;combat=4;biotech=4;powerstorage=4;syndicate=3"
holder = /obj/item/weapon/gun/energy/laser/mounted
/obj/item/organ/cyberimp/arm/gun/laser/l/zone = "l_arm"
@@ -168,7 +168,7 @@
/obj/item/organ/cyberimp/arm/toolset
name = "integrated toolset implant"
desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all neccessary tools."
- origin_tech = "materials=4;engineering=4;biotech=3;powerstorage=4"
+ origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4"
contents = newlist(/obj/item/weapon/screwdriver/cyborg, /obj/item/weapon/wrench/cyborg, /obj/item/weapon/weldingtool/largetank/cyborg,
/obj/item/weapon/crowbar/cyborg, /obj/item/weapon/wirecutters/cyborg, /obj/item/device/multitool/cyborg)
@@ -179,4 +179,4 @@
usr << "You unlock [src]'s integrated knife!"
items_list += new /obj/item/weapon/kitchen/knife/combat/cyborg(src)
return 1
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index 74e50bc12fd..c2d7fc0efa0 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -14,7 +14,7 @@
var/synthesizing = 0
var/poison_amount = 5
slot = "stomach"
- origin_tech = "materials=5;programming=3;biotech=4"
+ origin_tech = "materials=4;powerstorage=5;biotech=4"
/obj/item/organ/cyberimp/chest/nutriment/on_life()
if(synthesizing)
@@ -41,16 +41,14 @@
implant_color = "#006607"
hunger_threshold = NUTRITION_LEVEL_HUNGRY
poison_amount = 10
- origin_tech = "materials=5;programming=3;biotech=5"
-
-
+ origin_tech = "materials=4;powerstorage=5;biotech=5"
/obj/item/organ/cyberimp/chest/reviver
name = "Reviver implant"
desc = "This implant will attempt to revive you if you lose consciousness. For the faint of heart!"
icon_state = "chest_implant"
implant_color = "#AD0000"
- origin_tech = "materials=6;programming=3;biotech=6;syndicate=4"
+ origin_tech = "materials=5;programming=4;biotech=6"
slot = "heartdrive"
var/revive_cost = 0
var/reviving = 0
@@ -114,7 +112,7 @@
Unlike regular jetpack, this device has no stablilzation system."
slot = "thrusters"
icon_state = "imp_jetpack"
- origin_tech = "materials=6;programming=4;magnets=3;biotech=4;engineering=4"
+ origin_tech = "materials=4;magnets=4;biotech=4;engineering=5"
implant_overlay = null
implant_color = null
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -193,4 +191,4 @@
T.assume_air(removed)
toggle(silent=1)
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index e7432e89fa6..50c3875f258 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -50,7 +50,7 @@
desc = "These cybernetic eye implants will give you X-ray vision. Blinking is futile."
eye_color = "000"
implant_color = "#000000"
- origin_tech = "materials=6;programming=4;biotech=6;magnets=5"
+ origin_tech = "materials=4;programming=4;biotech=6;magnets=4"
dark_view = 8
sight_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
@@ -59,7 +59,7 @@
desc = "These cybernetic eye implants will give you Thermal vision. Vertical slit pupil included."
eye_color = "FC0"
implant_color = "#FFCC00"
- origin_tech = "materials=6;programming=4;biotech=5;magnets=5;syndicate=4"
+ origin_tech = "materials=5;programming=4;biotech=4;magnets=4;syndicate=1"
sight_flags = SEE_MOBS
see_invisible = SEE_INVISIBLE_MINIMUM
flash_protect = -1
@@ -93,7 +93,7 @@
desc = "These cybernetic eye implants will display a medical HUD over everything you see."
eye_color = "0ff"
implant_color = "#00FFFF"
- origin_tech = "materials=4;programming=3;biotech=4"
+ origin_tech = "materials=4;programming=4;biotech=4"
aug_message = "You suddenly see health bars floating above people's heads..."
HUD_type = DATA_HUD_MEDICAL_ADVANCED
@@ -102,7 +102,7 @@
desc = "These cybernetic eye implants will display a security HUD over everything you see."
eye_color = "d00"
implant_color = "#CC0000"
- origin_tech = "materials=4;programming=4;biotech=3;combat=1"
+ origin_tech = "materials=4;programming=4;biotech=3;combat=3"
aug_message = "Job indicator icons pop up in your vision. That is not a certified surgeon..."
HUD_type = DATA_HUD_SECURITY_ADVANCED
@@ -112,11 +112,11 @@
name = "welding shield implant"
desc = "These reactive micro-shields will protect you from welders and flashes without obscuring your vision."
slot = "eye_shield"
- origin_tech = "materials=4;biotech=3"
+ origin_tech = "materials=4;biotech=3;engineering=4;plasmatech=3"
implant_color = "#101010"
flash_protect = 2
aug_message = null
eye_color = null
/obj/item/organ/cyberimp/eyes/shield/emp_act(severity)
- return
\ No newline at end of file
+ return
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 3dc5e743049..683a2a176a4 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -47,7 +47,7 @@
var/obj/item/r_hand_obj = null
implant_color = "#DE7E00"
slot = "brain_antidrop"
- origin_tech = "materials=5;programming=4;biotech=4"
+ origin_tech = "materials=4;programming=5;biotech=4"
actions_types = list(/datum/action/item_action/organ_action/toggle)
/obj/item/organ/cyberimp/brain/anti_drop/ui_action_click()
@@ -125,7 +125,7 @@
desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned."
implant_color = "#FFFF00"
slot = "brain_antistun"
- origin_tech = "materials=6;programming=4;biotech=5"
+ origin_tech = "materials=5;programming=4;biotech=5"
/obj/item/organ/cyberimp/brain/anti_stun/on_life()
..()
@@ -188,4 +188,4 @@
var/implant
while(contents.len <= amount + 1) // +1 for the autoimplanter.
implant = pick(boxed)
- new implant(src)
\ No newline at end of file
+ new implant(src)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 47e3615388d..a6d42fc8523 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/surgery.dmi'
var/mob/living/carbon/owner = null
var/status = ORGAN_ORGANIC
- origin_tech = "biotech=2"
+ origin_tech = "biotech=3"
force = 1
w_class = 2
throwforce = 0
@@ -105,7 +105,7 @@
icon_state = "heart-on"
zone = "chest"
slot = "heart"
- origin_tech = "biotech=3"
+ origin_tech = "biotech=5"
var/beating = 1
var/icon_base = "heart"
attack_verb = list("beat", "thumped")
@@ -168,7 +168,7 @@
desc = "it needs to be pumped..."
icon_state = "cursedheart-off"
icon_base = "cursedheart"
- origin_tech = "biotech=5"
+ origin_tech = "biotech=6"
actions_types = list(/datum/action/item_action/organ_action/cursed_heart)
var/last_pump = 0
var/add_colour = TRUE //So we're not constantly recreating colour datums
@@ -437,7 +437,7 @@
name = "black tumor"
desc = "A tiny black mass with red tendrils trailing from it. It seems to shrivel in the light."
icon_state = "blacktumor"
- origin_tech = "biotech=4"
+ origin_tech = "biotech=5"
w_class = 1
zone = "head"
slot = "brain_tumor"
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index d783434c582..67b1a888703 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -84,7 +84,7 @@
throw_speed = 2
throw_range = 5
materials = list(MAT_METAL=10000, MAT_GLASS=6000)
- origin_tech = "materials=1;biotech=1"
+ origin_tech = "biotech=1;combat=1"
attack_verb = list("attacked", "slashed", "sawed", "cut")
sharpness = IS_SHARP
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index b4f1e9ff465..ae377c651c6 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -6,17 +6,15 @@
icon = 'icons/obj/telescience.dmi'
icon_state = "bluespace_crystal"
w_class = 1
- origin_tech = "bluespace=4;materials=3"
+ origin_tech = "bluespace=6;materials=3"
points = 50
var/blink_range = 8 // The teleport range when crushed/thrown at someone.
-
/obj/item/weapon/ore/bluespace_crystal/New()
..()
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
-
/obj/item/weapon/ore/bluespace_crystal/attack_self(mob/user)
user.visible_message("[user] crushes [src]!", "You crush [src]!")
PoolOrNew(/obj/effect/particle_effect/sparks, loc)
@@ -43,6 +41,6 @@
/obj/item/weapon/ore/bluespace_crystal/artificial
name = "artificial bluespace crystal"
desc = "An artificially made bluespace crystal, it looks delicate."
- origin_tech = "bluespace=2"
+ origin_tech = "bluespace=3;plasmatech=4"
blink_range = 4 // Not as good as the organic stuff!
- points = 0 // nice try
\ No newline at end of file
+ points = 0 // nice try
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index a05819054e7..3df5a057277 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -6,7 +6,7 @@ var/list/GPS_list = list()
icon_state = "gps-c"
w_class = 2
slot_flags = SLOT_BELT
- origin_tech = "programming=2;engineering=2"
+ origin_tech = "materials=2;magnets=3;bluespace=3"
var/gpstag = "COM0"
var/emped = 0
var/turf/locked_location
@@ -32,8 +32,8 @@ var/list/GPS_list = list()
overlays += "working"
/obj/item/device/gps/AltClick(mob/user)
- if(!in_range(src, user))
- return
+ if(!user.canUseTopic(src, be_close=TRUE))
+ return //user not valid to use gps
if(emped)
user << "It's busted!"
if(tracking)
@@ -109,4 +109,4 @@ var/list/GPS_list = list()
/obj/item/device/gps/mining/internal
icon_state = "gps-m"
gpstag = "MINER"
- desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
\ No newline at end of file
+ desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm
index e1e6dcdc37e..19195dd1cbf 100644
--- a/code/modules/uplink/uplink_item.dm
+++ b/code/modules/uplink/uplink_item.dm
@@ -190,7 +190,7 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
/datum/uplink_item/dangerous/sniper
name = "Sniper Rifle"
desc = "Ranged fury, Syndicate style. guaranteed to cause shock and awe or your TC back!"
- item = /obj/item/weapon/gun/projectile/sniper_rifle/syndicate
+ item = /obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate
cost = 16
surplus = 25
include_modes = list(/datum/game_mode/nuclear)
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
index 356c5ca354d..e0792514af8 100644
--- a/code/modules/vehicles/pimpin_ride.dm
+++ b/code/modules/vehicles/pimpin_ride.dm
@@ -1,5 +1,3 @@
-
-
//PIMP-CART
/obj/vehicle/janicart
name = "janicart (pimpin' ride)"
@@ -40,6 +38,7 @@
desc = "An upgrade for mobile janicarts."
icon = 'icons/obj/vehicles.dmi'
icon_state = "upgrade"
+ origin_tech = "materials=3;engineering=4"
/obj/vehicle/janicart/Moved(atom/OldLoc, Dir)
@@ -91,4 +90,3 @@
user.put_in_hands(mybag)
mybag = null
update_icon()
-
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
new file mode 100644
index 00000000000..5e2455a18e9
--- /dev/null
+++ b/code/modules/zombie/items.dm
@@ -0,0 +1,111 @@
+/obj/item/zombie_hand
+ name = "zombie claw"
+ desc = "A zombie's claw is its primary tool, capable of infecting \
+ unconcious or dead humans, butchering all other living things to \
+ sustain the zombie, forcing open airlock doors and opening \
+ child-safe caps on bottles."
+ flags = NODROP|ABSTRACT
+ icon = 'icons/effects/blood.dmi'
+ icon_state = "bloodhand_left"
+ var/icon_left = "bloodhand_left"
+ var/icon_right = "bloodhand_right"
+ hitsound = 'sound/hallucinations/growl1.ogg'
+ force = 20
+ damtype = "brute"
+
+ var/removing_airlock = FALSE
+
+/obj/item/zombie_hand/equipped(mob/user, slot)
+ . = ..()
+ switch(slot)
+ // Yes, these intentionally don't match
+ if(slot_l_hand)
+ icon_state = icon_right
+ if(slot_r_hand)
+ icon_state = icon_left
+
+/obj/item/zombie_hand/dropped(mob/user)
+ . = ..()
+ // Zombie hands are force dropped upon species loss
+ qdel(src)
+
+/obj/item/zombie_hand/afterattack(atom/target, mob/user, proximity_flag)
+ . = ..()
+ if(!proximity_flag)
+ return
+ if(istype(target, /obj/machinery/door/airlock) && !removing_airlock)
+ tear_airlock(target, user)
+
+ else if(isliving(target))
+ if(ishuman(target))
+ check_infection(target, user)
+ else
+ check_feast(target, user)
+
+/obj/item/zombie_hand/proc/check_infection(mob/living/carbon/human/target, mob/user)
+ CHECK_DNA_AND_SPECIES(target)
+
+ if(NOZOMBIE in target.dna.species.specflags)
+ // cannot infect any NOZOMBIE subspecies (such as high functioning
+ // zombies)
+ return
+
+ var/obj/item/organ/body_egg/zombie_infection/infection
+ infection = target.getorganslot("zombie_infection")
+ if(!infection)
+ infection = new(target)
+
+/obj/item/zombie_hand/proc/check_feast(mob/living/target, mob/living/user)
+ if(target.stat == DEAD)
+ var/hp_gained = target.maxHealth
+ target.gib()
+ user.adjustBruteLoss(-hp_gained)
+ user.adjustToxLoss(-hp_gained)
+ user.adjustFireLoss(-hp_gained)
+ user.adjustCloneLoss(-hp_gained)
+ user.adjustBrainLoss(-hp_gained) // Zom Bee gibbers "BRAAAAISNSs!1!"
+
+/obj/item/zombie_hand/proc/tear_airlock(obj/machinery/door/airlock/A, mob/user)
+ removing_airlock = TRUE
+ user << "You start tearing apart the airlock...\
+ "
+
+ playsound(src.loc, 'sound/machines/airlock_alien_prying.ogg', 100, 1)
+ A.audible_message("You hear a loud metallic \
+ grinding sound.")
+
+ spawn(20)
+ if(removing_airlock)
+ playsound(src.loc, 'sound/hallucinations/growl3.ogg', 50, 1)
+ user.audible_message("[user] growls as \
+ their claws dig into the metal frame...")
+
+ if(do_after(user, delay=160, needhand=FALSE, target=A, progress=TRUE))
+ playsound(src.loc, 'sound/hallucinations/far_noise.ogg', 50, 1)
+ A.audible_message("With a screech, [A] is torn \
+ apart!")
+ var/obj/structure/door_assembly/door = new A.doortype(get_turf(A))
+ door.density = 0
+ door.anchored = 1
+ door.name = "ravaged [door]"
+ door.desc = "An airlock that has been torn apart. Looks like it \
+ won't be keeping much out now."
+ qdel(A)
+ removing_airlock = FALSE
+
+/obj/item/zombie_hand/suicide_act(mob/living/carbon/user)
+ // Suiciding as a zombie brings someone else in to play it
+ user.visible_message("[user] is lying down.")
+ if(!istype(user))
+ return
+
+ user.Weaken(30)
+ var/success = offer_control(user)
+ if(success)
+ user.visible_message("[user] appears to have \
+ found new spirit.")
+ return SHAME
+ else
+ user.visible_message("[user] stops moving.\
+ ")
+ return OXYLOSS
diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm
new file mode 100644
index 00000000000..35f0b611686
--- /dev/null
+++ b/code/modules/zombie/organs.dm
@@ -0,0 +1,70 @@
+#define START_TIMER reanimation_timer = world.time + rand(600,1200)
+
+/obj/item/organ/body_egg/zombie_infection
+ name = "festering ooze"
+ desc = "A black web of pus and vicera."
+ zone = "head"
+ slot = "zombie_infection"
+ var/reanimation_timer
+ var/datum/species/old_species
+ var/living_transformation_time = 5
+ var/converts_living = FALSE
+
+/obj/item/organ/body_egg/zombie_infection/New()
+ . = ..()
+ zombie_infection_list += src
+
+/obj/item/organ/body_egg/zombie_infection/Destroy()
+ zombie_infection_list -= src
+ . = ..()
+
+/obj/item/organ/body_egg/zombie_infection/on_find(mob/living/finder)
+ finder << "Inside the head is a disgusting black \
+ web of pus and vicera, bound tightly around the brain like some \
+ biological harness."
+
+/obj/item/organ/body_egg/zombie_infection/egg_process()
+ if(!ishuman(owner)) // We do not support monkey or xeno zombies. Yet.
+ qdel(src)
+ return
+ else if(reanimation_timer && (reanimation_timer < world.time))
+ zombify() // Rise and shine, Mr Romero... rise and shine.
+ reanimation_timer = null
+ else if(owner.stat == DEAD && (!reanimation_timer))
+ START_TIMER
+ else if(converts_living && !iszombie(owner) && !reanimation_timer)
+ START_TIMER
+
+/obj/item/organ/body_egg/zombie_infection/Remove(mob/living/carbon/M, special = 0)
+ . = ..()
+ CHECK_DNA_AND_SPECIES(M)
+ if(iszombie(M) && old_species)
+ M.set_species(old_species)
+
+/obj/item/organ/body_egg/zombie_infection/proc/zombify()
+ CHECK_DNA_AND_SPECIES(owner)
+ if(!iszombie(owner))
+ old_species = owner.dna.species.type
+
+ owner.grab_ghost()
+ owner.set_species(/datum/species/zombie/infectious)
+ var/old_stat = owner.stat // Save for the message
+ owner.revive(full_heal = TRUE)
+ switch(old_stat)
+ if(DEAD, UNCONSCIOUS)
+ owner.visible_message("[owner] staggers to \
+ their feet!")
+ owner << "You stagger to your feet!"
+ // Conscious conversions will generally only happen for an event
+ // or for a converts_living=TRUE infection
+ if(CONSCIOUS)
+ owner.visible_message("[owner] suddenly \
+ convulses, as they gain a ravenous hunger in their \
+ eyes!",
+ "You HUNGER!")
+ playsound(owner.loc, 'sound/hallucinations/growl3.ogg', 50, 1)
+ owner.do_jitter_animation(living_transformation_time)
+ owner.Stun(living_transformation_time)
+ owner << "You are now a zombie!"
+
+#undef START_TIMER
diff --git a/config/sillytips.txt b/config/sillytips.txt
new file mode 100644
index 00000000000..c804c3d9b43
--- /dev/null
+++ b/config/sillytips.txt
@@ -0,0 +1,25 @@
+Occasionally the tip of the round might lie to you. Don't panic, this is normal.
+To defeat the slaughter demon, shoot at it until it dies.
+Sometimes you won't be able to avoid dying no matter how good you are at the game. Try not to stress too much about it.
+When a round ends nearly everything about it is lost forever, leave your salt behind with it.
+Killing the entire station isn't fun except when it is.
+You can win a pulse rifle from the arcade machine. Honest.
+Just like real life the entropy of the game can only increase with time. If things aren't on fire yet, just wait.
+Completing your objectives is good practice, but the best antagonists will strive to do more than the bare minimum to really leave an impression.
+The more obscure and underused a game mechanic is, the less likely your victims are to be able to deal with it.
+Space is cold and it will quickly freeze you to death if you don't protect yourself. This isn't how thermodynamics really works but just go with it.
+Cleanbot.
+The wizard is supposed to be extremely strong in one on one combat, stop getting mad about it.
+Sometimes a round will just be a bust. C'est la vie.
+This is a game that is constantly being developed for. Expect things to be added, removed, fixed, and broken on a daily basis.
+It's fun to try and predict the round type from the tip of the round message.
+The quartermaster is not a head of staff and will never be one.
+The bird remembers.
+Your sprite represents your hitbox, so that afro makes you easier to kill. The sacrifices we make for style.
+Spacemen can't move diagonally but most animals can. Blame the slow decline of the numpad.
+Sometimes admins will just do stuff. Roll with it.
+The remake will never come out.
+Plenty of things that aren't traditionally considered weapons can still be used to slowly brutalize someone to death, get creative!
+DEATH IS IMMINENT!
+This game is older than some of the people playing it.
+Do not go gentle into that good night.
diff --git a/html/changelog.html b/html/changelog.html
index ff1f9c80e26..298d40abf85 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,110 @@
-->
+
04 June 2016
+
MrStonedOne updated:
+
+ - fixes see_darkness improperly hiding ghosts in certain cases.
+
+
Xhuis updated:
+
+ - Clockwork marauders can now smash walls and tables.
+ - Servants are no longer turned into harvesters by Nar-Sie but instead take heavy brute damage and begin to bleed. Similarly, cultists are no longer converted by Ratvar but instead take heavy fire damage and are set ablaze.
+ - Added clockwork reclaimers. Ghosts can now click on Ratvar to become clockwork reclaimers - small constructs capable of forcefully converting those that still resist Ratvar's reign. Alt-clicking a valid target will allow the reclaimer to leap onto the head of any non-servant, latching onto their head and converting the target if they are able. The target will be outfitted with an unremovable, acid-proof hat version of the reclaimer. The reclaimer will be able to speak as normal and attack its host and anything nearby. If the reclaimer's host goes unconscious or dies, it will leap free.
+ - Added pinion airlocks. These airlocks can only be opened by servants and conventional deconstruction will not work on them. They can be created by proselytizing a normal airlock or from Ratvar.
+ - Added ratvarian windows. They are created when Ratvar twists the form of a normal window, and there are both single-direction and full-tile variants.
+ - Non-servants can no longer use clockwork proselytizers or mending motors.
+ - Servants are now deconverted properly.
+
+
coiax updated:
+
+ - The cloning pod now sounds robotic on the radio.
+ - For extra observer drama, ghosts can now visibly see the countdown of syndicate bombs, nuclear devices, cloning pods, gang dominators and AI doomsday devices.
+
+
+
02 June 2016
+
Joan updated:
+
+ - Closed false walls will block air.
+
+
Lati updated:
+
+ - R&D required levels and origin tech levels have been rebalanced
+ - Overall, items buildable in R&D have lower tech levels and items in other departments have their tech levels raised. Remember to use science goggles to see tech levels of items!
+ - There are now level gates at high levels. R&D scientists will need help from others to get past these level gates.
+ - Other departments such as hydroponics and genetics will be important to R&D's progress now and xenobio, mining and cargo are more important than before
+ - Efficiency upgrades are back in R&D machines and tweaked to be less powerful in autolathes
+ - Reliability has been removed from all items
+ - Most bugs in R&D machines should be fixed
+
+
PKPenguin321 & Nienhaus updated:
+
+ - Letterman jackets are now available from the ClothesMate.
+
+
Quiltyquilty updated:
+
+ - The bar has seen a redesign.
+
+
coiax updated:
+
+ - Clone pods now notify the medical channel on a successful clone. They also notify the medical channel if the clone dies or is horribly mutilated; but not if it is ejected early by authorised medical personnel.
+ - Cloning pods now are more capable of cloning humanoid species that do not breathe.
+ - You can only be damaged once by a shuttle's arrival. It is still unpleasant to be in the path of one though; try to avoid it.
+ - Adds Asteroid emergency shuttle to shuttle templates. It is a very oddly shaped one though, it might not be compatible with all stations.
+ - The Chaplain soulshard can only turn a body into a shade once. A released shade can still be reabsorbed by the stone to heal it.
+ - The shuttle manipulator now has a Fast Travel button, for those admins that really want a shuttle to get to where its going FAST.
+
+
+
01 June 2016
+
coiax updated:
+
+ - Added a mirror to the beach biodome. Beach Bums, rejoyce!
+
+
pudl updated:
+
+ - The brig infirmary has received a redesign.
+
+
+
31 May 2016
+
CoreOverload updated:
+
+ - Cleanbot software was updated to version 1.2, improving pathfinding and adding two new cleaning options: "Clean Trash" and "Exterminate Pests".
+ - New cleaning options are still experimental and disabled by default.
+
+
Kiazusho updated:
+
+ - Changeling organic suit and chitin armor can be toggled off once again.
+
+
Kor updated:
+
+ - The Japanese Animes button is back,
+ - The chaplain has three new weapons: The possessed blade, the extra-dimensional blade, and the nautical energy sword. The former has a new power, the latter two are normal sword reskins.
+ - The chapel mass driver has been buffed.
+
+
coiax updated:
+
+ - Zombies can no longer be butchered
+ - If you encounter an infectious zombie, be cautious, its claws will infect you, and on death you will rise with them. If you manage to kill the beast, you can remove the corruption from its brain via surgery, or just chop off the head to stop it coming back.
+ - Adds some stock computers and lavaland to Birdboat Station.
+ - Free Golem scientists have proved that as beings made out of stone, golems are immune to all electrical discharges, including the tesla.
+ - Nuclear bombs are now points of interest. Never miss a borg steal a nuke from the syndicate shuttle again!
+ - Alt-clicking a spraycan toggles the cap.
+
+
+
30 May 2016
+
coiax updated:
+
+ - A new Shuttle Manipulator verb has been added for quick access to probably the best and
most mostly bugfree feature on /tg/.
+ - Spectral sword is now a point of interest for ghosts.
+ - Clicking the spectral sword action now orbits the sword, instead of just teleporting to its location.
+ - Gang tags can again be sprayed over.
+ - Fixes bug where the wisp was unable to be recalled to the lantern.
+
+
xxalpha updated:
+
+ - Engineering, CE and Atmos hardsuits no longer have in-built jetpacks.
+
+
29 May 2016
GunHog updated:
@@ -64,6 +168,19 @@
- Pixel projectiles. This is easier to see than explain, so go fire a weapon.
+ Xhuis updated:
+
+ - Ratvar and Nar-Sie now actively seek each other out if they both exist.
+ - Celestial gateway animations have been twweaked.
+ - Ratvar now has a new sound and message upon spawning.
+ - Ratvar now only moves one tile at a time.
+ - The celestial gateway now takes an unreasonably long amount of time.
+ - God clashing is now much more likely to work properly.
+ - Function Call now works as intended.
+ - Break Will now works as intended.
+ - Holy water now properly deconverts servants of Ratvar.
+ - Deconverted servants of Ratvar are no longer considered servants.
+
pudl updated:
- Chemicals should now have color, instead of just being pink.
@@ -488,6 +605,560 @@
- Fixes chembomb recipe to use any matter bin. Again.
- ARG's disappear once finished reacting.
+
+ 30 April 2016
+ Joan updated:
+
+ - Blobs attempting to attack the supermatter will instead be eaten by it.
+ - This doesn't mean throwing a supermatter shard at the blob is a good idea; blobs attacking it will gradually damage it, eventually resulting in a massive explosion, and it will not consume blobs if on a space turf.
+ - Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of trying to open it.
+ - Cable coils, cablecuffs, and zipties now all have properly colored inhands.
+
+ Kor updated:
+
+ - Megafauna have been added to lavaland.
+ - Ash Drakes have been spotted roaming the wastes. Use your GPS to track their fiery signals.
+ - You can now knock on the Necropolis door, but it's probably best that you don't.
+
+ Mercenaryblue updated:
+
+ - Adds a basic paper plane to the game. Fold paper with alt-clicking.
+ - Paper planes are now fully compatible with every stamps on station.
+
+ bgobandit updated:
+
+ - Nanotrasen has released Cards Against Spess! Visit your local library for a copy. Warning: may cause breakage of the fourth wall.
+
+
+ 29 April 2016
+ Bawhoppen updated:
+
+ - Several lesser-used uplink's TC cost have been rebalanced.
+ - Steckhin down from 9TC to 7TC.
+ - Tactical medkit down from 9TC to 4TC.
+ - Syndicate magboots from 3TC to 2TC.
+ - Powersinks down from 10TC to 6TC.
+ - Stealth rad-laser down from 5TC to 3TC.
+ - Bundles have been updated accordingly.
+
+ Incoming5643 updated:
+
+ - The staff/wand of door creation can now also be used to open airlock doors.
+ - Doors spawned by the staff/wand now start open. Keep this in mind the next time you try to turn every wall on the escape shuttle into a door.
+
+ Robustin updated:
+
+ - The Teleport Other, Veil, Imbue, Reveal, Disguise, Blood Drain, Timestop, Stun, Deafen, Blind, Armaments, Construct Shell and Summon Tome runes are gone.
+ - Disguise, Veil/Reveal, Construct Shell and Armaments are now talismans. The Construction talisman requires 25 sheets of metal.
+ - Cultists will now receive a warning when attempting to use emergency communion or create the Nar-Sie rune
+ - Cultists can now create talismans with a super-simple Talisman-Creation rune. It takes about 10 seconds to invoke and will present a menu of all the talisman choices available. Its as simple as tossing the paper on, clicking the rune, and selecting your talisman.
+ - Cultists now have a proc, "How to Play" that will give a basic explanation of how to succeed as a cultist.
+ - The new Talisman of Horror is a stealthy talisman that will cause hallucinations in the victim. Great for undermining security without having to commit to murder them in middle of the hall.
+ - Creating the Summon Nar-Sie rune does takes slightly less time, but now adds a 3x3 square of red barrier shields (60hp each) to prevent the rune-scriber from being bumped by other idiots. This works in conjunction with the rune's warning to give crew a chance to stop the summoning. Manifest ghost has a weaker 1x1 shield to prevent bumps as well.
+ - Talismans are now color-coded by their effect so you can easily organize and deploy talismans.
+ - You can now make colored paper in the washing machine using crayons or stamps, honk.
+ - The Electromagnetic Disruption rune will now scale with the number of cultists invoking the rune. **A full 9-cultist invocation will EMP the entire station!**
+ - Armaments will now give the recipient a new cult bola.
+ - The new Talisman of Shackling will apply handcuffs directly to the victim. These cuffs will disappear when removed.
+ - Cult slur is a little less potent so victims might be able to squeeze in a coherent word or two if you let them keep jabbering on the radio, stun talismans now have less of a health cost and the stun is back to 10 seconds, from 9.
+ - Rune and Talisman names now give a much clearer idea of what they do.
+ - The following changes are courtesy of ChangelingRain
+ - The Teleport rune now allows cultists to select which rune to teleport to, and teleports everything on it.
+ - Veil and Reveal are merged into Talisman of Veiling. Veiling has two uses, the first use will hide and the second use will reveal.
+ - New icons for the cult bola
+ - You can now attack fellow cultists with a Talisman of Arming to arm them with robes and a sword.
+ - You can now only place one rune per tile.
+ - Ghosts are notified when a new manifest rune is created.
+
+ TechnoAlchemisto updated:
+
+ - Sinew can now be fashioned into restraints.
+
+ coiax updated:
+
+ - Internals Crate now contains breath masks and small tanks.
+ - Metal foam grenade box crate added for 1000 points
+ - Added two Engineering Mesons to Engineering Gear Crate
+ - Engineering Gear now costs 1300
+ - Breach Shield Generator Crate added for 2500 points
+ - Grounding Rod Crate added for 1700 points
+ - PACMAN Generator Crate added for 2500
+ - Defibrillator Crate added for 2500
+ - Added more helmets to the Laser Tag Crate.
+ - Nanotrasen Customs report that some wide band suppliers have been providing "alternative" firing pins. Nanotrasen reminds all crewmembers that contraband is contraband.
+ - Contraband crates now appear visually similar to legitimate crates.
+ - The cargo shuttle's normal transit time has been restored.
+
+ nullbear updated:
+
+ - Adds a preference option, allowing players to toggle whether recipes with no matching components should be hidden.
+
+
+ 28 April 2016
+ Bawhoppen updated:
+
+ - Sandbags are no longer tablecrafted. Now you just put in sand (or ash) by hand to make them.
+ - Miners and Engis now get boxes of empty sandbags in their lockers. Miners also get a few premade aswell.
+ - You can now break sandstone down into normal sand.
+
+ Joan updated:
+
+ - Attacking a blob with an analyzer will tell you what its chemical does, its health, and a small fact about the blob analyzed.
+ - NERFS:
+ - Zombifying Feelers does less toxin damage.
+ - Adaptive Nexuses does slightly less brute damage.
+ - Replicating Foam does slightly less brute damage.
+ - Blob Sorium does slightly less brute damage.
+ - Blob Dark Matter does slightly less brute damage.
+ - Cyrogenic Liquid injects slightly less frost oil and ice and does slightly less stamina damage.
+ - Pressurized Slime does less brute, oxygen, and stamina damage, and extinguishes objects and people on turfs it wets.
+ - Blob core strong blobs no longer give points when removed.
+ - PROBABLY BUFFS:
+ - Flammable Goo now does slightly more burn damage and applies more firestacks, but applies fire to blob tiles that don't share its chemical.
+ - Energized Fibers does slightly more burn damage, slightly less stamina damage, and now takes damage from EMPs.
+ - BUFFS:
+ - Boiling Oil does slightly more burn damage and applies more firestacks.
+ - Reactive Gelatin does slightly more damage on average.
+ - Penetrating Spines now also ignores bio resistance in addition to armor.
+ - Hallucinogenic Nectar causes more hallucinations.
+ - Normal strong blobs now refund 4 points when removed, from 2.
+ - Charger holoparasites now play a sound when hitting a target, as well as shaking the target's camera.
+
+ PKPenguin321 updated:
+
+ - The warden's locker now contains krav maga gloves.
+
+ TechnoAlchemisto updated:
+
+ - You can now craft skull helmets from bones.
+ - Syndicate bombs are now harder to detect
+
+
+ 27 April 2016
+ TechnoAlchemisto updated:
+
+ - Miners can now select explorer belts from the mining vendor using their vouchers, or mining points.
+
+
+ 26 April 2016
+ Iamgoofball & Super Aggro Crag updated:
+
+ - Fluorosulfuric Acid now has doubled acid power.
+ - Fluorosulfuric Acid now does BONUS burn damage scaling on the time it's been inside the consumer.
+
+ Joan updated:
+
+ - Blobbernauts now spawn at half health.
+ - Blobbernauts regeneration on blob is now 2.5 health per tick, from 5.
+ - Blobbernauts now cost 40 resources to produce, from 30.
+ - Factories supporting blobbernauts do not spawn spores.
+
+ Lati updated:
+
+ - Syndicate bomb can be only delayed once by pulsing the delay wire. Time gained from this is changed from 10 seconds to 30 seconds.
+
+ TechnoAlchemisto updated:
+
+ - Goliath plates can now be stacked.
+
+ phil235 updated:
+
+ - More structures and machines are now breakable and/or destroyable with melee weapon. Additionally, Some structures and machines that are already breakable/destroyable are now affected by more attack methods (gun projectiles, thrown items, melee weapons, xeno/animal attacks, explosions).
+ - Hitting any machine now always makes a sound.
+ - You can hit closed closets/crates and doors by using an item on harm intent (but it doesn't actually hurt them).
+ - you can now burst filled water balloons with sharp items.
+ - Wooden barricade drops wood when destroyed.
+ - Slot machines with coins inside are deconstructable now.
+
+
+ 25 April 2016
+ Joan updated:
+
+ - You can once again hit a closet or crate with an item to open it.
+
+ Kor Razharas updated:
+
+ - Adds support for autoclicking.
+ - The Shock Revolver has been added to RnD.
+ - The Laser Gatling Gun has been added to RnD. The Gatling Gun uses autoclick to fire as you hold down the mouse.
+ - The Research Director now starts with a box of firing pins.
+ - The SABR and Stun Revolver recipes have been removed from RnD
+
+ coiax updated:
+
+ - Laughter demons are like slaughter demons, but they tickle people to death
+ - Slaughter demons are no longer able to cast spells while phased.
+ - Wizards can now speak while ethereal, but still cannot cast spells while ethereal.
+ - Centcom's "drone expert" reports that drones vision filters have been upgraded to include the option of making all beings appear as harmless animals. info: As always, all drone filters are togglable.
+ - As a sign of friendship between the Free Golems and Centcom, they have modified Centcom's jaunter to be worn around a user's waist, which will save them from falling to their death in a chasm.
+ - The Golems warn that these modifications have created a risk of accidental activation when exposed to heavy electromagnetic fields.
+ - Renamed hivelord stabilizer to stabilizing serum.
+ - Centcom regret to inform you that new instabilities with nearby gas giants are causing exospheric bubbles to affect the telecommunications processors. Please contact your supervisor for further instructions.
+ - The Janitor's Union has mandated additional features to station light replacer devices.
+ - The light replacer now can be used on the floor to replace the bulbs of any lights on that tile.
+ - The light replacer now eats replaced bulbs, and after a certain number of bulb fragments (four) will recycle them into a new bulb.
+ - The description of the light replacer is now more informative.
+ - Clown mask appearance toggle now has an action button.
+
+
+ 23 April 2016
+ Joan updated:
+
+ - Aliens can now open crates and lockers.
+ - Aliens and monkeys can now climb climbable objects, such as crates and sandbags.
+ - Aliens climb very, very fast.
+
+ Kor updated:
+
+ - Running HE pipes over lava will now heat the gas inside.
+ - Alt+clicking on your mecha (while inside it) will toggle strafing mode.
+
+ Mercenaryblue updated:
+
+ - Allowed all corgis to wear red wizard hats.
+
+ TechnoAlchemisto updated:
+
+ - Goliaths now drop bones, and Watchers drop sinews.
+ - You can craft primitive gear from bone and sinew.
+
+ coiax updated:
+
+ - Non-humans are now able to interact with bee boxes.
+
+
+ 22 April 2016
+ Bawhoppen updated:
+
+ - Security belts can now hold any type of grenade. This includes barrier grenades.
+ - Janitorial belts are now able to store chem grenades.
+ - Military belts have been given a size upgrade, so they can now hold larger items.
+ - Bandoliers have been given a buff and now can hold a much larger amount of ammunition.
+
+ nullbear updated:
+
+ - xenobio console is deconstructable again.
+ - syndibomb recipe calls for any matter bin, scaling effectiveness with tier.
+
+
+ 21 April 2016
+ Kor updated:
+
+ - Mechas can now toggle strafing mode.
+
+
+ 20 April 2016
+ Erwgd updated:
+
+ - The autolathe can now make trays.
+
+ Fox McCloud updated:
+
+ - Fixes abductor vests having no cooldown between uses
+
+ Kor updated:
+
+ - You can now craft boats and oars out of goliath hides. These boats can move in lava.
+ - Added a spooky, upgraded boat to necropolis chests.
+
+ coiax updated:
+
+ - Slime grinders now cease suction of new slimes while grinding
+
+ coiax, Joan updated:
+
+ - Drone dufflebags now have their own sprite.
+
+ kevinz000 updated:
+
+ - Admin Detection Multitool: A multitool that shows when administrators are watching you! Now you can grief in safety!
+ - Syndicate R&D scientists have significantly increased the range of their "AI detection multitools", making them turn yellow when an AI's tracking is near, but not on you just yet!
+
+
+ 18 April 2016
+ Joan updated:
+
+ - Crates are now dense even when open.
+ - You can now climb onto crates in the same way as table and sandbags, though climbing onto crates is very fast and does not stun you.
+ - You can walk on crates, provided both are closed/open or the crate you're on is closed.
+ - You can't close or open a crate if there's a large mob on top of it.
+ - Stuffing items into a closet or crate is now instant and does not close the closet or crate. Stuffing mobs into a closet or crate still takes time and closes the closet/crate in question.
+ - Crowbars and wirecutters have new inhand sprites. Crowbars can now be distinguished from wrenches in-hand.
+
+ RandomMarine updated:
+
+ - Cloth items removed from biogenerator. Instead, it can create stacking cloth that crafts those items.
+ - In addition, cloth can be used to create grey jumpsuits, backpacks, dufflebags, bio bags, black shoes, bedsheets, and bandages.
+ - Bedsheets now tear into cloth instead of directly into bandages.
+
+ Shadowlight213 updated:
+
+ - AI will be notified when one of their cyborgs is detonated.
+
+ coiax updated:
+
+ - Fixed slime grinders not sucking up more than one slime
+ - Drones now start with a spacious dufflebag full of tools, so they will stop stealing the captain's
+ - Fixed issues with drones wearing chameleon headgear.
+ - Added admin-only "snowflake drone" (also known as drone camogear) headgear.
+
+ nullbear updated:
+
+ - Fixes air canisters being silent when bashed.
+
+
+ 16 April 2016
+ Bawhoppen updated:
+
+ - Cryo is no longer god-awful.
+
+ CoreOverload updated:
+
+ - A lot of items are now exportable in cargo.
+ - Use Export Scanner to check any item's export value.
+
+ Erwgd updated:
+
+ - Forks, bowls, drinking glasses, shot glasses and shakers can now be made and recycled in the autolathe! Access the designs in the new 'Dinnerware' category.
+ - Kitchen knives have been moved to the Dinnerware category of the autolathe.
+ - Butcher's cleavers can now be made in a hacked autolathe.
+
+ Fox McCloud updated:
+
+ - Slime batteries now self-recharge.
+ - Adds transference potion. A potion that allows the user to transfer their consciousness to a simple mob.
+ - Adds rainbow slime core reaction that generates a consciousness transference potion when injected with blood.
+
+ Iamgoofball, Lati, Geo_Jerkal, Tanquetsunami25 updated:
+
+ - Lati requested that the Slime Processor will now automatically scoop up any dead slimes into itself for processing.
+ - Geo_Jerkal requested that you be able to mix Arnold Palmers with Tea and Lemon Juice.
+ - Tanquetsunami25 requested that cyborg be able to boop.
+
+ Incoming5643 updated:
+
+ - Removed the horrible meme skeletons, please don't sue us.
+
+ Kor updated:
+
+ - Adrenals, no slips, surplus crates and SUHTANDOS now have minimum population requirements before they can be purchased.
+
+ KorPhaeron updated:
+
+ - You now need to butcher goliaths and watchers on lavaland to receive their loot. Use the combat knives to do so.
+
+ Lati updated:
+
+ - Custom floor tiles can now be added to floorbots. They will start replacing other tiles with these tiles if the option is toggled on.
+
+ coiax updated:
+
+ - Boxstation, not to be outdone by all the other competing station designs, has installed a drone shell dispenser in the Testing Lab, which makes automated drones to help fix the station.
+ - Toy fans, rejoyce! The famous skeleton brothers from the beloved game Belowyarn now have toys that you can win from the arcade machines!
+ - Airlock painters can be printed at your local autolathe
+ - Please do not attempt suicide with the airlock painter or the medical wrench.
+ - Metastation now has a plant DNA manipulator in Botany.
+ - Using the fire extinguisher on yourself or others while in HELP intent will spray you or them, rather than beat their probably flaming body with a metal object.
+ - Alt-clicking extinguishers to empty them now wets the floor underneath them.
+
+ lordpidey updated:
+
+ - Meth labs can now blow up if you don't purify the ingredients or over-heat the end product.
+
+ nullbear updated:
+
+ - Added attack verbs for heart and tongue organs
+ - Maximum output of air pumps has been raised.
+
+
+ 12 April 2016
+ Incoming5643 updated:
+
+ - Leading scientists have finally proven that humans (and xenos) in fact have tongues in their mouths.
+ - Swapping out tongues allows the various races to change their speech impediments. Putting a xeno tongue in someone allows them to make the hissing sound like a xeno whenever they speak.
+ - There are no erp mechanics tied to this feature.
+ - Remember that tongues are stored in the MOUTH, selecting the head isn't good enough.
+
+ Kor updated:
+
+ - Ash walker starting gear has been rebalanced.
+ - Ash walkers can no longer use guns.
+
+ TrustyGun updated:
+
+ - After carefully investing in the market, the Captain had enough money to replace his silver flask with a golden one!
+ - The Detective is now bringing his personalized flask to work, due to the grim work he has to do.
+ - The Booze-O-Mat now stocks 3 flasks.
+
+
+ 11 April 2016
+ Joan updated:
+
+ - Blob cores will take slight brute damage from explosions.
+
+ RandomMarine updated:
+
+ - Additional luxuries have been added to golem ships. Including new rewards. Praise be to The Liberator!
+ - However, jaunters are no longer easily obtained by free golems.
+
+ RemieRichards updated:
+
+ - The Station Blueprints now display the piping/wiring and some of the machinery the station started with, to assist in repairs
+
+ coiax updated:
+
+ - Emagging the cargo console also unlocks regular contraband, in addition to syndicate gear
+ - A working drone shell dispenser is now on display in MetaStation's museum, displaying the virtue of the tireless little workers!
+ - Dreamstation now has a drone shell dispenser in the Toxins Launch Room
+
+
+ 09 April 2016
+ GunHog updated:
+
+ - Aliens may now force open unbolted, unwelded airlocks. Unpowered airlocks open faster than powered ones. Has a cool sound provided by @Ultimate-Chimera!
+ - Alien Drone health increased to 125 hp.
+ - Alien drone is now faster!
+ - Alien egg and larva maturation times halved.
+ - Resin membrane health increased to 160 hp.
+ - Aliens may now open firelocks.
+ - Aliens may now unweld scrubbers and vents. (From the outside!)
+ - Droppers no longer affect aliens.
+
+ Joan updated:
+
+ - You can no longer drop survival capsules on top of dense objects, such as the windows in the emergency shuttle. You can still drop them on non-dense objects and mobs, however.
+ - Swarmers can now deconstruct objects simply by clicking.
+ - Swarmers can still teleport mobs away via ctrl-click.
+ - Emps will now properly damage swarmers.
+
+ Kor updated:
+
+ - Added wisp lanterns to necropolis chests.
+ - Added red/blue cube pairs to necropolis chests.
+ - Added meat hooks to necropolis chests.
+ - Added immortality talismans to necropolis chests.
+ - Added paradox bags to necropolis chests.
+ - Ripley drills work again. Go tear up lavaland.
+
+ PKPenguin321 updated:
+
+ - Goofball's grab nerf has been reverted.
+
+ TechnoAlchemisto updated:
+
+ - Pickaxe upgrades are now better.
+
+ coiax updated:
+
+ - Efficiency Station Testing Lab now has a Drone Shell Dispenser
+ - Fixed an issue with a door on the Golem Ship
+ - The unfathomable entity Carp'sie has blessed vir followers with mysterious carp guardians.
+ - Nanotrasen Cyborgs are now able to empty ore boxes without human assistance
+ - Ore boxes are now craftable with 4 planks of wood
+ - Ore boxes now drop their contents when destroyed, or dismantled with a crowbar
+
+ coiax, bobdobbington, Core0verload updated:
+
+ - An experimental plant DNA manipulator, based on machinery recovered from ancient seed vaults, has been installed in the Botany department.
+
+
+ 07 April 2016
+ Kor updated:
+
+ - The Laser Cannon in RD has been replaced with the Accelerator Laser Cannon. Try it out!
+ - Mechas now have armour facings. Attacking the front will deal far less damage, while attacking the back will deal massive bonus damage.
+ - EMPs now deal far less damage/drain to mechas.
+
+ Kor and Ausops updated:
+
+ - Survival pod interiors have been redone.
+ - Survival pods now contain a stationary GPS computer.
+ - You can now toggle your GPS off with alt+click.
+
+ bgobandit updated:
+
+ - Due to budget cuts, Nanotrasen is no longer utilizing copy-protected paper for its classified documents. Fortunately, our world-class security team has always prevented any thefts or photocopies from being made!
+ - Secret documents can be photocopied. If you have an objective to steal any set of documents, a photocopy will be accepted. If you must steal red or blue documents, a photocopy will NOT be accepted. Enterprising traitors can forge the red/blue seal with a crayon to take advantage of this.
+
+
+ 06 April 2016
+ CoreOverload updated:
+
+ - You can now put slimes in stasis by exposing them to room temp CO2. Useful for both fighting the slimes and safely storing them.
+
+ Erwgd updated:
+
+ - The autolathe can now make hydroponics tools! Access the design routines in the Misc. category of the machine.
+
+ LanCartwright updated:
+
+ - Custom viruses with stealth values of 3 or above are now invisible on the PANDEMIC and no longer visible on health huds.
+
+ MrStonedOne updated:
+
+ - Centcom is happy to report that our single sided windows and our windoors should once again create an airtight seal.
+
+ bgobandit updated:
+
+ - Honk! Nanotrasen's clowning and development department has invented the clown megaphone, standard in all clowning loadouts! Honk honk!
+
+
+ 05 April 2016
+ Erwgd updated:
+
+ - Utility belts of all kinds can now accept gloves. Most belts, except janitorial belts, may now also hold station bounced radios.
+ - Hazard vests and most jackets can carry a station bounced radio as well. Labcoats can be used to store a handheld crew monitor.
+ - The autolathe can now make toolboxes.
+
+ Joan updated:
+
+ - Adds protector holoparasites to traitor holoparasite injectors.
+ - Protector holoparasites cause the summoner to teleport to them when out of range, instead of the other way around.
+ - Protector holoparasites have two modes; Combat, where they do and take medium damage, and Protection, where they do and take almost no damage, but move slightly slower.
+ - Explosive Holoparasites no longer teleport non-mobs when attacking, but have a higher chance to teleport mobs.
+ - Explosive Holoparasite bombs no longer trigger on their summoner or any other parasites their summoner has.
+ - Ranged Holoparasites no longer have nightvision active by default. It can still be toggled on.
+ - Ranged Holoparasite snares no longer alert if the crossing mob is their summoner or one of the parasites their summoner has.
+ - Ranged Holoparasites are slightly less visible in scout mode.
+ - Standard Holoparasites attack 20% faster than other parasite types.
+ - Support Holoparasite beacons no longer require safe atmospheric conditions, but the warp channel takes slightly longer, and is preceded with a visible message.
+ - Zombies can no longer destroy more than one airlock at a time.
+ - The mining station has been updated.
+
+ MrStonedOne updated:
+
+ - Centcom is glad to announce the end of sending workers to our control group for space exposure testing, a fake station in "space" that noticeably had air in "space".
+
+ TechnoAlchemisto updated:
+
+ - Detective scanners are now smaller.
+ - Pickaxes now fit in explorer suit exosuit slots.
+
+ bgobandit updated:
+
+ - Alt-clicking a fire extinguisher cabinet opens and closes it. That is all.
+
+
+ 04 April 2016
+ TechnoAlchemisto updated:
+
+ - The recipes for some Trekchems are now back in the game
+ - Bicaridine can be made with carbon, oxygen, and sugar.
+ - Kelotane can be made with silicon and carbon.
+ - Antitoxin can be made with nitrogen, silicon, and potassium
+ - tricordrazine can be made by combining all three.
+
+
+ 03 April 2016
+ Erwgd updated:
+
+ - Our valued colleagues in the security department are reminded to search boots for hidden items (such as knives or syringes) as part of standard search procedures. Alt-click a pair of boots to remove any hidden items.
+
+ Isratosh updated:
+
+ - Fixed rudimentary transform not working properly on ghosts with minds.
+ - Admin logs for bluespace capsules not activated on the mining Z level.
+
most mostly bugfree feature on /tg/.
+ - rscadd: Spectral sword is now a point of interest for ghosts.
+ - bugfix: Clicking the spectral sword action now orbits the sword, instead of just
+ teleporting to its location.
+ - bugfix: Gang tags can again be sprayed over.
+ - bugfix: Fixes bug where the wisp was unable to be recalled to the lantern.
+ xxalpha:
+ - rscdel: Engineering, CE and Atmos hardsuits no longer have in-built jetpacks.
+2016-05-31:
+ CoreOverload:
+ - rscadd: 'Cleanbot software was updated to version 1.2, improving pathfinding and
+ adding two new cleaning options: "Clean Trash" and "Exterminate Pests".'
+ - experiment: New cleaning options are still experimental and disabled by default.
+ Kiazusho:
+ - bugfix: Changeling organic suit and chitin armor can be toggled off once again.
+ Kor:
+ - rscadd: The Japanese Animes button is back,
+ - rscadd: 'The chaplain has three new weapons: The possessed blade, the extra-dimensional
+ blade, and the nautical energy sword. The former has a new power, the latter
+ two are normal sword reskins.'
+ - rscadd: The chapel mass driver has been buffed.
+ coiax:
+ - rscdel: Zombies can no longer be butchered
+ - rscadd: If you encounter an infectious zombie, be cautious, its claws will infect
+ you, and on death you will rise with them. If you manage to kill the beast,
+ you can remove the corruption from its brain via surgery, or just chop off the
+ head to stop it coming back.
+ - rscadd: Adds some stock computers and lavaland to Birdboat Station.
+ - bugfix: Free Golem scientists have proved that as beings made out of stone, golems
+ are immune to all electrical discharges, including the tesla.
+ - rscadd: Nuclear bombs are now points of interest. Never miss a borg steal a nuke
+ from the syndicate shuttle again!
+ - rscadd: Alt-clicking a spraycan toggles the cap.
+2016-06-01:
+ coiax:
+ - rscadd: Added a mirror to the beach biodome. Beach Bums, rejoyce!
+ pudl:
+ - rscadd: The brig infirmary has received a redesign.
+2016-06-02:
+ Joan:
+ - tweak: Closed false walls will block air.
+ Lati:
+ - rscadd: R&D required levels and origin tech levels have been rebalanced
+ - experiment: Overall, items buildable in R&D have lower tech levels and items in
+ other departments have their tech levels raised. Remember to use science goggles
+ to see tech levels of items!
+ - tweak: There are now level gates at high levels. R&D scientists will need help
+ from others to get past these level gates.
+ - tweak: Other departments such as hydroponics and genetics will be important to
+ R&D's progress now and xenobio, mining and cargo are more important than before
+ - tweak: Efficiency upgrades are back in R&D machines and tweaked to be less powerful
+ in autolathes
+ - rscdel: Reliability has been removed from all items
+ - bugfix: Most bugs in R&D machines should be fixed
+ PKPenguin321 & Nienhaus:
+ - rscadd: Letterman jackets are now available from the ClothesMate.
+ Quiltyquilty:
+ - rscadd: The bar has seen a redesign.
+ coiax:
+ - rscadd: Clone pods now notify the medical channel on a successful clone. They
+ also notify the medical channel if the clone dies or is horribly mutilated;
+ but not if it is ejected early by authorised medical personnel.
+ - rscadd: Cloning pods now are more capable of cloning humanoid species that do
+ not breathe.
+ - bugfix: You can only be damaged once by a shuttle's arrival. It is still unpleasant
+ to be in the path of one though; try to avoid it.
+ - rscadd: Adds Asteroid emergency shuttle to shuttle templates. It is a very oddly
+ shaped one though, it might not be compatible with all stations.
+ - rscdel: The Chaplain soulshard can only turn a body into a shade once. A released
+ shade can still be reabsorbed by the stone to heal it.
+ - rscadd: The shuttle manipulator now has a Fast Travel button, for those admins
+ that really want a shuttle to get to where its going FAST.
+2016-06-04:
+ MrStonedOne:
+ - bugfix: fixes see_darkness improperly hiding ghosts in certain cases.
+ Xhuis:
+ - tweak: Clockwork marauders can now smash walls and tables.
+ - tweak: Servants are no longer turned into harvesters by Nar-Sie but instead take
+ heavy brute damage and begin to bleed. Similarly, cultists are no longer converted
+ by Ratvar but instead take heavy fire damage and are set ablaze.
+ - rscadd: Added clockwork reclaimers. Ghosts can now click on Ratvar to become clockwork
+ reclaimers - small constructs capable of forcefully converting those that still
+ resist Ratvar's reign. Alt-clicking a valid target will allow the reclaimer
+ to leap onto the head of any non-servant, latching onto their head and converting
+ the target if they are able. The target will be outfitted with an unremovable,
+ acid-proof hat version of the reclaimer. The reclaimer will be able to speak
+ as normal and attack its host and anything nearby. If the reclaimer's host goes
+ unconscious or dies, it will leap free.
+ - rscadd: Added pinion airlocks. These airlocks can only be opened by servants and
+ conventional deconstruction will not work on them. They can be created by proselytizing
+ a normal airlock or from Ratvar.
+ - rscadd: Added ratvarian windows. They are created when Ratvar twists the form
+ of a normal window, and there are both single-direction and full-tile variants.
+ - bugfix: Non-servants can no longer use clockwork proselytizers or mending motors.
+ - bugfix: Servants are now deconverted properly.
+ coiax:
+ - bugfix: The cloning pod now sounds robotic on the radio.
+ - rscadd: For extra observer drama, ghosts can now visibly see the countdown of
+ syndicate bombs, nuclear devices, cloning pods, gang dominators and AI doomsday
+ devices.
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index 855e6d21922..2469a264523 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/effects/clockwork_effects.dmi b/icons/effects/clockwork_effects.dmi
index ab97d77bf1f..ab349f4b2a8 100644
Binary files a/icons/effects/clockwork_effects.dmi and b/icons/effects/clockwork_effects.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index d48ca7ff01f..eec53b3c07c 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 06905f87d76..4811a7d31c2 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index db47abd7202..4f070af6b6e 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/clockwork_mobs.dmi b/icons/mob/clockwork_mobs.dmi
index 7a97fa733e6..6a500608ccb 100644
Binary files a/icons/mob/clockwork_mobs.dmi and b/icons/mob/clockwork_mobs.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 65b0323be4d..cf10ecb6e8f 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 38ec8bc7834..3d7dd56ecec 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index c400115775f..5c37eb916e9 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 0947ee1315f..fa83559b4f7 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/robot_transformations.dmi b/icons/mob/robot_transformations.dmi
index f389bb60a02..9860c004cf1 100644
Binary files a/icons/mob/robot_transformations.dmi and b/icons/mob/robot_transformations.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 997d2514ebc..2018eba76bf 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index d85d188d87d..ddc81aba4f5 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/wings.dmi b/icons/mob/wings.dmi
index 84cf9bd083b..cd1a6d3b1cc 100644
Binary files a/icons/mob/wings.dmi and b/icons/mob/wings.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 44382c1f48e..3f0b5eb70c9 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index b1b422eb558..29fed5de145 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/clockwork_objects.dmi b/icons/obj/clockwork_objects.dmi
index 01e06461c7a..80c71eb6618 100644
Binary files a/icons/obj/clockwork_objects.dmi and b/icons/obj/clockwork_objects.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 58430a3543a..33cb50421a4 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/clockwork_garb.dmi b/icons/obj/clothing/clockwork_garb.dmi
index 9eed34114bf..0db950e644f 100644
Binary files a/icons/obj/clothing/clockwork_garb.dmi and b/icons/obj/clothing/clockwork_garb.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 20a1cacfb1d..bf8b68040a3 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 70eaedb6709..176ec253293 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/doors/airlocks/clockwork/overlays.dmi b/icons/obj/doors/airlocks/clockwork/overlays.dmi
new file mode 100644
index 00000000000..1f95be24660
Binary files /dev/null and b/icons/obj/doors/airlocks/clockwork/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi b/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi
new file mode 100644
index 00000000000..817b150d37a
Binary files /dev/null and b/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
index a99a667bc59..ca306698982 100644
Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 7a77e8d2558..aabfdcfee9a 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 2e8776e2b71..0c3cc97ddc5 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/shuttleold.dmi b/icons/turf/shuttleold.dmi
new file mode 100644
index 00000000000..e0fe0025c3b
Binary files /dev/null and b/icons/turf/shuttleold.dmi differ
diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi
index 5ab9ae74629..e5851c2f62d 100644
Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ
diff --git a/icons/turf/walls/clockwork_wall.dmi b/icons/turf/walls/clockwork_wall.dmi
new file mode 100644
index 00000000000..ae9f2de887a
Binary files /dev/null and b/icons/turf/walls/clockwork_wall.dmi differ
diff --git a/sound/effects/ratvar_reveal.ogg b/sound/effects/ratvar_reveal.ogg
new file mode 100644
index 00000000000..e70cd9873c5
Binary files /dev/null and b/sound/effects/ratvar_reveal.ogg differ
diff --git a/sound/effects/ratvar_rises.ogg b/sound/effects/ratvar_rises.ogg
index 6201ce790d6..4c22d250c38 100644
Binary files a/sound/effects/ratvar_rises.ogg and b/sound/effects/ratvar_rises.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 2a20872de2a..9577240d529 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -311,10 +311,11 @@
#include "code\game\gamemodes\changeling\powers\transform.dm"
#include "code\game\gamemodes\clock_cult\__clock_defines.dm"
#include "code\game\gamemodes\clock_cult\clock_cult.dm"
+#include "code\game\gamemodes\clock_cult\clock_items.dm"
#include "code\game\gamemodes\clock_cult\clock_mobs.dm"
-#include "code\game\gamemodes\clock_cult\clock_objects.dm"
#include "code\game\gamemodes\clock_cult\clock_ratvar.dm"
#include "code\game\gamemodes\clock_cult\clock_scripture.dm"
+#include "code\game\gamemodes\clock_cult\clock_structures.dm"
#include "code\game\gamemodes\clock_cult\clock_unsorted.dm"
#include "code\game\gamemodes\cult\cult.dm"
#include "code\game\gamemodes\cult\cult_comms.dm"
@@ -1022,6 +1023,7 @@
#include "code\modules\clothing\under\jobs\engineering.dm"
#include "code\modules\clothing\under\jobs\medsci.dm"
#include "code\modules\clothing\under\jobs\security.dm"
+#include "code\modules\countdown\countdown.dm"
#include "code\modules\crafting\craft.dm"
#include "code\modules\crafting\guncrafting.dm"
#include "code\modules\crafting\recipes.dm"
@@ -1451,13 +1453,13 @@
#include "code\modules\mob\living\simple_animal\hostile\tree.dm"
#include "code\modules\mob\living\simple_animal\hostile\venus_human_trap.dm"
#include "code\modules\mob\living\simple_animal\hostile\wizard.dm"
-#include "code\modules\mob\living\simple_animal\hostile\zombie.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\dragon.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\legion.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\megafauna.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\bat.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm"
+#include "code\modules\mob\living\simple_animal\hostile\retaliate\spaceman.dm"
#include "code\modules\mob\living\simple_animal\slime\death.dm"
#include "code\modules\mob\living\simple_animal\slime\emote.dm"
#include "code\modules\mob\living\simple_animal\slime\life.dm"
@@ -1778,6 +1780,8 @@
#include "code\modules\vehicles\secway.dm"
#include "code\modules\vehicles\speedbike.dm"
#include "code\modules\vehicles\vehicle.dm"
+#include "code\modules\zombie\items.dm"
+#include "code\modules\zombie\organs.dm"
#include "code\orphaned_procs\AStar.dm"
#include "code\orphaned_procs\dbcore.dm"
#include "code\orphaned_procs\priority_announce.dm"
diff --git a/tgui/assets/tgui.css b/tgui/assets/tgui.css
index 35e16349ab3..1db67cd4b49 100644
--- a/tgui/assets/tgui.css
+++ b/tgui/assets/tgui.css
@@ -1 +1 @@
-@charset "utf-8";body,html{box-sizing:border-box;height:100%;margin:0}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff;background-color:#2a2a2a;background-image:linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}*,:after,:before{box-sizing:inherit}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgNDI1IDIwMCIgb3BhY2l0eT0iLjMzIj4NCiAgPHBhdGggZD0ibSAxNzguMDAzOTksMC4wMzg2OSAtNzEuMjAzOTMsMCBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTYuNzYxMzQsNi4wMjU1NSBsIDAsMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM0LDYuMDI1NTQgbCA1My4xMDcyLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xMDEuNTQ0MDE4IDcyLjIxNjI4LDEwNC42OTkzOTggYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDUuNzYwMTUsMi44NzAxNiBsIDczLjU1NDg3LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xODcuODcxNDcgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM1LC02LjAyNTU1IGwgLTU0LjcxNjQ0LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTMzLDYuMDI1NTUgbCAwLDEwMi42MTkzNSBMIDE4My43NjQxMywyLjkwODg2IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNS43NjAxNCwtMi44NzAxNyB6IiAvPg0KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPg0KICA8cGF0aCBkPSJtIDQyMC4xNTUzNSwxNzcuODkxMTkgYSAxMy40MTIwMzgsMTIuNTAxODQyIDAgMCAxIC04LjYzMjk1LDIyLjA2OTUxIGwgLTY2LjExODMyLDAgYSA1LjM2NDgxNTIsNS4wMDA3MzcgMCAwIDEgLTUuMzY0ODIsLTUuMDAwNzQgbCAwLC03OS44NzkzMSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.nanotrasen .normal{color:#40628a}body.nanotrasen .good{color:#537d29}body.nanotrasen .average{color:#be6209}body.nanotrasen .bad{color:#b00e0e}body.nanotrasen .highlight{color:#8ba5c4}body.nanotrasen main{display:block;margin-top:32px;padding:2px 6px 0}body.nanotrasen hr{height:2px;background-color:#40628a;border:none}body.nanotrasen .hidden{display:none}body.nanotrasen .bar .barText,body.nanotrasen span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.nanotrasen .bold{font-weight:700}body.nanotrasen .italic{font-style:italic}body.nanotrasen [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.nanotrasen div[data-tooltip],body.nanotrasen span[data-tooltip]{position:relative}body.nanotrasen div[data-tooltip]:after,body.nanotrasen span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.nanotrasen div[data-tooltip]:hover:after,body.nanotrasen span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.nanotrasen div[data-tooltip].tooltip-top:after,body.nanotrasen span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-top:hover:after,body.nanotrasen span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-left:after,body.nanotrasen span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-left:hover:after,body.nanotrasen span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}body.nanotrasen .bar .barText{position:absolute;top:0;right:3px}body.nanotrasen .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}body.nanotrasen .bar .barFill.good{background-color:#537d29}body.nanotrasen .bar .barFill.average{background-color:#be6209}body.nanotrasen .bar .barFill.bad{background-color:#b00e0e}body.nanotrasen span.button{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.nanotrasen span.button .fa{padding-right:2px}body.nanotrasen span.button.normal{transition:background-color .5s;background-color:#40628a}body.nanotrasen span.button.normal.active:focus,body.nanotrasen span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}body.nanotrasen span.button.disabled{transition:background-color .5s;background-color:#999}body.nanotrasen span.button.disabled.active:focus,body.nanotrasen span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}body.nanotrasen span.button.selected{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.selected.active:focus,body.nanotrasen span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.caution{transition:background-color .5s;background-color:#9a9d00}body.nanotrasen span.button.caution.active:focus,body.nanotrasen span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.nanotrasen span.button.danger{transition:background-color .5s;background-color:#9d0808}body.nanotrasen span.button.danger.active:focus,body.nanotrasen span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.nanotrasen span.button.gridable{width:125px;margin:2px 0}body.nanotrasen span.button+span:not(.button),body.nanotrasen span:not(.button)+span.button{margin-left:5px}body.nanotrasen div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}body.nanotrasen div.display header,body.nanotrasen div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}body.nanotrasen div.display header .buttonRight,body.nanotrasen div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.nanotrasen div.display article,body.nanotrasen div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.nanotrasen input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#000;background-color:#fff;border:1px solid #272727}body.nanotrasen input::-webkit-input-placeholder{color:#999}body.nanotrasen input::-moz-placeholder{color:#999}body.nanotrasen input:-ms-input-placeholder{color:#999}body.nanotrasen input::placeholder{color:#999}body.nanotrasen input::-ms-clear{display:none}body.nanotrasen svg.linegraph{overflow:hidden}body.nanotrasen div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}body.nanotrasen div.notice .label{color:#000}body.nanotrasen div.notice .content:only-of-type{padding:0}body.nanotrasen div.notice hr{background-color:#272727}body.nanotrasen div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.nanotrasen section{display:table-row;width:100%}body.nanotrasen section:not(:first-child){padding-top:4px}body.nanotrasen section.candystripe:nth-child(even){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.nanotrasen section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}body.nanotrasen section .content:not(:last-child){padding-right:16px}body.nanotrasen section .line{width:100%}body.nanotrasen div.subdisplay{width:100%;margin:0}body.nanotrasen header.titlebar .close,body.nanotrasen header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#8ba5c4}body.nanotrasen header.titlebar .close:hover,body.nanotrasen header.titlebar .minimize:hover{color:#9cb2cd}body.nanotrasen header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.nanotrasen header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.nanotrasen header.titlebar .title{position:absolute;top:6px;left:46px;color:#8ba5c4;font-size:16px;white-space:nowrap}body.nanotrasen header.titlebar .minimize{position:absolute;top:6px;right:46px}body.nanotrasen header.titlebar .close{position:absolute;top:4px;right:12px}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgMjAwIDI4OS43NDIiIG9wYWNpdHk9Ii4zMyI+DQogIDxwYXRoIGQ9Im0gOTMuNTM3Njc3LDAgYyAtMTguMTEzMTI1LDAgLTM0LjIyMDEzMywzLjExMTY0IC00OC4zMjM0ODQsOS4zMzQzNyAtMTMuOTY1MDkyLDYuMjIxNjcgLTI0LjYxMjQ0MiwxNS4wNzExNCAtMzEuOTQwNjUxLDI2LjU0NzEgLTcuMTg5OTM5OCwxMS4zMzc4OSAtMTAuMzAxMjI2NiwyNC43NDkxMSAtMTAuMzAxMjI2Niw0MC4yMzQ3OCAwLDEwLjY0NjYyIDIuNzI1MDAyNiwyMC40NjQ2NSA4LjE3NTExMTYsMjkuNDUyNTggNS42MTUyNzcsOC45ODY4NiAxNC4wMzgyNzcsMTcuMzUyMDQgMjUuMjY4ODIxLDI1LjA5NDM2IDExLjIzMDU0NCw3LjYwNTMxIDI2LjUwNzQyMSwxNS40MTgzNSA0NS44MzA1MTQsMjMuNDM3ODIgMTkuOTgzNzQ4LDguMjk1NTcgMzQuODQ4ODQ4LDE1LjU1NDcxIDQ0LjU5Mjk5OCwyMS43NzYzOCA5Ljc0NDE0LDYuMjIyNzMgMTYuNzYxNywxMi44NTg1IDIxLjA1NTcyLDE5LjkwOTUxIDQuMjk0MDQsNy4wNTIwOCA2LjQ0MTkzLDE1Ljc2NDA4IDYuNDQxOTMsMjYuMTM0NTkgMCwxNi4xNzcwMiAtNS4yMDE5NiwyOC40ODIyMiAtMTUuNjA2NzMsMzYuOTE2ODIgLTEwLjIzOTYsOC40MzQ3IC0yNS4wMjIwMywxMi42NTIzIC00NC4zNDUxNjksMTIuNjUyMyAtMTQuMDM4MTcxLDAgLTI1LjUxNTI0NywtMS42NTk0IC0zNC40MzM2MTgsLTQuOTc3NyAtOC45MTgzNywtMy40NTY2IC0xNi4xODU1NzIsLTguNzExMyAtMjEuODAwODM5LC0xNS43NjMzIC01LjYxNTI3NywtNy4wNTIxIC0xMC4wNzQ3OTUsLTE2LjY2MDg4IC0xMy4zNzc4OTksLTI4LjgyODEyIGwgLTI0Ljc3MzE2MjYyOTM5NDUsMCAwLDU2LjgyNjMyIEMgMzMuODU2NzY5LDI4Ni4wNzYwMSA2My43NDkwNCwyODkuNzQyMDEgODkuNjc4MzgzLDI4OS43NDIwMSBjIDE2LjAyMDAyNywwIDMwLjcxOTc4NywtMS4zODI3IDQ0LjA5NzMzNywtNC4xNDc5IDEzLjU0MjcyLC0yLjkwNDMgMjUuMTA0MSwtNy40Njc2IDM0LjY4MzA5LC0xMy42ODkzIDkuNzQ0MTMsLTYuMzU5NyAxNy4zNDA0MiwtMTQuNTE5NSAyMi43OTA1MiwtMjQuNDc0OCA1LjQ1MDEsLTEwLjA5MzMyIDguMTc1MTEsLTIyLjM5OTU5IDguMTc1MTEsLTM2LjkxNjgyIDAsLTEyLjk5NzY0IC0zLjMwMjEsLTI0LjMzNTM5IC05LjkwODI5LC0zNC4wMTQ2IC02LjQ0MTA1LC05LjgxNzI1IC0xNS41MjU0NSwtMTguNTI3MDcgLTI3LjI1MTQ2LC0yNi4xMzEzMyAtMTEuNTYwODUsLTcuNjA0MjcgLTI3LjkxMDgzLC0xNS44MzE0MiAtNDkuMDUwNjYsLTI0LjY4MDIyIC0xNy41MDY0NCwtNy4xOTAxMiAtMzAuNzE5NjY4LC0xMy42ODk0OCAtMzkuNjM4MDM4LC0xOS40OTcwMSAtOC45MTgzNzEsLTUuODA3NTIgLTE4LjYwNzQ3NCwtMTIuNDM0MDkgLTI0LjA5NjUyNCwtMTguODc0MTcgLTUuNDI2MDQzLC02LjM2NjE2IC05LjY1ODgyNiwtMTUuMDcwMDMgLTkuNjU4ODI2LC0yNC44ODcyOSAwLC05LjI2NDAxIDIuMDc1NDE0LC0xNy4yMTM0NSA2LjIyMzQ1NCwtMjMuODUwMzMgMTEuMDk4Mjk4LC0xNC4zOTc0OCA0MS4yODY2MzgsLTEuNzk1MDcgNDUuMDc1NjA5LDI0LjM0NzYyIDQuODM5MzkyLDYuNzc0OTEgOC44NDkzNSwxNi4yNDcyOSAxMi4wMjk1MTUsMjguNDE1NiBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNC40NzgyNSwtNS45MjQ0OCAtOS45NTQ4OCwtMTAuNjMyMjIgLTE1LjkwODM3LC0xNC4zNzQxMSAxLjY0MDU1LDAuNDc5MDUgMy4xOTAzOSwxLjAyMzc2IDQuNjM4NjUsMS42NDAyNCA2LjQ5ODYxLDIuNjI2MDcgMTIuMTY3OTMsNy4zMjc0NyAxNy4wMDczLDE0LjEwMzQ1IDQuODM5MzksNi43NzQ5MSA4Ljg0OTM1LDE2LjI0NTY3IDEyLjAyOTUyLDI4LjQxMzk3IDAsMCA4LjQ4MTI4LC0wLjEyODk0IDguNDg5NzgsLTAuMDAyIDAuNDE3NzYsNi40MTQ5NCAtMS43NTMzOSw5LjQ1Mjg2IC00LjEyMzQyLDEyLjU2MTA0IC0yLjQxNzQsMy4xNjk3OCAtNS4xNDQ4Niw2Ljc4OTczIC00LjAwMjc4LDEzLjAwMjkgMS41MDc4Niw4LjIwMzE4IDEwLjE4MzU0LDEwLjU5NjQyIDE0LjYyMTk0LDkuMzExNTQgLTMuMzE4NDIsLTAuNDk5MTEgLTUuMzE4NTUsLTEuNzQ5NDggLTUuMzE4NTUsLTEuNzQ5NDggMCwwIDEuODc2NDYsMC45OTg2OCA1LjY1MTE3LC0xLjM1OTgxIC0zLjI3Njk1LDAuOTU1NzEgLTEwLjcwNTI5LC0wLjc5NzM4IC0xMS44MDEyNSwtNi43NjMxMyAtMC45NTc1MiwtNS4yMDg2MSAwLjk0NjU0LC03LjI5NTE0IDMuNDAxMTMsLTEwLjUxNDgyIDIuNDU0NjIsLTMuMjE5NjggNS4yODQyNiwtNi45NTgzMSA0LjY4NDMsLTE0LjQ4ODI0IGwgMC4wMDMsMC4wMDIgOC45MjY3NiwwIDAsLTU1Ljk5OTY3IGMgLTE1LjA3MTI1LC0zLjg3MTY4IC0yNy42NTMxNCwtNi4zNjA0MiAtMzcuNzQ2NzEsLTcuNDY1ODYgLTkuOTU1MzEsLTEuMTA3NTUgLTIwLjE4ODIzLC0xLjY1OTgxIC0zMC42OTY2MTMsLTEuNjU5ODEgeiBtIDcwLjMyMTYwMywxNy4zMDg5MyAwLjIzODA1LDQwLjMwNDkgYyAxLjMxODA4LDEuMjI2NjYgMi40Mzk2NSwyLjI3ODE1IDMuMzQwODEsMy4xMDYwMiA0LjgzOTM5LDYuNzc0OTEgOC44NDkzNCwxNi4yNDU2NiAxMi4wMjk1MSwyOC40MTM5NyBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNi42NzczMSwtNC41OTM4MSAtMTkuODM2NDMsLTEwLjQ3MzA5IC0zNi4xNDA3MSwtMTUuODI1MjIgeiBtIC0yOC4xMjA0OSw1LjYwNTUxIDguNTY0NzksMTcuNzE2NTUgYyAtMTEuOTcwMzcsLTYuNDY2OTcgLTEzLjg0Njc4LC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk3MDUsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IG0gMTUuMjIxOTUsMjQuMDA4NDggOC41NjQ3OSwxNy43MTY1NSBjIC0xMS45NzAzOCwtNi40NjY5NyAtMTMuODQ2NzksLTkuNzE3MjYgLTguNTY0NzksLTE3LjcxNjU1IHogbSAyMi43OTcwNCwwIGMgMi43NzE1LDcuOTk5MjkgMS43ODc0MSwxMS4yNDk1OCAtNC40OTM1NCwxNy43MTY1NSBsIDQuNDkzNTQsLTE3LjcxNjU1IHogbSAtOTkuMTEzODQsMi4yMDc2NCA4LjU2NDc5LDE3LjcxNjU1IGMgLTExLjk3MDM4MiwtNi40NjY5NyAtMTMuODQ2NzgyLC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk1NDIsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#750000 0,#340404);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff750000',endColorstr='#ff340404',GradientType=0)}body.syndicate .normal{color:#40628a}body.syndicate .good{color:#73e573}body.syndicate .average{color:#be6209}body.syndicate .bad{color:#b00e0e}body.syndicate .highlight{color:#000}body.syndicate main{display:block;margin-top:32px;padding:2px 6px 0}body.syndicate hr{height:2px;background-color:#272727;border:none}body.syndicate .hidden{display:none}body.syndicate .bar .barText,body.syndicate span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.syndicate .bold{font-weight:700}body.syndicate .italic{font-style:italic}body.syndicate [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.syndicate div[data-tooltip],body.syndicate span[data-tooltip]{position:relative}body.syndicate div[data-tooltip]:after,body.syndicate span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.syndicate div[data-tooltip]:hover:after,body.syndicate span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.syndicate div[data-tooltip].tooltip-top:after,body.syndicate span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-top:hover:after,body.syndicate span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-left:after,body.syndicate span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-left:hover:after,body.syndicate span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:hover:after,body.syndicate span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #000;background:#272727}body.syndicate .bar .barText{position:absolute;top:0;right:3px}body.syndicate .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#000}body.syndicate .bar .barFill.good{background-color:#73e573}body.syndicate .bar .barFill.average{background-color:#be6209}body.syndicate .bar .barFill.bad{background-color:#b00e0e}body.syndicate span.button{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.syndicate span.button .fa{padding-right:2px}body.syndicate span.button.normal{transition:background-color .5s;background-color:#397439}body.syndicate span.button.normal.active:focus,body.syndicate span.button.normal.active:hover{transition:background-color .25s;background-color:#4a964a;outline:0}body.syndicate span.button.disabled{transition:background-color .5s;background-color:#363636}body.syndicate span.button.disabled.active:focus,body.syndicate span.button.disabled.active:hover{transition:background-color .25s;background-color:#545454;outline:0}body.syndicate span.button.selected{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.selected.active:focus,body.syndicate span.button.selected.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.caution{transition:background-color .5s;background-color:#be6209}body.syndicate span.button.caution.active:focus,body.syndicate span.button.caution.active:hover{transition:background-color .25s;background-color:#eb790b;outline:0}body.syndicate span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.syndicate span.button.danger.active:focus,body.syndicate span.button.danger.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.syndicate span.button.gridable{width:125px;margin:2px 0}body.syndicate span.button+span:not(.button),body.syndicate span:not(.button)+span.button{margin-left:5px}body.syndicate div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000);background-color:rgba(0,0,0,.5);box-shadow:inset 0 0 5px rgba(0,0,0,.75)}body.syndicate div.display header,body.syndicate div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #272727}body.syndicate div.display header .buttonRight,body.syndicate div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.syndicate div.display article,body.syndicate div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.syndicate input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#fff;background-color:#9d0808;border:1px solid #272727}body.syndicate input::-webkit-input-placeholder{color:#999}body.syndicate input::-moz-placeholder{color:#999}body.syndicate input:-ms-input-placeholder{color:#999}body.syndicate input::placeholder{color:#999}body.syndicate input::-ms-clear{display:none}body.syndicate svg.linegraph{overflow:hidden}body.syndicate div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#750000;background-image:repeating-linear-gradient(-45deg,#750000,#750000 10px,#910101 0,#910101 20px)}body.syndicate div.notice .label{color:#000}body.syndicate div.notice .content:only-of-type{padding:0}body.syndicate div.notice hr{background-color:#272727}body.syndicate div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.syndicate section{display:table-row;width:100%}body.syndicate section:not(:first-child){padding-top:4px}body.syndicate section.candystripe:nth-child(even){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.syndicate section .label{width:1%;padding-right:32px;white-space:nowrap;color:#fff}body.syndicate section .content:not(:last-child){padding-right:16px}body.syndicate section .line{width:100%}body.syndicate div.subdisplay{width:100%;margin:0}body.syndicate header.titlebar .close,body.syndicate header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#e74242}body.syndicate header.titlebar .close:hover,body.syndicate header.titlebar .minimize:hover{color:#eb5e5e}body.syndicate header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.syndicate header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.syndicate header.titlebar .title{position:absolute;top:6px;left:46px;color:#e74242;font-size:16px;white-space:nowrap}body.syndicate header.titlebar .minimize{position:absolute;top:6px;right:46px}body.syndicate header.titlebar .close{position:absolute;top:4px;right:12px}.no-icons header.titlebar .statusicon{font-size:20px}.no-icons header.titlebar .statusicon:after{content:"O"}.no-icons header.titlebar .minimize{top:-2px;font-size:20px}.no-icons header.titlebar .minimize:after{content:"—"}.no-icons header.titlebar .close{font-size:20px}.no-icons header.titlebar .close:after{content:"X"}
\ No newline at end of file
+@charset "utf-8";body,html{box-sizing:border-box;height:100%;margin:0}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff;background-color:#2a2a2a;background-image:linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}*,:after,:before{box-sizing:inherit}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA0MjUgMjAwIiBvcGFjaXR5PSIuMzMiPgogIDxwYXRoIGQ9Im0gMTc4LjAwMzk5LDAuMDM4NjkgLTcxLjIwMzkzLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM0LDYuMDI1NTUgbCAwLDE4Ny44NzE0NyBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgNi43NjEzNCw2LjAyNTU0IGwgNTMuMTA3MiwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTAxLjU0NDAxOCA3Mi4yMTYyOCwxMDQuNjk5Mzk4IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA1Ljc2MDE1LDIuODcwMTYgbCA3My41NTQ4NywwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzNSwtNi4wMjU1NSBsIC01NC43MTY0NCwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzMyw2LjAyNTU1IGwgMCwxMDIuNjE5MzUgTCAxODMuNzY0MTMsMi45MDg4NiBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTUuNzYwMTQsLTIuODcwMTcgeiIgLz4KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPgogIDxwYXRoIGQ9Im0gNDIwLjE1NTM1LDE3Ny44OTExOSBhIDEzLjQxMjAzOCwxMi41MDE4NDIgMCAwIDEgLTguNjMyOTUsMjIuMDY5NTEgbCAtNjYuMTE4MzIsMCBhIDUuMzY0ODE1Miw1LjAwMDczNyAwIDAgMSAtNS4zNjQ4MiwtNS4wMDA3NCBsIDAsLTc5Ljg3OTMxIHoiIC8+Cjwvc3ZnPgo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4KPCEtLSBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9saWNlbnNlcy9ieS1zYS80LjAvIC0tPgo=") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.nanotrasen .normal{color:#40628a}body.nanotrasen .good{color:#537d29}body.nanotrasen .average{color:#be6209}body.nanotrasen .bad{color:#b00e0e}body.nanotrasen .highlight{color:#8ba5c4}body.nanotrasen main{display:block;margin-top:32px;padding:2px 6px 0}body.nanotrasen hr{height:2px;background-color:#40628a;border:none}body.nanotrasen .hidden{display:none}body.nanotrasen .bar .barText,body.nanotrasen span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.nanotrasen .bold{font-weight:700}body.nanotrasen .italic{font-style:italic}body.nanotrasen [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.nanotrasen div[data-tooltip],body.nanotrasen span[data-tooltip]{position:relative}body.nanotrasen div[data-tooltip]:after,body.nanotrasen span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.nanotrasen div[data-tooltip]:hover:after,body.nanotrasen span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.nanotrasen div[data-tooltip].tooltip-top:after,body.nanotrasen span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-webkit-transform:translateX(-50%) translateY(8px);-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen div[data-tooltip].tooltip-top:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-top:hover:after{-webkit-transform:translateX(-50%) translateY(-8px);-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after{top:100%;left:50%}body.nanotrasen div[data-tooltip].tooltip-bottom:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:hover:after{-webkit-transform:translateX(-50%) translateY(8px);-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-left:after,body.nanotrasen span[data-tooltip].tooltip-left:after{top:50%;right:100%;-webkit-transform:translateX(8px) translateY(-50%);-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-left:hover:after,body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-left:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:after{-webkit-transform:translateX(-8px) translateY(-50%);-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-right:after{top:50%;left:100%}body.nanotrasen div[data-tooltip].tooltip-right:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:hover:after{-webkit-transform:translateX(8px) translateY(-50%);-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}body.nanotrasen .bar .barText{position:absolute;top:0;right:3px}body.nanotrasen .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}body.nanotrasen .bar .barFill.good{background-color:#537d29}body.nanotrasen .bar .barFill.average{background-color:#be6209}body.nanotrasen .bar .barFill.bad{background-color:#b00e0e}body.nanotrasen span.button{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.nanotrasen span.button .fa{padding-right:2px}body.nanotrasen span.button.normal{transition:background-color .5s;background-color:#40628a}body.nanotrasen span.button.normal.active:focus,body.nanotrasen span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}body.nanotrasen span.button.disabled{transition:background-color .5s;background-color:#999}body.nanotrasen span.button.disabled.active:focus,body.nanotrasen span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}body.nanotrasen span.button.selected{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.selected.active:focus,body.nanotrasen span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.caution{transition:background-color .5s;background-color:#9a9d00}body.nanotrasen span.button.caution.active:focus,body.nanotrasen span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.nanotrasen span.button.danger{transition:background-color .5s;background-color:#9d0808}body.nanotrasen span.button.danger.active:focus,body.nanotrasen span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.nanotrasen span.button.gridable{width:125px;margin:2px 0}body.nanotrasen span.button+span:not(.button),body.nanotrasen span:not(.button)+span.button{margin-left:5px}body.nanotrasen div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}body.nanotrasen div.display header,body.nanotrasen div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}body.nanotrasen div.display header .buttonRight,body.nanotrasen div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.nanotrasen div.display article,body.nanotrasen div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.nanotrasen input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#000;background-color:#fff;border:1px solid #272727}body.nanotrasen input::-webkit-input-placeholder{color:#999}body.nanotrasen input::-moz-placeholder{color:#999}body.nanotrasen input:-ms-input-placeholder{color:#999}body.nanotrasen input::placeholder{color:#999}body.nanotrasen input::-ms-clear{display:none}body.nanotrasen svg.linegraph{overflow:hidden}body.nanotrasen div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}body.nanotrasen div.notice .label{color:#000}body.nanotrasen div.notice .content:only-of-type{padding:0}body.nanotrasen div.notice hr{background-color:#272727}body.nanotrasen div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.nanotrasen section{display:table-row;width:100%}body.nanotrasen section:not(:first-child){padding-top:4px}body.nanotrasen section.candystripe:nth-child(even){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.nanotrasen section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}body.nanotrasen section .content:not(:last-child){padding-right:16px}body.nanotrasen section .line{width:100%}body.nanotrasen div.subdisplay{width:100%;margin:0}body.nanotrasen header.titlebar .close,body.nanotrasen header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#8ba5c4}body.nanotrasen header.titlebar .close:hover,body.nanotrasen header.titlebar .minimize:hover{color:#9cb2cd}body.nanotrasen header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.nanotrasen header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.nanotrasen header.titlebar .title{position:absolute;top:6px;left:46px;color:#8ba5c4;font-size:16px;white-space:nowrap}body.nanotrasen header.titlebar .minimize{position:absolute;top:6px;right:46px}body.nanotrasen header.titlebar .close{position:absolute;top:4px;right:12px}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCAyMDAgMjg5Ljc0MiIgb3BhY2l0eT0iLjMzIj4KICA8cGF0aCBkPSJtIDkzLjUzNzY3NywwIGMgLTE4LjExMzEyNSwwIC0zNC4yMjAxMzMsMy4xMTE2NCAtNDguMzIzNDg0LDkuMzM0MzcgLTEzLjk2NTA5Miw2LjIyMTY3IC0yNC42MTI0NDIsMTUuMDcxMTQgLTMxLjk0MDY1MSwyNi41NDcxIC03LjE4OTkzOTgsMTEuMzM3ODkgLTEwLjMwMTIyNjYsMjQuNzQ5MTEgLTEwLjMwMTIyNjYsNDAuMjM0NzggMCwxMC42NDY2MiAyLjcyNTAwMjYsMjAuNDY0NjUgOC4xNzUxMTE2LDI5LjQ1MjU4IDUuNjE1Mjc3LDguOTg2ODYgMTQuMDM4Mjc3LDE3LjM1MjA0IDI1LjI2ODgyMSwyNS4wOTQzNiAxMS4yMzA1NDQsNy42MDUzMSAyNi41MDc0MjEsMTUuNDE4MzUgNDUuODMwNTE0LDIzLjQzNzgyIDE5Ljk4Mzc0OCw4LjI5NTU3IDM0Ljg0ODg0OCwxNS41NTQ3MSA0NC41OTI5OTgsMjEuNzc2MzggOS43NDQxNCw2LjIyMjczIDE2Ljc2MTcsMTIuODU4NSAyMS4wNTU3MiwxOS45MDk1MSA0LjI5NDA0LDcuMDUyMDggNi40NDE5MywxNS43NjQwOCA2LjQ0MTkzLDI2LjEzNDU5IDAsMTYuMTc3MDIgLTUuMjAxOTYsMjguNDgyMjIgLTE1LjYwNjczLDM2LjkxNjgyIC0xMC4yMzk2LDguNDM0NyAtMjUuMDIyMDMsMTIuNjUyMyAtNDQuMzQ1MTY5LDEyLjY1MjMgLTE0LjAzODE3MSwwIC0yNS41MTUyNDcsLTEuNjU5NCAtMzQuNDMzNjE4LC00Ljk3NzcgLTguOTE4MzcsLTMuNDU2NiAtMTYuMTg1NTcyLC04LjcxMTMgLTIxLjgwMDgzOSwtMTUuNzYzMyAtNS42MTUyNzcsLTcuMDUyMSAtMTAuMDc0Nzk1LC0xNi42NjA4OCAtMTMuMzc3ODk5LC0yOC44MjgxMiBsIC0yNC43NzMxNjI2MjkzOTQ1LDAgMCw1Ni44MjYzMiBDIDMzLjg1Njc2OSwyODYuMDc2MDEgNjMuNzQ5MDQsMjg5Ljc0MjAxIDg5LjY3ODM4MywyODkuNzQyMDEgYyAxNi4wMjAwMjcsMCAzMC43MTk3ODcsLTEuMzgyNyA0NC4wOTczMzcsLTQuMTQ3OSAxMy41NDI3MiwtMi45MDQzIDI1LjEwNDEsLTcuNDY3NiAzNC42ODMwOSwtMTMuNjg5MyA5Ljc0NDEzLC02LjM1OTcgMTcuMzQwNDIsLTE0LjUxOTUgMjIuNzkwNTIsLTI0LjQ3NDggNS40NTAxLC0xMC4wOTMzMiA4LjE3NTExLC0yMi4zOTk1OSA4LjE3NTExLC0zNi45MTY4MiAwLC0xMi45OTc2NCAtMy4zMDIxLC0yNC4zMzUzOSAtOS45MDgyOSwtMzQuMDE0NiAtNi40NDEwNSwtOS44MTcyNSAtMTUuNTI1NDUsLTE4LjUyNzA3IC0yNy4yNTE0NiwtMjYuMTMxMzMgLTExLjU2MDg1LC03LjYwNDI3IC0yNy45MTA4MywtMTUuODMxNDIgLTQ5LjA1MDY2LC0yNC42ODAyMiAtMTcuNTA2NDQsLTcuMTkwMTIgLTMwLjcxOTY2OCwtMTMuNjg5NDggLTM5LjYzODAzOCwtMTkuNDk3MDEgLTguOTE4MzcxLC01LjgwNzUyIC0xOC42MDc0NzQsLTEyLjQzNDA5IC0yNC4wOTY1MjQsLTE4Ljg3NDE3IC01LjQyNjA0MywtNi4zNjYxNiAtOS42NTg4MjYsLTE1LjA3MDAzIC05LjY1ODgyNiwtMjQuODg3MjkgMCwtOS4yNjQwMSAyLjA3NTQxNCwtMTcuMjEzNDUgNi4yMjM0NTQsLTIzLjg1MDMzIDExLjA5ODI5OCwtMTQuMzk3NDggNDEuMjg2NjM4LC0xLjc5NTA3IDQ1LjA3NTYwOSwyNC4zNDc2MiA0LjgzOTM5Miw2Ljc3NDkxIDguODQ5MzUsMTYuMjQ3MjkgMTIuMDI5NTE1LDI4LjQxNTYgbCAyMC41MzIzNCwwIDAsLTU1Ljk5OTY3IGMgLTQuNDc4MjUsLTUuOTI0NDggLTkuOTU0ODgsLTEwLjYzMjIyIC0xNS45MDgzNywtMTQuMzc0MTEgMS42NDA1NSwwLjQ3OTA1IDMuMTkwMzksMS4wMjM3NiA0LjYzODY1LDEuNjQwMjQgNi40OTg2MSwyLjYyNjA3IDEyLjE2NzkzLDcuMzI3NDcgMTcuMDA3MywxNC4xMDM0NSA0LjgzOTM5LDYuNzc0OTEgOC44NDkzNSwxNi4yNDU2NyAxMi4wMjk1MiwyOC40MTM5NyAwLDAgOC40ODEyOCwtMC4xMjg5NCA4LjQ4OTc4LC0wLjAwMiAwLjQxNzc2LDYuNDE0OTQgLTEuNzUzMzksOS40NTI4NiAtNC4xMjM0MiwxMi41NjEwNCAtMi40MTc0LDMuMTY5NzggLTUuMTQ0ODYsNi43ODk3MyAtNC4wMDI3OCwxMy4wMDI5IDEuNTA3ODYsOC4yMDMxOCAxMC4xODM1NCwxMC41OTY0MiAxNC42MjE5NCw5LjMxMTU0IC0zLjMxODQyLC0wLjQ5OTExIC01LjMxODU1LC0xLjc0OTQ4IC01LjMxODU1LC0xLjc0OTQ4IDAsMCAxLjg3NjQ2LDAuOTk4NjggNS42NTExNywtMS4zNTk4MSAtMy4yNzY5NSwwLjk1NTcxIC0xMC43MDUyOSwtMC43OTczOCAtMTEuODAxMjUsLTYuNzYzMTMgLTAuOTU3NTIsLTUuMjA4NjEgMC45NDY1NCwtNy4yOTUxNCAzLjQwMTEzLC0xMC41MTQ4MiAyLjQ1NDYyLC0zLjIxOTY4IDUuMjg0MjYsLTYuOTU4MzEgNC42ODQzLC0xNC40ODgyNCBsIDAuMDAzLDAuMDAyIDguOTI2NzYsMCAwLC01NS45OTk2NyBjIC0xNS4wNzEyNSwtMy44NzE2OCAtMjcuNjUzMTQsLTYuMzYwNDIgLTM3Ljc0NjcxLC03LjQ2NTg2IC05Ljk1NTMxLC0xLjEwNzU1IC0yMC4xODgyMywtMS42NTk4MSAtMzAuNjk2NjEzLC0xLjY1OTgxIHogbSA3MC4zMjE2MDMsMTcuMzA4OTMgMC4yMzgwNSw0MC4zMDQ5IGMgMS4zMTgwOCwxLjIyNjY2IDIuNDM5NjUsMi4yNzgxNSAzLjM0MDgxLDMuMTA2MDIgNC44MzkzOSw2Ljc3NDkxIDguODQ5MzQsMTYuMjQ1NjYgMTIuMDI5NTEsMjguNDEzOTcgbCAyMC41MzIzNCwwIDAsLTU1Ljk5OTY3IGMgLTYuNjc3MzEsLTQuNTkzODEgLTE5LjgzNjQzLC0xMC40NzMwOSAtMzYuMTQwNzEsLTE1LjgyNTIyIHogbSAtMjguMTIwNDksNS42MDU1MSA4LjU2NDc5LDE3LjcxNjU1IGMgLTExLjk3MDM3LC02LjQ2Njk3IC0xMy44NDY3OCwtOS43MTcyNiAtOC41NjQ3OSwtMTcuNzE2NTUgeiBtIDIyLjc5NzA1LDAgYyAyLjc3MTUsNy45OTkyOSAxLjc4NzQxLDExLjI0OTU4IC00LjQ5MzU0LDE3LjcxNjU1IGwgNC40OTM1NCwtMTcuNzE2NTUgeiBtIDE1LjIyMTk1LDI0LjAwODQ4IDguNTY0NzksMTcuNzE2NTUgYyAtMTEuOTcwMzgsLTYuNDY2OTcgLTEzLjg0Njc5LC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk3MDQsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IG0gLTk5LjExMzg0LDIuMjA3NjQgOC41NjQ3OSwxNy43MTY1NSBjIC0xMS45NzAzODIsLTYuNDY2OTcgLTEzLjg0Njc4MiwtOS43MTcyNiAtOC41NjQ3OSwtMTcuNzE2NTUgeiBtIDIyLjc5NTQyLDAgYyAyLjc3MTUsNy45OTkyOSAxLjc4NzQxLDExLjI0OTU4IC00LjQ5MzU0LDE3LjcxNjU1IGwgNC40OTM1NCwtMTcuNzE2NTUgeiIgLz4KPC9zdmc+CjwhLS0gVGhpcyB3b3JrIGlzIGxpY2Vuc2VkIHVuZGVyIGEgQ3JlYXRpdmUgQ29tbW9ucyBBdHRyaWJ1dGlvbi1TaGFyZUFsaWtlIDQuMCBJbnRlcm5hdGlvbmFsIExpY2Vuc2UuIC0tPgo8IS0tIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LXNhLzQuMC8gLS0+Cg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#750000 0,#340404);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff750000',endColorstr='#ff340404',GradientType=0)}body.syndicate .normal{color:#40628a}body.syndicate .good{color:#73e573}body.syndicate .average{color:#be6209}body.syndicate .bad{color:#b00e0e}body.syndicate .highlight{color:#000}body.syndicate main{display:block;margin-top:32px;padding:2px 6px 0}body.syndicate hr{height:2px;background-color:#272727;border:none}body.syndicate .hidden{display:none}body.syndicate .bar .barText,body.syndicate span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.syndicate .bold{font-weight:700}body.syndicate .italic{font-style:italic}body.syndicate [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.syndicate div[data-tooltip],body.syndicate span[data-tooltip]{position:relative}body.syndicate div[data-tooltip]:after,body.syndicate span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.syndicate div[data-tooltip]:hover:after,body.syndicate span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.syndicate div[data-tooltip].tooltip-top:after,body.syndicate span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-webkit-transform:translateX(-50%) translateY(8px);-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate div[data-tooltip].tooltip-top:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-top:hover:after{-webkit-transform:translateX(-50%) translateY(-8px);-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-bottom:after{top:100%;left:50%}body.syndicate div[data-tooltip].tooltip-bottom:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:hover:after{-webkit-transform:translateX(-50%) translateY(8px);-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-left:after,body.syndicate span[data-tooltip].tooltip-left:after{top:50%;right:100%;-webkit-transform:translateX(8px) translateY(-50%);-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-left:hover:after,body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-left:hover:after,body.syndicate span[data-tooltip].tooltip-right:after{-webkit-transform:translateX(-8px) translateY(-50%);-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-right:after{top:50%;left:100%}body.syndicate div[data-tooltip].tooltip-right:hover:after,body.syndicate span[data-tooltip].tooltip-right:hover:after{-webkit-transform:translateX(8px) translateY(-50%);-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #000;background:#272727}body.syndicate .bar .barText{position:absolute;top:0;right:3px}body.syndicate .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#000}body.syndicate .bar .barFill.good{background-color:#73e573}body.syndicate .bar .barFill.average{background-color:#be6209}body.syndicate .bar .barFill.bad{background-color:#b00e0e}body.syndicate span.button{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.syndicate span.button .fa{padding-right:2px}body.syndicate span.button.normal{transition:background-color .5s;background-color:#397439}body.syndicate span.button.normal.active:focus,body.syndicate span.button.normal.active:hover{transition:background-color .25s;background-color:#4a964a;outline:0}body.syndicate span.button.disabled{transition:background-color .5s;background-color:#363636}body.syndicate span.button.disabled.active:focus,body.syndicate span.button.disabled.active:hover{transition:background-color .25s;background-color:#545454;outline:0}body.syndicate span.button.selected{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.selected.active:focus,body.syndicate span.button.selected.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.caution{transition:background-color .5s;background-color:#be6209}body.syndicate span.button.caution.active:focus,body.syndicate span.button.caution.active:hover{transition:background-color .25s;background-color:#eb790b;outline:0}body.syndicate span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.syndicate span.button.danger.active:focus,body.syndicate span.button.danger.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.syndicate span.button.gridable{width:125px;margin:2px 0}body.syndicate span.button+span:not(.button),body.syndicate span:not(.button)+span.button{margin-left:5px}body.syndicate div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000);background-color:rgba(0,0,0,.5);box-shadow:inset 0 0 5px rgba(0,0,0,.75)}body.syndicate div.display header,body.syndicate div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #272727}body.syndicate div.display header .buttonRight,body.syndicate div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.syndicate div.display article,body.syndicate div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.syndicate input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#fff;background-color:#9d0808;border:1px solid #272727}body.syndicate input::-webkit-input-placeholder{color:#999}body.syndicate input::-moz-placeholder{color:#999}body.syndicate input:-ms-input-placeholder{color:#999}body.syndicate input::placeholder{color:#999}body.syndicate input::-ms-clear{display:none}body.syndicate svg.linegraph{overflow:hidden}body.syndicate div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#750000;background-image:repeating-linear-gradient(-45deg,#750000,#750000 10px,#910101 0,#910101 20px)}body.syndicate div.notice .label{color:#000}body.syndicate div.notice .content:only-of-type{padding:0}body.syndicate div.notice hr{background-color:#272727}body.syndicate div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.syndicate section{display:table-row;width:100%}body.syndicate section:not(:first-child){padding-top:4px}body.syndicate section.candystripe:nth-child(even){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.syndicate section .label{width:1%;padding-right:32px;white-space:nowrap;color:#fff}body.syndicate section .content:not(:last-child){padding-right:16px}body.syndicate section .line{width:100%}body.syndicate div.subdisplay{width:100%;margin:0}body.syndicate header.titlebar .close,body.syndicate header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#e74242}body.syndicate header.titlebar .close:hover,body.syndicate header.titlebar .minimize:hover{color:#eb5e5e}body.syndicate header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.syndicate header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.syndicate header.titlebar .title{position:absolute;top:6px;left:46px;color:#e74242;font-size:16px;white-space:nowrap}body.syndicate header.titlebar .minimize{position:absolute;top:6px;right:46px}body.syndicate header.titlebar .close{position:absolute;top:4px;right:12px}.no-icons header.titlebar .statusicon{font-size:20px}.no-icons header.titlebar .statusicon:after{content:"O"}.no-icons header.titlebar .minimize{top:-2px;font-size:20px}.no-icons header.titlebar .minimize:after{content:"—"}.no-icons header.titlebar .close{font-size:20px}.no-icons header.titlebar .close:after{content:"X"}
\ No newline at end of file
diff --git a/tgui/assets/tgui.js b/tgui/assets/tgui.js
index 348dbbd48c0..9d3d3b212af 100644
--- a/tgui/assets/tgui.js
+++ b/tgui/assets/tgui.js
@@ -1,12 +1,12 @@
-require=function t(e,n,r){function i(o,s){if(!n[o]){if(!e[o]){var u="function"==typeof require&&require;if(!s&&u)return u(o,!0);if(a)return a(o,!0);var c=Error("Cannot find module '"+o+"'");throw c.code="MODULE_NOT_FOUND",c}var l=n[o]={exports:{}};e[o][0].call(l.exports,function(t){var n=e[o][1][t];return i(n?n:t)},l,l.exports,t,e,n,r)}return n[o].exports}for(var a="function"==typeof require&&require,o=0;o2?c[2]:void 0,p=Math.min((void 0===l?o:i(l,o))-u,o-s),f=1;for(s>u&&u+p>s&&(f=-1,u+=p-1,s+=p-1);p-- >0;)u in n?n[s]=n[u]:delete n[s],s+=f,u+=f;return n}},{76:76,79:79,80:80}],6:[function(t,e,n){"use strict";var r=t(80),i=t(76),a=t(79);e.exports=[].fill||function(t){for(var e=r(this),n=a(e.length),o=arguments,s=o.length,u=i(s>1?o[1]:void 0,n),c=s>2?o[2]:void 0,l=void 0===c?n:i(c,n);l>u;)e[u++]=t;return e}},{76:76,79:79,80:80}],7:[function(t,e,n){var r=t(78),i=t(79),a=t(76);e.exports=function(t){return function(e,n,o){var s,u=r(e),c=i(u.length),l=a(o,c);if(t&&n!=n){for(;c>l;)if(s=u[l++],s!=s)return!0}else for(;c>l;l++)if((t||l in u)&&u[l]===n)return t||l;return!t&&-1}}},{76:76,78:78,79:79}],8:[function(t,e,n){var r=t(17),i=t(34),a=t(80),o=t(79),s=t(9);e.exports=function(t){var e=1==t,n=2==t,u=3==t,c=4==t,l=6==t,p=5==t||l;return function(f,d,h){for(var m,v,g=a(f),y=i(g),b=r(d,h,3),x=o(y.length),w=0,_=e?s(f,x):n?s(f,0):void 0;x>w;w++)if((p||w in y)&&(m=y[w],v=b(m,w,g),t))if(e)_[w]=v;else if(v)switch(t){case 3:return!0;case 5:return m;case 6:return w;case 2:_.push(m)}else if(c)return!1;return l?-1:u||c?c:_}}},{17:17,34:34,79:79,80:80,9:9}],9:[function(t,e,n){var r=t(38),i=t(36),a=t(83)("species");e.exports=function(t,e){var n;return i(t)&&(n=t.constructor,"function"!=typeof n||n!==Array&&!i(n.prototype)||(n=void 0),r(n)&&(n=n[a],null===n&&(n=void 0))),new(void 0===n?Array:n)(e)}},{36:36,38:38,83:83}],10:[function(t,e,n){var r=t(11),i=t(83)("toStringTag"),a="Arguments"==r(function(){return arguments}());e.exports=function(t){var e,n,o;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=(e=Object(t))[i])?n:a?r(e):"Object"==(o=r(e))&&"function"==typeof e.callee?"Arguments":o}},{11:11,83:83}],11:[function(t,e,n){var r={}.toString;e.exports=function(t){return r.call(t).slice(8,-1)}},{}],12:[function(t,e,n){"use strict";var r=t(46),i=t(31),a=t(60),o=t(17),s=t(69),u=t(18),c=t(27),l=t(42),p=t(44),f=t(82)("id"),d=t(30),h=t(38),m=t(65),v=t(19),g=Object.isExtensible||h,y=v?"_s":"size",b=0,x=function(t,e){if(!h(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!d(t,f)){if(!g(t))return"F";if(!e)return"E";i(t,f,++b)}return"O"+t[f]},w=function(t,e){var n,r=x(e);if("F"!==r)return t._i[r];for(n=t._f;n;n=n.n)if(n.k==e)return n};e.exports={getConstructor:function(t,e,n,i){var l=t(function(t,a){s(t,l,e),t._i=r.create(null),t._f=void 0,t._l=void 0,t[y]=0,void 0!=a&&c(a,n,t[i],t)});return a(l.prototype,{clear:function(){for(var t=this,e=t._i,n=t._f;n;n=n.n)n.r=!0,n.p&&(n.p=n.p.n=void 0),delete e[n.i];t._f=t._l=void 0,t[y]=0},"delete":function(t){var e=this,n=w(e,t);if(n){var r=n.n,i=n.p;delete e._i[n.i],n.r=!0,i&&(i.n=r),r&&(r.p=i),e._f==n&&(e._f=r),e._l==n&&(e._l=i),e[y]--}return!!n},forEach:function(t){for(var e,n=o(t,arguments.length>1?arguments[1]:void 0,3);e=e?e.n:this._f;)for(n(e.v,e.k,this);e&&e.r;)e=e.p},has:function(t){return!!w(this,t)}}),v&&r.setDesc(l.prototype,"size",{get:function(){return u(this[y])}}),l},def:function(t,e,n){var r,i,a=w(t,e);return a?a.v=n:(t._l=a={i:i=x(e,!0),k:e,v:n,p:r=t._l,n:void 0,r:!1},t._f||(t._f=a),r&&(r.n=a),t[y]++,"F"!==i&&(t._i[i]=a)),t},getEntry:w,setStrong:function(t,e,n){l(t,e,function(t,e){this._t=t,this._k=e,this._l=void 0},function(){for(var t=this,e=t._k,n=t._l;n&&n.r;)n=n.p;return t._t&&(t._l=n=n?n.n:t._t._f)?"keys"==e?p(0,n.k):"values"==e?p(0,n.v):p(0,[n.k,n.v]):(t._t=void 0,p(1))},n?"entries":"values",!n,!0),m(e)}}},{17:17,18:18,19:19,27:27,30:30,31:31,38:38,42:42,44:44,46:46,60:60,65:65,69:69,82:82}],13:[function(t,e,n){var r=t(27),i=t(10);e.exports=function(t){return function(){if(i(this)!=t)throw TypeError(t+"#toJSON isn't generic");var e=[];return r(this,!1,e.push,e),e}}},{10:10,27:27}],14:[function(t,e,n){"use strict";var r=t(31),i=t(60),a=t(4),o=t(38),s=t(69),u=t(27),c=t(8),l=t(30),p=t(82)("weak"),f=Object.isExtensible||o,d=c(5),h=c(6),m=0,v=function(t){return t._l||(t._l=new g)},g=function(){this.a=[]},y=function(t,e){return d(t.a,function(t){return t[0]===e})};g.prototype={get:function(t){var e=y(this,t);return e?e[1]:void 0},has:function(t){return!!y(this,t)},set:function(t,e){var n=y(this,t);n?n[1]=e:this.a.push([t,e])},"delete":function(t){var e=h(this.a,function(e){return e[0]===t});return~e&&this.a.splice(e,1),!!~e}},e.exports={getConstructor:function(t,e,n,r){var a=t(function(t,i){s(t,a,e),t._i=m++,t._l=void 0,void 0!=i&&u(i,n,t[r],t)});return i(a.prototype,{"delete":function(t){return o(t)?f(t)?l(t,p)&&l(t[p],this._i)&&delete t[p][this._i]:v(this)["delete"](t):!1},has:function(t){return o(t)?f(t)?l(t,p)&&l(t[p],this._i):v(this).has(t):!1}}),a},def:function(t,e,n){return f(a(e))?(l(e,p)||r(e,p,{}),e[p][t._i]=n):v(t).set(e,n),t},frozenStore:v,WEAK:p}},{27:27,30:30,31:31,38:38,4:4,60:60,69:69,8:8,82:82}],15:[function(t,e,n){"use strict";var r=t(29),i=t(22),a=t(61),o=t(60),s=t(27),u=t(69),c=t(38),l=t(24),p=t(43),f=t(66);e.exports=function(t,e,n,d,h,m){var v=r[t],g=v,y=h?"set":"add",b=g&&g.prototype,x={},w=function(t){var e=b[t];a(b,t,"delete"==t?function(t){return m&&!c(t)?!1:e.call(this,0===t?0:t)}:"has"==t?function(t){return m&&!c(t)?!1:e.call(this,0===t?0:t)}:"get"==t?function(t){return m&&!c(t)?void 0:e.call(this,0===t?0:t)}:"add"==t?function(t){return e.call(this,0===t?0:t),this}:function(t,n){return e.call(this,0===t?0:t,n),this})};if("function"==typeof g&&(m||b.forEach&&!l(function(){(new g).entries().next()}))){var _,k=new g,E=k[y](m?{}:-0,1)!=k,S=l(function(){k.has(1)}),O=p(function(t){new g(t)});O||(g=e(function(e,n){u(e,g,t);var r=new v;return void 0!=n&&s(n,h,r[y],r),r}),g.prototype=b,b.constructor=g),m||k.forEach(function(t,e){_=1/e===-(1/0)}),(S||_)&&(w("delete"),w("has"),h&&w("get")),(_||E)&&w(y),m&&b.clear&&delete b.clear}else g=d.getConstructor(e,t,h,y),o(g.prototype,n);return f(g,t),x[t]=g,i(i.G+i.W+i.F*(g!=v),x),m||d.setStrong(g,t,h),g}},{22:22,24:24,27:27,29:29,38:38,43:43,60:60,61:61,66:66,69:69}],16:[function(t,e,n){var r=e.exports={version:"1.2.6"};"number"==typeof __e&&(__e=r)},{}],17:[function(t,e,n){var r=t(2);e.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,i){return t.call(e,n,r,i)}}return function(){return t.apply(e,arguments)}}},{2:2}],18:[function(t,e,n){e.exports=function(t){if(void 0==t)throw TypeError("Can't call method on "+t);return t}},{}],19:[function(t,e,n){e.exports=!t(24)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},{24:24}],20:[function(t,e,n){var r=t(38),i=t(29).document,a=r(i)&&r(i.createElement);e.exports=function(t){return a?i.createElement(t):{}}},{29:29,38:38}],21:[function(t,e,n){var r=t(46);e.exports=function(t){var e=r.getKeys(t),n=r.getSymbols;if(n)for(var i,a=n(t),o=r.isEnum,s=0;a.length>s;)o.call(t,i=a[s++])&&e.push(i);return e}},{46:46}],22:[function(t,e,n){var r=t(29),i=t(16),a=t(31),o=t(61),s=t(17),u="prototype",c=function(t,e,n){var l,p,f,d,h=t&c.F,m=t&c.G,v=t&c.S,g=t&c.P,y=t&c.B,b=m?r:v?r[e]||(r[e]={}):(r[e]||{})[u],x=m?i:i[e]||(i[e]={}),w=x[u]||(x[u]={});m&&(n=e);for(l in n)p=!h&&b&&l in b,f=(p?b:n)[l],d=y&&p?s(f,r):g&&"function"==typeof f?s(Function.call,f):f,b&&!p&&o(b,l,f),x[l]!=f&&a(x,l,d),g&&w[l]!=f&&(w[l]=f)};r.core=i,c.F=1,c.G=2,c.S=4,c.P=8,c.B=16,c.W=32,e.exports=c},{16:16,17:17,29:29,31:31,61:61}],23:[function(t,e,n){var r=t(83)("match");e.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[r]=!1,!"/./"[t](e)}catch(i){}}return!0}},{83:83}],24:[function(t,e,n){e.exports=function(t){try{return!!t()}catch(e){return!0}}},{}],25:[function(t,e,n){"use strict";var r=t(31),i=t(61),a=t(24),o=t(18),s=t(83);e.exports=function(t,e,n){var u=s(t),c=""[t];a(function(){var e={};return e[u]=function(){return 7},7!=""[t](e)})&&(i(String.prototype,t,n(o,u,c)),r(RegExp.prototype,u,2==e?function(t,e){return c.call(t,this,e)}:function(t){return c.call(t,this)}))}},{18:18,24:24,31:31,61:61,83:83}],26:[function(t,e,n){"use strict";var r=t(4);e.exports=function(){var t=r(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},{4:4}],27:[function(t,e,n){var r=t(17),i=t(40),a=t(35),o=t(4),s=t(79),u=t(84);e.exports=function(t,e,n,c){var l,p,f,d=u(t),h=r(n,c,e?2:1),m=0;if("function"!=typeof d)throw TypeError(t+" is not iterable!");if(a(d))for(l=s(t.length);l>m;m++)e?h(o(p=t[m])[0],p[1]):h(t[m]);else for(f=d.call(t);!(p=f.next()).done;)i(f,h,p.value,e)}},{17:17,35:35,4:4,40:40,79:79,84:84}],28:[function(t,e,n){var r=t(78),i=t(46).getNames,a={}.toString,o="object"==typeof window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],s=function(t){try{return i(t)}catch(e){return o.slice()}};e.exports.get=function(t){return o&&"[object Window]"==a.call(t)?s(t):i(r(t))}},{46:46,78:78}],29:[function(t,e,n){var r=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=r)},{}],30:[function(t,e,n){var r={}.hasOwnProperty;e.exports=function(t,e){return r.call(t,e)}},{}],31:[function(t,e,n){var r=t(46),i=t(59);e.exports=t(19)?function(t,e,n){return r.setDesc(t,e,i(1,n))}:function(t,e,n){return t[e]=n,t}},{19:19,46:46,59:59}],32:[function(t,e,n){e.exports=t(29).document&&document.documentElement},{29:29}],33:[function(t,e,n){e.exports=function(t,e,n){var r=void 0===n;switch(e.length){case 0:return r?t():t.call(n);case 1:return r?t(e[0]):t.call(n,e[0]);case 2:return r?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return r?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return r?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},{}],34:[function(t,e,n){var r=t(11);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},{11:11}],35:[function(t,e,n){var r=t(45),i=t(83)("iterator"),a=Array.prototype;e.exports=function(t){return void 0!==t&&(r.Array===t||a[i]===t)}},{45:45,83:83}],36:[function(t,e,n){var r=t(11);e.exports=Array.isArray||function(t){return"Array"==r(t)}},{11:11}],37:[function(t,e,n){var r=t(38),i=Math.floor;e.exports=function(t){return!r(t)&&isFinite(t)&&i(t)===t}},{38:38}],38:[function(t,e,n){e.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},{}],39:[function(t,e,n){var r=t(38),i=t(11),a=t(83)("match");e.exports=function(t){var e;return r(t)&&(void 0!==(e=t[a])?!!e:"RegExp"==i(t))}},{11:11,38:38,83:83}],40:[function(t,e,n){var r=t(4);e.exports=function(t,e,n,i){try{return i?e(r(n)[0],n[1]):e(n)}catch(a){var o=t["return"];throw void 0!==o&&r(o.call(t)),a}}},{4:4}],41:[function(t,e,n){"use strict";var r=t(46),i=t(59),a=t(66),o={};t(31)(o,t(83)("iterator"),function(){return this}),e.exports=function(t,e,n){t.prototype=r.create(o,{next:i(1,n)}),a(t,e+" Iterator")}},{31:31,46:46,59:59,66:66,83:83}],42:[function(t,e,n){"use strict";var r=t(48),i=t(22),a=t(61),o=t(31),s=t(30),u=t(45),c=t(41),l=t(66),p=t(46).getProto,f=t(83)("iterator"),d=!([].keys&&"next"in[].keys()),h="@@iterator",m="keys",v="values",g=function(){return this};e.exports=function(t,e,n,y,b,x,w){c(n,e,y);var _,k,E=function(t){if(!d&&t in A)return A[t];switch(t){case m:return function(){return new n(this,t)};case v:return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",O=b==v,C=!1,A=t.prototype,P=A[f]||A[h]||b&&A[b],T=P||E(b);if(P){var j=p(T.call(new t));l(j,S,!0),!r&&s(A,h)&&o(j,f,g),O&&P.name!==v&&(C=!0,T=function(){return P.call(this)})}if(r&&!w||!d&&!C&&A[f]||o(A,f,T),u[e]=T,u[S]=g,b)if(_={values:O?T:E(v),keys:x?T:E(m),entries:O?E("entries"):T},w)for(k in _)k in A||a(A,k,_[k]);else i(i.P+i.F*(d||C),e,_);return _}},{22:22,30:30,31:31,41:41,45:45,46:46,48:48,61:61,66:66,83:83}],43:[function(t,e,n){var r=t(83)("iterator"),i=!1;try{var a=[7][r]();a["return"]=function(){i=!0},Array.from(a,function(){throw 2})}catch(o){}e.exports=function(t,e){if(!e&&!i)return!1;var n=!1;try{var a=[7],o=a[r]();o.next=function(){n=!0},a[r]=function(){return o},t(a)}catch(s){}return n}},{83:83}],44:[function(t,e,n){e.exports=function(t,e){return{value:e,done:!!t}}},{}],45:[function(t,e,n){e.exports={}},{}],46:[function(t,e,n){var r=Object;e.exports={create:r.create,getProto:r.getPrototypeOf,isEnum:{}.propertyIsEnumerable,getDesc:r.getOwnPropertyDescriptor,setDesc:r.defineProperty,setDescs:r.defineProperties,getKeys:r.keys,getNames:r.getOwnPropertyNames,getSymbols:r.getOwnPropertySymbols,each:[].forEach}},{}],47:[function(t,e,n){var r=t(46),i=t(78);e.exports=function(t,e){for(var n,a=i(t),o=r.getKeys(a),s=o.length,u=0;s>u;)if(a[n=o[u++]]===e)return n}},{46:46,78:78}],48:[function(t,e,n){e.exports=!1},{}],49:[function(t,e,n){e.exports=Math.expm1||function(t){return 0==(t=+t)?t:t>-1e-6&&1e-6>t?t+t*t/2:Math.exp(t)-1}},{}],50:[function(t,e,n){e.exports=Math.log1p||function(t){return(t=+t)>-1e-8&&1e-8>t?t-t*t/2:Math.log(1+t)}},{}],51:[function(t,e,n){e.exports=Math.sign||function(t){return 0==(t=+t)||t!=t?t:0>t?-1:1}},{}],52:[function(t,e,n){var r,i,a,o=t(29),s=t(75).set,u=o.MutationObserver||o.WebKitMutationObserver,c=o.process,l=o.Promise,p="process"==t(11)(c),f=function(){var t,e,n;for(p&&(t=c.domain)&&(c.domain=null,t.exit());r;)e=r.domain,n=r.fn,e&&e.enter(),n(),e&&e.exit(),r=r.next;i=void 0,t&&t.enter()};if(p)a=function(){c.nextTick(f)};else if(u){var d=1,h=document.createTextNode("");new u(f).observe(h,{characterData:!0}),a=function(){h.data=d=-d}}else a=l&&l.resolve?function(){l.resolve().then(f)}:function(){s.call(o,f)};e.exports=function(t){var e={fn:t,next:void 0,domain:p&&c.domain};i&&(i.next=e),r||(r=e,a()),i=e}},{11:11,29:29,75:75}],53:[function(t,e,n){var r=t(46),i=t(80),a=t(34);e.exports=t(24)(function(){var t=Object.assign,e={},n={},r=Symbol(),i="abcdefghijklmnopqrst";return e[r]=7,i.split("").forEach(function(t){n[t]=t}),7!=t({},e)[r]||Object.keys(t({},n)).join("")!=i})?function(t,e){for(var n=i(t),o=arguments,s=o.length,u=1,c=r.getKeys,l=r.getSymbols,p=r.isEnum;s>u;)for(var f,d=a(o[u++]),h=l?c(d).concat(l(d)):c(d),m=h.length,v=0;m>v;)p.call(d,f=h[v++])&&(n[f]=d[f]);return n}:Object.assign},{24:24,34:34,46:46,80:80}],54:[function(t,e,n){var r=t(22),i=t(16),a=t(24);e.exports=function(t,e){var n=(i.Object||{})[t]||Object[t],o={};o[t]=e(n),r(r.S+r.F*a(function(){n(1)}),"Object",o)}},{16:16,22:22,24:24}],55:[function(t,e,n){var r=t(46),i=t(78),a=r.isEnum;e.exports=function(t){return function(e){for(var n,o=i(e),s=r.getKeys(o),u=s.length,c=0,l=[];u>c;)a.call(o,n=s[c++])&&l.push(t?[n,o[n]]:o[n]);return l}}},{46:46,78:78}],56:[function(t,e,n){var r=t(46),i=t(4),a=t(29).Reflect;e.exports=a&&a.ownKeys||function(t){var e=r.getNames(i(t)),n=r.getSymbols;return n?e.concat(n(t)):e}},{29:29,4:4,46:46}],57:[function(t,e,n){"use strict";var r=t(58),i=t(33),a=t(2);e.exports=function(){for(var t=a(this),e=arguments.length,n=Array(e),o=0,s=r._,u=!1;e>o;)(n[o]=arguments[o++])===s&&(u=!0);return function(){var r,a=this,o=arguments,c=o.length,l=0,p=0;if(!u&&!c)return i(t,n,a);if(r=n.slice(),u)for(;e>l;l++)r[l]===s&&(r[l]=o[p++]);for(;c>p;)r.push(o[p++]);return i(t,r,a)}}},{2:2,33:33,58:58}],58:[function(t,e,n){e.exports=t(29)},{29:29}],59:[function(t,e,n){e.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},{}],60:[function(t,e,n){var r=t(61);e.exports=function(t,e){for(var n in e)r(t,n,e[n]);return t}},{61:61}],61:[function(t,e,n){var r=t(29),i=t(31),a=t(82)("src"),o="toString",s=Function[o],u=(""+s).split(o);t(16).inspectSource=function(t){return s.call(t)},(e.exports=function(t,e,n,o){"function"==typeof n&&(n.hasOwnProperty(a)||i(n,a,t[e]?""+t[e]:u.join(e+"")),n.hasOwnProperty("name")||i(n,"name",e)),t===r?t[e]=n:(o||delete t[e],i(t,e,n))})(Function.prototype,o,function(){return"function"==typeof this&&this[a]||s.call(this)})},{16:16,29:29,31:31,82:82}],62:[function(t,e,n){e.exports=function(t,e){var n=e===Object(e)?function(t){return e[t]}:e;return function(e){return(e+"").replace(t,n)}}},{}],63:[function(t,e,n){e.exports=Object.is||function(t,e){return t===e?0!==t||1/t===1/e:t!=t&&e!=e}},{}],64:[function(t,e,n){var r=t(46).getDesc,i=t(38),a=t(4),o=function(t,e){if(a(t),!i(e)&&null!==e)throw TypeError(e+": can't set as prototype!")};e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,n,i){try{i=t(17)(Function.call,r(Object.prototype,"__proto__").set,2),i(e,[]),n=!(e instanceof Array)}catch(a){n=!0}return function(t,e){return o(t,e),n?t.__proto__=e:i(t,e),t}}({},!1):void 0),check:o}},{17:17,38:38,4:4,46:46}],65:[function(t,e,n){"use strict";var r=t(29),i=t(46),a=t(19),o=t(83)("species");e.exports=function(t){var e=r[t];a&&e&&!e[o]&&i.setDesc(e,o,{configurable:!0,get:function(){return this}})}},{19:19,29:29,46:46,83:83}],66:[function(t,e,n){var r=t(46).setDesc,i=t(30),a=t(83)("toStringTag");e.exports=function(t,e,n){t&&!i(t=n?t:t.prototype,a)&&r(t,a,{configurable:!0,value:e})}},{30:30,46:46,83:83}],67:[function(t,e,n){var r=t(29),i="__core-js_shared__",a=r[i]||(r[i]={});e.exports=function(t){return a[t]||(a[t]={})}},{29:29}],68:[function(t,e,n){var r=t(4),i=t(2),a=t(83)("species");e.exports=function(t,e){var n,o=r(t).constructor;return void 0===o||void 0==(n=r(o)[a])?e:i(n)}},{2:2,4:4,83:83}],69:[function(t,e,n){e.exports=function(t,e,n){if(!(t instanceof e))throw TypeError(n+": use the 'new' operator!");return t}},{}],70:[function(t,e,n){var r=t(77),i=t(18);e.exports=function(t){return function(e,n){var a,o,s=i(e)+"",u=r(n),c=s.length;return 0>u||u>=c?t?"":void 0:(a=s.charCodeAt(u),55296>a||a>56319||u+1===c||(o=s.charCodeAt(u+1))<56320||o>57343?t?s.charAt(u):a:t?s.slice(u,u+2):(a-55296<<10)+(o-56320)+65536)}}},{18:18,77:77}],71:[function(t,e,n){var r=t(39),i=t(18);e.exports=function(t,e,n){if(r(e))throw TypeError("String#"+n+" doesn't accept regex!");return i(t)+""}},{18:18,39:39}],72:[function(t,e,n){var r=t(79),i=t(73),a=t(18);e.exports=function(t,e,n,o){var s=a(t)+"",u=s.length,c=void 0===n?" ":n+"",l=r(e);if(u>=l)return s;""==c&&(c=" ");var p=l-u,f=i.call(c,Math.ceil(p/c.length));return f.length>p&&(f=f.slice(0,p)),o?f+s:s+f}},{18:18,73:73,79:79}],73:[function(t,e,n){"use strict";var r=t(77),i=t(18);e.exports=function(t){var e=i(this)+"",n="",a=r(t);if(0>a||a==1/0)throw RangeError("Count can't be negative");for(;a>0;(a>>>=1)&&(e+=e))1&a&&(n+=e);return n}},{18:18,77:77}],74:[function(t,e,n){var r=t(22),i=t(18),a=t(24),o=" \n\x0B\f\r \u2028\u2029\ufeff",s="["+o+"]",u="
",c=RegExp("^"+s+s+"*"),l=RegExp(s+s+"*$"),p=function(t,e){var n={};n[t]=e(f),r(r.P+r.F*a(function(){return!!o[t]()||u[t]()!=u}),"String",n)},f=p.trim=function(t,e){return t=i(t)+"",1&e&&(t=t.replace(c,"")),2&e&&(t=t.replace(l,"")),t};e.exports=p},{18:18,22:22,24:24}],75:[function(t,e,n){var r,i,a,o=t(17),s=t(33),u=t(32),c=t(20),l=t(29),p=l.process,f=l.setImmediate,d=l.clearImmediate,h=l.MessageChannel,m=0,v={},g="onreadystatechange",y=function(){var t=+this;if(v.hasOwnProperty(t)){var e=v[t];delete v[t],e()}},b=function(t){y.call(t.data)};f&&d||(f=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return v[++m]=function(){s("function"==typeof t?t:Function(t),e)},r(m),m},d=function(t){delete v[t]},"process"==t(11)(p)?r=function(t){p.nextTick(o(y,t,1))}:h?(i=new h,a=i.port2,i.port1.onmessage=b,r=o(a.postMessage,a,1)):l.addEventListener&&"function"==typeof postMessage&&!l.importScripts?(r=function(t){l.postMessage(t+"","*")},l.addEventListener("message",b,!1)):r=g in c("script")?function(t){u.appendChild(c("script"))[g]=function(){u.removeChild(this),y.call(t)}}:function(t){setTimeout(o(y,t,1),0)}),e.exports={set:f,clear:d}},{11:11,17:17,20:20,29:29,32:32,33:33}],76:[function(t,e,n){var r=t(77),i=Math.max,a=Math.min;e.exports=function(t,e){return t=r(t),0>t?i(t+e,0):a(t,e)}},{77:77}],77:[function(t,e,n){var r=Math.ceil,i=Math.floor;e.exports=function(t){return isNaN(t=+t)?0:(t>0?i:r)(t)}},{}],78:[function(t,e,n){var r=t(34),i=t(18);e.exports=function(t){return r(i(t))}},{18:18,34:34}],79:[function(t,e,n){var r=t(77),i=Math.min;e.exports=function(t){return t>0?i(r(t),9007199254740991):0}},{77:77}],80:[function(t,e,n){var r=t(18);e.exports=function(t){return Object(r(t))}},{18:18}],81:[function(t,e,n){var r=t(38);e.exports=function(t,e){if(!r(t))return t;var n,i;if(e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;if("function"==typeof(n=t.valueOf)&&!r(i=n.call(t)))return i;if(!e&&"function"==typeof(n=t.toString)&&!r(i=n.call(t)))return i;throw TypeError("Can't convert object to primitive value")}},{38:38}],82:[function(t,e,n){var r=0,i=Math.random();e.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++r+i).toString(36))}},{}],83:[function(t,e,n){var r=t(67)("wks"),i=t(82),a=t(29).Symbol;e.exports=function(t){return r[t]||(r[t]=a&&a[t]||(a||i)("Symbol."+t))}},{29:29,67:67,82:82}],84:[function(t,e,n){var r=t(10),i=t(83)("iterator"),a=t(45);e.exports=t(16).getIteratorMethod=function(t){return void 0!=t?t[i]||t["@@iterator"]||a[r(t)]:void 0}},{10:10,16:16,45:45,83:83}],85:[function(t,e,n){"use strict";var r,i=t(46),a=t(22),o=t(19),s=t(59),u=t(32),c=t(20),l=t(30),p=t(11),f=t(33),d=t(24),h=t(4),m=t(2),v=t(38),g=t(80),y=t(78),b=t(77),x=t(76),w=t(79),_=t(34),k=t(82)("__proto__"),E=t(8),S=t(7)(!1),O=Object.prototype,C=Array.prototype,A=C.slice,P=C.join,T=i.setDesc,j=i.getDesc,M=i.setDescs,L={};o||(r=!d(function(){return 7!=T(c("div"),"a",{get:function(){return 7}}).a}),i.setDesc=function(t,e,n){if(r)try{return T(t,e,n)}catch(i){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(h(t)[e]=n.value),t},i.getDesc=function(t,e){if(r)try{return j(t,e)}catch(n){}return l(t,e)?s(!O.propertyIsEnumerable.call(t,e),t[e]):void 0},i.setDescs=M=function(t,e){h(t);for(var n,r=i.getKeys(e),a=r.length,o=0;a>o;)i.setDesc(t,n=r[o++],e[n]);return t}),a(a.S+a.F*!o,"Object",{getOwnPropertyDescriptor:i.getDesc,defineProperty:i.setDesc,defineProperties:M});var F="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(","),N=F.concat("length","prototype"),R=F.length,D=function(){var t,e=c("iframe"),n=R,r=">";for(e.style.display="none",u.appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("