Commit Graph

30316 Commits

Author SHA1 Message Date
PJBot
b5125f040c Automatic changelog update 2025-02-04 21:47:58 +00: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
PJBot
1d5b01190d Automatic changelog update 2025-02-04 16:12:55 +00: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
PJBot
d531a9db9c Automatic changelog update 2025-02-04 07:53:17 +00: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
PJBot
df56b67ba8 Automatic changelog update 2025-02-03 23:34:21 +00: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
ActiveMammmoth
ca4e99b819 Store Test Change (#34844) 2025-02-03 17:11:06 -05:00
UpAndLeaves
a4599f6d60 fixed effect string typos (#34858)
fixed typos
2025-02-03 22:29:43 +01:00
PJBot
4476b1e64b Automatic changelog update 2025-02-03 21:23:30 +00: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
PJBot
f8c203ba0a Automatic changelog update 2025-02-03 01:05:11 +00:00
DieselMohawk
8b56f6f1e9 Security Shield Naming Structure Inconsistency Change (#34841) 2025-02-02 20:04:04 -05:00
slarticodefast
87fa6a3b74 Revert "Add taped logo back for 10th anniversary" (#34831) 2025-02-02 23:33:02 +01:00
SlamBamActionman
f25720124a Fix hitting through directional windows (and more!) (#34793) 2025-02-02 23:03:31 +01:00
pubbi
82bd0a291d Allowed windows to be properly clicked on (#34751) 2025-02-02 23:02:24 +01:00
Errant
f34233a074 HOTFIX revert lecter visual update #34589 (#34826) 2025-02-02 22:59:45 +01:00
Errant
7579620459 HOTFIX update staging submodule to 242.0.1 (#34833) 2025-02-02 22:56:16 +01:00
UpAndLeaves
20f5cbf3fd Fixed Wehxplosion yaml error (#34837) 2025-02-02 22:31:32 +01:00
PJBot
c52ff59e96 Automatic changelog update 2025-02-02 20:01:35 +00:00
ScarKy0
8d1a300b57 [Admin] Omni Accent Smite (#34824)
gods forgive me
2025-02-02 21:00:27 +01:00
Plykiya
75e469738c Fixes debug assertion crash when inserting cash (#34812) 2025-02-02 20:39:23 +01:00
Plykiya
28709fdc72 Fixes debug assertion thrown when chopping logs (#34814) 2025-02-02 20:39:02 +01:00
Plykiya
95b863dd2b Fixes debug assertion thrown when spiking with pills (#34813) 2025-02-02 20:38:34 +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
metalgearsloth
26f6a15fbb Update submodule to 242.0.1 (#34817) 2025-02-02 13:44:53 +11:00
PJBot
67e66644f1 Automatic changelog update 2025-02-02 01:39:09 +00:00
Tayrtahn
a238f71540 Ghost orbit jitter fix (#34797)
* Only randomize orbit parameters once

* Revert "Only randomize orbit parameters once"

This reverts commit e828c51e66600bf11b66308169da1d1daf7501e3.

* Derive orbit properties from current time

* Derive orbit progress from current time

* Remove now-unused orbit animation

* Remove OrbitVisualsComponent.Orbit as it is no longer used

* Update AnimationPlayerSystem method calls to Entity<T> versions
2025-02-02 02:38:02 +01:00
PJBot
4864d4770e Automatic changelog update 2025-02-02 01:01:38 +00: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
PJBot
3fa83d8dad Automatic changelog update 2025-02-01 21:20:34 +00: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
PJBot
ce10a1b8c6 Automatic changelog update 2025-02-01 15:21:08 +00:00
Boaz1111
db1b0a9144 Separates frost oil into coldsauce and frost oil (#34458) 2025-02-01 09:20:01 -06:00
PJBot
c139701830 Automatic changelog update 2025-02-01 12:11:28 +00: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
PJBot
79ef8a51d5 Automatic changelog update 2025-02-01 06:36:42 +00:00
ToxicSonicFan04
59e53dc025 Box Chemistry change (#34803) 2025-01-31 23:35:36 -07:00
PJBot
efa77f4f2a Automatic changelog update 2025-02-01 06:33:48 +00:00
Nox
9e9c9b94eb Marathon Armory Restock (#34798)
* Initial commit

* fixed a issue

* finished
2025-01-31 23:32:41 -07:00
PJBot
b61b24db47 Automatic changelog update 2025-01-31 23:40:28 +00:00
Nox
36225188d7 Rename shields (#34794) 2025-01-31 18:39:21 -05:00
PJBot
b33590c4b5 Automatic changelog update 2025-01-31 17:42:58 +00:00
themias
b2299bf0fa Update shutter sounds (#34774) 2025-01-31 18:41:51 +01:00