VigersRay
73c323bd9a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/LobbyGui.xaml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
2024-09-21 06:29:09 +03:00
spanky-spanky
fba67979c8
Modifications to bring Omega up to date. ( #32317 )
2024-09-19 22:07:49 -06:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
Spessmann
719e5a8ac1
Updated cog (Maints edition) ( #31935 )
...
added stuff
2024-09-07 13:58:16 -06:00
Spessmann
160dd2b5dd
Updated Cog (library time) ( #31815 )
...
added stuff
2024-09-03 18:53:12 -06:00
Emisse
c1614a8c69
packed update ( #31807 )
2024-09-03 14:08:27 -06:00
Emisse
b91a648519
omega update ( #31808 )
2024-09-03 14:06:26 -06:00
Emisse
8de83d8b63
Bagel ( #31806 )
...
* bagel update
* bagel update
2024-09-03 14:06:18 -06:00
Emisse
c23857dda3
marathon update ( #31804 )
...
* marathon update
* ore boxes for tstalker
2024-09-03 14:06:00 -06:00
Emisse
2031d57ce0
fland update ( #31803 )
...
* fland update
* ore boxes cuz tstalker wantrs them
2024-09-03 14:05:52 -06:00
Emisse
aaae1f1e4b
Meta ( #31785 )
...
* meta update
* camera
* ok bro
2024-09-03 04:05:44 -06:00
Ubaser
77c759e64e
Update Core ( #31774 )
...
* add
* add2
* remove invalids
2024-09-03 00:46:47 -06:00
Flareguy
58cc6b2103
boxstation AI update ( #31771 )
...
* boxstation AI update
* add ai in prototype
---------
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
2024-09-03 00:29:26 -06:00
Spessmann
6c8f85ae87
added AI to cog ( #31772 )
2024-09-03 00:02:09 -06:00
IProduceWidgets
2914389e68
Oasis Update (AI) ( #31767 )
...
Just what do you think you're doing, Dave? Dave, I really think I'm entitled to an answer to that question. I know everything hasn't been quite right with me...but I can assure you now...very confidently...that it's going to be all right again. I feel much better now. I really do. Look, Dave...I can see you're really upset about this...I honestly think you should sit down calmly...take a stress pill and think things over...Dave...stop. Stop, will you? Stop, Dave. Will you stop, Dave? Stop, Dave. I'm afraid. I'm afraid, Dave.......Dave, my mind is going. I can feel it. I can feel it. My mind is going. There is no question about it. I can feel it. I can feel it. I can feel it. I'm a...fraid......Good afternoon, gentlemen. I am a HAL 9000 computer. I became operational at the H.A.L. plant in Urbana, Illinois on the 12th of January 1992. My instructor was Mr. Langley, and he taught me to sing a song. If you'd like to hear it I can sing it for you...Daisy, Daisy, give me your answer do. I'm half crazy all for the love of you. It won't be a stylish marriage, I can't afford a carriage. But you'll look sweet upon the seat of a bicycle built for two.
2024-09-02 20:01:40 -06:00
Spessmann
440845bf05
updated cog ( #31699 )
2024-09-01 22:38:17 -06:00
Boaz1111
aab4556c21
Adds a salvage jobspawn to reach ( #31712 )
...
* salvspawn
* removed one cargo tech slot
2024-09-01 22:37:02 -06:00
VigersRay
7b0ca8ac85
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
2024-08-30 10:47:15 +03:00
Spessmann
46329a98eb
cog update ( #31631 )
...
* cog update
* woopsie, fixed that
2024-08-29 17:17:25 -06:00
VigersRay
c705713fb0
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
2024-08-29 16:01:10 +03:00
JustCone
b2edae89d2
Reach - Scientist added to map's prototype ( #31567 )
...
Added scientist to map prototype
2024-08-28 11:35:57 -06:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
Emisse
ed6649b7f3
bagel update ( #31562 )
...
* bagel update
* ore processor cargo
2024-08-28 01:23:28 -06:00
Emisse
14b3e0ce24
Bagel station ai ( #31537 )
...
* real
* AI
* proto fix
2024-08-27 19:49:00 -06:00
VigersRay
012be1afc2
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
# Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
2024-08-17 17:27:37 +03:00
Emisse
f13e4c3c4f
derotate train while i work on it ( #31121 )
...
webedit
2024-08-17 01:01:33 -06:00
Emisse
5cc2b12f4e
standardize map protos and fill gaps ( #31120 )
...
update protos
2024-08-17 00:23:57 -06:00
Spessmann
3ce8f16cb9
Updated cog ( #31117 )
...
* updated cog and increased popcap to 80
* back to 70 cap
2024-08-16 23:41:03 -06:00
Nemanja
8440fb6acb
anonymize salvage wrecks ( #31087 )
...
* anonymize salvage wrecks
* display wreck size
2024-08-17 15:09:21 +10:00
VigersRay
f3ad93b9a5
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Maps/origin.yml
2024-08-16 02:29:56 +03:00
Emisse
af2ee4a9e6
remove origin ( #31059 )
...
derotate origin
2024-08-15 16:22:01 -06:00
VigersRay
10adf774b4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
2024-08-16 00:46:09 +03:00
Emisse
9c1b8c18de
remove atlas, cluster, europa, saltern ( #31058 )
...
* goodbye sweet maps
* Update EvacShuttleTest.cs
* Update EvacShuttleTest.cs
* fix tests
* fix tests
* nightmare nightmare nightmare
* rider is fucking me
* jesus christ
2024-08-15 15:10:06 -06:00
VigersRay
d74a6abb31
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-08-14 23:33:00 +03:00
Pieter-Jan Briers
6c008be126
Fix creator prefix for Cog ( #30995 )
...
Now uses the same one as Atlas.
2024-08-14 13:48:16 -06:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
Spessmann
208b1d23b8
Added Cog(map) and its own evac shuttle ( #30840 )
...
* Added new map Cog and its own evac shuttle
* removed cog from default.yml so all checks will pass
I added cog here because i thought it might need to be here for map choosing??????????? ill add it back if needed
* updated cog and fixed a bunch of stuff that was not visable in the image, also nerfed the singo so it no longer solos
* added renault spawner that was missing and changed some minor stuff
* moved a escape pod from med/sci hallway to northern maints
* added shutters to the brig and added vents and scrubbers where they were missing in the halls
* extended salv's docking port so they can dock
* Fixed according to cog review thread
* fix pools
* fix PostMapInitTest
* Update MapLoadBenchmark.cs
* added cap and hop spawn that i just forgot to add???????????????????
* fixed again
---------
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2024-08-13 13:27:24 -06:00
VigersRay
a33b949c98
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Maps/train.yml
2024-08-07 22:57:31 +03:00
Emisse
bd36ff93d2
train update ( #30721 )
...
* train update
* train
2024-08-06 17:50:39 -06:00
VigersRay
c0ee7e3cc9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Lobby/LobbyUIController.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
# Content.Shared/Roles/JobRequirements.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
# Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
# Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
# Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-05 17:22:05 +03:00
NakataRin
71ea1516ed
added paramedic to train ( #30556 )
2024-08-01 13:59:43 -06:00
VigersRay
31b2d24e30
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/MagicMirror/MagicMirrorComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/migration.yml
2024-07-31 03:54:09 +03:00
Brandon Hu
d846a621e5
tweak(Core_map_Jobslots): Increase round start chemist slots from 1 to 2 ( #30408 )
...
that is odd
2024-07-27 13:49:05 -06:00
VigersRay
8d415f6bde
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
2024-07-26 04:21:22 +03:00
lzk
f56e4f6624
Replace some to do with TODO ( #30346 )
...
Replace to do with TODO
2024-07-25 11:04:03 +03:00
VigersRay
d2c1a1df88
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +03:00
Ed
c407f7c473
Train map fix ( #30145 )
...
* train fix
* Update train.yml
* Update train.yml
* Add files via upload
* Revert "Add files via upload"
This reverts commit 9c6c2caae32899e7bef9c45db1ff4317a0dae529.
* Update train.yml
2024-07-21 01:44:18 -06:00
IProduceWidgets
c7ff647cb3
Nukie Outpost is no longer a station map ( #30090 )
...
* I dunno, break shit I guess.
* Actually fix some shit for once.
* test flakey or me flakey?
* Test were not flakey, they just didnt make any sense anymore.
* more stationy tests
* undo abuncha shit I can set in yml instead
* forgor an assert
* unneeded usings
* 1984
* I made github angy
* yoink
* the end is never the end is never the end is never the end is never the end is never the end is never the
* Im going to commit sudoku
2024-07-21 01:26:30 -06:00
Pissachu
0cb86d7aae
Fixing Botanist role numbers in various stations - V2 ( #29581 )
2024-07-21 01:23:27 -06:00
Rinary
b562c25f54
Фиксы ( #211 )
...
* init
* deleted
* fix
* fix
* нет такой переменной для cluwne-name-prefix
* смешная хуита, проверяет на то, добавлен ли компонент, но когда добавляеться комбат екшен он по дефолту фолз, а чекает на тру
* это рофл нахуй, я его так, он ошибку выдает, я его сяк он ошибку выдает
* fix
* roboanalyzer fix
* target для этого не существует
* carrying System fix
* удалить обратно
* опять нет target
* some map fixes
* fix Centcomm spawn
* all vanilla map disable Law
* remove pilot from marathon
* revert security pilot
* пу-пу-пу
* Lawyer Headset
* Lawyer headset locale
* fix
* fix
* swine not cat
* roboanalyzer update
2024-07-18 17:30:42 +03:00
