Ko4ergaPunk
ba6d770ffb
[Maps] Pilgrim update #6 ( #2681 )
2024-10-16 19:06:06 +03:00
Meguneri
2f1bf3fca6
[Maps] Maus update ( #2674 )
2024-10-15 21:03:37 +03:00
Stubaretka24
a05b6083c7
[Maps] Awesome MachineGun Fix ( #2675 )
2024-10-15 20:56:12 +03:00
Morb0
0eba25c0eb
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2024-10-15 17:04:40 +03:00
scrivoy
8c17624896
Marathon: Add EVA Helmets to Perma and add Disposal Unit front of Atmos ( #32799 )
...
add: EVA helmets to perma, disposals bin atmos
2024-10-14 05:23:41 -06:00
lastPechkin
1f29e791e5
[Maps] Astra brig rework ( #2661 )
2024-10-13 17:38:48 +03:00
lzk
b999752e88
Update omega evac ( #32748 )
...
- rename to evac omega
- add screens
2024-10-12 13:03:55 -06:00
Scribbles0
561297495f
Marathon AI tweaks ( #32756 )
...
* camera tweaks
* add intercoms
2024-10-12 13:03:31 -06:00
Stubaretka24
ab71093097
[Map] New Station Awesome ( #2657 )
2024-10-12 19:38:36 +03:00
lzk
cd37f528d7
remove cringe ( #2660 )
2024-10-12 17:25:04 +02:00
lastPechkin
b4e1697fa3
[Maps] Astra fix ( #2656 )
2024-10-11 18:48:12 +03:00
Saphire Lattice
729de28844
Fix Centcom cloning scanner ( #32746 )
...
* Fix Centcom cloning scanner
* Fix uid conflict
2024-10-11 03:00:54 -06:00
lzk
7a4cefa8ac
update fland ( #32747 )
...
add captain id card
2024-10-11 02:35:46 -06:00
TiFeRi
3696d516cf
[MAPS] Paper Service and AI update ( #2653 )
2024-10-11 01:49:37 +03:00
lzk
e281e9a304
Fix tushkan engi disposals ( #2649 )
2024-10-10 11:38:52 +03:00
Ubaser
38fd54a1bf
Update Core ( #32665 )
...
* add
* remove invalids
* fix
* yes
2024-10-07 19:59:06 -06:00
Scribbles0
6b10e00da4
oasis update ( #32679 )
...
sec apcs and ai core wiring
2024-10-06 19:24:44 -06:00
lastPechkin
a493504b45
[Maps] Новая цель на астру ( #2646 )
2024-10-06 19:41:11 +03:00
Ko4ergaPunk
e5252ac14b
[Maps] Pilgrim update #5 ( #2647 )
2024-10-06 12:28:17 +03:00
Spessmann
126c1786de
Cog update fix ( #32657 )
...
* fixes for cog
* ok fixed that
2024-10-05 20:30:10 -06:00
Spessmann
2287df13bd
Cog engineering DIY update ( #32651 )
...
engineers forced to do work, sobbing
2024-10-05 12:08:39 -06:00
Morb
4b8ecbb16e
Remove custom PaperPrinter and use Paper material ( #2644 )
2024-10-05 14:38:10 +03:00
TakoDragon
db64ad9c4d
Marathon Removed double walls and a wrong cable ( #32603 )
...
removed double walls and cable fucks
2024-10-04 17:18:46 -06:00
Morb0
3ab6d3ef71
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.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/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
Southbridge
c0d67429ab
Box Station - Connected Recycler, rerouted power for Singlo Substation, added law boards to AI upload room ( #32608 )
...
* Fixed #32443 and #30375
* Fixed duplicate ID issue, and added lawboards to resolve #32581
* Removed Overlord board and added Crewsimov
* Removed invalid UserInterface component
2024-10-03 19:12:59 -06:00
Preston Smith
2df61e4e71
Added LV cables to Marathon SMES room ( #32574 )
...
Added LV cables to SMES room, powering light and computers.
2024-10-01 23:30:58 -06:00
Scribbles0
20aa14e4f7
Cog update ( #32585 )
...
* ai core upgrades
* fix distro color
2024-10-01 19:45:54 -06:00
Ko4ergaPunk
5d546cfc8b
[Maps] Tushkan hotfix #3 ( #2636 )
2024-10-01 07:26:18 +03:00
lastPechkin
766d4168c8
[Maps] Astra Update ( #2631 )
2024-09-30 10:11:44 +03:00
Meguneri
338b396e3d
[Maps] Maus tweak ( #2633 )
2024-09-30 06:25:40 +03:00
Ko4ergaPunk
c058921fe5
[Maps] Tushkan update #1 ( #2630 )
2024-09-27 14:32:48 +03:00
Spessmann
af3ea5253a
Cog update (power fix/grav) ( #32475 )
...
* became real
* fixed 32456
2024-09-26 23:20:47 -06:00
Meguneri
c61a87f123
[Maps] Delta AI update ( #2626 )
2024-09-25 20:48:41 +03:00
spanky-spanky
9d75a228c0
Add missing LV cables in Omega atmos ( #32417 )
...
Adds missing LV wire in atmos burn chambers.
2024-09-23 22:48:14 -06:00
NotSoDamn
58b1676ce9
[Maps] Glacier hotfix #3 ( #2620 )
2024-09-23 22:17:18 +03:00
spanky-spanky
5e9a0c9d9d
Omega Minor Sec Update ( #32410 )
...
* Updated Omega armory and Warden office.
* Adjusted walls, a decal, and an air sensor.
2024-09-23 10:17:45 -06:00
IProduceWidgets
5e162e776d
Add the Syndicate Instigator Shuttle ( #32083 )
...
* Instigator
* sustenance
2024-09-22 17:27:48 -07:00
Killerqu00
8a2c69d18d
reach update :3 ( #32387 )
2024-09-22 14:08:56 -06:00
TiFeRi
6741ef8ec2
[MAPS] Paper UltraSmallUpdate ( #2615 )
2024-09-22 19:28:07 +03:00
NotSoDamn
9c4111d561
[Maps] Glacier hotfix #2 ( #2614 )
2024-09-22 16:30:51 +03:00
spanky-spanky
fba67979c8
Modifications to bring Omega up to date. ( #32317 )
2024-09-19 22:07:49 -06:00
Spessmann
2d42a6bf98
Cog update (Mail) ( #32315 )
...
make mailing better
2024-09-19 21:55:48 -06:00
Saphire Lattice
3e1c067c41
Fland change - Add glasslocks to the Contiguous Fland Hallway Volume ( #32264 )
...
* Add glasslocks to the Contiguous Fland Hallway Volume
* Fix up the firelocks, hopefully!
2024-09-19 13:17:18 -06:00
Spessmann
cd8ba1d6b3
Cog update (Engineering update) ( #32263 )
...
* updated cog atmos and engi
* fixed that
* updated
2024-09-19 07:37:28 -06:00
lzk
37a8c23f79
Update Fland ( #32241 )
2024-09-19 07:36:29 -06:00
lzk
2e37b1fb2f
Update Meta ( #32238 )
2024-09-19 07:36:12 -06:00
lzk
67b34cf8cf
Update Omega ( #32237 )
2024-09-19 07:35:57 -06:00
IProduceWidgets
3c0be539ec
Oasis updoot. ( #32133 )
...
* updoooooooooooot
* had to change to closed shutters
* I press wrong button
* ngl logic gates kinda ass to work with
* get linked
* Why is it so easy to place entities twice!?
* camer
2024-09-19 07:35:39 -06:00
Morb0
34d3cf6293
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 10:30:01 +03:00
lzk
a1237910c5
Fix bagel vox box ( #32208 )
...
Fix vox box on bagel
2024-09-18 10:37:35 +03:00
