Commit Graph

6971 Commits

Author SHA1 Message Date
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
ScarKy0
d71b469922 slightly lighter 2025-02-17 13:46:50 +01:00
ScarKy0
c1b3577e6c init 2025-02-17 13:23:57 +01:00
ScarKy0
3628161716 [ADMIN] Adds missing accesses to universal access config (#35229)
init
2025-02-16 22:51:03 +01:00
keronshb
7bf33ffaa9 Wizard Fix - Summon Ghost Event no longer shows Admin Ghosts or Revenants (#34994)
* Prevents admin ghosts from being shown with ghost event

* Changes summon ghost tooltip to permanently visible

* Adds AllowGhostShownByEvent tag, adds it to regular observers, removes ghost hands check & revenant check and replaces it with a tag check.
2025-02-16 21:29:10 +01:00
Velken
5fb60f3fd8 fix sync issue with paramed siren (#35203)
fix sync issue with paramed siren

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2025-02-16 19:43:20 +01:00
Ed
bc53ed4aa5 Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/centcomm.yml
2025-02-16 16:39:26 +03:00
ElectroJr
afc41947a7 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into pr/34711 2025-02-17 01:16:22 +13:00
Ed
7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml
2025-02-16 11:58:47 +03:00
metalgearsloth
b6ee183dc6 Add planet lighting (#32522)
* Implements a Dynamic Lighting System on maps.

* Edit: the night should be a little bit brighter and blue now.

* Major edit: everything must be done on the client side now, with certain datafield replicated.
Changes were outlined in the salvage to accommodate the new lighting system.

* Edit: The offset is now serverside, this makes the time accurate in all situations.

* Removing ununsed import

* Minor tweaks

* Tweak in time precision

* Minor tweak + Unused import removed

* Edit: apparently RealTime is better for what I'm looking for

* Fix: Now the time is calculated correctly.

* Minor tweaks

* Adds condition for when the light should be updated

* Add planet lighting

* she

* close-ish

* c

* bittersweat

* Fixes

* Revert "Merge branch '22719' into 2024-09-29-planet-lighting"

This reverts commit 9f2785bb16aee47d794aa3eed8ae15004f97fc35, reversing
changes made to 19649c07a5fb625423e08fc18d91c9cb101daa86.

* Europa and day-night

* weh

* rooves working

* Clean

* Remove Europa

* Fixes

* fix

* Update

* Fix caves

* Update for engine

* Add sun shadows (planet lighting v2)

For now mostly targeting walls and having the shadows change over time. Got the basic proof-of-concept working just needs a hell of a lot of polish.

* Documentation

* a

* Fixes

* Move blur to an overlay

* Slughands

* Fixes

* Remove v2 work

* Finalise

---------

Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com>
2025-02-16 19:35:32 +11:00
Tayrtahn
51a56e013c Separate Udder examine into ExamineableHunger (#35164)
* Separate udder hunger examine into ExamineableHunger

* Fluent grammar improvements

* Add ExamineableHunger to chickens and ducks.

* Use starving message as "dead" message
2025-02-15 05:29:40 +01:00
ArtisticRoomba
ef4f5cf0a1 Engineering guidebook improvements (#34695)
* engineering guidebook improvements

* whoops

* Changes

* this game is en-US, so it shall be gasses, not gases

* make changes to AccessConfigurator.xml, SolarPanels.xml, TeslaEngine.xml

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-02-14 19:59:19 -08:00
keronshb
db732a2581 Supermatter Grenade Rework (#35122)
* Renames Supermatter grenade to singularity grenade. Removes explosion from Singularity Grenade.

* Adjusts Singularity Grenade to account for engine changes, small buff to max range

* Adjusts further

* fix order

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-02-14 16:01:40 +01:00
Centronias
12105234fe High Heel Boots do the Clicky Clacky (#35083)
* click clack

* fix quote marks

Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
2025-02-13 23:35:59 +01:00
Velken
7495081c40 Paramedic Void Suit update (#34657)
* Made paramedic void suit into proper hardsuit (was softsuit before)
Added light to the paramedic void suit helmet
Added siren with light to the paramedic void suit

* Changed paramed helmet flashlight icon and textures

* fixed siren action icon

* BigAction

* updated icon-siren.png

* fixed not being able to add it to containers (like when it parented off eva suit)

* changed light to cyan, made it less brighter and reduced siren volume

* changed ambulancesiren.ogg to a different one (hopefully less hard on the ears)

* created ClothingHeadEVAHelmetWithLightBase in base_clothinghead.yml
replaced ambulancesiren.ogg (again, this time with better fading on the audio loop)
credited myself for the siren icon art
reverted parents to original (but kept it in hardsuits yml, since void suits are light hardsuits) - [ the adoption was revoked 😢 ]
fixed indentations
removed un-used sprite and sprite state

* final final siren sound change (for real this time?)

* fixed license type

* final FINAL final (for real this time, please?) ambulancesiren.ogg change

* ContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainer

* attributions updated (turns out, i have to give myself credit when i make stuff);
fixed identation;
moved action to Action/types.yml.

* hopefully fixed everything this time

* sync shenanigans

* final final final final final for real final ambulancesiren.ogg change pinky promise this time and if you don't like it, make a new PR yourself and offer a new sound

* typo

* done the suggested changes

* cleaning up some forgotten stuff :p

* oops, cleaned up a bit too much

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Update Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml

* Update Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml

* Update attributions.yml

* evil web edit never again

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
2025-02-13 20:52:21 +01:00
Booblesnoot42
be8702ef3f Fix intercom key deletion but for real this time (#34911)
fixes intercom issues
2025-02-13 20:31:33 +01:00
themias
87f2071ba1 Make experimental welding tool less harmful to eyes (#34792)
code
2025-02-13 11:26:01 -08:00
Smith
3c8fb2e865 Grilled Cheese Sandwich Entity and Recipe (#33807)
* Grilled Cheese Prototype

* Typos

* Removed butter reagent to test flavour changes.

* Flavour corrections.

* CC-BY-SA-3.0 attribution

* Fixing meta.json

* I lost an hour of my life to a missing comma in meta.json

* Merge Conflict Rebase and Test Fixing

* Cook time to 10 seconds.

* Sandwich nutritional balance

* Grilled cheese sprite fixed, found the actual original source for copyright.
2025-02-13 00:00:38 -08:00
Minemoder5000
8f96c77de5 Slime plushie now squishes (#33554)
* Slime plushie now squishes

* Remove useSound
2025-02-13 08:55:04 +01:00
ActiveMammmoth
9fad86342f Wizard Staff of Animation (#34649) 2025-02-12 23:46:02 -05:00
Ghagliiarghii
859918f1bd light brown fibers (#35111) 2025-02-12 13:41:57 -05:00
Ed
47cb8a0b08 RoomSpawner mask (#33110)
* RoolFill can now spaw rooms with any size

* tile ignoring

* upgrade interior

* simplify

* Update DungeonSystem.Rooms.cs

* center rooms

* Update RoomFillComponent.cs

* Update RoomFillComponent.cs

* Update DungeonSystem.Rooms.cs

* Remove roomfillcoponent from integration test

* Update EntityTest.cs

* remove nullable size, replaced with minsize and maxsize

* clear existing logic refactor

* delete this one
2025-02-12 15:47:48 +03:00