Commit Graph

9022 Commits

Author SHA1 Message Date
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
beck-thompson
daad17c97d Add fultons as a T2 research (#34567)
* commit

* fixed
2025-02-11 16:29:13 -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
7b38a99d23 give CE atmos gas mask (#35063) 2025-02-11 09:48:27 -08:00
metalgearsloth
15b28936df Add loadout names (#31303)
* Add loadout names

Did it for AI, breaking change for pgsql + migrations in general. Nothing atm uses it.

* the box

* Spawning cherry pick

* Fix nit

* revert

* Final cleanup

* Real

* Name UI fix

* Migrations

* a

* Review

* Re-run migrations

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2025-02-11 18:30:24 +01:00
Theodore Lukin
527f4ae6f2 make interrogator lamp security contraband (#35064) 2025-02-11 11:15:13 -05:00
T
0feeaba0bd Increase the price of bulletproof armor. (#34541)
Update cargo_security.yml
2025-02-11 13:17:33 +01: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
Theodore Lukin
8d51a1fc15 buff python (#33306) 2025-02-11 20:36:45 +11:00
Nox
16149f17a7 Put screwdrivers in the vendomat (#35059)
Increased vendomat Wirecutter stock from 1 to 2. Increased vendomat Screwdriver stock from 0 to 2.
2025-02-11 07:35:05 +01: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
Nox
4b58d7a09f Fland Armory Restock (#35044)
* Upped cyborgs from 2 to 5, updated armory stock, did some button QOL, gave warden a enforcer.

* Fixed a few more buttons
2025-02-10 13:45:42 -07:00
ToxicSonicFan04
dc1edbe3b5 Amber Armory Restock (#35045) 2025-02-10 13:45:32 -07: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
Deerstop
2e2a3a9cb1 Elkridge Tweaks 2 (#34757)
* bigger TEG, moved EVA, moved engi and med substations, maints loot, increased pop to 15-45

* tweaked some job numbers around for higher pop

* holy shit i forgot the o2 and n2 miners

* fixed unwired substation

* made the TEG worse >:)

* added southbridge's pride-o-mat cos i kept forgetting

* fixed evac timer display, resolves #34850

* removed pridevend for testing

* nvm it was the shuttle, not the pridevend, oops
2025-02-09 18:07:10 -07:00
Vortebo
3ab1db99c1 Relic station (#34988)
* General structure mostly complete.

* I thiiiiiink I am done with air alarms. And pipes. Maybe.

* Decals, shuttle, rust.

* Small fixes.

* Shuttle more or less where I want it.

* Security is prettier, spawns are more fun.

* Shuttle done. Almost done with one checklist.

* Map renders now.

* Checklists done.

* Adjusted min player count.

* Should pass the Build & Test Debug check now.
2025-02-09 16:24:13 -07:00
Джексон Миссиссиппи
0024f3fa0d Add loungewear to uniform printer (#35008)
* Update clothing.yml

* Update clothing.yml
2025-02-09 23:16:17 +01:00
Spessmann
afede7d4d0 Removes Cog station (#34996)
freedom!!!
2025-02-09 14:01:31 -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
ScarKy0
bf6fd4d581 Wizard Item Recall Spell (#34411) 2025-02-08 16:56:08 -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
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