rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33004 commits 1 branch 0 tags 1.2 GiB
Commit graph

31 commits

Author SHA1 Message Date
Vigers Ray
10888fd269 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/GameTicking/Managers/ClientGameTicker.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
#	Content.Server/StationEvents/Events/PowerGridCheckRule.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Content.Shared/CCVar/CCVars.Game.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs
#	Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
#	Resources/Locale/en-US/_strings/guidebook/cooking.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Guidebook/antagonist.yml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
#	Resources/migration.yml
 2025-02-26 22:01:48 +03:00
Milon
f5eafc7ed3
make the detailed examine verb predicted (#35362) 
can we stop predicting things
 2025-02-21 11:30:06 -08:00
Vigers Ray
652852e1ca Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
 2025-02-10 07:47:04 +03:00
Zachary Higgs
1c8e7443ae
Move DnaComponent to shared (#35012) 
* Move DnaComponent to shared

- Add Using statements to AdminSystem and StationRecordsSystem to point
to Content.Shared.Forensics

* Proper namespacing

* Revert an un-intended change

* Add Networking to DNA Component

* CR - Remove ("dna")

* CR - add back ("dna") tag
 2025-02-10 04:36:01 +01:00
Vigers Ray
3355febe9b Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/StatusIcon/StatusIconSystem.cs
#	Content.Server/Implants/ImplantedSystem.cs
#	Resources/Audio/Effects/attributions.yml
#	Resources/Locale/en-US/markings/ears.ftl
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Prototypes/Entities/Mobs/Player/observer.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/LootTables/suspicion_loot_table.yml
#	Resources/Prototypes/Research/arsenal.yml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
#	Resources/manifest.yml
#	Resources/migration.yml
#	RobustToolbox
 2025-02-09 22:17:22 +03:00
12rabbits
b6ccbef147
DNA scrambler examine fixes (#34920) 
* Remove custom character description after using DNA scrambler

* Mark grammar as dirty when updating identity

* Update Content.Server/Implants/SubdermalImplantSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-06 11:09:59 -08:00
Vigers Ray
28ba3e857b Фикс выпадение предметов с импланта хранилища в апстриме 2025-01-20 06:07:01 +03:00
Vigers Ray
1b61551b4d Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/Implants/SubdermalImplantSystem.cs
#	Content.Server/Silicons/Borgs/BorgSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl
#	Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml
#	Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
 2025-01-16 20:00:41 +03:00
themias
6d218f2ad5
Fix DNA scrambler updating station record (#34091) 
* Fix DNA scrambler updating station record

* Update Content.Server/Implants/SubdermalImplantSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-01-15 23:49:51 +01:00
Vigers Ray
502811b5c8 Много говна 2025-01-04 06:03:21 +03:00
Vigers Ray
f84969630d
Диверсионный отряд (#985) 
* Диверсионный отряд

* фиксы

* фиксы линтера

* Спрайт терминала икаруса

* фикс пинпоинтера

* Доработки ДО

* Фиксы удалённого управления шаттлом

* Не запускать ДО если на может быть меньше 3 глав
 2025-01-01 07:53:31 +03:00
Preston Smith
01c1d8f824
Prevent pulling when teleporting (#33252) 
* No more teleporting pulling

* pulled dash

* Update Content.Shared/Ninja/Systems/DashAbilitySystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Implants/SubdermalImplantSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-16 17:09:17 +03:00
Leon Friedrich
d806db264a
Fix currency duplication bug (#32524) 2024-09-29 22:13:22 +10:00
SlamBamActionman
07174d0aaf
Better DNA forensics & ReagentData (#26699) 
* Added the ability for blood to track DNA using ReagentData; Forensic Scanner now accounts for solution DNA, non-DNA holders have "Unknown DNA"

* Removes touch DNA for puddles, adds DNA to vomit

* DNA now leaves traces in containers and those marked without don't show DNA on scan (except for puddles), gibbed parts have DNA

* Fix stupid metamorphic glass bug grrr

* Removed SpillableComponent since DnaSubstanceTraceComponent is used instead

* Removes data field from maps, adds DNA tracking for some missed items

* Give default value, fix missing values.

* Fixes recipe bug

* Review changes

* Make the Data list into a nullable type

* Revert map changes

* Move gibbed unknown DNA to forensicssystem
 2024-08-09 09:27:27 +10:00
Nemanja
be6f55a090
Clean up store system (#28463) 2024-06-01 11:29:17 -04:00
nikthechampiongr
2ffd616c41
Replace the teleportation logic on the SCRAM implant! (#26429) 
* Replace the teleportation logic on the SCRAM implant!

Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:

- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
  will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
  tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
  position they are at. Effectively not teleporting them.

* Actually make the defaults sane which I forgor in the last commit

* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.

* Address reviews as much as possible

* Address reviews
 2024-04-01 17:31:36 +11:00
metalgearsloth
d215419f9a
Revert "Fix scram implant's teleportation out of containers" (#25030) 
* Revert "Fix scram implant's teleportation out of containers (#24827)"

This reverts commit d4434dbb5e.

* Remove EntityQuery<T> pass-ins
 2024-03-30 13:28:42 +11:00
nikthechampiongr
eb80d9752e
Fix scram! implant keeping you pulled to someone when teleporting you (#26309) 
* Fix scram! implant keeping you pulled to someone when teleporting you

* Exorcise sleep deprivation speak
 2024-03-21 18:42:32 +01:00
Tayrtahn
f4cb02fb0c
Code cleanup: Purge calls to obsolete EntityCoordinates methods (#26292) 
* Purge calls to obsolete EntityCoordinates methods

* Pizza defruited; rerun those tests!
 2024-03-21 12:59:56 +11:00
Kot
d4434dbb5e
Fix scram implant's teleportation out of containers (#24827) 
* Fix scram teleportation out of containers

* re-run ci

* Use AttachToGridOrMap method
 2024-02-07 16:41:11 -07:00
Ilya246
ca529178e2
scram implant (#23122) 
* implement

* fix charges

* add listing

* fixes

* fix locale, probably all done

* fix

* fix of fix

* move query init

* cleanup

* unbrokey rt
 2024-01-04 05:38:02 -07:00
Tomás Alves
9d9cfbdd88
Change Biometrics after using Dna Scrambler Implant (#22098) 2023-12-04 18:18:49 -05:00
Nemanja
2f2df5c74b
Fix DNA scrambler (#19079) 2023-08-13 12:56:21 -04:00
Arendian
a39b3eddbd
New implanters for uplink (#18038) 
* New implants for uplink

* made changes based on reviews

* was meant to be 3
 2023-07-17 13:48:09 -06:00
Leon Friedrich
677ef07aa2
Misc implant fixes (#17172) 2023-06-06 21:53:11 -06:00
deltanedas
2eaec2d528
Add uplink implant (#15728) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-29 19:07:50 +10:00
Mr0maks
bca82315c1
Fix freedom implant charges (#14737) 2023-03-24 14:07:20 +11:00
Nemanja
49f7575298
Cuffable/Handcuff ECS (#14382) 2023-03-13 19:34:26 -04:00
Jezithyr
eeb5b17b34
Mobstate Refactor (#13389) 
Refactors mobstate and moves mob health thresholds to their own component

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2023-01-13 16:57:10 -08:00
keronshb
21c1cb57ce
Makes adjustment to macro bomb implants and how mobstate trigger handles suicide (#12682) 2022-11-20 20:51:44 -06:00
keronshb
671324bef8
Implanters and Subdermal Implants (#11840) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-11-20 17:49:37 +11:00