Commit Graph

36638 Commits

Author SHA1 Message Date
SonicHDC ea0655ecaa
L gun reshape (#23104)
* Update pistols.yml

* Update revolvers.yml

* Update battery_guns.yml

* Update battery_guns.yml

(cherry picked from commit fae28594f4)
2024-01-23 22:52:39 +01:00
Łukasz Mędrek 9fd71ca321
Fix reptilians pulling after being zombiefied (#23066)
* Fix reptilians pulling after being zombiefied

Now being zombefied removes ability to pull objects, regardless of if
the entity could pull without using their hands.

Fix #23043

* Apply changes from review

(cherry picked from commit 3a7fda10df)
2024-01-23 22:52:37 +01:00
PJBot eb75465c0b
Automatic changelog update
(cherry picked from commit 7ac7258b56)
2024-01-23 22:52:36 +01:00
Ubaser 50eaf37080
Lizards get more marking availability (#23219)
add

(cherry picked from commit c8f1387ba0)
2024-01-23 22:52:34 +01:00
lzk d2e35a2003
Fix windoor secure graph (#23274)
* 1

* try fix

* real fix

(cherry picked from commit 07a5eaf258)
2024-01-23 22:52:34 +01:00
lzk 27df9ce239
Localize hand labeler ui header (#23320)
(cherry picked from commit a6cde8bbe9)
2024-01-23 22:51:58 +01:00
PJBot 349f61cc34
Automatic changelog update
(cherry picked from commit d5574f6274)
2024-01-23 22:51:57 +01:00
Ed 9b3a1b7c37
Electric anomaly rework (#23173)
* add content

* remove using

* update

* Update ElectricityAnomalyComponent.cs

* 2-5 lightnings

* tweaks

* remove tesla comment (sorry)

(cherry picked from commit 05ee6eb308)
2024-01-23 22:51:56 +01:00
deltanedas fed653e62f
light ciggies with fire structures (#23196)
the pro ops

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 984cd643fe)
2024-01-23 22:51:55 +01:00
PJBot 056ea6f290
Automatic changelog update
(cherry picked from commit e443a204b1)
2024-01-23 22:51:54 +01:00
themias 231b9d0368
fix cauterization (#23264)
* fix cauterization

* remove if statement

* revert DamageTest change

* fix

(cherry picked from commit 9115994abf)
2024-01-23 22:51:53 +01:00
PJBot 9e741af383
Automatic changelog update
(cherry picked from commit 2ac40560dd)
2024-01-23 22:51:52 +01:00
Kara c2afab46b7
Remove ambient sound from lv/mv/pipes + up default ambience volume (#22536)
* Remove remaining ambientsound enabled overrides on maps

* Disable LV and MV ambience altogether

* hv enable default

* not necessary bc subfloor

* up default volume

* no pipe ambience

* pepis

(cherry picked from commit f9355c6151)
2024-01-23 22:51:36 +01:00
PJBot 085ddf9322
Automatic changelog update
(cherry picked from commit 1479f74b64)
2024-01-23 22:50:54 +01:00
778b 8c59c2ef3b
Fixed airlock appearance bugs (#23300)
fixed airlock appearance bugs

(cherry picked from commit 60b0267390)
2024-01-23 22:50:53 +01:00
PJBot 62c568348f
Automatic changelog update
(cherry picked from commit 89a081d57c)
2024-01-23 22:50:35 +01:00
Ed 4e0cf764de
Major Tesla tweaks (#23235)
* add ignore chance

* twekas

* add damaging and repairing

* grounding rod undestructable by tesla

(cherry picked from commit 5e1fcfc63e)
2024-01-23 22:50:34 +01:00
Nemanja 1df3def681
Make the material ejection control completely generic (#23308)
* Finish decoupling material ejection from lathes

* commented

(cherry picked from commit 2b01899d63)
2024-01-23 22:50:32 +01:00
PJBot c177a99222
Automatic changelog update
(cherry picked from commit 10c09c7655)
2024-01-23 22:50:31 +01:00
icekot8 9a6c2e7909
artifact effect fauna and flora spawn (#23295)
* adding EffectFaunaSpawn

* add spawn flora effect, blood trigger

* fix

removed the bloody trigger

* fix

oh, I hope this solves the problem.

* I added an icon sprite..

* fix

I'm stupid..

* final touch...

(cherry picked from commit 77c10185bb)
2024-01-23 22:50:30 +01:00
Nemanja 8b90cd0cd7
Give throwing a cooldown (#23311)
(cherry picked from commit ad5f7a5c76)
2024-01-23 22:50:29 +01:00
LankLTE c31dcc1bd7
add cvar for custom panic bunker reason (#23267)
Panic bunker cvar

(cherry picked from commit e76d8390bd)
2024-01-23 22:50:28 +01:00
PJBot 9e8b1a0a66
Automatic changelog update
(cherry picked from commit ab982b17e4)
2024-01-23 22:50:27 +01:00
Rainfey 8f437aad2d
Ensure correct number of thieves are selected (#23270)
Fix thief selection

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
(cherry picked from commit 3ea7c5e4f7)
2024-01-23 22:50:25 +01:00
PJBot bb72d3478c
Automatic changelog update
(cherry picked from commit 8e473d2369)
2024-01-23 22:50:24 +01:00
Ilya246 64d260e005
minor science tree changes (#23269)
* it is done

* unbrokey rt again

(cherry picked from commit b9b88123d7)
2024-01-23 22:50:23 +01:00
Emisse 4103d9e2d7
grand lottery tree hotfix (#23309)
(cherry picked from commit a2a3bf4f1e)
2024-01-23 22:50:10 +01:00
PJBot 0df5532490
Automatic changelog update
(cherry picked from commit 09f6797236)
2024-01-23 22:49:59 +01:00
LordCarve bb72f9c91c
Fix formatting to match .editorconfig (IDE0055 warnings) (#23301)
(cherry picked from commit 24f07b203f)
2024-01-23 22:49:57 +01:00
Ed 85a7adedc5
More artifact content (#22574)
* 3 new effect

* new trigger

* swap portal to Cak

* cake

* portals

* finish

* pupupu

* limitations (same maps)

* its broken now

* a

* portal fix, thx deltanedas

(cherry picked from commit bf7aa47b32)
2024-01-23 22:49:56 +01:00
lzk a084520a6b
Fix tesla coil showing at power monitoring puter (#23306)
(cherry picked from commit aa02d6e1f6)
2024-01-23 22:49:55 +01:00
Kot 6a454c6026
Fix fulton size inconsistency (#22956)
(cherry picked from commit 4f949746e5)
2024-01-23 22:49:54 +01:00
PJBot aea7aa5dde
Automatic changelog update
(cherry picked from commit 617d25adcd)
2024-01-23 22:49:53 +01:00
IlyaElDunaev b3e8e077dc
Stunprod (#23133)
(cherry picked from commit 1283c35f28)
2024-01-23 22:49:29 +01:00
Velcroboy 53488ba0f2 what? 2024-01-22 15:20:43 -06:00
Velcroboy e652eeb4ea Merge remote-tracking branch 'origin/interior_questionmark' into interior_questionmark 2024-01-22 15:18:46 -06:00
Velcroboy 93f5581096 Add nospawn to tubes as well 2024-01-22 15:17:55 -06:00
Velcroboy d47901fbfa Add nospawn to tubes as well 2024-01-22 15:11:31 -06:00
Velcroboy 032bebfe9b
Update Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-01-22 15:10:50 -06:00
Velcroboy 471cfc97c9 and the tubes I guess since some of those were mapped. 2024-01-22 14:49:44 -06:00
Velcroboy f687c42fe6 Always powered too, to avoid confusion 2024-01-22 14:46:26 -06:00
Velcroboy 79ddf9417d Update for preferred Delta V exterior lights 2024-01-22 14:38:59 -06:00
Debug 42d38fea90
Fix paramedic spawing with wrong backpack (#710)
Update paramedic.yml

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-22 20:30:23 +00:00
Velcroboy dda1cde2cf
Map Hotfix: Hammurabi (#708)
* Map Hotfix: Hammurabi

* completes note to captain

---------

Co-authored-by: Velcroboy <>
2024-01-22 21:23:19 +01:00
PJBot a5837220c7
Automatic changelog update
(cherry picked from commit d73e13be4c)
2024-01-22 21:16:07 +01:00
Danger Revolution! 7160a6eef1
fixes fax machine error from emag rewrite (#23291)
(cherry picked from commit 207ebad6f0)
2024-01-22 21:16:06 +01:00
lzk 85ab06be4d
Rename SpawnPointAssistant to SpawnPointPassenger (#23222)
good commit

(cherry picked from commit 77b477f29b)
2024-01-22 21:16:05 +01:00
PJBot d01498b582
Automatic changelog update
(cherry picked from commit 3d80e39f3e)
2024-01-22 21:16:03 +01:00
PJBot 41352fce3a
Automatic changelog update
(cherry picked from commit 8bce047a00)
2024-01-22 21:15:31 +01:00
PJBot 4d629b8511
Automatic changelog update
(cherry picked from commit 83afcbe73c)
2024-01-22 21:15:13 +01:00