This repository was archived by the owner on May 22, 2025. It is now read-only.
Commit af38c0b
committed
Merge branch 'master' of https://github.com/yogstation13/Yogstation into supermatter-tesla-con
File tree
395 files changed
+6305
-173303
lines changed- .github/workflows
- _maps
- RandomRuins
- IceRuins
- SpaceRuins
- StationRuins
- BoxStation
- GaxStation
- RandomZLevels
- VR
- map_files
- DonutStation
- IceMeta
- MiniStation
- YogStation
- code
- __DEFINES
- traits
- __HELPERS
- _globalvars
- lists
- _onclick
- hud
- controllers/subsystem
- datums
- brain_damage
- components
- crafting
- diseases/advance/symptoms
- elements
- martial
- mutations
- station_traits
- status_effects/debuffs
- traits
- votes
- wires
- wounds
- game
- atom
- machinery
- computer
- doors
- shuttle
- telecomms
- mecha
- equipment
- medical
- working
- objects
- effects
- decals/cleanable
- effect_system/fluid_spread
- items
- devices
- granters
- grenades
- stacks
- sheets
- storage
- tools
- structures
- beds_chairs
- crates_lockers
- closets/secure
- crates
- modules
- admin
- verbs
- antagonists
- abductor
- blob/structures
- bloodsuckers
- clans
- powers
- vassal
- brother
- changeling
- clockcult
- clock_items
- ert
- horror
- nukeop
- equipment
- space_dragon
- asset_cache/assets
- atmospherics/machinery
- components
- gas_recipe_machines
- unary_devices
- other
- portable
- awaymissions
- cargo
- client/preferences
- clothing
- outfits
- suits
- under
- jobs
- events/anomaly
- food_and_drinks/kitchen_machinery
- hydroponics
- grown
- jobs/job_types
- library
- mining/lavaland/ruins
- mob
- dead
- new_player
- observer
- living
- carbon
- human
- species_types
- silicon
- pai
- robot
- simple_animal
- friendly/drone
- hostile
- mining_mobs/elites
- modular_computers
- computers/item
- hardware
- power
- singularity
- tesla
- projectiles
- guns/energy
- projectile/energy
- reagents
- chemistry
- machinery
- reagents
- recycling/disposal
- research
- ruins
- shuttle
- spells/spell_types/self
- surgery
- advanced
- bioware
- organs
- swarmers
- tgui/states
- uplink
- vehicles
- vending
- config
- html
- changelogs
- icons
- mob
- obj
- tgui
- packages
- tgui-panel/styles/components
- tgui/interfaces
- PreferencesMenu/preferences/features/character_preferences
- yogstation
- code
- datums
- components
- mapgen
- ruins
- game
- gamemodes/clean_this_shit_up
- objects/items
- devices
- fishing
- modules
- admin
- antagonists
- darkspawn
- darkspawn_abilities
- darkspawn_objects
- darkspawn_upgrades
- nukeop
- clothing/under
- donor
- jobs/job_types
- jungleland
- megafauna
- mentor
- mob/living
- carbon/human/species_types
- preternis
- simple_animal/hostile
- storytellers
- converted_events/solo
- vending
- icons
- effects
- mob
- clothing/uniform
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
395 files changed
+6305
-173303
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
69 | 73 | | |
70 | 74 | | |
71 | 75 | | |
| |||
0 commit comments