Commit Graph

6992 Commits

Author SHA1 Message Date
Tornado Tech
1ad686f42e feature: add to adghost CP14AllKnowing 2025-03-06 19:59:33 +10:00
Ed
acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
2025-03-03 23:23:40 +03:00
SlamBamActionman
41c51e2905 Implanter draw rework (#32136)
* Initial commit

* Clean-up

* Fix ftl, new damage

* ftl fix for real

* Updates based on feedback

* Child implant fix

* Make the UI only open when implanter is in draw mode

* Review fixes

* shunting
2025-02-27 18:57:28 +01:00
SlamBamActionman
c7b9a76342 Prevent crates, pet carriers and other things from going into disposals (#35557)
* Initial commit

* Solve underlying bug, readd to disposals

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-27 18:43:56 +01:00
deltanedas
7520d8a2c8 add button to print logprobe logs (#32255)
* add EntityName at the bottom of LogProbe

* pass User into CartridgeMessageEvent

* add button to print logprobe logs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-27 14:47:16 +01:00
slarticodefast
0c6081fe10 Fix egg cooking and make microwave code a little less bad (#35459) 2025-02-27 23:39:06 +11:00
Ed
5524e029f4 Essence splitter (#948)
* disable rotting

* pipipi

* essence storage

* energy splitter

* Update essence_splitter.yml

* Update impact.png

* visual fixes

* sound fix

* Update twoHandedStaffs.yml

* unhardcode

* Update meta.json

* fix
2025-02-27 13:48:38 +03:00
qwerltaz
7b0b401312 t-ray reveal for entities and draw depth fix (#33012)
* t-rays show above catwalk

* a

* RevealSubfloorComponent

* revealSubfloorOnScan, add it to catwalk

* TrayScanReveal sys and comp

* Rr

* handle anchoring

* use tile indices for vector2i

* fix IsUnderRevealingEntity reset on pvs pop in reanchor

* fix exception on TrayScanRevealComponent remove

* fix IsUnderRevealingEntity not updating on pvs enter

* update to ent

* make subfloor retain respect for their relative draw depth

* fix carpets not revealing subfloor on plating

* chapel carpet

* ??

* draw depth gap for subfloor entities.

* revert alpha change

* remove abs from draw depth difference

* move TrayScanReveal to client

* delete old refactor

* let's show them above puddles too

* Remove superfluous component classes

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-02-27 11:46:09 +01:00
Brassica Prime
f850b69e89 Wizard Stamp (#35552)
* First go around adds everything necessary to work

* fixes issues with attribution and a whitespace

* Update Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update Resources/Textures/Objects/Misc/stamps.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: Pumkin69 <judeb@DESKTOP-M4B8G5D>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-02-27 11:26:30 +03:00
DieselMohawk
7bd98b9075 Old Rollie Name Integration (#35544) 2025-02-26 15:37:31 -08:00
ScarKy0
058d9fec09 Wizard robes allow you to wear gas tanks (#35537)
Update misc.yml
2025-02-26 18:41:42 +01:00
ScarKy0
7c6028bc80 Wizard ID (#35530)
* init

* comment

* agentless

* sprite changes
2025-02-26 15:06:18 +01:00
keronshb
68de58eb66 THE WIZARD (#35406)
* Adds Survivor Antag

* Adds Survivor Role

* Adds Survivor Rule ECS, adds a survivor role event, adds make antagonist to  random global spawn spell

* Moves Survivor Ensurecomp to event handler. Makes Add Survivor Role a broadcast. Adds Survivor Component. Removes redundant briefing.

* Adds Survivor Antagonist role type for admins to keep track of this easier, adds it to Survivor.

* Adds access to survivor game rule system

* Adds Survivor Rule

* Adds end of round survivor text

* Adds end of round reporting logic. Adds logic to start the survivor rule.

* Changes desc from centcomm to shuttle

* survivor (S)

* Checks if they're alive on the shuttle instead of centcomm.

* ftl text selection based on number of survivors.

* Removed Survivor Antagonist, replaced it with Free Agent.

* Adds InvalidForGlobalSpawnSpell tag, checks for it on spawnspell, and adds it to a zombified person.

* Changes logic so we launch the game rule if it hasnt launched yet. Moves rule logic starting to server. Moved survivor rule logic out of event and into Start method.

* Fixes invalid entity issue

* Descs for Survivor Rule and Survivor comps

* Moves Survivor Rule to its own yml

* Checks for dead survivors, changes survivor checks for mind. Adds survivor comp to mind to fix any mindswap issues. Same for invalid survivor tag

* Changes shuttle xform call to just mapid

* Protoid fix

* THE WIZARD

* Wizard spawner

* adds the correct state

* Wizard preset and weight

* Fixes wizard rule

* Weight back to 100%

* Adds Random Metadata

* Wizard locs

* Puts requirements in the right place

* Adds wiz ghost spawner and mob

* wizard spawnpoint fix + shuttle mapping

* wizard loadout + fix wizard spawning + wizard random name

* comment

* Adds Wizard testing

* FIXES SHUTTLE ISSUE BASED REI

* THE WIZARD LOBBY SONG. Special thanks to song creator Chris Remo for allowing us to use this.

* Free Objective ECS + Base Free Objective

* Space Wizard Federation for Wiz Obj issuer.

* Wizard Objectives

* Moves wizard shuttle to base wizard rule. Gives Wizard their objectives. Removes WizardRule

* Renames midround to subgamemodes. Adds wizard sub game mode.

* Adds SubWizard to SubGameModesRule. Adds a SubGameMode with no wizard. Adds No SubGamemodeRule for Wizard preset

* Wizard midround event

* Fixes wizard midround

* Wizard Guidebook

* Removes todo

* Fixes text

* Removes wizard rule ECS, not needed

* Wizard jetpack

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-02-25 22:34:07 -07:00
ToastEnjoyer
11dd26e08e Made forensic scanner classified as contraband. (#35512)
Update forensic_scanner.yml
2025-02-25 18:22:20 -08:00
Momo
f65ff0bd37 Lizard Plushie Slippers (#35381)
* added the lizard plushie slippers yippeegit status

* fixed attributions so that the links arent broken

* update meta.json links

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* four spacing in meta.json

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-02-25 18:18:42 -08:00
Sparlight
9f4a4b81ac Add species-specific code for ToggleableLightVisuals (#35482) 2025-02-25 09:00:37 -08:00
spderman3333
7ddad07118 Unbreakable bar sign fix. (#35490)
* Fixed bar signs being indestructable

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-25 15:43:03 +01:00
ScarKy0
afe83e1231 [ADMIN] Admin IDs now have Agent ID properties (#35345)
init
2025-02-25 15:25:48 +01:00
Theodore Lukin
7f67ff4b26 borgs don't scream (#33038)
* borgs don't scream

* revert that
2025-02-25 14:45:19 +01:00
slarticodefast
920df98f76 fix mousetraps (#35486)
fix mousetrap
2025-02-24 19:52:05 -08:00
Tiniest Shark
b7c86cae71 Put Neckwear above Backpacks (#35322)
Puts Neck layer on top of Back.
2025-02-24 00:29:59 +01:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
slarticodefast
55e22b6a94 Remove disablers from emagged lathe (#35423) 2025-02-23 10:05:23 -05:00
chromiumboy
066c773965 Sentry turrets - Part 2: Basic prototype (#35031) 2025-02-24 00:39:44 +11:00
metalgearsloth
a457551108 Roof data rework (#35388) 2025-02-23 18:23:00 +11:00
keronshb
c922b4f843 Wizard: Smoke Spell (#35403)
* Adds smoke spell for wizard

* Adds the actual sprites oops

* Removes repulse attract change

* Removes change again?
2025-02-22 15:04:42 -08:00
Sparlight
e631fa893e Give dogs speech noises (#35383) 2025-02-22 22:34:29 +01:00
Boaz1111
54bb2a31b7 Adds Colored Light Bulbs (#35333)
* goober

* changes parenting
2025-02-21 19:01:31 +01:00
lzk
b41a348ebf fix rubber hammer attack rotation (#35357) 2025-02-21 11:01:29 -05:00
spderman3333
d6cc167506 Fixed Veggie pizza slice having 40u of reagent space (#35343)
* Fixed Veg pizza slice having 40u of reagent space

* Changed FoodPizzaVegetableSlice to hold 10u rather than 6u

* Fixed donk pocket slice having 50u reagent space.
2025-02-20 20:50:30 -08:00
keronshb
a9054c5e9c Mjollnir and Singularity Hammer for Wizard (#34446) 2025-02-20 18:38:52 -05:00
Zokkie
580f908ca2 Fix to make all corpses butcher able and better disposable (#33727)
* Made all corpses disposable. Argocytes, Mimics, Butterflies, Bees, Space Kangaroos, Laser Raptors and Watchers their corpses can now be butchered.

* Accidentally removed a line break. restored it.

* Removed a dash that did not belong there.

* Changed mimic giving a "Changeling Sting Can" when butchered instead of normal meat.
2025-02-20 17:12:55 +01:00
Winkarst
3e449f755f Fix: Toys sounds (#33449)
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-20 12:12:06 +11:00
FungiFellow
f189bdcf6e Removed Contraband Status from Flares (#34705)
* Update shotgun.yml

* Update shotgun.yml

* Update shotgun.yml
2025-02-19 16:27:34 -08:00
SeamLesss
33b9149a56 Space Lizard Plushie In-hands (#35295)
* space lizard

* attributions

* attribution fix
2025-02-19 20:27:57 +01:00
robinthedragon
22254a14e6 ports two barsigns from frontier (#35296)
* adds two new barsigns

* webedit to fix a typo

* the typo was in two locations

* reformatted meta.json and added attribution links
2025-02-19 20:25:17 +01:00
MilenVolf
cc18ba72a6 Fix ExaminableHunger spelling (#35309)
Fix ExaminableHunger spelling mistake
2025-02-19 09:23:53 -05:00
Winkarst
9b7339e497 Make OuterClothing hide PDA and belt sprites under it. (#33448)
Make OuterClothing hide the PDA sprite
2025-02-19 14:13:21 +01:00
K-Dynamic
5f41726cc9 Returns Explosive Technology recipes to Protolathes (#35303)
add scienceexplosives to dynamic pack
2025-02-19 06:34:40 -05:00
lizelive
b3cea81863 add ShowJobIcons to AiHeldIntellicard (#35282)
so crew is still crew when you are icard
2025-02-18 23:23:32 +01:00
Pronana
0df6bfb0e9 Crusher Dagger Knife Component (#35259)
* Added Knife Component to Crusher dagger, allowing
it to be used in a few new crafting recipes such
as baseball bats.

* Changed BaseKnife to CombatKnife, reordered parents

* now inherits from baseknife, throwing and disarm added manually
2025-02-18 16:16:47 +01:00
BramvanZijp
b85253df01 Fix contraband parenting defaulting to security. (#35281)
Fix an issue with contraband parenting that made janitor restricted gear available to security.
2025-02-18 14:07:09 +01:00
War Pigeon
c0e5c18d7d Add radiation shielding to metal crates (#35168) 2025-02-18 23:56:14 +11:00
Winkarst
63f640dcdb Make `ShuttleGunBase child of BaseStructure` (#35085) 2025-02-18 23:47:50 +11:00
Ignaz "Ian" Kraft
6d1cdd8639 Added a test for the MagazineVisualsComponent and fixed found issues (#34491) 2025-02-18 23:32:54 +11:00
Myra
42ce0837fb Add CentComm Comms Console + Change admin announcement color (#35248) 2025-02-18 10:04:37 +01:00
ScarKy0
918767bcc5 Magical contraband type (#35254)
* init

* really ponderous
2025-02-18 01:21:49 +01:00
lzk
3d7e7e8320 Make AllowedEmotes bypass whitelists and fix syndiborg ability to laugh (#31510) 2025-02-17 22:59:33 +01:00
ScarKy0
eb930f5b7a blue 2025-02-17 20:13:29 +01:00
ScarKy0
5ffe14e2ab i cant decide 2025-02-17 13:52:26 +01:00