Commit Graph

8189 Commits

Author SHA1 Message Date
Ed
2ef4402068 Update base.yml 2024-07-12 12:57:02 +03:00
Ed
0931c9e7d1 Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
2024-07-12 12:53:42 +03:00
slarticodefast
f125dda677 Make stun batons be thrown like a throwing weapon (#29883)
* make stun batons be thrown like a throwing weapon

* stun prods too

* pies too
2024-07-12 19:19:24 +10:00
themias
3a9b1eaa16 Allow notice boards to be built on walls (#29851) 2024-07-12 12:18:32 +03:00
Jonathan Argo
00a2c6a234 Made musket wieldable. (#29910)
* Made musket wieldable.

* Updated musket rsi meta.json copyright.

* Copyright adjustment again.
2024-07-12 12:16:21 +03:00
Ed
e87994ae40 Localization clean up + temp eng switch (#325)
* Update ContentLocalizationManager.cs

* Update battle_royale_temp.yml

* Update basic-effect-reagent.ftl
2024-07-12 08:34:08 +03:00
lzk
e3bb2771d6 Update cluster evac (#29885)
* Update cluster evac

* forgot tiny fans

* the change
2024-07-11 15:03:51 -06:00
deltanedas
02636386b5 item toggling giga rework + full ninja refactor (#28039)
* item toggle refactoring and some new systems

* add ToggleClothing component/system

* unhardcode magboots gravity logic

* make magboots and speedboots use ItemToggle and stuff

* remove now useless clothing components

* update client/server magboots systems

* add note to use ItemToggledEvent in ToggleActionEvent doc

* refactor PowerCellDraw to use ItemToggle for ui open/close control

* add TryUseCharges, refactor charges system

* update magboot trigger code

* make borg use ItemToggle, network SelectedModule instead of now removed Activated

* add AccessToggle for borg

* the giga ninja refactor

* update ninja yml

* update ItemToggle usage for some stuff

* fix activatableui requires power

* random fixing

* yaml fixing

* nuke ItemToggleDisarmMalus

* make defib use ItemToggle

* make things that use power not turn on if missing use charge

* pro

* fix sound prediction

* bruh

* proximity detector use ItemToggle

* oop

* big idiot syndrome

* fix ninja spawn rule and make it generic

* fix ninja spawn rule yml

* move loading profiles into AntagLoadProfileRule

* more ninja refactor

* ninja yml fixes

* the dreaded copy paste ops

* remove useless NinjaRuleComponent and ue AntagSelection for greeting

* fix invisibility

* move IsCompleted to SharedObjectivesSystem

* ability fixes

* oop fix powercell instantly draining itself

* sentient speedboots gaming

* make reflect use ItemToggle

* fix other test

* loadprofilerule moved into its own pr

* remove conflict with dragon refactor

* remove all GenericAntag code from ninja

* )

* probably

* remove old enabled

* great language bravo vince

* GREAT LANGUAGE

* who made this language

* because it stinks

* reparent blood-red magboots to magboots probbbly works

* most of the review stuff

* hasGrav doesnt mean what i thought it did

* make health analyzer use itemtoggle, not fail test

* fix mag/speed boots being wacky

* UNTROLL

* add ItemToggle to the random health analyzers

* a

* remove unused obsolete borg func

* untrolling

* :trollface:

* fix test

* fix

* g

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-11 15:55:56 +10:00
Cojoke
eae04129cf Glass Airlocks In Spray Painter (#29869) 2024-07-11 15:33:20 +10:00
saga3152
a5ec01792b Crafting pizza boxes. (#29680)
* We can now craft pizza boxes

* Fixing errors
2024-07-10 15:52:33 +10:00
Ghagliiarghii
56fb8c832e books bag tabletop (#29863)
* books bag tabletop

* Update Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-07-10 15:51:01 +10:00
Ivan
a0165773a4 Add scarf to warm clothing bounty (#29779)
* Add scarf to warm clothing bounty

* Added ClothingScarfBase prototype and assigned to all of the scarves
2024-07-10 15:26:33 +10:00
Boaz1111
d3495fc51c made the guitars be able to be worn on suitstorage (#29048)
* made the guitars be able to be worn on suitstorage

* minor fix
2024-07-10 09:28:10 +10:00
lzk
bb82b4cd6f Change Cluster evac (#29828) 2024-07-09 15:14:25 -06:00
Ed
1ac9ec85c5 Some mobs pvs-based systems (#321)
* outPVS despawn component

* Update CP14HelperPvsSystem.cs

* experimental constrained spawners
2024-07-09 23:05:19 +03:00
Jaraten
82f1ed1493 upd cliffs (#320)
* upd cliffs

* localize

* Update marker_base.yml

* Update entities.ftl

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-07-09 21:31:36 +03:00
Cojoke
62d8665484 Let Pacifists Use Certain Guns(Foam Weapons) (#29835)
Let Pacifists Use Certain Guns(foam)
2024-07-09 23:46:21 +10:00
slarticodefast
7e087a6eb8 fix passive vent sprite in construction menu (#29820) 2024-07-09 23:39:47 +10:00
Ed
ba03872c57 Expedition goals (#318)
* forgot this one

* disable dinosaurus

* expedition collect objective condition

* Update CP14ExpeditionSystem.cs

* add expedition objectives

* auto-issue of objectives to all expedition participants

* delete cp14playtest gamemode

* Update CP14ExpeditionObjectivesRule.cs
2024-07-09 08:31:24 +03:00
Whisper
8dde49db95 all toggle light actions have a 1 second use delay (#29833) 2024-07-09 14:14:51 +10:00
Errant
149b6a89ca Vox guidebook entry (#29713)
* vox guidebook entry

* skreee

* Removed incorrect diet reference
2024-07-09 10:28:33 +10:00
metalgearsloth
40f735acb1 Don't treat vgroid as station grid (#29811)
Forgot I added this toggle.
2024-07-08 12:05:01 -06:00
Ed
f42546e0c6 Some round beginning preparation (#317)
* gamepresets filter

* addgamerule cp14 filter

* shuttle dropping

* long time FTL

* FTL map tweaks

* Update ShuttleSystem.FasterThanLight.cs

* handle player ship spawning (not tested yet)

* typo

* test elemental shit (ship)

* player spawn handling (real this time)

* FTL map gravity

* clean up 1

* clean up 2

* instant FTL

* Update CP14ExpeditionSystem.cs
2024-07-08 17:39:04 +03:00
ravage
451d04d759 Add beards (#312)
* :neckbeard:

borodi

* :neckbeard: v2

a
2024-07-08 14:21:56 +03:00
slarticodefast
92e2980534 Improve throwing precision (#29726)
* improve throwing precision

* remove debugging logs

* minor fixes

* f

* Update Content.Shared/Throwing/LandAtCursorComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-07-08 19:03:53 +10:00
Tayrtahn
8c3e72c8c8 Silence ringtones on admin PDAs (#29801)
* Silence ringtones on invisible PDAs

* Revert "Silence ringtones on invisible PDAs"

This reverts commit afc1041f31eebe82e83630a856a8856b877a9826.

* Literally just this

* Add an admin announcement for news article publishing
2024-07-08 13:33:17 +10:00
KittenColony
5ae2590667 removed Goblin lastname (#314) 2024-07-07 21:00:02 +03:00
Plykiya
04249e8682 Removes max damage threshold on healing for hyperzine (#29712)
* Removes max damage threshold for hyperzine

* the description...

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-08 00:28:13 +10:00
Nemanja
21d0f85cc2 metal foam grenades (#29428)
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push
2024-07-08 00:26:58 +10:00
Brandon Hu
70b56136aa fix(hardsuits): Give the carp suit and hardsuit a suit storage slot (#29322)
* fix(hardsuits): Give the carp hardsuit suit storage

* Both carpsuits have suit slots
2024-07-08 00:23:03 +10:00
NotSoDamn
437f6f451a Slicing food with Swords (#29005)
* added utensil component

* BaseSword added
2024-07-08 00:22:38 +10:00
Verm
13b84870ec Bartending+: Shaking and Stirring (#29243)
* Shaking and Stirring

* Remove shake message

* Switch if order a bit

* Add doafter supprot for reactionmixer

* Fix nullability

* Timespan zero

* Forgot to remove loc string

* Reorganize usings

* Remove unneeded usings, fix b52 needing to be shaken
2024-07-08 00:21:53 +10:00
Nemanja
0e9ed36b85 Intercom buffs and fixes (#29580)
* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
2024-07-08 00:19:10 +10:00
Simon
f50488d7e3 Raise ratking migration minimum players to 30 from 15 (#29737) 2024-07-07 23:06:24 +10:00
lzk
c9c721be16 Add supplybot moving states (#29795)
* Add supplybot moving states

* forgor
2024-07-07 23:05:09 +10:00
Ed
20d6ccffdb Scythe (#311)
* Scythe

* Update entities.ftl
2024-07-07 12:55:03 +03:00
Ed
205aae364c Battle royale playtest map (#309)
* setup balance

* more preparation

* Update arenas.yml

* Update battle_royale.yml

* pop

* Update arenas.yml
2024-07-06 11:22:36 +03:00
MFMessage
34f36665a6 Fixes a minor typo for the base gingerbread body part (#29717)
"Fixes a minor typo in the gingerbread bodypart prototype"
2024-07-06 14:04:59 +10:00
Jezithyr
8adcb37964 Re-enabling nukie species(except vox), added antag species blacklisting
* Revert "Make all Nukies humans (#29693)"

This reverts commit 3e3e050aaf.

* Implemented species blacklist

* Re-enabled all species as Nukies except for Vox because loadouts don't support breathing alternative gases yet.
2024-07-05 00:59:16 -07:00
Ed
01f97a8aaa +3 berets (#306) 2024-07-05 08:56:38 +03:00
Ed
d9fc93e0c5 +2 lobby track (#304) 2024-07-04 23:35:53 +03:00
Ed
3182447fbf Grass update v2 (#303)
* high bush

* update worldgen
2024-07-04 23:25:22 +03:00
jmcb
bc7c121713 Fix typo in pineapple pizza description (#29714) 2024-07-04 14:30:33 -04:00
Ed
9280ca8830 Merge pull request #301 from crystallpunk-14/ed-05-07-2024-upstream
Upstream sync
2024-07-04 19:46:27 +03:00
Jaraten
a9cb687899 resprite decals (#302) 2024-07-04 19:45:24 +03:00
Ed
b1a2aaf1f5 remove vox 2024-07-04 18:25:23 +03:00
Ed
bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml
2024-07-04 18:14:21 +03:00
Ed
38cd8ad6a1 Fix Vox clothing in character creation menu (#29709)
Update vox.yml
2024-07-04 22:55:00 +10:00
JIPDawg
1471bd5b53 Added Health Analyzer to basic treatment module. (#29696)
Removed dropped, added Health Analyzer to Basic Treatment Module

Co-authored-by: JIP <jipdawg93@gmail.com>
2024-07-04 17:17:47 +10:00
metalgearsloth
2988ac3839 Make vox roundstart (#29704)
* Make vox roundstart

I believe all the issues are fixed.

* Click detection bandaid
2024-07-04 17:11:01 +10:00