Commit Graph

8994 Commits

Author SHA1 Message Date
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
lzk
64ebcb5277 cleanup not needed locale string (#34922)
* cleanup not needed locale string

* Update Resources/Prototypes/Actions/types.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-06 10:42:57 -08:00
SG6732
16aad5a168 Swapped butter w/ olive oil for making spaghetti (#34904)
* > Swapped the butter in boiled spaghetti with olive oil

* Update meal_recipes.yml

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
2025-02-06 12:45:33 +01: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
hyperDelegate
54d5ef93ad Reduce NukeOps Reinforcement price from 35TC to 30TC (#34675)
* Reduce NukeOps Reinforcement to 25TC from 35TC

* price adjustment to 30

* Revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.

* revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.
submodule?! YAML preserve me...

* Revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.
submodule!?!? yaml save me

* attempt #2 at changing to 30
2025-02-05 15:54:45 +01: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
ActiveMammmoth
6a017ef17b Mind Swap Fix (#33553)
* Stores owned by mind instead of body

* Requested changes, traitor uplink fixed

* Store, listings fixed and now use Entity<MindComponent>

* Removed duplicate code

* test change

* test change 2

* back to mind entityuid

* MilonPL requested minor changes

* ScarKy0 requested changes
2025-02-04 17:25:54 +01:00
pubbi
a71a79d785 Fixed bola effect stacking (#34723) 2025-02-04 11:11:46 -05: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
Smith
2ffe539ba2 contrabandInventory Changes (Fixed) (#32934)
* Reimport of .yml files, edit to medidrobe.yml

* Fixed typo for "Richard" in AutoDrobe contrabandInventory

* contrabandInventory Revision

* Add a spare bible to PietyVend (#32363)

Update chapel.yml

* Bible to normal inventory, not contraband

* Balance changes based on maintainer feedback.

* VendoMat change to Proximity Sensor and Borg Arm.

* Revert "VendoMat change to Proximity Sensor and Borg Arm."

This reverts commit 44c68daaaedeea26f9376db7f65d1e01771a761e.

* PR Rebase, Fixing Reversion

* seeds.yml Bungo Seeds swapped for Tobacco Seeds.

---------

Co-authored-by: Jarmer123 <148848017+Jarmer123@users.noreply.github.com>
2025-02-03 15:33:14 -08: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
SlamBamActionman
f25720124a Fix hitting through directional windows (and more!) (#34793) 2025-02-02 23:03:31 +01:00
UpAndLeaves
20f5cbf3fd Fixed Wehxplosion yaml error (#34837) 2025-02-02 22:31:32 +01:00
keronshb
c82f77ef07 Wizard Touch Spells (Smite, Cluwne's Curse, Slippery Slope) (#34531)
* Renames Smite Spells yml to Touch Spells and Renames Smite Spells region to the same

* Adds wizard clothes requirement to Smite. Adds Cluwne spell. Adds EnsureCompOnTouchSpellEvent and implements it in the magicsystem

* Adds Smite and Cluwne to the grimore and loc for them

* Adds Slippery Slope spell and SlipOnCollide

* Adds handled for comp spell event

* Removes super slippery

* Removes EnsureCompOnTouchSpell it was redundant with ChangeComponentsSpellEvent

* Makes requirement-free action for smite

* checks if we should be slipping what we touch

* Removes SlipOnCollide, adds negative speed for steptrigger

* Removes slip on collide adds negative speed for steptrigger
2025-02-02 20:23:41 +01:00
Utmanarn
2991f1ad40 Reworded the "SAY HEY LISTEN" silicon law (#34819)
* Changed law

Changed a must always law to have wording that does not encourage message spamming.

* Fixed a mistake

Forgot to remove the "YOU MUST ALWAYS" from the commit.

* Reworded the law

Reworded the law to be more open the other potential options.
2025-02-02 20:13:58 +01:00
Tayrtahn
eeccdbf038 Fix diona plushie bloom visuals (#34832) 2025-02-02 20:12:23 +01:00
Minty642
4aaa7baa7f Add Reagent gold and silver solification with frost oil (#33239)
* Add Reagent gold and silver solification with frost oil

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* edit frostOil value

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-02 02:00:31 +01:00
ToxicSonicFan04
763136f09e Armory Packed update. (#34808) 2025-02-01 14:19:28 -07:00
Spessmann
6beb8e4d35 Randomized maints rooms (#33619)
* became real

* should fix it

* added moar
2025-02-01 17:52:32 +01:00
Boaz1111
db1b0a9144 Separates frost oil into coldsauce and frost oil (#34458) 2025-02-01 09:20:01 -06:00
NazrinNya
207aa5fb38 Replacing protein with razorium in flesh kudzu (#32821)
* Update kudzu.yml

* FleshKudzu also contains a little of protein now

* oop-

* add meat tag

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-01 13:10:20 +01:00
Nox
9e9c9b94eb Marathon Armory Restock (#34798)
* Initial commit

* fixed a issue

* finished
2025-01-31 23:32:41 -07:00
Nox
36225188d7 Rename shields (#34794) 2025-01-31 18:39:21 -05:00
themias
b2299bf0fa Update shutter sounds (#34774) 2025-01-31 18:41:51 +01:00
SlamBamActionman
b07327cc2f Tweak pill eat delays (#34764)
Initial commit
2025-01-31 12:59:38 +01:00
Nox
ef238200f5 Box Armory Restock (#34750)
* initial commit

* Initial commit

* fixed some things

* Finished changes
2025-01-31 00:23:03 -07:00
Nox
aa71ace43f Meta Station - Armory restock + fixes (#34717)
* Initial commit

* Updated

* Finished changes

* made the minefield signs outside sec much more visible to stop your skill issue.
2025-01-31 00:22:52 -07:00
keronshb
6565ba52b2 Void's Applause (#34591)
* Adds single clap emote

* Adds missing single clap loc

* Adds void blink effects, sound, and sprite

* Adds VoidApplauseEvent and implements it into the Magic System and Grimoire

* Removes commented Spawn code in Shared Magic System. Adds comments to replace pointlight with a negative light in the future.

* Makes spells Mono

* Changes to swap positions.

* Makes Void Applause target body only

* Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs

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

* Update Content.Client/Magic/MagicSystem.cs

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

* Update Resources/Audio/Effects/Emotes/attributions.yml

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

* Update Resources/Prototypes/SoundCollections/emotes.yml

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

* Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs

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

* Removes duplicate effect spawning from server

* Puts Void Applause effect on server, lets lizards hear clap

* Adds single clap to diona

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-31 01:10:35 +01:00
K-Dynamic
1cbfc7d652 Minor shotgun changes and comments for future changes (#33512)
* kammerer ammo, firerate and comment

* bulldog description

* enforcer description and comment

* DB and sawn-off firerate parity, sawn-off comment

* description changes

* reduce kammerer firerate again
2025-01-30 09:36:12 -08:00
ScarKy0
ca297f576e Serializable emag flags (#34766)
* serializable idk

* guh
2025-01-30 14:15:01 +01:00
SpaceRox1244
cccdd8875e Adjust inventory size of ginormous scrap (#33454)
Adjusts the size of ginormous scrap to fit in bags of holding
2025-01-30 13:06:41 +01:00
Velken
c360a97e3b Juice that makes you go boom (#34730)
* Juice that makes you go boom

* moved explosive juice to fun yml - fixed ExplosionReactionEffect.cs not having TileBreakScale parameter - made Drazil plushie major contraband (they are evil!!!!!)

* removed JASON!!!! JASOOON!!! JASON!!!

* don't do commits at 1am

* Update fun.yml

fix ident

* no more bullying the server (only 1 explosion)
2025-01-30 12:34:32 +01:00
August Sun
4085fe70e8 The Goliath Hardsuit (#34721)
* Entities for hardsuit and helmet, graph and crafting recipe; modifies goliath hide drop rate

* Added hardsuit sprites, corrected some crafting YAML

* fixed crafting recipe, adjusted resource requirements

* Added durathread material req

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
2025-01-29 20:45:56 -08:00
Southbridge
1af53b1e8d Astro Asteroid Sand (#34463)
* Added astro asteroid sand

* fixed the stack name

* adjusted tile sprites for asteroid and ice

* Adjusted meta.json

* Realized the other tile sprites all have solid lines on their perimeters

* Update Resources/Prototypes/Stacks/floor_tile_stacks.yml

that works

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update tiles.yml

* Update Resources/Locale/en-US/tiles/tiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* adjusted the snow sprite

* Update meta.json

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2025-01-29 20:41:58 -08:00
ScarKy0
253a9fbdf1 Seperate EMAG into EMAG and Authentication Disruptor (#34337) 2025-01-29 23:05:47 -05:00
DR-DOCTOR-EVIL-EVIL
60e83376ef Update cigarette.yml (#34756)
simple change to one of Dan's Smokes that fixes a typo.
2025-01-29 20:42:22 -07:00
Spessmann
a07df05858 New Highpop map: Convex recreational complex (#33346)
* start ig

* command work +AI

* finished bridge, added signs to departments

* engi partly done

* finish engi + atmos except for cams

* added med yippie

* carGODO

* nerd department finished

* se(x)c finish

* courtroom + service power

* man im tweaking out

* service propa done

* hallways

* added cams everywhere and named all the doors :pain:

* arrivals maints + exterior catwalk

* more maints

* voxob

* draft done

* holopadpilled + gaspipesensor based

* added convex name everywhere it needed to be

* nvm i guess we dont do oxford comma

* redid ALL THE HGOLOPADS FAAAAAAAAAAAAAAAAAAAAA

* Fix conflicts?

* ok let me try something

* this works right?

* atmos updated + jani lights

* uniform hallway tiles +roundstart TEG

* fixed some hidden atmos stuff

* Update map_attributions.txt

* :finnadie: no map review ...

* the fog is coming

* maints theater redone

* light dirt and the murder of most trims

* 💔

* decal based and tileoverlay pilled

* updated arrivals/library

* bungus

* yvgh

* 6 hours later...

* finished for real?
2025-01-29 19:44:45 -07:00