Commit Graph

31570 Commits

Author SHA1 Message Date
Thinbug
ce080276db Push horn (#36009)
* Empty commit

* epic super duper cool fr push horn draft

* whoops turns out theres a system that does that thingi already x.x

* bunch of like fixis and generalization

* general progress

* most stuffies done

* last thingi hopefully

* small fixies, mostly preventing bypassing the delay by spamming

* rename to fit better

* rename for real i forgor to add

* weird fixie but last commit didn workie

* oki shold be fine now

* lastish cleanup

* fixies

* missed a space

* removed unnecessary component check

* getting the typos out of the way first

* moved the component to shared

* rest of fixies
2025-04-29 09:07:57 -04:00
kosticia
9e9726f81b Add borders to the asteroid sand (#35397)
* tiles

* Fix

* borderless

* Astrosand

* Add tile

* Fix
2025-04-29 08:58:39 -04:00
PJBot
db008825e6 Automatic changelog update 2025-04-29 10:26:03 +00:00
abadaba695
8245474fdc Chem master more unit transfer buttons (#36995)
* Changes chem master unit transfers to be the same as the chem dispenser

* adds chem master transfer buttons for 15u, 20u, and 30u
2025-04-29 12:24:56 +02:00
PJBot
ad63aef2b2 Automatic changelog update 2025-04-29 10:02:04 +00:00
TytosB
53c3153645 re-buffs proto kinetic accelerator (#37012)
* new ruins

* genpop

* nvm

* abc

* fuckin

* turnstyle

* ruins

* stamp

* abc

* bruh

* efg

* pka fixed

* range tweak
2025-04-29 12:00:55 +02:00
PJBot
5afd520773 Automatic changelog update 2025-04-29 09:05:14 +00:00
IProduceWidgets
23d835b4b6 oasis genpop (#37031) 2025-04-29 02:04:07 -07:00
Princess Cheeseballs
aeed6b3954 More Mail Sprites (#37023)
* Commit

* Sprite update

* Last push for real for real

* Final Commit for real for real for real
2025-04-29 01:27:14 -04:00
PJBot
31e0fedb61 Automatic changelog update 2025-04-29 05:25:40 +00:00
lzk
207d513666 SSD sleep take 2 (#34039)
* ssd sleep part 2

* forgot this

* apply review

* yeah

* add onmapinit

* cache cvar values

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-29 01:24:33 -04:00
PJBot
e21944d083 Automatic changelog update 2025-04-29 04:46:17 +00:00
drakewill-CRL
294a5a1b69 Display obvious plant mutations in examine text (#32650)
* Effect mutations now display on examine

* ChangeSpecies shouldn't stay on the list after running. Name cleanup

* EmoGarbage Review - convert description to LocId and add minor logic fix

* fix the dastardly yaml

---------

Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-29 00:45:10 -04:00
PJBot
9a3e70ca13 Automatic changelog update 2025-04-29 03:38:45 +00:00
Nemanja
f75811b4cb Rebalance magnet debris, update worldgen (#37025) 2025-04-28 20:37:39 -07:00
PJBot
ef49416540 Automatic changelog update 2025-04-29 03:14:08 +00:00
Stomf
a94d4a0991 Buffing slugs and replacing beanbags from the Bulldog bundle (#33517)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-28 20:13:01 -07:00
Kirus59
8c38aa3742 BatteryWeaponPowerCell tweaks (#33500)
* BatteryWeaponPowerCell tweaks

* add update ammo ev & shuttle guns tweaks

* MilonPL requested changes

* revert changes in OnPowerCellChanged

* Add events to get charge info & change current charge

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-28 21:12:25 -04:00
PJBot
a8054c37b1 Automatic changelog update 2025-04-29 00:27:29 +00:00
themias
b33f1db432 Theatre access to Service Request Computer (#37003) 2025-04-29 02:26:23 +02:00
PJBot
9154fbf7fe Automatic changelog update 2025-04-29 00:25:19 +00:00
Victor Shen
4671382419 Remove Contact Slowdown when Weightless or in the Air (#33299)
* removed contact slowdowns from entities that are weightless or in the air

* fixed kudzu not applying contact slowdown to airbone entities

* revert kudzu fix

* reimplemented kudzu fix with bool datafield

* update variable serialization format

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* empty commit

* cleaned up and added documentation

* cached airborne check

* rerun tests

* minor review

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-28 20:24:12 -04:00
PJBot
f7a8a1779e Automatic changelog update 2025-04-28 23:44:46 +00:00
themias
bd08c71189 Fix t-ray scanner exception spam (#37018) 2025-04-28 19:43:39 -04:00
Partmedia
956652e111 Disown atmos and botany (#37017)
* Disown atmos and botany

* Update .github/CODEOWNERS

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-29 00:21:53 +02:00
Samuka-C
02b5592d69 Xenoborgs part 2 (#36844)
* add lawsets for the xenoborgs and mothership core

* add xenoborg names

* add xenoborg radio

* add xenoborg device frequency

* add xenoborg access

* add xenoborg contraband

* Update Resources/Locale/en-US/station-laws/laws.ftl

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

* add xenoborg access to the universal Id card and universal access config

* remove 6th law of xenoborg and mothership lawset (got jointed into the 5th law)

* added xenoborg and mothership law boards

* add more names

* add Xenoborg faction

* moved all lawboards into a separate yml file

* removed custom xenoborg contraband severity

* add Xenoborg and Mothership components

* add xenoborg laser guns

* add self recharging fire extinguisher

* add mothership pinpointer

* add material bag

* add infinite jetpack

* add a only blue energy dagger

* add xenoborg jammer

* add refueling welding tool

* add nocturine hypo

* add nuclear small power cell

* add cloaking device

* add xenoborg door remote

* add custom sprites for xenoborg modules

* add custom sprites for xenoborg module actions

* removed Xenoborg Comp until is actually needed

* add xenoborg module tags

* spelling

* add xenoborg module bases

* organazied xenoborg modules sprites better

* add generic xenoborg modules

* add heavy xenoborg modules

* add engi xenoborg modules

* small fix to meta file in actions_borg.rsi

* renamed mothership comp to XenoborgMothership

* fixed the base for the xenoborg engi modules

* add scout xenoborg modules

* add stealth xenoborg modules

* localization for names and descriptions of the xenoborg modules

* fixed issues related to the XenoborgMothership component

* revert localization (it wasn't working for some reason)

* fixes

* fixed issue with container slot in the cloaking device

* Update description of small capacity nuclear power cell

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

* Fix indentation in material bag

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

* Spelling

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

* fix parameter order in some prototypes

* rename proto id InfiniteJetpack to JetpackXenoborg

* localize pinpointer targets

* Revert "localize pinpointer targets"

doesn't work

* added lines in the end of files (and in the middle of one)

* reorder paramenter in some entities

* fixed some descriptions

* minor fixes

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-28 18:10:35 -04:00
PJBot
46b030df45 Automatic changelog update 2025-04-28 21:17:21 +00:00
ScarKy0
9d8cc64d48 Fix mail cutting thinking your arms are infinite length (#37019)
* init

* hand
2025-04-28 17:16:14 -04:00
PJBot
75a90152a7 Automatic changelog update 2025-04-28 21:01:17 +00:00
KingFroozy
3d0485fe5b Shoulder-length hairstyles resprite (#37000)
* sprite

* final

* final (final fr)
2025-04-28 17:00:10 -04:00
PJBot
b3ea8ee031 Automatic changelog update 2025-04-28 19:23:15 +00:00
lzk
4171c4e6d5 make scrubber widenet in panic mode (#37013) 2025-04-28 21:22:05 +02:00
slarticodefast
c6bdce3b0c merge staging into master (#37009) 2025-04-28 20:14:39 +02:00
keronshb
0a394d4af5 Wizard Teleport Scroll (Teleport Location ECS) (#36424) 2025-04-28 19:42:24 +02:00
Myra
f6bae21184 Cherrypick #36955 into staging (#37002) 2025-04-28 19:40:56 +02:00
Nemanja
d4e40ae44b Revert "Add new color turtlenecks in WinterDrobe" (#36983)
Revert "Add new color turtlenecks in WinterDrobe (#32920)"

This reverts commit 34cc49c175.
2025-04-28 19:38:43 +02:00
metalgearsloth
fe3fe95dfa Fix autorecharge 2025-04-28 15:53:40 +02:00
Kyle Tyo
88eda89faa MapManager warning cleanup on tests (#36940)
lets see if this works.
2025-04-28 12:52:25 +02:00
ScarKy0
14ddd8b4cd Merge hotfix into master (#37001) 2025-04-28 11:47:56 +02:00
Nemanja
4509821f0e [HOTFIX] Revert "Updated air scrubber and air vent sprites." (#36992)
Revert "Updated air scrubber and air vent sprites. (#34223)"

This reverts commit 3957bbb97d.
2025-04-28 11:45:19 +02:00
ScarKy0
14cca7990a [HOTFIX] Fix maroon objective, change the text (#36990)
* test

* text

* capital C

* guh
2025-04-28 11:31:42 +02:00
PJBot
973ad71f5c Automatic changelog update 2025-04-28 06:57:46 +00:00
Southbridge
2e8291cecb Amber Station - Added Genpop (#36997) 2025-04-27 23:56:39 -07:00
IProduceWidgets
0043bde402 Add some salvage ruins (#36814)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-27 22:33:40 -07:00
PJBot
ff69325652 Automatic changelog update 2025-04-28 02:41:28 +00:00
KingFroozy
a42fb658fd Mime suit resprite (#36702) 2025-04-27 19:40:21 -07:00
Leon Friedrich
fba07c69a9 Update staging to engine v255.0.0 (#36916)
Updatee engine to v255.0.0
2025-04-28 12:11:48 +10:00
PJBot
03894048e9 Automatic changelog update 2025-04-28 01:01:56 +00:00
lzk
875ccb94c6 nuke shelves' whitelists (#36986) 2025-04-27 18:00:46 -07:00
Bokser815
f6b3ba79d3 Temporarily Making Cargo Buy and Sell Pallets Indestructible (#34195)
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-27 17:59:54 -07:00