NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-09 04:24:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
23287 commits 14 branches 0 tags 3 GiB
Commit graph

3952 commits

Author SHA1 Message Date
Morb0
3cb4017c90 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Audio/Announcements/license.txt
#	Resources/Audio/Effects/Shuttle/licenses.txt
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/Textures/Structures/Storage/tanks.rsi/meta.json
 2023-11-14 16:35:33 +03:00
Chubbygummibear
e6e7a2358c
Fix thrown items not registering the tile they stop by colliding with a hard surface (#21107) 2023-11-14 23:54:35 +11:00
deltanedas
318d843b80
Add MindPlaySound to role system (#21460) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-11-14 23:52:40 +11:00
Leon Friedrich
16a96976d3
Flammable system bug fixes. (#21594) 2023-11-14 22:55:45 +11:00
Justin Pfeifler
ec76958b51
Add Check For Gravity On Thrown Items (#21647) 2023-11-14 21:52:18 +11:00
Nemanja
4e84961ef8
Minimalist Action Bar (#21352) 2023-11-13 22:27:14 -05:00
Ed
786bb79ebc
Pet Carrier (Zookeeper gameplay?) (#21545) 
* add visual

* fix item + entityStorage problem, add generation in maints

* make pet carrier two-handed

* added to cargo

* add resistlocker component
 2023-11-13 16:55:47 -07:00
Bakke
966201c6b3
Fix CanImplant returning true when there's no implant (#21637) 
In CanImplant, FirstOrDefault would make up a new implant with default
values if there wasn't any to inject. This resulted in localization
errors and exceptions. Replacing with FirstOrNull fixes the issue.
 2023-11-13 15:53:54 -07:00
metalgearsloth
aae3d7133a
Bump expedition timer to 11mins (#21635) 
We've had it at like, 18, 12, and 7, I think 7 is too low and 18 is definitely too high.

Ideally:
- 2 minutes to get inside
- 7 or so minutes inside.
- 2 minutes as a buffer to either fulton themselves out or run out if necessary.
 2023-11-13 15:39:33 -07:00
Leon Friedrich
eb0c86f803
Storage CanInsert() tweaks (#21623) 2023-11-13 23:43:03 +11:00
deltanedas
e02bffc28e
fix egg debug assert (#21628) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-11-13 01:48:47 -07:00
Leon Friedrich
c9e2a91f13
Fix ghost FOV bug (#21614) 2023-11-13 05:36:00 +11:00
Slava0135
bfd509e7af
fix (#21612) 2023-11-12 21:02:39 +03:00
DrSmugleaf
f094862684
Fix world targeted actions making the user face in the wrong direction (#21602) 2023-11-12 19:50:35 +11:00
DrSmugleaf
1a3d3a3ed0
Fix missing if statement when logging missing action error (#21560) 2023-11-10 23:46:42 -07:00
Leon Friedrich
9af95742df
Fix replay spectating bugs (#21573) 2023-11-10 23:45:46 -07:00
Vasilis
909621ee5f
stasis bed and microwave qol(#21572) 2023-11-10 23:42:59 -07:00
Leon Friedrich
654cc7f071
Merge ActorSystem and IPlayerManager (#21314) 2023-11-11 13:08:10 +11:00
Nemanja
ac5e9cd70b
Fix borg mobstates (#21307) 
* Add dead states to borgs

* this?

* ack
 2023-11-09 16:14:06 -07:00
Vasilis
2f2d237f86
LOOC will appear on top of your head (#21514) 
* Oh well

* Minor fixing up

* HOLY BINGLE I DID IT

* TOGGLE!
 2023-11-09 02:18:58 -07:00
themias
c1791eb65d
Fix space vault (#21541) 2023-11-08 18:43:43 -07:00
brainfood1183
8be97a20c5
Roller Skates fixes (#21542) 2023-11-08 18:43:27 -07:00
Morb0
7d7c9e5f4c Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png
 2023-11-09 01:09:14 +03:00
PixelTK
52af546267
Arachnid 2: Episode 2 (#19984) 
* Shield

* minor sprite changes and buffs

* structure buff

* Crafting stuff

* tweaks

* 88-88

* Better web pocket sprites.

* yeah it's fine now.
 2023-11-08 12:18:52 -08:00
Morb0
7a328a7635 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-11-08 14:28:45 +03:00
Leon Friedrich
ac25dd85fc
Fix mob state error (#21431) 2023-11-07 18:30:05 -07:00
Nemanja
94368f1f00
Speed Boots [Tier 3 Civ-Service] (#21438) 
* Speed Boots

* validate

* monkey
 2023-11-07 18:25:43 -07:00
DrSmugleaf
3953257b7a
Add method to clear an action's cooldown (#21517) 2023-11-07 18:24:43 -07:00
Morb0
611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Packaging/ContentPackaging.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Resources/Audio/Weapons/Guns/Gunshots/license.txt
#	Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
 2023-11-08 03:00:51 +03:00
DrSmugleaf
dc3b6e31b2
Fix Client RoleSystem not inheriting SharedRoleSystem, network job component (#21436) 2023-11-07 14:44:53 -08:00
Nemanja
4729024d3e
Convert ItemSize to prototypes (#21481) 
* item sizes are prototypes

* eek
 2023-11-06 00:20:50 -07:00
deltanedas
38904904d0
ninja stun change (#20503) 
* tagless fields

* add damage and paralyze instead of electrocuting

* add disable bool to RevealNinja

* raise MeleeAttackEvent on the user after swinging

* uncloak ninja after attacking

* revert RevealNinja bool

* revert meleeattack event

* revert uncloak

* validate shock prototype

* damagespecifier no validation

* ;

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-11-05 21:08:33 -07:00
Ed
8b3adf6085
Anomaly Synchronizer (#20945) 
* added textures and basic prototype without functionality

* add full functional

* finish work

* fix naming

* reduce random anomaly spawner offset

* Update AnomalySystem.Vessel.cs

* Update SharedAnomalySystem.cs

* Update SharedAnomalySystem.cs

* Update production.yml

* fix errors

* fix?

* Update anomaly_sync.yml

* deltanedas code fixes. Thx, deltanedas!

* git what

* fix yml

* fix yml 2

* meh, try again

* work, work, work

* fix powered checking. now component work also without ApcPowerReceiving

* now supercrit port invoke on start growing, not after explosion
fix errors

* deltanedas fix pack 1

* Update AnomalySynchronizerComponent.cs
 2023-11-05 21:02:02 -07:00
brainfood1183
40b36d1dc5
Roller Skates (#20257) 
* adds roller skates

* removed hascomp and changed addcomp to ensurecomp, modified to _random, _stun

* remove icon from type: sprite

* sorted dependencies

* skates no longer added skater component to user, movmeentspeedmodifier and damagehighspeedimpact had access removed.

* fixes

* fixes
 2023-11-05 19:42:37 -07:00
KISS
4cacb7b9e3
Ice anomaly spawns ice underneath it (#21227) 
* added TileAnomalySystem to AnomalyIce

* added FloorIce for station

* created ice crust entity to spawn under ice anomaly

* update draw depth for ice crust

* uh oh, added ice-sliding but at what cost

* resolved mispredicts

* updated sprite alpha, removed appearance component (not used)

* fixed function not reflecting event name, left datafield attributes blank, added one comment about saving data (?)

---------

Co-authored-by: Yurii Kis <yurii.kis@smartteksas.com>
 2023-11-05 19:41:42 -07:00
Christopher Thirtle
d07ea20f74
Use object-spaced bounding boxes for putting stuff in crates (#21427) 
* Use object-spaced bounding boxes for putting stuff in crates

* Use existing _lookup.GetAABB, different component

* PR edits updated

* Remove unused bits from around GetAABB

* Use GetAABBNoContainer
 2023-11-05 21:40:25 -05:00
IntegerTempest
615f15e8a9
Nukeops hud (#21260) 
* a

* a

* a2

* syndi visor

* left icon

* a3
 2023-11-05 19:36:08 -07:00
deltanedas
77d49ea7e1
:trollface: (#21470) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-11-05 16:49:59 -07:00
Leon Friedrich
6a8023cf8b
Fix admin verb PVS issue (#21406) 2023-11-05 02:58:26 +11:00
themias
9182c201e9
Enter mech with drag-drop (#21405) 2023-11-04 11:23:46 -04:00
Nemanja
7a2a3ce9a7
fix hand examine (#21309) 2023-11-04 15:50:05 +03:00
Morb0
259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Resources/Prototypes/Catalog/Fills/Boxes/general.yml
#	Resources/Prototypes/Entities/Clothing/Back/satchel.yml
#	Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
 2023-11-04 12:16:53 +03:00
Ed
aa713ea7e6
Candles (#21087) 
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
 2023-11-03 22:53:51 -07:00
keronshb
3a788dd8d4
Mind Action Container (#21336) 2023-11-03 19:55:32 -04:00
TemporalOroboros
19614453d9
Makes thieving gloves sneakier (#21398) 
* Hidden DoAfters

* Fix formatting warnings

* Hide progress bar and pickup animation

* Copy Hidden field in copy constructor
 2023-11-02 22:10:58 -04:00
DrSmugleaf
2d58d19b07
Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
Nemanja
85f09cae86
More Storage Rebalancing (#21373) 
* the changes...

* eek
 2023-11-01 17:19:41 -06:00
Ed
96ff529c82
Anomaly Cores (#21306) 
* add first anomaly core

* meme

* 5 min to 10 min
fix yml

* fix

* Update doc

* no static price
 2023-10-31 19:20:52 -04:00
Psychpsyo
6a18bdc023
Soapy Water & Edible Soap (#20364) 
* soap reagent and soapy water

* make soapy water recognizable

* Fix tile cleaning bug

CleanDecalsReaction was able to take more than the reactVolume it was given.

* make soapy water an evaporating reagent

* Tile reactions when mopping

* Fix indescribably soap flavor

* Adjust soap flavours

Soap and soapy water now taste clean and syndie soap tastes like punishment.

* Better soap numbers & DeleteOnSolutionEmpty

* Changed TrashOnEmpty to TrashOnSolutionEmpty

* Last TrashOnSolutionEmpty change

* Fix merged code not compiling

* Requested changes.
 2023-10-31 13:39:12 -07:00
Bixkitts
74f1098008
Candy Bucket for Halloween (#21257) 
* Added candy bucket and component to update appearance of held containers akin to it

* cleanup newline

* newline was load-bearing

* moved component to Shared, cleanup

* newline is spooky

* You build and run without errors, stop pretending otherwise

* Updated for new storage system in master branch
 2023-10-31 11:54:41 -04:00