Commit Graph

19975 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
PJBot
4dfe1c1b29 Automatic changelog update 2025-02-12 00:30:20 +00:00
beck-thompson
daad17c97d Add fultons as a T2 research (#34567)
* commit

* fixed
2025-02-11 16:29:13 -08:00
PJBot
4e39481555 Automatic changelog update 2025-02-11 23:14:09 +00:00
robinthedragon
a849d2c989 ancient jumpsuit copyright info (#35061)
* update meta.json with copyright info

* unblob

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

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-02-11 15:06:53 -08:00
Spessmann
bf20b6bb6e Convex update (#35086)
convex update #5
2025-02-11 14:44:18 -07:00
PJBot
072d2f4834 Automatic changelog update 2025-02-11 21:35:31 +00:00
PJBot
fa020ceef3 Automatic changelog update 2025-02-11 19:06:41 +00: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
justdie12
78c951c790 Fixed trooper uniform sprite (#35065) 2025-02-11 10:04:42 -08:00
PJBot
5c598ae90f Automatic changelog update 2025-02-11 17:49:33 +00: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
PJBot
c197d3db37 Automatic changelog update 2025-02-11 16:16:21 +00:00
Theodore Lukin
527f4ae6f2 make interrogator lamp security contraband (#35064) 2025-02-11 11:15:13 -05:00
Killerqu00
a62ffdc740 Move contraband text to a separate examine tab (#32250) 2025-02-12 01:06:22 +11:00
PJBot
c699bd9cd8 Automatic changelog update 2025-02-11 12:18:40 +00: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
PJBot
dbcd86a983 Automatic changelog update 2025-02-11 09:37:52 +00:00
Theodore Lukin
8d51a1fc15 buff python (#33306) 2025-02-11 20:36:45 +11:00
PJBot
e023c78c34 Automatic changelog update 2025-02-11 06:36:13 +00: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
chromiumboy
a2ac503201 Sentry turrets - Part 1: Art assets (#35025)
* Initial commit

* Updated sprites

* Updated base.png and base_shadow.png

* Updated meta file
2025-02-11 00:25:30 -06:00
PJBot
224a95b103 Automatic changelog update 2025-02-11 03:30:44 +00:00
PJBot
a393c15f92 Automatic changelog update 2025-02-11 03:24:18 +00: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
PJBot
0cfcbdeccd Automatic changelog update 2025-02-11 02:53:33 +00:00
PJBot
a8715dc6a7 Automatic changelog update 2025-02-11 02:38:04 +00:00
Tayrtahn
4abadf9f99 Display radio frequencies with a decimal place (#35046) 2025-02-11 13:36:58 +11:00
PJBot
371a513d9a Automatic changelog update 2025-02-11 02:16:43 +00:00
PJBot
724f87e62a Automatic changelog update 2025-02-10 22:19:07 +00: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
Errant
54aeceb96c Vulture test server config (#35005)
* Test Vulture server config

* skreee

* weh

* color!

* comment

* Update Resources/ConfigPresets/WizardsDen/vulture.toml

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

* Update Resources/ConfigPresets/WizardsDen/vulture.toml

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

---------

Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
2025-02-10 21:13:15 +01:00
ArtisticRoomba
b6ec43035a remove redundant rainbowcarpplush yaml lines (#35033) 2025-02-10 22:45:41 +11:00
PJBot
b18c5ff980 Automatic changelog update 2025-02-10 09:06:31 +00: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
PJBot
2f30bc3c0d Automatic changelog update 2025-02-10 01:25:18 +00: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
Spessmann
eeb689261b Convex update (#35023)
convex update
2025-02-09 18:06:32 -07:00
ArtisticRoomba
e1aff4dd98 Rebalance Relic station power + misc fixes (#35022)
Rebalance Relic station power
2025-02-09 17:51:29 -07:00
compilatron
21b3f23938 Plasma fixes 3 (#35021)
Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
2025-02-09 17:47:21 -07:00
ArtisticRoomba
27e54832d9 Misc Loop improvements (#34997)
* misc loop improvements

* fixgridatmos

* god help me
2025-02-09 16:41:13 -07:00
PJBot
d8db4a66fd Automatic changelog update 2025-02-09 23:25:20 +00: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