Commit Graph

574 Commits

Author SHA1 Message Date
Kevin Zheng
655e5d5cec Add speedloader to secfab (#20219) 2023-09-16 15:32:16 +10:00
chromiumboy
e92e913452 Adjust default airlock hacking protections (#20171) 2023-09-14 23:08:50 -08:00
Nairod
58373ccc18 Add HoloBarrier To SecFab (#20128) 2023-09-14 16:34:43 -07:00
Doru991
3f51795cc7 Add plant species mutations (#19960) 2023-09-13 20:56:24 -08: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
5dbf79f7da ian crafting (#19821) 2023-09-09 23:04:32 -04:00
Kevin Zheng
442cc7f659 Switch security techfab to produce magazines (#19769)
* Switch security techfab to produce magazines

* Add back ammo boxes
2023-09-07 19:16:19 -07:00
Velcroboy
1de23dc4d0 Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
lzk
08d0c78a25 grooog (#19870) 2023-09-06 20:32:23 -04:00
EnDecc
f8eefc0725 Craftable steel secure crate (#19881)
* recipe

* i cast retest spell
2023-09-06 17:25:25 -07:00
PixelTK
74bd86af2f Arachnid RE-REWORK (#19138)
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
2023-09-04 13:02:54 -07:00
liltenhead
e7ea597c51 Rebalance Ore Conversions (#19814) 2023-09-04 22:57:51 +10:00
KingFroozy
5d4c8998ad Chief Engineer's Turtleneck (#19737)
* Add chief engineer's turtleneck

* Printable now
2023-09-03 14:38:28 -04:00
metalgearsloth
0c42533433 Fulton tweaks (#19786) 2023-09-03 22:18:09 +10:00
Nemanja
6695ac2ad6 Show materials as sheets, tweak lathe ui (#19709) 2023-08-31 22:28:08 -07:00
Thom
31282a3fc6 Adds Supplybot, a cargo-focused deliverybot with internal storage. (#19638) 2023-08-31 12:46:49 -07:00
deltanedas
5171004bfb food doesnt come with plate (#19472)
* no plates from eating cooked meat

* no more plate

* no plate sprite

* already food

* -

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-30 22:14:53 -04:00
metalgearsloth
789c5e0a2b Add fultons (#18958) 2023-08-29 16:34:05 +10:00
Alekshhh
db98338cc8 Reduce electrical cable printing cost (#19488) 2023-08-28 10:53:01 -08:00
qwerltaz
0c58a1e945 add board container to wallmounts (#19565) 2023-08-26 18:25:22 -04:00
Pieter-Jan Briers
bf16698efa Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
Ilya246
7ecdb937ac Make pipes cost 1 steel (#19494) 2023-08-24 12:17:11 -08:00
deltanedas
113bb79316 Add plate recipes to autolathe (#19473) 2023-08-24 10:01:13 -08:00
Ilya246
6cf15177b3 Rebalance radiator cooling and material cost (#18823) 2023-08-24 09:36:16 -08: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
deltanedas
4935a95687 borg construction module (#19260)
* cant insert materials into machine if unremoveable

* lingering materials

* add construction cyborg module

* fix empty stack color

* lathe recipe

* a

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-23 17:34:39 -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
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