Commit Graph

129 Commits

Author SHA1 Message Date
IProduceWidgets
80947b128a Add explosive cord. (#25875) 2025-09-25 23:33:28 +02:00
SharkSnake98
fd20cc2a00 Dark/Light Grass & Desert Astrotiles (#37867)
* Added Waterjug, a low-mid pop map with a tropical theme and custom evac shuttle

* Fixed postmapinittest issues (Hopefully)

* Actually fixed the afformentioned issue.

* Added Warden Spawnpoint which I forgot

* Named APCs, Substations, & Cameras, added some more decals

* Decorated some more, notably the bar.

* Minor adjustments, added cans, slightly reworked salv and maints bar

* Fixed some small issues, notably weird closed doors, added a few small things (shutters mostly)

* Added 2 new astrotiles, dark grass and desert sand.

* Removed map. Fixing issue. Please hold.

* Forgot to remove a comma, please god forgive me maptainers. I blame Rider IDE for it's autoaddition of all changes made even on seperate branches.

* Added localization for stacks.

* Actually fixed the loc. issue. Maybe. Please.

* Hopefully fixed the last localization issue.

* Added Light Astro-tiles, and edited the names of the inhand png's for the dark grass astrotiles to be more internally consistant

* Fixed some issues caused by another PR I made, added more maints stuff

* Made some small decorative and practical changes

* Fixed, changed, and added a ton of stuff. I don't think I can list it all, honestly.

* Removed shields to try to fix an issue with the test

* Hopefully fixed issues relating to a failed test.

* Replaced grass/flora decals with randomized ones, readded shields to armory

* Fixed some YML issues, whitelisted files for flora decal spawners

* Added a bridge-beach, added some misc. items and objects.

* Small changes to buttons, fixed wires and flooring

* Fixed AME-Holopad issue.

* Added a Custom Waterjug Parallax, made it so the parallaxes actually work, and made some minor adjustments to the map

* Fixed an accidental adjustment to CoreStation's parallax prototype YML

* Changed some Salvage and Cargo stuff

* Fixed some merge issues, updated Adriatic with a locker and added some little details to Waterjug

* Fixed some stuff, added docking arm near evac

* meta json fix tiles

* fixed again

* fixed once more

* Removed all the waterjug stuff.

* fix spacing

* fix unnecessary formatting

---------

Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-09-14 18:30:12 -07:00
ThatGuyUSA
bd3d5cff19 Advanced Clowning Module (#35797)
* pAIs can now accept keys, but can't talk in said channels

* added dummy module

* added adv clown module alongside projector

* holopeel & projector sprite added, it's destroyable too

* added experimental pie cannon

* exp pie thrower throws pies, added tool icon, added bananium horn

* removed the weird pAI changes, my bad!

* okay NOW the pAI stuff is all gone

* added icon, recipe, renamed tech for unlocking

* removed bananium horn

* Added in-hand sprites, credited to TiniestShark. Changed holopeel projector description to let the user know it recharges over time.
2025-08-02 22:19:17 -04:00
slarticodefast
46ec3b402a New science unlock: the H.A.R.M.P.A.C.K (#38824) 2025-07-07 23:43:33 +02:00
Голубь
114ec579f5 JumpBoots Attempt №2 (#36862)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: unknown <wainzor1337@gmail.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-07-07 21:19:28 +02:00
Entvari
72501bac10 Researchable & Printable Hyper Capacity Cells (#37619)
* wowwww batterie

* americanized the spelling of "maximised" to "maximized"

* changed recipe to be more unique from microreactors

* addressing requested changes
2025-05-19 18:35:08 -04:00
JrInventor05
0386bd332d Make the Syringe gun a science research (#37251)
* LauncherSyringe

* fix

* fixfortest

* Update technologies.ftl

* Change

* Change
2025-05-12 02:14:13 +02:00
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
Nemanja
f900d9f8b2 PKA Modkits + Rebalance (#31247) 2025-04-25 11:18:23 -07:00
Nox
a92ad620b2 Cyborg Rebalance (#34186)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-24 19:29:16 -07:00
ArtisticRoomba
a94f64d942 New Arsenal T3: Temperature Gun Revitalization (#35447)
* tempgun real

* fixin shit

* Warios Couch

* fix tests. i hope

* add to lathes

* tests begone

* RIP svalinn

* maintainer for the project btw

---------

Co-authored-by: Flareguy <woaj9999@outlook.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
2025-04-16 13:58:35 -04:00
Flareguy
92b0f62500 New Experimental Science T3: Desynchronizer (#35752)
* desynchronizer real

* yaml stuff from slarti branch

* C# stuff

* oops

* review

* improve

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-16 11:33:39 +10:00
beck-thompson
daad17c97d Add fultons as a T2 research (#34567)
* commit

* fixed
2025-02-11 16:29:13 -08:00
deltanedas
1f5fab5761 move lathe recipes into packs (easier for forks and maintaining) (#33095)
* add LatheRecipePackPrototype

* change Lathe and EmagLathe to use packs

* add AddRecipesFromPacks helper to SharedLatheSystem

* update lathe logic to work with packs and clean up some stuff

* migrate individual recipes to recipe packs

* update client

* remove node/artifact scanner from techs

* :trollface:

* fix test and make it include emag recipes

* add test that every dynamic recipe must be researched

* pro

* fix

* fix

* fix all tests, genuinely good test i wonder who made it

* add unused uranium and incendiary drozd mags to tech and lathe

* add recipes

* add incendiary prototype

* undo some changes

* troll

* :trollface:

* true

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* shitmed real

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* update funny test

* :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-02-07 19:22:49 +01:00
Southbridge
1af53b1e8d Astro Asteroid Sand (#34463)
* Added astro asteroid sand

* fixed the stack name

* adjusted tile sprites for asteroid and ice

* Adjusted meta.json

* Realized the other tile sprites all have solid lines on their perimeters

* Update Resources/Prototypes/Stacks/floor_tile_stacks.yml

that works

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update tiles.yml

* Update Resources/Locale/en-US/tiles/tiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* adjusted the snow sprite

* Update meta.json

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2025-01-29 20:41:58 -08:00
amatwiedle
adaa584720 Add Holopad Circuit Board to A/V Communication Technology (#34150)
Added the holopad circuit board to the AV Communication technology and circuit imprinter lathe.
2024-12-31 08:20:07 -05:00
Alpaccalypse
a21d8099a9 Removed Power Monitoring Computer boards from research and lathe recipes. Added default engineering sprites for atmos computer boards. (#34078)
* Defined sprites for Atmospheric Alerts and Monitoring computer boards. Added research unlocks and lathe recipes for them.

* Defined default engineering sprite for atmospherics computer boards. Removed Power Monitoring Computer board from research and lathe recipes.

* Defined engineering sprite for atmos computer boards. Removed Power Monitoring Computer board from research and lathe recipes.
2024-12-28 11:13:13 +01:00
ArtisticRoomba
e7330ece9c Adds Advanced SMES, an SMES with higher capacity for mapping (#33757)
* Adds Advanced SMES machine and board to autolathe roundstart

* Make Advanced SMES T2 Advanced Powercells research, reduce cost, remove from random spawner, add sprites by augustsun

* fix attribution formatting

* Update smes.yml to address review

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

* add new sprites and change naming scheme, testing something

* address review, tested it a bit more, works ingame

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2024-12-18 00:58:53 +01:00
Pieter-Jan Briers
1bebb3390c Borg type switching. (#32586)
* Borg type switching.

This allows borgs (new spawn or constructed) to select their chassis type on creation, like in SS13. This removes the need for the many different chassis types, and means round-start borgs can actually play the game immediately instead of waiting for science to unlock everything.

New borgs have an additional action that allows them to select their type. This opens a nice window with basic information about the borgs and a select button. Once a type has been selected it is permanent for that borg chassis.

These borg types also immediately start the borg with specific modules, so they do not need to be printed. Additional modules can still be inserted for upgrades, though this is now less critical. The built-in modules cannot be removed, but are shown in the UI.

The modules that each borg type starts with:

* Generic: tools
* Engineering: advanced tools, construction, RCD, cable
* Salvage: Grappling gun, appraisal, mining
* Janitor: cleaning, light replacer
* Medical: treatment
* Service: music, service, clowning

Specialized borgs have 3 additional module slots available on top of the ones listed above, generic borgs have 5.

Borg types are specified in a new BorgTypePrototype. These prototypes specify all information about the borg type. It is assigned to the borg entity through a mix of client side, server, and shared code. Some of the involved components were made networked, others are just ensured they're set on both sides of the wire.

The most gnarly change is the inventory template prototype, which needs to change purely to modify the borg hat offset. I managed to bodge this in with an API that *probably* won't explode for specifically for this use case, but it's still not the most clean of API designs.

Parts for specific borg chassis have been removed (so much deleted YAML) and specialized borg modules that are in the base set of a type have been removed from the exosuit fab as there's no point to printing those.

The ability to "downgrade" a borg so it can select a new chassis, like in SS13, is something that would be nice, but was not high enough priority for me to block the feature on. I did keep it in mind with some of the code, so it may be possible in the future.

There is no fancy animation when selecting borg types like in SS13, because I didn't think it was high priority, and it would add a lot of complex code.

* Fix sandbox failure due to collection expression.

* Module tweak

Fix salvage borg modules still having research/lathe recipes

Engie borg has regular tool module, not advanced.

* Fix inventory system breakage

* Fix migrations

Some things were missing

* Guidebook rewordings & review

* MinWidth on confirm selection button
2024-11-14 11:08:35 -06:00
Boaz1111
29b0b33a71 makes advanced atmospherics require the basic atmospherics tech (#32048)
hmm freemzer
2024-09-11 00:19:17 +02:00
Nemanja
8599251825 Mineral Scanner (#31390)
* Mineral Scanner

* doink

* review

* sunday funday

* review and fix bugs i think?

* Update MiningOverlay.cs
2024-09-07 00:05:53 +10:00
Nemanja
f710b34573 Roundstart Grappling Gun (#31737)
Roundstart grappling hook
2024-09-01 22:33:25 -06:00
Alzore
453c28f825 Make space scanning T1 technology (#31321)
make space scanning and mass scanner t1 tech
2024-08-25 18:47:10 +02:00
slarticodefast
ee4729fed3 Revert "Tweaking things that restrict freedom (#31095) (#31197)
* Revert "Tweaking things that restrict freedom (#31095)"

This reverts commit 171884df8f.

* keep the unequip time

* keep alphabetical order
2024-08-19 12:47:23 -06:00
to4no_fix
171884df8f Tweaking things that restrict freedom (#31095)
* Adding a straitjacket production recipe

* Adding unequipDelay and equipDelay to the muzzle

* Adding unequipDelay and equipDelay to the blindfold

* Sorting recipes
2024-08-18 21:05:25 -06:00
to4no_fix
6567fa36e4 Adding shock collar and electropack (#30529)
* Adding shock collar with the new ShockOnTrigger

* Cleaning and updating the shock collar

* Add StripDelay datafield to ClothingComponent

* Adding SelfUnremovableClothingComponent

* ShockCollar Update

* Correction of the shock collar

* Correction of the shock collar 2

* Renaming the DamageSpecifier DataField to Damage

* Fixing the damage field in ShockCollar

* Cleaning the ShockCollar

* Renaming ShockCollar to ClothingNeckShockCollar

* Adding ClothingNeckShockCollar as a stealTarget to a thief

* Fixing a typo of the sprite path in ClothingNeckShockCollar

* Cleaning the ShockOnTriggerComponent

* Revision of SelfUnremovableClothing

* Adding a ClothingBackpackElectropack

* Sprite fix

* Code review

* Shock Collar sprite update

* add commit hash

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-08-15 10:30:39 -04:00
Alzore
bcd7085a3e Add diamond mining drills, buff regular mining drills (#30814)
* why do I have to change so much just to add drills

* diamon
2024-08-12 11:49:09 +10:00
Boaz1111
a74ca54cf8 moves explosive tech to T1 (#29227)
moves explo tech to T1
2024-06-20 22:22:04 +10:00
Nemanja
748e5831e8 Add moon boots (#29009) 2024-06-14 20:43:23 -07:00
Cojoke
865810c6e1 New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903)
* New Sprites for Tranq

* Add consistancy to secfab print
2024-06-12 22:17:35 -04:00
Plykiya
71dbb955ce Increase Blast Grenade Recipe Cost and Add Research Requirement (#27580)
* Adjust blast grenade recipe

* Move blast grenades into tier 2 research

* Move blast grenades to dynamic recipes for secfab and autolathe

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-05-03 10:03:52 +10:00
Boaz1111
a8c297a374 Hyperconvection Circuit Imprinter (#27283)
* not done yet

* i may be stupid

* Update electronics.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 15:49:03 +10:00
icekot8
a7ad59f6ba Portable Recharger: Arsenal T3 (#26655)
* sys

* item

* ahm.

* Update Content.Server/Power/Components/ChargerComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 13:19:33 +10:00
Plykiya
a478446e5a Printable Special and Empty Mags for Autolathes (#27396)
* Change emag recipes to print mags instead of single ammo

* Get rid of useless single ammo printing recipes

* Add in submachine gun mags

* missing magazine shotgun beanbag in nonlethal research

* Sort lathes that use ammo crafting recipes alphabetically

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-28 13:02:56 +10:00
Plykiya
cafb41c161 Printable Special Mags and Empty Mags and Material Rebalance for Ammo (#26178)
* Printable Empty Magazines

* Adjust values of ammo boxes, adjust material costs, add empty lethal/non-lethal mags, swap secfab shotgun shells with shotgun ammo boxes, add recipe for shotgun ammo boxes

* Adds fully loaded pistol mags at secfab, removes printing respective cartridges at secfab

* Adds fully loaded rifle mags at secfab, removes respective cartridges

* Adds fully loaded light rifle mags at secfab, removes respective cartridges from secfab

* Adds fully loaded speedloader to secfab, removes respective cartridges from secfab

* small id mismatch fix

* another wrong ID fix

* capitalize Ls in speedloader

* Add missing SpeedLoader recipe

* Adds fully loaded shotgun drums to secfab, removes respective shells from secfab

* add rifle ammo unlocks back in, forgot ammo unlocks affect other fabs as well

* Moves tranquilizer shells to the non-lethal ammunition research

* Account for the removal of rubbers, adds in craftable disablers

* rubber rounds don't exist, remove empty non-lethal mags to just have empty mags

* Add in WT550 mags

* Convert latheRecipes to use LayeredTextureRect instead of TextureRect

* Fix for issue, texture layering now works

* Add in missing shell uranium box art

* add shelluranium to meta.json

* Fix yml issue

* Get rid of unused single ammo printing unlocks

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-27 20:38:59 +10:00
Nemanja
0215292baa welding gas mask (#27108)
* welding gas mask

* eek
2024-04-27 15:47:38 +10:00
Alzore
4290d5f13e Make the cargo telepad T2 civilian (#26270)
therearetwowaystodothis
2024-04-24 23:21:28 +10:00
Hannah Giovanna Dawson
f059714a75 SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-04-21 12:09:26 -04:00
metalgearsloth
2db374988c Added Jukebox (#26736)
* Added Jukebox, along with music for jukebox

* Fixed Jukebox meta.json copyright

* Removed songs I couldn't find a license for.

* Renamed files to solve check failures from spaces

* Added missing attributions.yml

* Fixed lack of description in Jukebox

* Jukebox is now constructable.

* Change Jukebox menu to FancyWindow

* Moved Jukebox messages out of jukebox component

* Removed Jukebox OnValueChanged.

* JukeboxComp now uses AutoGenerateComponentState

* Removed state code, since it's auto generated

* Fixed various Jukebox code to match conventions.

* Updated Standard.yml to match changed song list.

* fixes

* Jukebox workin

* Fix

* Polishing

* Finalising

* Revert

* bad

* jukey

* Reviews

* name

* Update submodule to 218.2.0

---------

Co-authored-by: iNVERTED <alextjorgensen@gmail.com>
2024-04-17 19:27:00 +10:00
GeneralGaws
8cd0cce22e Robotists technology icon fix (#26723)
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
2024-04-04 09:49:01 -04:00
Flareguy
a98d0cfe2e Makes secglasses roundstart (#26487)
* makes secglasses roundstart

* fix epic fail

* fix tests questionmark?

* Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-03-30 23:00:45 -04:00
Boaz1111
6ef592ddba Industrial Reagent Grinder (#25020)
* all work done

* adress whitespace

* millions must factorio

* conflict fix

* i forgot
2024-03-30 13:46:20 +11:00
Nairod
9594afa400 Remove Rubber Rounds, Give Security Disablers (#26470)
Remove Rubbers, give sec Disablers
2024-03-27 11:11:13 -04:00
IProduceWidgets
89235b9e1b Add astro-jungle/mowed grass and astro-snow (#26381) 2024-03-24 18:14:04 -07:00
deltanedas
5ac88d9b27 remove rped (#26316)
* remove rped

* trol

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-21 20:20:26 -04:00
FungiFellow
8d83efd254 Moved Grapple to T1 Industrial (#25782) 2024-03-03 11:36:01 +11:00
Nemanja
9cdffb7b6e move space heaters into cargo (#25735)
* move space heaters into cargo

* AAA!!! the indentation1!!!

* remove crate
2024-03-01 23:43:29 -07:00
Menshin
9884351101 Add space heaters (#25250) 2024-02-28 10:27:29 -08:00
Ed
7a5f81ddb4 Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix
2024-02-26 16:19:51 -07:00
Debug
8c6a8c3c5c Remove drones, fix InnateToolSystem (#25372)
* Fix drones

* They dont need a full bloodstream

* Incorrect indentation

* Nuke drones

* Fix ClothingHeadHatCatEars

* Remove last mention of drones

* Implement requested changes
2024-02-20 23:23:04 -07:00