NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-12 20:01:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
21874 commits 14 branches 0 tags 2.9 GiB
Commit graph

1542 commits

Author SHA1 Message Date
Morb0
5f3e6c4716 Fix maps 2023-09-13 21:20:52 +03:00
Morb0
e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
 2023-09-13 16:51:52 +03:00
Ed
1ff24a7ee1
New station Gate (#1408) 2023-09-13 16:35:01 +03:00
Ubaser
9c2f11d0eb
Add map "Europa" (#19930) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-13 22:22:21 +10:00
deltanedas
89b670d0c0
run fixgridatmos on dev (#20099) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-13 00:52:12 -06:00
SyndiCarp
d387108631
Update corvax_avrit.yml (#1409) 2023-09-13 08:04:50 +03:00
SyndiCarp
5e41e09a9f
HotFix corvax_ishimura.yml (#1410) 2023-09-13 08:04:30 +03:00
deltanedas
ef869b1cff
saltern updat (#20075) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 14:25:59 -06:00
deltanedas
6953070d40
ninja bombing target whitelist warp point (#19977) 
* ninja bombing target whitelist

* :trollface:

* add bombing targets to saltern

* oops remove jordans

* remove aspid js too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:04:00 -06:00
SyndiCarp
f0be429afb
Update corvax_ishimura.yml (#1406) 2023-09-10 23:52:59 +03:00
Bloodcanis
a68f2cc6f6
Update corvax_delta.yml (#1402) 2023-09-10 23:51:32 +03:00
Nyranu
976b887989
New station Spectrum (#1397) 2023-09-10 23:51:17 +03:00
DrSmugleaf
b37a33444b
Revert "Revert "Small Fixes (#19929)" (#19937)" (#19939) 
This reverts commit c5a1c3dedd.
 2023-09-09 01:37:04 -06:00
Emisse
c5a1c3dedd
Revert "Small Fixes (#19929)" (#19937) 
This reverts commit 70076361bd.
 2023-09-09 01:28:54 -06:00
Nairod
70076361bd
Small Fixes (#19929) 2023-09-08 23:44:14 -06:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
Kevin Zheng
de9354a562
Add powered SCI to dev map (#19915) 2023-09-08 13:43:47 -06:00
deltanedas
ffe04b41e7
saltern 4.21 (#19908) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-08 13:22:11 -06:00
Morb0
78c6e7bd89 Remove WebChair from Ishimura 2023-09-05 01:50:27 +03:00
Morb0
b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
 2023-09-05 00:12:02 +03:00
TsjipTsjip
a99962d969
Add grid names to evac shuttles that need it (#19655) 2023-09-02 15:54:37 +10:00
Kara
cd9ceb2378
Ice & snow tile modernization (#19689) 
* Add snow tile edges

* Changes for edge tile prio

* Add support for tile weightlessness

* Add weightlessness to ice

* snow duggy moments

* fix ice thing yeah

* actually why even use weightless movement

* upd8 nukieplanet

* i have no idea what im doing

* sprite modifications
 2023-08-31 15:31:23 -06:00
Morb0
5a6058666e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Tiles/dark_mono.png
#	Resources/Textures/Tiles/steel_mono.png
#	Resources/Textures/Tiles/white_mono.png
 2023-08-31 20:55:00 +03:00
LankLTE
d74649abd4
PACMANs and glass (#19674) 2023-08-30 19:45:07 -06:00
Nemanja
4d677f0685
1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2023-08-30 18:06:15 -07:00
deltanedas
b8de818077
add pacmans to saltern (#19617) 
* add pacmans to saltern

* :nerd:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-08-30 18:53:46 -06:00
Morb0
2968d856bf Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
 2023-08-30 20:42:46 +03:00
Morb
c99e365ce7
Give nukies the ability to declare war for a TC boost (#19291) 
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2023-08-29 23:56:20 -08:00
Ubaser
90c10c4675
update real (#19630) 2023-08-29 13:11:34 -06:00
Morb0
1b513f0c1a Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Textures/Tiles/attributions.yml
 2023-08-29 05:58:14 +03:00
JustCone
25a915d283
jrpacmans to Packed (#19609) 2023-08-28 12:37:08 -06:00
TsjipTsjip
231d3a591a
Add J.R.P.A.C.M.A.N.'s to kettle's maints (#19599) 2023-08-28 12:36:57 -06:00
JustCone
29a2f7f36c
Cluster Pacmans (#19592) 2023-08-27 21:33:43 -06:00
JustCone
3c6ccbadcf
Jr Pacmen around Omega (#19587) 2023-08-27 16:24:55 -06:00
TsjipTsjip
e79c39b521
Run variantize on barratry (#19527) 
* Run variantize on barratry

Also use new asteroid plating tile in sci

* Requested changes
 2023-08-27 02:43:21 -06:00
brainfood1183
8195690b8c
Origin Station Update 26.08.2023 (jrpacman, borg roles) (#19568) 2023-08-26 19:33:24 -06:00
DrSmugleaf
38a9d1e5c7
Add a rat to the test dev map (#19549) 2023-08-25 14:56:48 -07:00
TsjipTsjip
50828363fe
Add Mv cable to PA on origin (#19526) 2023-08-25 10:54:30 -06:00
Bloodcanis
c34d029f28
Update corvax maps (#1367) 2023-08-25 12:29:16 +03:00
TsjipTsjip
7c4564adcc
Add Mv cable to PA on packed (#19525) 2023-08-25 02:09:27 -06:00
TsjipTsjip
18b264b338
Add Mv cable to PA on saltern (#19523) 2023-08-25 01:52:09 -06:00
TsjipTsjip
0998d9ea6d
Add Mv cable to PA on kettle (#19522) 2023-08-25 01:50:06 -06:00
Emisse
8940ce9220
Fland update (#19524) 
* fland update

* proto
 2023-08-25 01:38:39 -06:00
Emisse
51e7ad1102
Meta update (#19520) 
* meta update

* proto
 2023-08-25 01:38:34 -06:00
Emisse
4db22b4b85
Marathon update (#19519) 
* marathon update

* proto
 2023-08-25 01:38:26 -06:00
Emisse
cdcd3497c9
Box update (#19518) 
* box update

* proto
 2023-08-25 01:36:47 -06:00
Emisse
580f947cf8
Bagel update (#19517) 
* map

* proto
 2023-08-25 01:36:40 -06:00
Morb0
5277dceed2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
 2023-08-24 22:01:46 +03:00
TsjipTsjip
222b40ad49
Kettle QoL (#19443) 
* Robotics QoL

* Add note pointing chemists to the drain in morgue

* Add senior role spawns

* Add senior roles to kettle map prototype
 2023-08-23 20:02:37 -06:00
LankLTE
2c21f48786
update s (#19453) 2023-08-23 20:00:19 -06:00