Commit Graph

1284 Commits

Author SHA1 Message Date
Tunguso4ka
ee54022832 Ash Walker`s spear and uniform (#20292)
* bones, gladiators, milk, spear and tears

* :trollface: my copy/paste python script did the funny

* forgor

* fixed

* mat.yml fixed

* bones

* bone armor

* gladiator uniform now in clothesmate like ss13

* bone armor craft

* pieces

* i was dumb in the past, now im dumb too

* that was dumb...

* fixing stuff

* i hate git

* Revert "i hate git"

This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.

* Revert "fixing stuff"

This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.

* this will work?

* i fucking merged it
2023-09-24 15:57:10 -04:00
drteaspoon420
1a67c5583a Solutions on thrown spears/shot arrows (#20416)
* Solutions on thrown spears/shot arrows

Spears inject their solution on thrown hit.
Arrows now have 5u solution storage that is injected when it hits target.

* Whoops, wrong arrow.

Instead of base arrow, I accidentally modified the 'regular arrow'

* spear and arrow solution graphics

Spears and arrows now show what they are doped with when they are on ground. (just like beakers)
2023-09-24 15:46:16 -04:00
Kara
f8d194b117 Bows & arrows (#19771) 2023-09-22 02:45:21 -07:00
Арт
0c9c68027a Added corn in butter (#19448)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-20 19:51:08 +10:00
Alekshhh
c93433839f Medkit Fill Change (#19362)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-20 17:50:19 +10:00
Doru991
fcfe75a308 New crops: Berries and Bungo (#19800)
* Add berries

* Berry recipes

* Add bungo fruit

* yml tweaks

* yummy poisonous pits

* Technically it's a seed

* Revert "Technically it's a seed"

This reverts commit be892cf119c1e733ac2922b878aaa476f435152a.

Slapping the seed component onto it led to unforeseen consequences, and I don't want to mess with the seed system for a mostly useless gimmick.

* Revert 2 Electric Boogaloo

This reverts commit 2c4fb34250e9369085d49e730de3dab0e077b687.

* Small rewording

* Cocoa balancing

* Oops
2023-09-18 23:29:27 -04:00
Psychpsyo
067797fcb1 Make advanced mop show up on janitor trolley (#20124)
* Make advanced mop show up on janitor trolley

* Make blue trash bag show up on janitor trolley

* Revert "Make blue trash bag show up on janitor trolley"

This reverts commit 3f94b3cf81fba68255f60ca4b2ff085f4ab0c48f.
2023-09-17 20:23:35 -04:00
Psychpsyo
5d74447679 Make advanced mop wieldable (#20229) 2023-09-15 21:33:01 -07:00
Psychpsyo
11972a0066 Make Shark Plush Janitor-Bucketable (#20123) 2023-09-14 00:17:44 -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
24810d916b ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
Ubaser
d7c9a2cb73 fix transparency (#19934) 2023-09-09 01:44:35 -06:00
Velcroboy
1de23dc4d0 Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
Fromoriss
b50e5651a1 Add moth plushie (#19828)
* Add moth plushie

Moth plushie. It's cute, don't mind, merge it.

* Update toys.yml
2023-09-04 13:18:03 -07:00
/ʊniɹɑː/
b52b063d6f refactor checkerboard (#18359) 2023-09-03 16:16:09 +10:00
Nemanja
4d677f0685 1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-08-30 18:06:15 -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
Nemanja
f4503864d5 Concrete and asphalt tiles (#19642)
* concrete and asphalt

* los decals
2023-08-29 17:50:11 -05:00
metalgearsloth
789c5e0a2b Add fultons (#18958) 2023-08-29 16:34:05 +10:00
Ubaser
7065f6cc02 New bloodpack sprites (#18192)
* Add bloodpack sprite for testing ingame

* shrink

* small tweaks

* Update bloodpack.png

* add sprites

* add meta

* fix meta again

* fix regenerative-mesh

idk how i accidentally deleted it

* HOPEFULLY FINAL FIX AAA

* change copyright

* TEST

* Revert "TEST"

This reverts commit 34de38e2a228d3f28feed966404640cc8b6c788d.

* maybe fixed

* blue
2023-08-28 22:30:10 -06:00
Nemanja
595d42659d Revert "Add peeled state for bananas (#19393)" (#19588)
Using "spawn item on use" blatantly breaks botany mutations for bananas.
2023-08-28 10:30:16 -08:00
Kara
70e0520a2c Watchers (#19367) 2023-08-27 16:14:57 +10:00
potato1234_x
77711dea5d Add peeled state for bananas (#19393)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-26 09:31:13 -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
potato1234_x
149e58d30a revamp getmore inventory (#19372) 2023-08-23 17:49:25 -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
Tollhouse
8dedabbb8f Dan's Soaked Smokes (#19150)
* Added all the basics I think I needed for the basic cigs to show up in vendors and game. Need to implement the randomizer to grab varied chems from a list.

* Forgot a png

* Smokes work just need sprite work and random

* First pass on random cigs

* Cigarettes are named now just randomization left

* Finished on my end.

* Whoops

* Nutrient is not availiable for smokes I guess?

* Testing fixes

* Dunno found this on the filledbookshelf might work here?

* I dont know what Im doing wrong but I think this might work.

* Trying with orgroups in the pack YAML

* It seems to not like the food chems. Commented them out.

* THC is also a no go. Also increased storage size of pack to total pool. Given the low prob should still should never hit max volume.

* I have a sneaky suspicion its the size of the container and pool of fill items.

* Messed with the size of the cigarrettes so they all have a chance to fit and the size of box stays consistent.

* Apparently non whole number size is a no go.

* Cartons were to small and added maxamount on cigarettes.

* Amount: 0 caused odd errors. removed and changed maxamount to 2.

* Reworked randomization system to try and use weightedRandom instead of prob in storageFill

* Wrong weightedRandom

* Rework of a rework. Good on my end. Simplified the randomization to bare minimum.

* Added gas station dick pill vibe to all the names.
2023-08-15 18:27:18 -06:00
Velcroboy
75d2c12e65 Add food carts (#19177)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-08-15 15:26:49 -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
deltanedas
8b1af46a2b add throwing star (#18700)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-14 01:18:48 +10: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
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
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
TaralGit
8acac895fc (Re)Adds open bolt animations for gun sprites (#17219)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-13 15:58:07 +10: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
Flareguy
ea06a33a81 Updates asteroid tile sprites & adds asteroid plating (and tile items too, I guess) (#18937) 2023-08-10 10:46:43 -07:00
AlexMorgan3817
62ccbdaeae Supermatter grenades (#13747)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-11 00:29:47 +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
metalgearsloth
5688c40f0e Resprite grappling hook (#18939) 2023-08-10 16:16:57 +10:00
Interrobang01
3457729ba4 Added Mustard (#18930) 2023-08-09 19:38:36 -06:00
Errant
5b2d20b654 Disabler inhand sprites (#18918) 2023-08-09 14:43:34 -06:00
Pieter-Jan Briers
07f932ae3c New /vg/ nuke sprite (#18890) 2023-08-08 17:55:41 -04:00
chromiumboy
2df70799f8 Add access configurator (#18638)
The access configurator programs the access levels of any access reader. To use the access configurator, players must:

- Insert an ID card
- Click a nearby entity with an access reader with the access configurator in hand
- Change the access list

Note that players only need one of the access levels listed on the device to lock/unlock it, but will only be able to alter access settings when they all of the access levels listed on the device

For example, an airlock which has 'Science' and 'Engineering' access listed can be opened by any player with either 'Science' or 'Engineering' access. However, to change the access settings on this airlock, a player must have both 'Science' and 'Engineering' access. This is to prevent people from easily breaking into secure areas with this tool, by adding one of their own access levels to the target device

Obviously, the most useful ID card to use with this tool is one with all access, since it can change the settings of any device. Removing all access requirements from a device will make it useable by anyone.

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-08 10:30:46 -08:00
Vordenburg
bd13a4b357 Cull high-velocity ammo (#18656) 2023-08-08 11:08:53 +10:00
Morb
8187e00072 [Trait] Wheelchair bound (#18785)
* Init commit

* move to shared and remove all from component

* maybe that

* Use SharedBuckleSystem

* Rename to WheelchairBound

* Move Carriage to prototype

* Update sprite to TG, add folded sprite, rename carriage to wheelchair

* Fix wheelchair rsi path

* Add stand & down for buckling

* Add wheelchair inhand sprites

* Move wheelchair down in file & fix fold sprite & add suffix Vehicle

* Use new wheelchair id

* Add standing & speed reset on component remove

* Split system to leg paralyzed and wheelchair bound

* Rename to LegsParalyzed

* Rename in prototype

* Move LegsParalyzed to shared

---------

Co-authored-by: Ray <vigersray@gmail.com>
2023-08-07 18:28:59 -06:00
Flareguy
8c256d3960 Adds Checkerboard Tiles, External Hull Plating, Hardened Reinforced Floors, & Monotile Dirty Decal (#18676)
* adds checkered floor tiles, hull tiles, and steel monotile decal

* adds checker floors, hull floors, and dirty steel monotile decal

* adds hardened reinf tiles
2023-08-06 02:27:48 -06:00