Commit Graph

96 Commits

Author SHA1 Message Date
SlamBamActionman
aabf030515 Changed names of uplink categories and swapped around items (#25079)
* Changed names of uplink categories and swapped around items

* sloth feedback
2024-03-13 20:47:17 +11:00
AlexUm & XGabriel08X
7af183ec72 Barber scissors in uplink and chameleon bundle. (#25920)
scissors

uplink catalog localization and just catalog update, with adding scissors to the chameleon set
2024-03-07 17:55:24 -06:00
Firewatch
93d820f315 Syndicate Decoy Bundle + Snap Pops (#25333)
* it works

halilujeah

* toggleable lights

removes a redundant flashlight since you can turn on the balloons to cast light

* final touches

syndicate decoys :trollface:

* touches

it works now

* minor spelling mistake



* minor spelling mistake 2

darn

* adds whistle

commanders now spawn with a whistle around their neck

* yaml linter

luv you linter baby

* smallify the whistle

it was way too big, this has been addressed

* sprite fix

am dummy 👍

* netsync errors

wouldn't compile properly

* forgor

* i suck at yaml

smh

* decoys for all

now both syndicate and traitors can use the decoys, yippee!

* Update meta.json

credit my discord username

* Update uplink-catalog.ftl

* Update decoys.yml

base decoy no longer shows in the entity browser

* immortal gone

balloons have gained mortality
2024-02-28 16:53:46 -05:00
takemysoult
92e115fbe4 add syndicate hud to nukeops uplink (#25087) 2024-02-20 23:41:01 -07:00
deltanedas
1eb6958ca0 add troll conducting gloves to uplink (#25227)
* add conducting gloves

* add conducting gloves to uplink

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-20 23:34:47 -07:00
Varen
b46944f80e Remove battery from crew observation kit, fix description (#25000)
-Remove battery from crew observation kit, fix description
2024-02-10 19:17:07 +11:00
Ilya246
bd4a0b93c8 fix scram implant uplink desc (#24336)
fix
2024-01-20 18:05:09 +03:00
Emisse
b3008ab7c8 Syndie elite uplink (#23859)
* elite suit store

* eek

* dont drink
2024-01-10 04:33:10 -07:00
Naive817
1b93243bea Adds syndicate cyborgs. Adds Assault cyborgs to nukie uplink (#19733)
* added syndicate cyborgs

* add assault cyborg to uplink

* updated tags.yml

* changed syndicate cyborgs' hitpoints to 200
fixed NPCfaction

* added noslip and MovementAlwaysTouching component to syndicate cyborgs akin to carps, as a stop gap for no magboots or jetpack. Access component fix.

* fixes nodes

* fixes construction

* fixed typo and intergrationtests

* adds back ammocounter for l6c

* fix lawset

* fix item size

* nono, fix again

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-08 01:12:08 +03:00
TruePaInt
4c2fd55720 Gun cyborg module (#19629)
* Update borg_modules.yml

* Update uplink_catalog.yml

* Update uplink-catalog.ftl

* Add files via upload

* Update meta.json

* Update uplink-catalog.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-08 00:03:18 +03:00
Ed
d22fe3f921 SyndiCat (#22554)
* add content

* 4 tk to 8 tk

* replace to autoinject, now cat can explode in any moment. increase cost to 10tk

* Update animals.yml
2024-01-06 17:52:41 -08:00
Ilya246
154416787e add syndicate singularity beacon (#18486)
* implement singulo attraction

* add attractor syndie item

* cleanup

* fix name/desc

* actually fix name

* singulo toolbox no longer whitelisted

* add custom sprite, overhaul prototype

* address review

* beacon real

* webedit 1

* webedit 2

* webedit 3

* permalink to copyright

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-01-06 00:21:24 -08:00
Ilya246
ca529178e2 scram implant (#23122)
* implement

* fix charges

* add listing

* fixes

* fix locale, probably all done

* fix

* fix of fix

* move query init

* cleanup

* unbrokey rt
2024-01-04 05:38:02 -07:00
ERROR404
abbb724849 Observation Kit (#23384)
Observation Kit
2024-01-04 05:36:44 -07:00
Moomoobeef
b8583ed573 fixed nocturine locale (#22737)
* removed nocturine from the uplink catalog

* fixed nocturine locale, added back to catalog for 6tc
2023-12-20 16:43:17 -07:00
Ubaser
d172988a8d Chemical Synthesis Kit (#22631)
* add

* locale

* probably fix

* fix stuffs

* oversight

* uh yea

* i beg

* tag

* i pray to god this fixes it

* update

* fix

* vestine

* fix note

* balancing

* fix

* toxin wipe
2023-12-17 19:40:28 -07:00
deltanedas
7dd472c934 smoke grenades (#20996)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 17:49:30 -08:00
Ed
0a8a6693a8 add content (#22518) 2023-12-15 02:55:57 -07:00
Arendian
3e766402b9 Cluster grenades for uplink and security (#22029)
* clustergrenades go boom

* Small tweaks

* Some tweaks and soaplet

* clustergrenadesystem changes and launcher types

* small tweaks

* typo

* whitespace

* rsi edit

* another typo

* add containers

* Some changes related to merge

* Forgot to change name

* Made changes based on review

* Removed new china lake ammo based on feedback in other PR

* Unneeded nested loop moment

* Nested loop needed after all moment
2023-12-13 22:30:42 -05:00
deltanedas
e1ff79b4b1 let cyberpen edit stamped papers (#22457)
* let cyberpen edit stamped papers

* desc

* little more desc

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-13 14:33:31 -07:00
Whisper
3ccf171ea1 adds the death acidifier implant and returns the micro-bomb implant to the uplink (#22060) 2023-12-01 13:14:45 -07:00
Nemanja
818d53b7c4 Fix DNA scrambler uplink text (#21830) 2023-11-21 21:32:19 -07:00
deltanedas
07a956e790 syndicate snack box (#21024)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 00:26:26 +11:00
Tryded
7073b292c0 Buffs Double bladed energy swords (#21131) 2023-10-23 10:35:32 -04:00
deltanedas
5f11646f20 add binary translator key to uplink (#20295)
* add binary translator key

* add binary translator key to uplink

* grammar

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-18 13:20:56 -06:00
Flareguy
7d02c4af0f Miscellaneous syndicate bomb tweaks & fixes (#20068)
* syndicate bomb tweaks & ss13 parity

* 100s

* 90s timer

* fuck. my furniture

* timer back to 120s, no more wire mirroring
2023-09-13 17:26:58 -07:00
JoeHammad1844
3401709e84 Nukies get free microbomb (#20012) 2023-09-12 08:09:32 -07:00
eclips_e
133ca98655 Hardbombs & Defusables (#15380)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: LankLTE <twlowe06@gmail.com>
Co-authored-by: LankLTE <135308300+LankLTE@users.noreply.github.com>
2023-09-11 18:42:38 -07:00
deltanedas
d8effa6150 carpsuit and iansuit revival (#19728)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 22:16:36 -07:00
Morb
c99e365ce7 Give nukies the ability to declare war for a TC boost (#19291)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-29 23:56:20 -08: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
brainfood1183
ae5dcbabee Holoclown (clown only) syndicate uplink item. (#18966)
* Holoclown (clown only) syndicate uplink item.

* added clumsy to holoclown

* holoclown now uses clown names, holoclown kits box now counts as boxhugs for crafting.

* gibs holoparasite on death if has hands (this will cause the items in hands and pockets to drop.
2023-08-13 01:18:09 -06:00
Ilya246
642d9b021f bloodred magboots buff (#18948)
* bloodred jetboots

* fix actionbar
2023-08-13 01:17:09 -06:00
Errant
75ba8f8a31 Minor Uplink text fix (#18971) 2023-08-11 16:01:33 -04:00
AlexMorgan3817
62ccbdaeae Supermatter grenades (#13747)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-11 00:29:47 +10:00
Sailor
b2bf49235b Nerf emp pricing, add EMP kit to uplink (#18877) 2023-08-10 11:40:17 +03:00
lapatison
b6bcae6a18 Syndicate Lobbying Bundle (briefcase with spacebucks) (#18405) 2023-08-05 14:10:21 -07:00
crazybrain23
ba9f2bd512 Add syndicate pAI to uplink (#18674) 2023-08-05 14:26:25 +10:00
liltenhead
290feca8a5 Fix the incorrect ammo count in the China Lake bundle's description (#18553) 2023-08-04 12:57:02 +10:00
Vordenburg
e44c235396 [CHANGES PROTOTYPE ID] Clean up lantern (#18526)
- Fix the un-cased proto ID
- Remove the give-away name and description from the Syndicate item
- Remove the same-value inherited fields from PointLight
- Better uplink catalog description
2023-08-03 01:29:05 -06:00
Nim
6a2aac39e4 Magazine for C20R in uplink (#17108) 2023-08-02 20:03:39 +10:00
Arendian
4cd70b241c Disposable turret explodes when empty (#18175)
* turret go boom

* fix ammo

* universal function name

* Also explodes when destroyed

* comment added

* Triggerwhenemptycomponent added

* comment adjusted

* Updated uplink description

* Moved to own event file

* file namespace

* rerun tests

---------

Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru>
2023-08-01 15:38:22 -04:00
JoeHammad1844
d2744b60c3 made the hristov just a little greater (#18447) 2023-07-30 12:54:13 -06:00
Jackal298
3ee808fcbe Syndicate Sniper bundle change and rework of the anti-material ammo box (#18414) 2023-07-29 00:09:33 -06:00
JoeHammad1844
35197d0b99 Syndicate Sniper Bundle (contains hristov) (#18250)
* added sniper bundle

* fixed an error in briefcases.yml that would brick the entire map for some reason when I tried to test

* mokey

* whoops thats 1 line too many

* squashed another bug that would brick the uplink

* aha!

* 9 TC

* Update briefcases.yml

* 1984 you cant make black hole storages

* 6TC sniper
2023-07-27 03:49:22 -06:00
liltenhead
bffba51a37 Reduce cost of several syndicate/nukie firearms (#18351)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-07-27 18:24:21 +10:00
LankLTE
1247d23ce2 Revolver / Python changes. (#18352) 2023-07-27 17:32:26 +10:00
Flareguy
23ab5b8f3f Reworks the Python to match the SS13 .357 (#18197)
* buffs the python to replicate /tg/ stats

* meta.json shits

* fuc

* fix attributions.yml

* yaml linter fix?

* fix fill
2023-07-24 17:02:15 -06:00
Ilya246
be588242b4 add syndicate monkey reinforcement (#18126)
* implement

* 8tc

* reparent syndicate monkey, remove clumsy
2023-07-19 15:23:23 -06:00
vanx
0e42ecba70 Uplink extention: nukie edition (#18011)
* added and rebalanced some uplink stuff

Signed-off-by: vanx <vanx#5477>

* typo

Signed-off-by: vanx <vanx#5477>

* added combat medipen to the meds bundle

Signed-off-by: vanx <vanx#5477>

* raised healing prices a bit

Signed-off-by: vanx <vanx#5477>

* mosin ammo box finally
Signed-off-by: vanx <vanx#5477>

* implants price swap + buff

Signed-off-by: vanx <vanx#5477>

* more meds for less yay

Signed-off-by: vanx <vanx#5477>

* free samples
Signed-off-by: vanx <#vanxxxx>

* microbombs for everyone

Signed-off-by: vanx <#vanxxxx>

* grenadier rig cheapening

Signed-off-by: vanx <#vanxxxx>

* merge conflict

Signed-off-by: vanx <#vanxxxx>

* More meds fuck it

* locale
Signed-off-by: vanx <#vanxxxx>

---------

Signed-off-by: vanx <vanx#5477>
Signed-off-by: vanx <#vanxxxx>
Co-authored-by: vanx <vanx#5477>
Co-authored-by: vanx <#vanxxxx>
2023-07-19 00:05:53 -06:00