Merge remote-tracking branch 'ParadiseSS13/master' into toml-config

This commit is contained in:
AffectedArc07
2021-06-03 18:10:19 +01:00
117 changed files with 12076 additions and 18356 deletions
@@ -258,7 +258,7 @@
/obj/item/assembly/signaler/anomaly/random = 50, // anomaly core
/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray = 25, // mecha x-ray laser
/obj/item/mecha_parts/mecha_equipment/teleporter/precise = 25, // upgraded mecha teleporter
/obj/item/autosurgeon = 50,
/obj/item/autosurgeon/organ = 50,
// Research / Experimentor
/obj/item/paper/researchnotes = 150, // papers that give random R&D levels