mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-11 03:11:14 +03:00
57 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
f5c44e5bd0 |
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts: # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/typing_indicator.yml # Resources/ServerInfo/Guidebook/Science/Robotics.xml # Resources/Textures/Effects/speech.rsi/alien0.png # Resources/Textures/Effects/speech.rsi/alien1.png # Resources/Textures/Effects/speech.rsi/alien2.png # Resources/Textures/Effects/speech.rsi/alienroyal0.png # Resources/Textures/Effects/speech.rsi/alienroyal1.png # Resources/Textures/Effects/speech.rsi/alienroyal2.png # Resources/Textures/Effects/speech.rsi/blob0.png # Resources/Textures/Effects/speech.rsi/blob1.png # Resources/Textures/Effects/speech.rsi/blob2.png # Resources/Textures/Effects/speech.rsi/clock0.png # Resources/Textures/Effects/speech.rsi/clock1.png # Resources/Textures/Effects/speech.rsi/clock2.png # Resources/Textures/Effects/speech.rsi/default0.png # Resources/Textures/Effects/speech.rsi/default1.png # Resources/Textures/Effects/speech.rsi/default2.png # Resources/Textures/Effects/speech.rsi/guardian0.png # Resources/Textures/Effects/speech.rsi/guardian1.png # Resources/Textures/Effects/speech.rsi/guardian2.png # Resources/Textures/Effects/speech.rsi/holo0.png # Resources/Textures/Effects/speech.rsi/holo1.png # Resources/Textures/Effects/speech.rsi/holo2.png # Resources/Textures/Effects/speech.rsi/lawyer0.png # Resources/Textures/Effects/speech.rsi/lawyer1.png # Resources/Textures/Effects/speech.rsi/lawyer2.png # Resources/Textures/Effects/speech.rsi/machine0.png # Resources/Textures/Effects/speech.rsi/machine1.png # Resources/Textures/Effects/speech.rsi/machine2.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Effects/speech.rsi/robot0.png # Resources/Textures/Effects/speech.rsi/robot1.png # Resources/Textures/Effects/speech.rsi/robot2.png # Resources/Textures/Effects/speech.rsi/slime0.png # Resources/Textures/Effects/speech.rsi/slime1.png # Resources/Textures/Effects/speech.rsi/slime2.png # Resources/Textures/Effects/speech.rsi/swarmer0.png # Resources/Textures/Effects/speech.rsi/swarmer1.png # Resources/Textures/Effects/speech.rsi/swarmer2.png # Resources/Textures/Effects/speech.rsi/syndibot0.png # Resources/Textures/Effects/speech.rsi/syndibot1.png # Resources/Textures/Effects/speech.rsi/syndibot2.png # Resources/Textures/Structures/Machines/microwave.rsi/meta.json # Resources/Textures/Structures/Machines/microwave.rsi/mw.png # Resources/Textures/Structures/Machines/microwave.rsi/mw0.png # Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png # Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png # Resources/Textures/Structures/Machines/microwave.rsi/mwb.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png # Resources/Textures/Structures/Machines/microwave.rsi/mwo.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/command.rsi/base.png # Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/command.rsi/open.png # Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/science.rsi/base.png # Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/science.rsi/open.png # Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png |
||
|
|
98fa00a21f
|
Borgs (#18136)
* Laws * positronic brain and PAI rewrite * MMI * MMI pt. 2 * borg brain transfer * Roleban support, Borg job (WIP), the end of mind shenaniganry * battery drain, item slot cleanup, alerts * visuals * fix this pt1 * fix this pt2 * Modules, Lingering Stacks, Better borg flashlight * Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power. * sprotes * no zombie borgs * oh fuck yeah i love a good relay * charger * fix the tiniest of sprite issues * adjustable names * a functional UI???? * foobar * more modules * this shit for some reason * upstream * genericize selectable borg modules * upstream again * holy fucking shit * i love christ * proper construction * da job * AA borgs * and boom more shit * admin logs * laws redux * ok just do this rq * oh boy that looks like modules * oh shit research * testos passo * so much shit holy fuck * fuckit we SHIP * last minute snags * should've gotten me on a better day |
||
|
|
23ba4fe4c6 | Remove pacifist component usage | ||
|
|
0cffa43345 |
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml # Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml # Resources/Prototypes/Roles/Jobs/Civilian/musician.yml # Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png # Resources/Textures/Decals/bricktile.rsi/dark_box.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/dark_end_e.png # Resources/Textures/Decals/bricktile.rsi/dark_end_n.png # Resources/Textures/Decals/bricktile.rsi/dark_end_s.png # Resources/Textures/Decals/bricktile.rsi/dark_end_w.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/dark_line_e.png # Resources/Textures/Decals/bricktile.rsi/dark_line_n.png # Resources/Textures/Decals/bricktile.rsi/dark_line_s.png # Resources/Textures/Decals/bricktile.rsi/dark_line_w.png # Resources/Textures/Decals/bricktile.rsi/meta.json # Resources/Textures/Decals/bricktile.rsi/steel_box.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/steel_end_e.png # Resources/Textures/Decals/bricktile.rsi/steel_end_n.png # Resources/Textures/Decals/bricktile.rsi/steel_end_s.png # Resources/Textures/Decals/bricktile.rsi/steel_end_w.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/steel_line_e.png # Resources/Textures/Decals/bricktile.rsi/steel_line_n.png # Resources/Textures/Decals/bricktile.rsi/steel_line_w.png # Resources/Textures/Decals/bricktile.rsi/white_box.png # Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/white_corner_se.png # Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/white_end_e.png # Resources/Textures/Decals/bricktile.rsi/white_end_n.png # Resources/Textures/Decals/bricktile.rsi/white_end_s.png # Resources/Textures/Decals/bricktile.rsi/white_end_w.png # Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/white_inner_se.png # Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/white_line_e.png # Resources/Textures/Decals/bricktile.rsi/white_line_n.png # Resources/Textures/Decals/bricktile.rsi/white_line_s.png # Resources/Textures/Decals/bricktile.rsi/white_line_w.png # Resources/Textures/Decals/minitile.rsi/dark_box.png # Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png # Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png # Resources/Textures/Decals/minitile.rsi/dark_corner_se.png # Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png # Resources/Textures/Decals/minitile.rsi/dark_end_e.png # Resources/Textures/Decals/minitile.rsi/dark_end_n.png # Resources/Textures/Decals/minitile.rsi/dark_end_s.png # Resources/Textures/Decals/minitile.rsi/dark_end_w.png # Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png # Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png # Resources/Textures/Decals/minitile.rsi/dark_inner_se.png # Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png # Resources/Textures/Decals/minitile.rsi/dark_line_e.png # Resources/Textures/Decals/minitile.rsi/dark_line_n.png # Resources/Textures/Decals/minitile.rsi/dark_line_s.png # Resources/Textures/Decals/minitile.rsi/dark_line_w.png # Resources/Textures/Decals/minitile.rsi/meta.json # Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png # Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png # Resources/Textures/Decals/minitile.rsi/steel_corner_se.png # Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png # Resources/Textures/Decals/minitile.rsi/steel_end_e.png # Resources/Textures/Decals/minitile.rsi/steel_end_n.png # Resources/Textures/Decals/minitile.rsi/steel_end_s.png # Resources/Textures/Decals/minitile.rsi/steel_end_w.png # Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png # Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png # Resources/Textures/Decals/minitile.rsi/steel_inner_se.png # Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png # Resources/Textures/Decals/minitile.rsi/steel_line_e.png # Resources/Textures/Decals/minitile.rsi/steel_line_n.png # Resources/Textures/Decals/minitile.rsi/steel_line_s.png # Resources/Textures/Decals/minitile.rsi/steel_line_w.png # Resources/Textures/Decals/minitile.rsi/white_box.png # Resources/Textures/Decals/minitile.rsi/white_corner_ne.png # Resources/Textures/Decals/minitile.rsi/white_corner_nw.png # Resources/Textures/Decals/minitile.rsi/white_corner_se.png # Resources/Textures/Decals/minitile.rsi/white_corner_sw.png # Resources/Textures/Decals/minitile.rsi/white_end_e.png # Resources/Textures/Decals/minitile.rsi/white_end_n.png # Resources/Textures/Decals/minitile.rsi/white_end_s.png # Resources/Textures/Decals/minitile.rsi/white_end_w.png # Resources/Textures/Decals/minitile.rsi/white_inner_ne.png # Resources/Textures/Decals/minitile.rsi/white_inner_nw.png # Resources/Textures/Decals/minitile.rsi/white_inner_se.png # Resources/Textures/Decals/minitile.rsi/white_inner_sw.png # Resources/Textures/Decals/minitile.rsi/white_line_w.png # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/bar.png # Resources/Textures/Tiles/clown.png # Resources/Textures/Tiles/dark.png # Resources/Textures/Tiles/dark_diagonal.png # Resources/Textures/Tiles/dark_diagonal_mini.png # Resources/Textures/Tiles/dark_herringbone.png # Resources/Textures/Tiles/dark_mini.png # Resources/Textures/Tiles/dark_mono.png # Resources/Textures/Tiles/dark_offset.png # Resources/Textures/Tiles/dark_pavement.png # Resources/Textures/Tiles/dark_pavement_vertical.png # Resources/Textures/Tiles/hydro.png # Resources/Textures/Tiles/kitchen.png # Resources/Textures/Tiles/laundry.png # Resources/Textures/Tiles/steel.png # Resources/Textures/Tiles/steel_diagonal.png # Resources/Textures/Tiles/steel_diagonal_mini.png # Resources/Textures/Tiles/steel_herringbone.png # Resources/Textures/Tiles/steel_mini.png # Resources/Textures/Tiles/steel_mono.png # Resources/Textures/Tiles/steel_offset.png # Resources/Textures/Tiles/steel_pavement.png # Resources/Textures/Tiles/steel_pavement_vertical.png # Resources/Textures/Tiles/white.png # Resources/Textures/Tiles/white_diagonal.png # Resources/Textures/Tiles/white_diagonal_mini.png # Resources/Textures/Tiles/white_herringbone.png # Resources/Textures/Tiles/white_mini.png # Resources/Textures/Tiles/white_mono.png # Resources/Textures/Tiles/white_offset.png # Resources/Textures/Tiles/white_pavement.png # Resources/Textures/Tiles/white_pavement_vertical.png |
||
|
|
c31c848afd
|
Shooting NPCs and more (#18042)
* Add pirate shooting * Shooting working * Basics working * Refactor time * More conversion * Update primitives * Update yml * weh * Building again * Draft * weh * b * Start shutdown * Starting to take form * Code side done * is it worky * Fix prototypes * stuff * Shitty working * Juke events working * Even more cleanup * RTX * Fix interaction combat mode and compquery * GetAmmoCount relays * Fix rotation speed * Juke fixes * fixes * weh * The collision avoidance never ends * Fixes * Pause support * framework * lazy * Fix idling * Fix drip * goobed * Fix takeover shutdown bug * Merge fixes * shitter * Fix carpos |
||
|
|
23eef7660d | Merge remote-tracking branch 'upstream/master' into upstream-sync | ||
|
|
d55cd23b0a
|
Zombie Mode 𝓡𝓮𝓭𝓾𝔁 (#18199)
* zombie mode redux * the great zombie changes * fix this * 65 down to 50 * empty * Changes to address stalling * make zombie nukies no longer nukies * actually work |
Renamed from Content.Server/Zombies/ZombifyOnDeathSystem.cs (Browse further)