Commit Graph

61 Commits

Author SHA1 Message Date
deltanedas
cf95dd39e2 roundstart mop and stuff (#23203)
* roundstart mop and stuff

* dragonops

* move move

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-31 01:09:00 -05:00
Nemanja
c3f81bfe03 Hyper convection lathes and industrial ore processor (#23202)
* Hyper-convection lathes and industrial ore processor

* balance

* gold... why not?

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-12-31 03:18:58 +11:00
Ubaser
56884fd72d Science magboots (#23107)
* add

* uhhh

* fix RSI

* lathe

* fix
2023-12-28 20:08:07 -07:00
Nemanja
9bd03824ac GORILLA Gauntlets (#23012)
* GORILLA gauntlets

* oh shit this too
2023-12-27 20:11:13 -07:00
Stanislav4ix
28b825d898 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
2023-12-27 20:08:30 -07:00
Boaz1111
4c081aab04 Uranium Ammo (#22406)
* working on depleted uranium shotgun ammo

* added depleted uranium to more ammo

* Last changes and additions

* Forgot something, theoretically resolved the merge conflict too

* Nerfed the DU munitions, renamed em to uranium because it's not really DU

* made the ammo more expensive, also fixing the crash at the same time

* Fixed the last error, theoretically at least

* Revert "Fixed the last error, theoretically at least"

This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b.

* copyright changes, small sprite changes, last references of depleted uranium removed

* Revert "copyright changes, small sprite changes, last references of depleted uranium removed"

This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f.

* Update meta.json

* Update meta.json

* Update lathe.yml

* Update arsenal.yml
2023-12-21 12:07:44 -05:00
Stanislav4ix
d38b4e1bca Added ore bag of holding (#22680)
* Added ore bag of holding

* Now its in industrial tecnologi

Yeah, I fixed it with Tunguso4ka

Co-Authored-By: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>

* Update ore_bag_holding.yml

Now the "magnet" has a larger radius of attraction

* Changed location

---------

Co-authored-by: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
2023-12-20 09:28:56 +11:00
Kevin Zheng
3f2c5c2a58 Give security sunglasses the security HUD (#19904)
* Give security sunglasses the security HUD

* Switch security to round-start sunglasses, add sec glasses research
2023-12-19 00:29:06 -08:00
Nemanja
5eb1a1ce8c Remove RCD from tech and make it a crate (#22720) 2023-12-18 21:40:55 -05:00
Emisse
8c1eecffd4 Svalinn Experimental Battery Ammo Research [T3] (#22045) 2023-12-16 19:43:49 -08:00
Kara
8399d0a9eb Faux astro-tiles for science & mappers (#22586)
* Faux astro-tiles for science

* didnt mean to commit dode
2023-12-16 01:20:57 -07:00
deltanedas
fce18f43da add glaive to salv weapons (#22514)
* refactor ops

* add recipe

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-14 20:34:36 -05:00
Nemanja
6e91346ff3 artifact crusher (#22301) 2023-12-12 10:15:47 +11:00
Nemanja
627bf30580 Remove tasers from arsenal tech (#22361) 2023-12-11 15:33:29 -07:00
Nemanja
e7e7974a24 Experimental Anomaly Vessel (#22233)
* experimental anomaly vessel

* sprote changes
2023-12-08 12:50:41 -06:00
Boaz1111
a263a17f72 Cryostasis syringe (#22021)
* Added cryo syringe, sprite courtesy of Ubaser

* I failed to put a comma in meta.json file because I was so shocked by jeneral that I couldn't think clearly

* IN MY DEFENSE JENERAL IS SCARY I THINK THE FORMATTING IS FIXED NOW

* added canReact at the wrong place, fixed now

* made the transfer good

* more issues with the sprites

* not much to say, one must imagine sisyphus happy

* mmm yes give me 0 of layers

* I oughta double check shit more

* Should be all done!

* I didn't add it to the lathe, I am le stupide

* Forgot to add the recipe somewhere

* final touches, can actually be made at the medlathe now

* added the recipe to the protolathe as well
2023-11-30 19:40:34 -05:00
Kadeo64
d614fdb386 Ripley APLU is now T1 Industrial. (#21787)
* Add files via upload

* Updates industrial.yml with ripley changes
2023-11-19 19:58:06 -05:00
Emisse
ca8d53b4e5 janiborg cleaning module starts with trashbag now (#21680)
* burger king

* fixe

* nightmare blunt rotation
2023-11-15 20:41:12 -07:00
Doru991
d7810e6d6a Borg QOL, part 3 (#21567)
* Basic and advanced cleaning modules

* Roundstart entry level modules

* Oops forgot recipe

* Gold
2023-11-10 23:43:13 -07:00
Emisse
5d46bbb615 Minor Borg Qol (#21548)
* boirg stuff

* gaming

* modules shits

* mini welder is too lmao

* pro

* cheaper recipes, fix mob state thresholds, remove silly crayon, rename module

* generic borg 6 module

* literacy module shityourself
2023-11-09 15:22:50 -07:00
Nemanja
94368f1f00 Speed Boots [Tier 3 Civ-Service] (#21438)
* Speed Boots

* validate

* monkey
2023-11-07 18:25:43 -07:00
Ed
8b3adf6085 Anomaly Synchronizer (#20945)
* added textures and basic prototype without functionality

* add full functional

* finish work

* fix naming

* reduce random anomaly spawner offset

* Update AnomalySystem.Vessel.cs

* Update SharedAnomalySystem.cs

* Update SharedAnomalySystem.cs

* Update production.yml

* fix errors

* fix?

* Update anomaly_sync.yml

* deltanedas code fixes. Thx, deltanedas!

* git what

* fix yml

* fix yml 2

* meh, try again

* work, work, work

* fix powered checking. now component work also without ApcPowerReceiving

* now supercrit port invoke on start growing, not after explosion
fix errors

* deltanedas fix pack 1

* Update AnomalySynchronizerComponent.cs
2023-11-05 21:02:02 -07:00
deltanedas
3be6c5b9d5 Microreactor power cell research (#21473)
* buff microreactor cell and tweak a little

* add portable fission research

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-05 22:00:11 -05:00
RiceMar1244
196be3cba1 Adds more sources for sheet paper material (#21364)
* Moves sheetifier research unlock from civilian services to industrial

* Makes wood insertable into the sheetifier and makes paper a lathable material

* Adds a paper crate to the cargo catalog

* Adds localizations
2023-11-05 19:14:02 -07:00
deltanedas
33e5dfb9a8 add igniter (#20962)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-14 00:11:50 -07:00
deltanedas
f0bd861fc8 actually add jug to medfab (#20679)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-02 09:49:45 -04:00
deltanedas
3488e577d9 Electric grill (#20661)
---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-01 19:17:50 -05:00
Nim
d15b7dff42 Advanced treatment cyborg module for medical borg (#19667)
* chemical analysis goggles for medical borg

* module and its tools

* fix

* fix2

* icon

* module research

* meh
2023-10-01 16:45:17 -04:00
Nairod
fcdedb377d Practice Ammunition Tech (#20331) 2023-10-01 13:18:05 -07:00
Ed
45db770759 Wide anomaly locator (#20581)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* add textures

* fix encoding

* fix 2
2023-10-01 12:41:32 -04:00
Nairod
58373ccc18 Add HoloBarrier To SecFab (#20128) 2023-09-14 16:34:43 -07:00
Nim
afd30c5c75 Telescopic shield (#20048)
* telescopic shield

* research

* removed the shield from the locker

* sound

* eh

* fix
2023-09-13 18:03:12 -07:00
deltanedas
64f2efbb55 move advanced laser gun into t3 lasers tech (#19875)
* move advanced laser gun into t2 lasers tech

* t3 and troll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-07 19:25:04 -07:00
Pieter-Jan Briers
bf16698efa Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
lapatison
9341cac5ef Split gardening cyborg module, literacy cyborg module tweak (#19449)
* book bag to literacy module, bucket n plant bag to gardening

* split gardening into gardening and harvesting

* book bag whitelist document, also dumpable

* fix

* new icon
2023-08-23 20:12:05 -04:00
chromiumboy
26eb71f1eb C.H.I.M.P handcannon redesign (#19004)
* Added basic alternative fire mode system for the CHIMP

* Redesign of the CHIMP handcannon
- the CHIMP now has an internal rechargable battery (10 shots at 100% charge)
- it has three alternative fire modes, one for each particle type, that its user can easily switch between
- syndicate scientists have access to an experimental version which can also fire omega particles (4 TC)
- each particle type now has a distinct color and damage type: delta (red): heat, epsilon (green): radiation, zeta (yellow): shock, omega (purple): heat + radiation. This affects A.P.E.s as well
- CHIMP particles now do 10 damage (up from 5)
- all CHIMP particle cartridges have been removed from the game (including the syndicate omega particle ammo pack)

* Code revisions

* Code revisions
- Removed changes to particle damage and damage types
- The experimental CHIMP was removed from the syndicate uplink and replaced with an upgrade kit, which when used on a standard CHIMP will convert it to an experimental one

* Code revisions
- Added a 2 second DoAfter for applying the upgrade kit

* Fixed spelling mistake

* Update projectiles.yml

Removed commented code

* Update Content.Server/Weapons/Ranged/Systems/AlternativeFireModesSystem.cs

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

* Code revisions
- Implemented changes requested by EmoGarbage
- Removed UpgradeKitComponent in favor of using a construction graph
- Renamed AlternativeFireModesComponent.cs to BatteryWeaponFireModesComponent.cs

Textures
- Reverted omega particle to being a green color
- Epsilon particles are now a cyan color

* Added comments

* Revisions
- Moved BatteryWeaponFireModesComponent from Shared to Server
- Restricted access to this component to BatteryWeaponFireModesSystem
- Changed the CHIMP upgrade kit to a chip
- Updated the localization files to reflect this change

* Delete interaction-upgrade-kit-component.ftl

This file is no longer needed

* Update battery_guns.yml

Added new description for the experimental CHIMP

* Update battery_guns.yml

Updated experimental CHIMP description again...

* Fixed issue with ItemComponent

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-08-19 18:54:52 -04:00
T-Stalker
8752fcd83a Nerf a bunch of point requirement (#19217) 2023-08-17 21:41:53 -04:00
Арт
a7583eb525 Construct and upgrade mini gravity generator (#18568)
* Construct and upgrade mini gravity generator

Now the mini gravity generator can be assembled/disassembled, the necessary machine board has been added to ShuttleCraft technology. Now it is possible to destroy the mini gravity generator and improve its components, thereby increasing the maximum charge of the generator.

* Test with empty OnRefreshParts

Perhaps this will help to get rid of the error during the test...

* Revert "Test with empty OnRefreshParts"

This reverts commit 5f32e15d66a4cb0d8df7578593867062be7872d8.

* Test without OnRefreshParts

Let's check if the problem is multiple inheritance.

* Revert "Test without OnRefreshParts"

This reverts commit d319757aa15a8ebec1237e552213e80eb8042790.

* Enabled by default

Maybe this will solve the problem, and maybe not...

* Swapped the components ApcPowerReciver and GravityGenerator

The previous "solution" did not give results, perhaps this time it will work....

* Revert "Swapped the components ApcPowerReciver and GravityGenerator"

This reverts commit 38759ca5a3465908b97d1d7e6ca583f8e9a97afb.

* Brought everything back to the beginning

* One parent in generator prototype, test

* Revert "One parent in generator prototype, test"

This reverts commit f7275b5d53234d9f66e8b4df0692596e14d82c95.

* Test without switchedOn and charge

* Revert "Test without switchedOn and charge"

This reverts commit 3916de8cc68e488098e6adc1e6b13e00d3f0e1a1.

* Revert "Revert "Test without switchedOn and charge""

This reverts commit 3d95efbfd4cb358b5c04a2302a377d51eb5f34cc.

* Update Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-08-14 20:23:40 -04:00
RiceMar1244
7de1cedff5 PKA resprite (#19024)
* Changed all PKA sprites, added wield sprites, modified meta.json

* Added animation assets for future yaml'ing. Made changes to existing textures.

* meta.json changes

* Corrected arsenal.yml missing sprite

* Removed unused animation assets.

* Put back the one animation asset I was suppose to keep.
2023-08-13 00:50:41 -04:00
Nemanja
98fa00a21f Borgs (#18136)
* Laws

* positronic brain and PAI rewrite

* MMI

* MMI pt. 2

* borg brain transfer

* Roleban support, Borg job (WIP), the end of mind shenaniganry

* battery drain, item slot cleanup, alerts

* visuals

* fix this pt1

* fix this pt2

* Modules, Lingering Stacks, Better borg flashlight

* Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power.

* sprotes

* no zombie borgs

* oh fuck yeah i love a good relay

* charger

* fix the tiniest of sprite issues

* adjustable names

* a functional UI????

* foobar

* more modules

* this shit for some reason

* upstream

* genericize selectable borg modules

* upstream again

* holy fucking shit

* i love christ

* proper construction

* da job

* AA borgs

* and boom more shit

* admin logs

* laws redux

* ok just do this rq

* oh boy that looks like modules

* oh shit research

* testos passo

* so much shit holy fuck

* fuckit we SHIP

* last minute snags

* should've gotten me on a better day
2023-08-12 16:39:58 -05:00
deltanedas
ccd93dc464 vim!!!!!!11! (#15659) 2023-08-11 12:20:16 -04:00
Vordenburg
bd13a4b357 Cull high-velocity ammo (#18656) 2023-08-08 11:08:53 +10:00
MisterMecky
1b4d4f8c35 Add chemical scanning goggles (#18373)
* add chemical scanning goggles

* add prototype and textures

* .ftl stuff

* add lathe, recipe, research stuff

* missing description

* emo review

* remove static method + newlines

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-08-01 15:57:22 -04:00
HerCoyote23
27becd8986 Security Melee Weapon, the Truncheon (#17666)
* Added Combat Baton

* Add to secfab

* reduce damage to 15

* Renamed to Truncheon, set damage to 17 again.

* Added T2 research, up dmg to 18 cause it'll be rarer.

* Make recipe dynamic
2023-07-31 14:37:12 -06:00
MishaUnity
325d2a39ee add mass-media system (#18251)
* Add Console, PDA news tab, and ringstone popup

* Add English localization

* Add mass-media console board to Advanced Entertainment resrarch

* Fix misprint

* Deleting unused libraries

* Fix round restart problem

* Fixing restart problem

* Just another fix

* Сode optimization

* Code optimization
2023-07-26 12:49:38 -06:00
Nim
25d459ac7d Add solar tracker electronics to the circuit printer (#17637) 2023-06-26 13:04:06 +10:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
Nemanja
eb114677ad move hamtr to civilian services tech (#17393) 2023-06-17 11:59:53 +10:00
metalgearsloth
f7e4a69b65 Move PKA to a tech (#17043) 2023-06-16 13:56:59 +10:00
Nemanja
fa23d57fd8 Remove cloning tech, add bluespace chemistry tech (#17345) 2023-06-14 21:11:11 -06:00