Commit Graph

1670 Commits

Author SHA1 Message Date
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
Pieter-Jan Briers
bf16698efa Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
Flareguy
370cbfbbdd Yet Another Asteroid-Related Tile Update (read: asteroid tile variantizing) (#19237)
* makes asteroid tiles and snow use weighted variantize, adds snow plating

* GO FUCK YOURSELF!!!!

* hello? boner department, id like to order a DINNER. make it MAMA LUIGI

* test fix. hopefully. boner. boobies.

* did he know? (no)
2023-08-24 23:40:04 -04: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
potato1234_x
566505cdb3 short hair sprite change (#19425) 2023-08-23 17:42:33 -04:00
Nairod
4a520ae2cb Arachnid Markings Expansion (#19439) 2023-08-23 17:37:42 -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
Emisse
a470f8f40b classic hair options (#19422) 2023-08-21 23:45:19 -06:00
VelonacepsCalyxEggs
9bf20c7f9b Random Grille Spawner for mappers. (#19416)
* random grille textures

* random grille prototype
2023-08-21 22:21:45 -04:00
potato1234_x
4761e8679c Vending machine sprite polish (#19210)
* g

* chefvend
2023-08-21 14:45:53 -04:00
Nemanja
848b713982 diona customization (#19304) 2023-08-20 19:02:12 -06:00
Alekshhh
b1350b61aa Modern Hair Tweak (#19344)
* hair

* hair2

* mm
2023-08-20 19:00:51 -06:00
Alekshhh
b65728793c I am being held at gunpoint by emisse (#19335) 2023-08-20 02:54:44 -06: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
Alekshhh
9491f322de Hair Overhaul (#19298)
* OLD SPICE

* BODY WASH

* POWER

* meta moment
2023-08-19 18:37:56 -04:00
Velcroboy
f04e0a0ea1 Centers condiment dispenser (#19308)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-08-19 09:45:43 -07:00
Ubaser
82cbdafe60 new machine frame sprites (#19211)
* replace sprites

* change copyright

* Update Resources/Textures/Structures/Machines/parts.rsi/meta.json

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2023-08-16 22:16:12 -06:00
JoeHammad1844
ebdf249e52 Add fingerless insulated gloves (#19111)
Fingerless insulated gloves are a joke variant of insulated gloves that neither insulates you, nor prevents you from transferring fingerprints. The name and description make this adequately clear.
2023-08-16 10:38:07 -08:00
Emisse
5cacc2aa5c make the smaller sinks look good again (#19198)
* make sinks loog good

* meta
2023-08-15 23:44:14 -06: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
Kara
2e86f4c556 Portal sprite & behavior tweaks (#19179)
* Portal repalette

* Portal traversal verb + anchoring

* map restriction

* optional max distance checks if we decide to have them later

* lower pointlight energy slightly hopefully makes it less garish
2023-08-15 14:56:14 -06:00
Kara
cfccb5959a Lavaland chasms (#19154) 2023-08-15 12:29:24 +10:00
Kara
ec02907446 Various bar-related fixes (#19126)
* Various bar-related fixes

* smartfwidge

* gumbo
2023-08-14 15:03:20 -06: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
Moony
3b7a23bde4 Update paperstamp.swsl (#19114)
blorg
2023-08-14 02:04:07 -06:00
Emisse
3268ea3d92 plastic hydro crates (#19112) 2023-08-14 02:29:01 -05:00
Emisse
b3c8dff61c o2 crate recolour (#19113)
* o2 crate recolour

* fix inside of box shading
2023-08-14 02:28:53 -05:00
Emisse
603f990f8a engi crate recolor (#19094) 2023-08-14 00:17:07 -04:00
eoineoineoin
4ccc8a04be Improve paper stamping experience (#17135) 2023-08-13 14:28:10 -04: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
potato1234_x
2b6cbdab74 Fix inconsistent vending machine sprites (#18953)
* fixe

* updatery
2023-08-13 01:15:13 -06:00
Nim
998c6f3d7b Secret door (#19023)
* secret door

* oops
2023-08-13 01:10:45 -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
Pieter-Jan Briers
a242af506e Adds the thermo-electric generator (#18840)
* Basic TEG start.

Connects via node group.

* Basic TEG test map

* Sensor monitoring basics, TEG circulator flow

* Basic power generation (it doesn't work)

* More sensor monitoring work

* Battery (SMES) monitoring system.

* Sensor monitoring fixes

Make it work properly when mapped.

* Test map improvements

* Revise TEG power output mechanism.

Now uses a fixed supplier with a custom ramping system.

* TEG test map fixes

* Make air alarms and pumps open UI on activate.

* Clean up thermo machines power switch.

Removed separate Enabled bool from the component that always matched the power receiver's state.

This enables adding a PowerSwitch component to give us alt click/verb menu.

* TEG but now fancy

* Make sensor monitoring console obviously WiP to mappers.

* Vending machine sound, because of course.

* Terrible, terrible graph background color

* Examine improvements for the TEG.

* Account for electrical power when equalizing gas mixtures.

* Get rid of the TegCirculatorArrow logic.

Use TimedDespawn instead. The "no show in right-click menuu" goes into a new general-purpose component.

Thanks Julian.

* Put big notice of "not ready, here's why" on the sensor monitoring console.

* TryGetComponent -> TryComp

* Lol there's a HideContextMenu tag

* Test fixes

* Guidebook for TEG

Fixed rotation on GuideEntityEmbed not working correctly.

Added Margin property to GuideEntityEmbed

* Make TEG power bar default to invisible.

So it doesn't appear in the guidebook and spawn menu.
2023-08-12 15:41:55 -05:00
potato1234_x
f4bbe3603d Add trash carts and janitorial trash carts (#18996)
* everything

* half loot
2023-08-12 13:05:32 -06:00
terezi
bfc852f29b jester outfit sprite fix (#19003) 2023-08-12 13:06:46 -04:00
Kara
7b51cebfea Deathgasp + last words / succumbing / fake deathgasp as crit actions (#18993) 2023-08-11 22:56:34 -07:00
deltanedas
ccd93dc464 vim!!!!!!11! (#15659) 2023-08-11 12:20:16 -04:00
potato1234_x
fbecde1f68 ice (#18985) 2023-08-11 01:28:26 -06:00
Flareguy
509f20084a Converts Microwave & Wallmed to old /tg/ sprites (#18970)
* changes microwave and nanomed to use old /tg/ sprites

* makes microwave smaller
2023-08-10 23:12:37 -06:00