Commit Graph

537 Commits

Author SHA1 Message Date
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
LankLTE
9e6bd30aa4 Ambuzol Plus (#17884)
* Added component and functionality.

* Fixed ZombieImmune.

* Zombies now have zombie blood.

* Ambuzol plus.

* Ambuzol plus spawns in bundle.

* Fine CBURN get one too.

* Reworked the reaction

* No more magic blood refilling.

* ok CE i fixed it

* Component change.
2023-07-09 16:01:35 -06:00
Nemanja
d3d718f968 fix test fail from ambuzol reaction (#17887) 2023-07-08 12:51:57 +10:00
Nemanja
e78257419b Zombie chem tweaks (#17870)
* make romerol cause zombification, make zombrex the cure, nuke corpium

* fix descriptions

* zombrex -> ambuzol
2023-07-06 22:45:59 -06:00
Gagarinten-Noverdo
eca22beb30 balance a explosive payload craft (#17853)
A grenade that costs 4 TK is too easy to make. I fixed it.
2023-07-06 18:31:18 -06:00
Errant
b7ff79c1fb Fixes airlock construction graph issues (#17812) 2023-07-04 18:31:35 -06:00
Gagarinten-Noverdo
9ae0b9e81c Balance a laser carbine craft (#17814)
* Balance a laser carbine

* Fix
2023-07-04 18:31:20 -06:00
Topy
b85c902189 Added sink (#14348) 2023-06-30 18:10:47 -04:00
Tom Leys
67df47f553 No atmos stacking (attempt 2) (#16687)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-06-29 22:04:36 +10:00
LankLTE
d0a9cce717 Adds Lead & Zinc, nerfs Licoxide. (#17703)
* Added Lead & Zinc, Nerfed Licoxide.

* Updated physical descriptions.

* Fixed my stupid dumb error.
2023-06-28 12:53:56 -05:00
TemporalOroboros
d9de405859 ECS AME (#16779) 2023-06-28 08:02:06 -04:00
lzk
335ee13caf Taco! (#17635) 2023-06-26 13:05:07 +10:00