mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
35a20002c6
Conflicts: baystation12.dme code/defines/obj/weapon.dm code/game/mecha/equipment/tools/medical_tools.dm code/game/mecha/equipment/tools/tools.dm code/game/mecha/mecha.dm code/game/mecha/mecha_parts.dm code/game/objects/items/devices/flash.dm code/game/objects/items/devices/powersink.dm code/game/objects/items/devices/scanners.dm code/game/objects/items/stacks/sheets/glass.dm code/game/objects/items/stacks/sheets/sheet_types.dm code/game/objects/items/weapons/RCD.dm code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm code/game/objects/items/weapons/circuitboards/machinery/cloning.dm code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm code/game/objects/items/weapons/circuitboards/machinery/pacman.dm code/game/objects/items/weapons/circuitboards/machinery/power.dm code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm code/game/objects/items/weapons/circuitboards/machinery/research.dm code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm code/game/objects/items/weapons/flamethrower.dm code/game/objects/items/weapons/handcuffs.dm code/game/objects/items/weapons/kitchen.dm code/game/objects/items/weapons/shields.dm code/game/objects/items/weapons/storage/backpack.dm code/game/objects/items/weapons/surgery_tools.dm code/game/objects/items/weapons/teleportation.dm code/game/objects/items/weapons/tools.dm code/modules/assembly/igniter.dm code/modules/assembly/infrared.dm code/modules/assembly/mousetrap.dm code/modules/assembly/proximity.dm code/modules/assembly/signaler.dm code/modules/assembly/timer.dm code/modules/assembly/voice.dm code/modules/clothing/glasses/glasses.dm code/modules/hydroponics/trays/tray_tools.dm code/modules/mining/drilling/scanner.dm code/modules/mining/mine_items.dm code/modules/mining/ore.dm code/modules/mob/living/silicon/robot/analyzer.dm code/modules/power/rust/circuits_and_design.dm code/modules/projectiles/ammunition/boxes.dm code/modules/projectiles/guns/energy/laser.dm code/modules/projectiles/guns/energy/special.dm code/modules/projectiles/guns/energy/stun.dm code/modules/research/circuitprinter.dm code/modules/research/designs.dm code/modules/research/destructive_analyzer.dm code/modules/research/protolathe.dm code/modules/research/rdconsole.dm code/modules/research/research.dm code/modules/research/server.dm code/modules/research/xenoarchaeology/genetics/reconstitutor.dm