98530a63dc
clerical error station event ( #23091 )
...
(cherry picked from commit 3e08fe07cd
2024-01-22 18:47:30 +01:00
27bebbcda9
Added disabler SMG! ( #23051 )
...
* Added disabler SMG!
* Changed a few errors
* errors.. again
* Update battery_guns.yml
* Update security.yml
* Update lathe.yml
* Update security.yml
(cherry picked from commit 28b825d898
2024-01-22 18:46:27 +01:00
b8c87c060f
allow crusher suicide ( #22987 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 62a6a03cd1
2024-01-22 18:45:44 +01:00
857304684a
Automatic changelog update
...
(cherry picked from commit a0f9e15913
2024-01-22 18:45:43 +01:00
cd5c92d818
Fix flammables air ignition ( #23063 )
...
* Fix welder ignition
* fix mobs on fire hotspot expose frequency
* fix shotgun pellets ignition
* ensure ignitionComp on flammable init
* \n
* Revert "ensure ignitionComp on flammable init"
This reverts commit 6915dcdc
(cherry picked from commit 3f91028395
2024-01-22 18:45:42 +01:00
27b1077299
Wall Locker Tweaks ( #23060 )
...
locker
(cherry picked from commit c138809ba9
2024-01-22 18:45:41 +01:00
5a324a78fb
Automatic changelog update
...
(cherry picked from commit abdfc6de95
2024-01-22 18:45:40 +01:00
64840c529c
change morty to old sprite ( #23071 )
...
webedit
(cherry picked from commit f8a258f0cc
2024-01-22 18:45:39 +01:00
3b03d744c5
remove ion storm announcement ( #23045 )
...
real
(cherry picked from commit 880ca0af50
2024-01-22 18:45:26 +01:00
98c9ddd84b
Automatic changelog update
...
(cherry picked from commit a8eb03e27b
2024-01-22 18:44:57 +01:00
c59e514bb9
Salami does melee dmg ( #23041 )
...
* Add melee dmg to salami
* Bump up dmg to 6, 1 more than a punch
* Add in-hand and wielded sprites, and adjust swing angle
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit ff75b1be56
2024-01-22 18:44:56 +01:00
471e704460
Marking Locale Fix ( #23072 )
...
* Marking Locale Fix
* A Couple Touch-ups
* Gah
(cherry picked from commit 3664a17272
2024-01-22 18:44:55 +01:00
5f73cc24fd
Update engine to v197.1.0 ( #23080 )
...
(cherry picked from commit cc476b3593
2024-01-22 18:44:33 +01:00
2d52ea3771
Revert to v196.0.0 ( #23074 )
...
(cherry picked from commit d82767be7d
2024-01-22 18:44:31 +01:00
f3e61795f4
Add some tests and fix some miscellaneous bugs ( #22836 )
...
* Add some tests and fix some bugs
* Add more helper methods
* remove submodule
* fix merge
* also fix DirtyAll()
* poke
(cherry picked from commit 35ba42af9c
2024-01-22 18:44:30 +01:00
d1b0c99e9c
Automatic changelog update
...
(cherry picked from commit 44adc32613
2024-01-22 18:44:29 +01:00
15878f3a45
Inspector Coat and Brown Fedora Tweak ( #23065 )
...
* det
* hat
* oops
(cherry picked from commit d10ebbc5bf
2024-01-22 18:44:28 +01:00
46f411ef85
Cache ItemSizePrototype in StorageSystem ( #22611 )
...
(cherry picked from commit 364ecae94f
2024-01-22 18:44:26 +01:00
e27a59b938
Try fix organ networking ( #23034 )
...
(cherry picked from commit 0734a876f9
2024-01-22 18:44:25 +01:00
0a2e3663e5
Added a regular and an engraved zippo (flippo) lighter ( #23020 )
...
* Added the zippo and engraved zippo. Added the engraved zippo in the detective's coat.
* Added copyright.
* Renamed to Flippo
* Gave the Flippo new sounds. Moved the lighter sound collections to their own folder in Items.
* Fixed YAML issues that showed up with moving the lighter noises to their own folder.
* Added the detective's Flippo as a thief objective, with half the weight of the forensic scanner.
(cherry picked from commit 1c8eb2f3de
2024-01-22 18:44:11 +01:00
38f8bc5b5f
Move stamps out of big mess ( #22877 )
...
* gigacommit
* Update honkbot.yml
* foxing
* merg
* bring back mime sound
* ;
* :trollface:
(cherry picked from commit 78965d1e36
2024-01-22 18:43:33 +01:00
9155e5f5b7
some chairs tweaks ( #22901 )
...
* make all chairs rotatable and anchorable
* Revert "make all chairs rotatable and anchorable"
This reverts commit d7f98261d5c228b7035b611f2becf2355c2f257f.
* comt
(cherry picked from commit 5dc9a954bc
2024-01-22 18:38:53 +01:00
09931e4ffc
Fix missing entities in round summary window ( #23032 )
...
(cherry picked from commit ae243007a8
2024-01-22 18:38:43 +01:00
f00f9f6281
Update engine to v197.0.0 ( #23069 )
...
(cherry picked from commit a608071dda
2024-01-22 18:38:42 +01:00
dfce24f487
Update ToolshedTest for engine PR ( #22989 )
...
(cherry picked from commit eb04a98294
2024-01-22 18:38:41 +01:00
f8efcef342
Automatic changelog update
...
(cherry picked from commit b032d778fa
2024-01-22 18:38:40 +01:00
a86f9ba75f
Thief hotfix ( #22976 )
...
* fixes!
* reduced collection amount
* omeeeeega
* pipup
* popup
(cherry picked from commit 166296b2c5
2024-01-22 18:38:38 +01:00
f32ad38dde
Makes brown rocks have a planetmap suffix ( #23011 )
...
* makes brown rocks planetmap stuff
* revert le procgen asteroids
(cherry picked from commit 7d19a323b5
2024-01-22 18:38:37 +01:00
cca47947f2
Automatic changelog update
...
(cherry picked from commit b1e2e4c16e
2024-01-22 18:38:36 +01:00
ee5ff0147b
the grand lottery update ( #23048 )
...
* the grand lottery update
* Update cargo.yml
(cherry picked from commit 412170f0e7
2024-01-22 18:38:35 +01:00
1805610dac
remove racism ( #23039 )
...
* Remove only 'species' is crew rules
* hit space one too many times
(cherry picked from commit ed997dc5be
2024-01-22 18:38:34 +01:00
e5b9ef0f70
Automatic changelog update
...
(cherry picked from commit 8530ad27d1
2024-01-22 18:38:33 +01:00
5ca5dd982a
Adding missing tag to make windoors pryable. ( #23047 )
...
Fixed tag to be pryable by hand
(cherry picked from commit a1110a4ca9
2024-01-22 18:38:32 +01:00
41cace14eb
Added "The Throngler" ( #22995 )
...
* The Throngler.
* The Thronger
* Thron
* Revert "Thron"
This reverts commit e6774ea4eefd4eee52bd6e3340f77d5890b50083.
* Fixes Inhand sprites
(cherry picked from commit e584970c26
2024-01-22 18:38:31 +01:00
9d7e3161ee
fix potted plant drawdepth ( #23027 )
...
(cherry picked from commit b5a53c0b6b
2024-01-22 18:38:07 +01:00
9c1dae2e47
Automatic changelog update
...
(cherry picked from commit f1a91b71f3
2024-01-22 18:38:06 +01:00
e10457dc4e
Fix emergency and extended nitrogen tanks having the same volume ( #23040 )
...
Update gas_tanks.yml
(cherry picked from commit 1c3645e31c
2024-01-22 18:38:05 +01:00
f56d45f8ef
Pacifism rework ( #23037 )
...
* Pacifism rework
* grammar
(cherry picked from commit faca1d7043
2024-01-22 18:38:03 +01:00
a1e4d9c9aa
Dial back shotgun pellet damage slightly. ( #23042 )
...
Suggesting reducing the individual per pellet damage of the common shotgun shell from 12 to 10, changing the effectiveness at mid to long range to be slightly less oppressive. This would mean that shotguns will still 2 hit crit an unarmored target at point blank but allow a well armored target to withstand one more shot, and this should make them a little less effective down long hallways.
(cherry picked from commit 0366d27586
2024-01-22 18:38:02 +01:00
c171790149
Fix device networking, again ( #23035 )
...
(cherry picked from commit af42cf82b7
2024-01-22 18:38:01 +01:00
3240160819
Define plastic bottle ( #23015 )
...
* Define plastic bottle
* mark beer bottles as small so trash bag can collect them
(cherry picked from commit 6ef12e62e3
2024-01-22 18:37:46 +01:00
6dd211c44f
Fix rotation visuals desync & appearance state spam ( #23016 )
...
* Fix rotation visuals desync
* :bucklemeup:
* A
(cherry picked from commit cf98300ba2
2024-01-22 18:37:45 +01:00
7278318225
Add access logs (IC ones) ( #17810 )
...
(cherry picked from commit 476ea14e8a
2024-01-22 18:37:44 +01:00
2140730976
Fix awful slimepeople parts sprites ( #22969 )
...
fix awful slime parts
(cherry picked from commit 4d42d00194
2024-01-22 18:37:42 +01:00
dfe06b2725
fix ahelp relay times ( #23001 )
...
RoundDuration instead of CurTime
(cherry picked from commit d75d7d7187
2024-01-22 18:37:41 +01:00
067db77d7c
Fix potted plants going over doors ( #22869 )
...
* Update potted_plants.yml
* Update potted_plants.yml
(cherry picked from commit aadc75a07a
2024-01-22 18:37:40 +01:00
3833d8d55f
fix the mothroach crate saying it contains six mothroaches instead of four ( #22968 )
...
FINALLY FUCKING FIX THAT ONE FUCKING LIKE FUCK IT
(cherry picked from commit ef726a9cb0
2024-01-22 18:37:39 +01:00
567c7618cc
Update engine to v195.0.1 ( #22994 )
...
(cherry picked from commit d3ae3776ed
2024-01-22 18:37:38 +01:00
5ea25f5e91
Add chaplain stoles ( #22955 )
...
add
(cherry picked from commit fd3c922a08
2024-01-22 18:37:37 +01:00
249dcf38fe
fixed the sulfacid issue, made some more chems use the industrial chems ( #22981 )
...
(cherry picked from commit cde532bfa4
2024-01-22 18:37:36 +01:00
Nemanja
Stanislav4ix
deltanedas
PJBot
qwerltaz
Alekshhh
Emisse
Velcroboy
Nairod
Leon Friedrich
Darkie
lzk
Ed
Flareguy
LankLTE
Blazeror
PoorMansDreams
sneb
Kara
Admiral-Obvious-001
themias
Chief-Engineer
Avalon
Ubaser
Boaz1111