vanx
6f27ab6eac
[Locale] Steal Objectives ( #256 )
...
steal objectives localization
Co-authored-by: vanx <discord@vanxxxx>
2025-03-02 16:15:59 +03:00
SimpleStation14
24f36c1803
Mirror: Pulling Rework V2 ( #269 )
...
## Mirror of PR #24936 : [Pulling rework
v2](https://github.com/space-wizards/space-station-14/pull/24936 ) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4 "
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards )/[space-station-14](https://github.com/space-wizards/space-station-14 )
###### `c584f6444a85cc53edb060230f7e7b2b76cc87bf`
PR opened by <img
src="https://avatars.githubusercontent.com/u/31366439?v=4 "
width="16"/><a href="https://github.com/metalgearsloth ">
metalgearsloth</a> at 2024-02-04 01:43:17 UTC
---
PR changed 53 files with 796 additions and 1356 deletions.
The PR had the following labels:
- Status: Needs Review
---
<details open="true"><summary><h1>Original Body</h1></summary>
> Health v2 moment
>
> Fixes https://github.com/space-wizards/space-station-14/issues/24900
>
> - Fixes container changes.
> - Fixes keybind.
> - Fixes multi-pull.
> - Fixes alerts cleanup for non-predicted pull stops.
>
> I'm awake now for any issues.
</details>
---------
Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
2024-07-09 19:51:27 -04:00
Jezithyr
070af36c57
Emergency revert for pulling ( #24923 )
...
Revert "Pulling rework (#20906 )"
This reverts commit 0d8254b2a2891f8d5623c9878bd0e567d0c7fe3c.
(cherry picked from commit c15b0691ec452e543a3cc6894a28bb409dbc65f8)
2024-02-08 12:34:47 +01:00
metalgearsloth
7e7655b3c4
Pulling rework ( #20906 )
...
* Pulling rework
Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame.
* More pulling cleanup
* stats
* More cleanup
* First draft
* More pulling
* weh
* Fix puller
* Pulling working
* Fix merge
* Dunked
* Self-merge time
(cherry picked from commit 0d8254b2a2891f8d5623c9878bd0e567d0c7fe3c)
2024-02-08 12:31:57 +01:00
metalgearsloth
0f35906014
Steal cleanup ( #24428 )
...
- Fix datafield spelling
- Fix some code oddities
(cherry picked from commit b1f9e25c1364064b03bc37357d3453f01e28b8a4)
2024-02-08 11:49:26 +01:00
Ed
8bca049ca7
New Thief minor antagonist ( #21520 )
...
* start working
* add right-click thief antagins
some architecture restruct
* add meh thief greeting audio
* add thief subgamemode to Traitors gamemode
* add late join thief (not tested yet)
add briefing
* add pacifism
* add Steal tasks to thief
* fix crash thief+traitor on person
* add new condition: collection steal
* add tracking of succes collection objective
* add stamp collection target
remove some boring steal target
add check pulling entity to collection target
* finalize first 2 group objective
* start merging stealing objective systems
* merging
* finish merging. Now traitor steal objective work better
* we don't check the items of pullable sentient entity
* clear naming, enable thief signle item objective start
* objective pack add
* finish with steal item objectives
* convert string to ProtoId<>
* some clean up
* add thieves to revolution game mode
* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
* update pacifism: fix crashing, monkey-thief without pacified
* adaptive animal briefing, cleaning locales
* add structure steal objectives
* remove RCD target
* add thiefs to manifest, but bug with traitor duplications
* add escape objective
* add chat briefing
* setup animal objective group system
* add animal steal objectives
* add animal objectives notroleconditions
* add morty
* now thief mode has a chance of not launching Now there are a random number of thieves per round from 1 to 3
* 6 hours of trying to fix duplicate tasks. Failure
* added thief pinpointer (buggy)
* start thief backpack UI work
* revert pinpointer for scope reason
* UI continue work
* add thief starter kits content
* remove ERP kit :trollface:
* finally! giving starting items to thief. Now it playable, but still need more work
* clean up
* fix
* fox
* add merged items into thief
new Starting Kit (buggy)
* fix YES antag menu
* objection tweaks
* remove hearts objective, working on spawning things from toolbox
* smug
* fixes
* add race specifier objective condition LAMPS
* meh
* fix fix fix
* the alive
* Adding stamps
* Update backpack.ftl
* Revert1
* Revert ftl
* add voice mask to communicator kit
* Update Resources/Locale/en-US/administration/antag.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/objectives/conditions/steal.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/prototypes/roles/antags.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* Update Resources/Locale/en-US/thief/backpack.ftl
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
* update
* fix
* more reusable function, add documentation
* fix doc
* faint fixes
---------
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com >
(cherry picked from commit 144af233c4f4135cccacfa5d50281fce44a1595e)
2024-01-22 18:30:44 +01:00
deltanedas
0baa93716e
Objectives ecs rework ( #19967 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-27 21:59:12 +02:00