Commit Graph

548 Commits

Author SHA1 Message Date
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
liltenhead
23dece236c laser costs (#19228) 2023-08-16 22:10:06 -06:00
T-Stalker
947832c6b6 Merge pull request #19226
* Lower material price for tier 2 parts
2023-08-16 15:49:24 -07:00
T-Stalker
75c8ded542 Nert part creation (#19216) 2023-08-16 16:12:09 -06:00
Velcroboy
ab3106f18b Adds Directional Switches (#19175)
* Adds directional switches

* Revert unintended line deletion

* Consistent recipes

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-08-15 17:01:50 -06: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
mhamster
4470608c64 Add plastic sheets chemical recipe (#18865)
* Plasticchemistry

+ Added new way of getting ash: burn oil at 480k and you will get some (1u oil = 1u ash)
+ Added new way of getting plastic: mix together 5 parts oil, 3 parts ash and 2 parts SulfuricAcid to get plastic (10u of mixture = 1 plastic sheet)

* Remove ash recipe

Removed ash recipe because of it's silliness (and because there should be other way of making it)
(https://github.com/space-wizards/space-station-14/pull/18865#issuecomment-1669191528 and https://github.com/space-wizards/space-station-14/pull/18865#issuecomment-1669187894)
2023-08-14 19:40:48 -04:00
Artur
10e2e74d27 Ritual chair no longer deletes people when disassembled (#19145) 2023-08-14 15:57:32 -07:00
LightVillet
ac2ac4b9e5 Fix recipes for translations (#19133)
Co-authored-by: LightVillet <dev@null>
2023-08-14 09:04:21 -07:00
c4llv07e
d7eb3bfb44 Pipe painter (now with airlock painter) (#19031)
* Add a pipe painting function to the airlock painter

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Rename engineer painter to omnipainter

Signed-off-by: c4llv07e <kseandi@gmail.com>

* review changes

Signed-off-by: c4llv07e <kseandi@gmail.com>

* fix migration duplicate

Signed-off-by: c4llv07e <kseandi@gmail.com>

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
2023-08-14 15:06:21 +03:00
chromiumboy
6a41a554e5 Fixed an issue where airlock safeguards could not be applied to glass airlocks (#19110) 2023-08-14 00:42:02 -06:00
Vladislav Kadira
229df7c5ec Add cocoa cultivation (#18366)
* Add cocoa cultivation

* fix

* Fix 2

* fix 3

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-08-13 10:35:58 -04:00
PixelTK
dfa9b45490 Fix crafting steel tiles requiring silk (#19071) 2023-08-13 22:43:00 +10:00
PixelTK
f189b73fe5 Arachnid rework (#18631)
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
2023-08-13 01:38:05 -06:00
CrigCrag
ade5cace12 make acids hurt more (#18938)
* Update toxins.yml

* Update toxins.yml

rework how acids do damage. they now metabolize at a rate of 3.0, but deal a lot of damage.

* make polytrinic require plasma

polytrinic acid now requires plasma to make

* add comments to indicate acid design
2023-08-13 01:24:50 -06:00
CrigCrag
e6b8d18787 Make jugs printable and bigger (#18941)
* Update medfab recipes

add jug

* Update chemical-containers.yml

* Update chemical-containers.yml again

what if it was 25

* Update medical.yml yet again

reduce cost

* Update chemical-containers.yml again

* Update medical.yml

remove name for recipe since it seems redundant as its ID is jug anyways
2023-08-13 01:23:37 -06:00
Errant
1ff125a240 bola buff (#18998) 2023-08-13 01:11:11 -06:00
Nim
998c6f3d7b Secret door (#19023)
* secret door

* oops
2023-08-13 01:10:45 -06: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
CrigCrag
d47c601413 make pickaxe cost 5x more (and make it bigger) (#19007) 2023-08-11 23:17:26 -07:00
deltanedas
ccd93dc464 vim!!!!!!11! (#15659) 2023-08-11 12:20:16 -04:00
LankLTE
6e192341f2 Removes Spaceacillin (#18979)
* Removes spaceacillin

* this game blows
2023-08-10 23:04:49 -04:00
Kara
baddcf1b26 Chain link fencing (#18956) 2023-08-11 00:16:25 +10:00
kxv
4772d9e6f5 stun prod (#17467)
* stunprod

* update

alphabetical correct,
the battery charge is less,
stamina damage is less (5 hits now),
graph id fixed

* update

crafting has become more difficult

* update

makeshiftstunprod

* remove netsync

* Update meta.json

* fix

* remove bluntStaminaDamageFactor
2023-08-10 12:33:34 +03:00
chromiumboy
636819f4e3 Hacking protections for airlocks (#18894)
* Adds the ability to better protect to the internal wiring of airlocks
- Achieved by opening the maintenance panel, adding either steel or plasteel to the airlock, then welding the plate in place
- To access the wiring, the plating must be cut with a welder and then pried out with a crowbar

* Code revisions
- Cleaned up the code
- Cutting the security grille can now shock you
- Atmospherics and Security dept airlocks start with a medium level of protection (a welded steel plate)
- Command dept airlocks start with a high level of protection (a welded plasteel plate and electrified security grille)

* Code revision
- Accounted for a potentially null string

* Update Content.Server/Construction/Completions/AttemptElectrocute.cs

Co-authored-by: Slava0135 <40753025+Slava0135@users.noreply.github.com>

* Update ChangeWiresPanelSecurityLevel.cs

Adjusted scope

* Update Content.Shared/Wires/SharedWiresSystem.cs

Co-authored-by: Slava0135 <40753025+Slava0135@users.noreply.github.com>

* Update Content.Shared/Wires/SharedWiresSystem.cs

Co-authored-by: Slava0135 <40753025+Slava0135@users.noreply.github.com>

* Update ChangeWiresPanelSecurityLevel.cs

Removed get / setter and added [ValidatePrototypeId] attribute

* Update ChangeWiresPanelSecurityLevel.cs

Set security level to "Level0" as the default

* Update airlock.yml

Removed 'super max' level of security

* Update WiresPanelSecurityLevelPrototype.cs

* Update WiresSystem.cs

Added check for WiresAccessible to OnInteractUsing

* Update AttemptElectrocute.cs

File scoped namespace

* Update ChangeWiresPanelSecurityLevel.cs

File scoped namespace

* Update AirlockSystem.cs

File scoped namespace

* Update SharedWiresSystem.cs

Removed boiler plate 'OnGetState' and 'OnHandleState'

* Update WiresPanelComponent.cs

Implemented AutoGenerateComponentState

* Removed unnecessary usage references

* use TryCloseAll when wires not accessible

* minor changes to AttemmptElectrocute

* lets try all 7 levels

* fix indent in airlock graph

* fix indent 2

---------

Co-authored-by: Slava0135 <40753025+Slava0135@users.noreply.github.com>
Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru>
2023-08-10 11:33:03 +03:00
Whisper
9550a04a2c Adds Sechud to lockers and sec techfab (#18907)
* Adds Sechud to lockers and sec techfab

* Add sechud to HOS lockers.
2023-08-10 00:04:42 -06:00
Interrobang01
3457729ba4 Added Mustard (#18930) 2023-08-09 19:38:36 -06:00
Emisse
71d3689c42 qm turtleneck (#18909)
* qm alt clothes your mom

* textures

* retrieve textures from the void

* Update heads.yml

* resprite to fit

* fixe sides quick

* fixe a hole

* why is this hole here

* why does this happen to me

* fixed the weird hole thing
2023-08-09 19:17:37 -06:00
Vordenburg
bd13a4b357 Cull high-velocity ammo (#18656) 2023-08-08 11:08:53 +10:00
Nemanja
5c6013ab07 Make chemical analysis goggles cheaper to print (#18791) 2023-08-07 13:44:24 +10:00
Kevin Zheng
db5dee6db3 Add radiators (#18728)
* Add radiators

* Limit heat transfer to fluid heat capacity

* Adjust datafield names

* Fix material arbitrage

* This code has been debugged, and so there are no more bugs. Debugging code is therefore unnecessary

* Adjust radiator layer subfloor visibility

* Cache CVars

* No default

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Like and unsubscribe

* Fix CVar caching

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-06 02:21:05 -06:00
Filler
2f50cb6208 Add TaxiBot (#18708) 2023-08-05 13:36:31 -05:00
mhamster
7b3f2cd0d4 Add EmpReactionEffect (#18248)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-05 14:31:14 +10:00
Vordenburg
ad47cee7f4 Replace THC with THCOil (#18617)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-03 22:49:56 -07:00
Interrobang01
14e6ad6635 Reverted some of the mechanical changes of #16157 (#18555)
* Reverted functional changes from PR 16157

* Unreverted Epinephrine recipe Diethylamine removal because really, Epinephrine is complicated enough.

* Unreverted that Phenol change because 1. Phenol isn't actually used except in Epinephrine so it literally does not matter and 2. having Phenol use these common ingredients causes git add .fungit add . reaction conflicts to happen which is good

* Reverted Diphesomethingsomething recipe change because Diphesomething is pretty useless and so doesn't need such an incredibly difficult recipe
2023-08-03 22:30:37 -04: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
forthbridge
5fc7f21853 Add Spaceshrooms (#17092)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-02 00:10:48 +10: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
Alekshhh
c7c56f4a81 Chemical Wiki Descriptions, Recipe Tweaks & Effect Tweaks (2) (#16157)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-07-31 16:03:49 +10:00
lzk
a52709fae2 New crafting recipes for hair flower and flower crown (#18421) 2023-07-29 11:46:29 -07: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
Tunguso4ka
730285290a coffin and two graves (#18213) 2023-07-23 21:13:10 -06:00
Arendian
657d15751b Disposable turret balance changes (#18155)
* tweaked stats

* change comment
2023-07-19 20:16:09 -06:00
Flareguy
ae9af73263 Adds the Improvised Shotgun (#18025)
* improvised shotguns

* spaghetti

* progress so far (TODO: rename modular_reciever.yml)

* i forgotted

* everything so far

* fuck fuck fuck (boner boner)

* ganon: You must die

* bobie

* boob boob booby balls
2023-07-18 15:10:07 -06:00
Emisse
440d01b487 Saline (#18097) 2023-07-17 20:02:41 +10:00
Vera Aguilera Puerto
9243050e1a Construction graph improvements (#17960) 2023-07-13 20:23:52 +10:00
deathride58
a32fbb37ce Chevre and chevre accessories - Adds chevre, crostini, and chevre chaud to the game (#17968) 2023-07-11 21:00:30 -06:00
LankLTE
2b29e58823 Sawn-off shotgun are now empty when made (#17971)
* New nonlethal sawnoff

* Empty guns now

* removed duplicate construct
2023-07-11 18:45:43 -06:00
Nemanja
6dbfbc52c0 Good Intercoms (#17950)
* crystal anomaly

* Good intercoms

* fixes

* fix construction fail

* Revert "crystal anomaly"

This reverts commit 0d9e3f62ff82c79e72f882b9c7f4ca1b9c6e6dd8.

* migration
2023-07-11 17:58:18 -06:00
Arendian
b4c251472f Adds Advanced ointment and bruisepack recipes (#17583)
* Adds Advanced ointment and bruisepack recipes

* Changes the sprites to the ones from /tg

* Changed names and sprites, slight tweaks

* Formatting

* Solve Conflict

* Formatting

* Fix issues found in check

* Fix Oopsie
2023-07-09 20:22:10 -06:00