Commit Graph

6842 Commits

Author SHA1 Message Date
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
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
ArtisticRoomba
75727db3a3 Add new freezer atmos devices and fix freezer fixgridatmos marker (#34991) 2025-02-12 18:32:18 +11:00
Nox
129bcdfeb7 Deathsquad revolver ammo fix (#34910)
* Added AP version of mateba, and put it in the deathsquad starting equipment.

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-11 16:43:10 -08:00
Terraspark4941
2c728dcca9 Make Advanced Spray more tolerable to use (#34209)
* initial commit

* Fixed the eject order

* FINALLY got a new sprite, its ready to merge!

* I FORGOT THE ATTRIBUTIONS DAMMIT

* Remove extra whitespace

* Sprite update!
2025-02-11 11:05:34 -08:00
Theodore Lukin
527f4ae6f2 make interrogator lamp security contraband (#35064) 2025-02-11 11:15:13 -05:00
War Pigeon
9db50c9ee2 Add additional holiday gear to jobs (#34207)
* Jobs react to more holidays

* Replace taser with Weh auto-injector

* Give cargo techs a box on box(ing) day
2025-02-11 12:47:19 +01:00
qwerltaz
b0cacc7f14 fix conveyor belt default linking (#32688) 2025-02-11 11:44:11 +01:00
deltanedas
5eceaf3e33 Remove batong etc from emagged autolathe (#35014)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-11 21:01:59 +11:00
K-Dynamic
1f0d68c24e Grenade resprites part 1, stinger sound change, projectile grenade animation fix (#34421)
* flashbang resprite

* emp grenade resprite

* smoke grenade resprite

* tear gas resprite

* stinger grenade resprite

* adds missing animations for projectile grenades
2025-02-10 19:23:11 -08:00
keronshb
2219487df2 Wizard Fix - Rod Polymorph - Prevent gibbing & slows speed (#34992) 2025-02-10 17:13:17 -05:00
ArtisticRoomba
b6ec43035a remove redundant rainbowcarpplush yaml lines (#35033) 2025-02-10 22:45:41 +11:00
lzk
a280009bbb Cleanup and fix disposal pipes (#34986) 2025-02-10 20:05:19 +11:00
GaussiArson
03bab30fc6 Wooden Grip for Antique Laser Pistol (#34886)
* wooden grip on antique laser, changes description to match.

* darker grip

* update meta.json

* redesigned shape similar to ps3moira, edited mag to match, changed lights colors to match each other

* fixing an only SLIGHTLY catastrophic fuckup with an experimental inhand sprite that I didn't mean to save and sleepily added to the previous commit

* I DID IT AGAIN

---------

Co-authored-by: gaussiarson-admin <stephenkitchens0306@gmail.com>
2025-02-09 19:33:55 -07:00
Boaz1111
3b621a0245 long bacon scarf (#34950)
* went to the long bacon store.

* obtainable :3
2025-02-09 16:10:10 +01:00
rokudara-sen
f37b851810 Fixed rotating anchored shuttle consoles (#35000)
Fixed rotation shuttle consoles when anchored
2025-02-09 13:15:44 +01:00
Ignaz "Ian" Kraft
36b59c69f4 allow paper labels on seeds (#34450)
* allow paper labels on seeds

* added the components required by PaperLabel to the SeedBase

* localize insert/eject for PaperLabel

* visualize the paper label on seeds

* new paper layer for seeds

* eject the seed label on use

* different looking paper label

* forgot to turn on a layer
2025-02-08 15:16:06 -08:00
lzk
50ba607bf5 add straight ally pin (#34977) 2025-02-08 18:02:00 -05:00
YoungThug
bc3de0fcd8 Fix: The SyndicateVisitor now has Free Agent mind role. (#34827) (#34836)
SyndieRefugeeRoleTypeFix
2025-02-08 22:16:48 +01:00
ScarKy0
f6c0e6d3d2 Wizard shuttle preperation (#34932)
FIREBALL MOTHERF-
2025-02-08 16:37:46 +01:00
Chaboricks
1caea8a759 Paper door (#34857)
* Add paper door sound

* Update attributions yml

* Update material_doors.yml

* Update attributions.yml
2025-02-07 23:24:01 -08:00
deltanedas
1f5fab5761 move lathe recipes into packs (easier for forks and maintaining) (#33095)
* add LatheRecipePackPrototype

* change Lathe and EmagLathe to use packs

* add AddRecipesFromPacks helper to SharedLatheSystem

* update lathe logic to work with packs and clean up some stuff

* migrate individual recipes to recipe packs

* update client

* remove node/artifact scanner from techs

* :trollface:

* fix test and make it include emag recipes

* add test that every dynamic recipe must be researched

* pro

* fix

* fix

* fix all tests, genuinely good test i wonder who made it

* add unused uranium and incendiary drozd mags to tech and lathe

* add recipes

* add incendiary prototype

* undo some changes

* troll

* :trollface:

* true

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* shitmed real

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* update funny test

* :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-02-07 19:22:49 +01:00
themias
ed01ad772d Buff the Combat Bakery Kit uplink item (#34927)
* Buff the Combat Bakery Kit uplink item

* whitespace
2025-02-06 15:07:26 -08:00
centcomofficer24
a0fe21ac2f Added Genderqueer pin! (Properly this time.) (#34561)
* Added Genderqueer pin! (Properly this time.)

* Update meta.json
2025-02-05 21:49:41 -08:00
Vasilis The Pikachu
36e42fb4b2 Merge branch 'master' of ssh://github.com/space-wizards/space-station-14 into staging 2025-02-06 01:11:50 +01:00
keronshb
f964908756 Sec Balance Part 1: Buffs Disabler and Disabler SMG (#34890)
* Increases Disabler Bolt to 47 stamina damage per. Increases fire rate to 3 and lowers shot cost by 50 for practice and disabler

* lowers stam per shot to 40

* increases disabler proj speed to 35

* ACTUALLY 4 shot

* Reverts disabler projectile to be 33 stamina damage per again. decreased disabler fire rate to 2.5 and increased projectile speed to 35. decrease disabler smg fire rate to 3.5

* Fire rate back down to 2
2025-02-06 00:12:07 +01:00
Farrellka
d0bdbc875e Elf Ears (#33572)
* Elf Supremacy

* Delete old ears

* Review Fix
2025-02-05 08:49:04 -08:00
Booblesnoot42
ded6b46b80 Remove instant cryobed insertion (#34619)
* added optional delay to DragInsertContainerComponent

* comments

* Change EntryDelay on DragInsertContainerComponent to use TimeSpan + cleanup

* changed drag insert container comp to match naming conventions
2025-02-05 15:46:21 +01:00
K-Dynamic
e9c0338884 Remove Vector assets and renames Vector SMG magazines (#34603)
* remove vector and assets

* reverts vector magazine removal; vector magazines renamed to SMG magazine (.45 magnum)

* remove vector from suspicion loot table

* vector migration set to null
2025-02-05 13:39:26 +01:00
DuckManZach
2cea673610 Expand variety of strange pills (#34843)
* Added da pills

* Revert "Added da pills"

This reverts commit 3d6b8fce3386107ac4c46543252fc31764a0c1c7.

* Updated to use existing weights, added larger chem variety

* Reweighed charcoal

* Rebalance of certain quantities

* Removed grey matter, weight balancing changes

* corrected comment

* adjusted balance for lead
2025-02-05 00:42:27 -08:00
Winkarst
265de76c9a Add clientside personal pointlight for observers (#33607)
* Observer personal pointlight

* Bigger light

* combine actions

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-05 00:26:06 +01:00
SlamBamActionman
e58d031300 Hristov & .60 changes - Hristov Rework, Part 2 (#31662)
* Initial commit

* Updated values to reflect new resistances

* Review fixes

* Review fixes

* LINQ BEGONETH
2025-02-04 22:55:09 +01:00
slarticodefast
8035455022 Add binoculars (#34687)
* add binoculars

* tabs evil

* give one to warden

* buff
2025-02-04 22:46:49 +01:00
pubbi
a71a79d785 Fixed bola effect stacking (#34723) 2025-02-04 11:11:46 -05:00
Killerqu00
e876befe0e Merge branch 'master' into DONOTMAPTEST 2025-02-04 12:56:47 +01:00
Ps3Moira
b2a6d5c1b0 Cabinetification (#34293)
* Resprite Boxes and Icons + Remove Boxes

* Update Meta

* Update Flatpacks

* Update Shotgun Ammo Boxes

* Remove Leftover Ammo Box Icons

* Update Donk Pocket Boxes

* Update Briefcase

* Update Happyhonk + Remove Open Sprites

* Update Medal Case

* Update Cigarette Packs

* Update Cigarette Cartons

* Update Medkits

* fix positioning for medkits

* Update Junk Medkit

* Update Present

* Tweak Rad and Burn Medkits

* Tweak Briefcase

* Update Toolboxes

* Update Decoy Boxes

* Fix Meta for Healing toolbox

* Update Cow tool box

* Update Donut Box

* Removal of left over rubber bullet sprites and duplicate ammo box sprites

* Removal of Duplicate Ammo Boxes

* Update .20 rifle ammo box

* Update .35 ammo box + fix meta

* Update .45 magnum ammo box Sprites

* Update .25 caseless ammo

* Remove leftover box

* Update cargo_service.yml

* Fix Icon Cigs

* fix big .20 ammo box

* Update Black Cigs Pack

* Update Cig Placement

* Update Blue Cigs

* Update Cig Packs

* Re-Add Big Ammo box for the USA guns vending machine lol

* Remove 10x24 mention in migration.yml

* Update Big Cig Cartons

* Remove Toolbox Changes
2025-02-04 00:52:10 -07:00
keronshb
3d6188c921 DSword Replacement - the Hypereutactic Blade (#32414)
* hypereutactic textures

* adds hypereutactic blade

* adjusts attack speed and damage

* adjust attack speed and adds movement modifier

* Adds structural damage

* Readjusts the attack rate to be 0.8

* Adds Hypereutactic blade to the upliink

* Adds use delay and structural damage, fixes disappearing wielded sprite

* Changes wideAngleAnimation to 180 and range to 2.5

* Adds copyright. Changes range to 2.0

* Required wield

* Changes reflect chance to 100%

* Comments for future todos

* Description update

* Removes duplicate mapping

* removes from uplink

* Reorder and remove indents
2025-02-03 22:22:21 +01:00
DieselMohawk
8b56f6f1e9 Security Shield Naming Structure Inconsistency Change (#34841) 2025-02-02 20:04:04 -05:00