Commit Graph

1174 Commits

Author SHA1 Message Date
Ed
5a1e317e0f It's time to build a barbershop! (#22565)
* barber!

* 5% change to maintenance
2023-12-22 02:54:00 -07:00
Guilherme Ornel
fb47c4c83b Added ashtrays (#22837)
added
2023-12-21 21:21:01 -07:00
Tayrtahn
8ad0d26015 Change range of 10-sided dice (#22833)
* d10s now roll values from 0 to 9

* Changelog for PR #22406 (#22824)

* Remove meta entry for 10 value state

* Gotta delete the 10 face state or the RSI validator complains

* Attempting to fix invalid state causing tests to fail

* Another, better attempt to fix the test

* Once again

* I am an overcomplicating dingbat

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2023-12-21 19:53:17 -07:00
Boaz1111
4c081aab04 Uranium Ammo (#22406)
* working on depleted uranium shotgun ammo

* added depleted uranium to more ammo

* Last changes and additions

* Forgot something, theoretically resolved the merge conflict too

* Nerfed the DU munitions, renamed em to uranium because it's not really DU

* made the ammo more expensive, also fixing the crash at the same time

* Fixed the last error, theoretically at least

* Revert "Fixed the last error, theoretically at least"

This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b.

* copyright changes, small sprite changes, last references of depleted uranium removed

* Revert "copyright changes, small sprite changes, last references of depleted uranium removed"

This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f.

* Update meta.json

* Update meta.json

* Update lathe.yml

* Update arsenal.yml
2023-12-21 12:07:44 -05:00
KittenColony
85b0ce9c48 Fireaxe icon resprite (#22805)
rotated icon 45 degrees
2023-12-21 01:03:52 -07:00
RiceMar1244
5ee01ce900 Resprites energy sword and double energy sword (#22797)
* Removes old inhand visuals from e_sword.rsi and its meta.json

* Adds new visuals with a longer blade for the e sword

* Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands

* Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up)

* Removes old desword sprites and modifies meta.json

* Temporarily removes esword blade sprites

* Adds back esword sprites after modifying them to flash instead of shimmer

* Adds new desword inhand sprites and modifies meta.json and entity prototype to use them

* Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict

* Removes blade inhands

* Adds back blade inhands

* Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder
2023-12-20 23:32:11 -07:00
Guilherme Ornel
3db343f160 Updated (most) medipen sprites (#22789)
* changed sprites

* desaturated a bit
2023-12-20 22:30:58 -07:00
Guilherme Ornel
d318e96936 Added CentCom clipboard, folder and added a normal green folder. (#22693)
* added

* pen touch up

* fixed conflict?

* whatever i dont want credits
2023-12-20 16:29:35 -07:00
Stanislav4ix
d38b4e1bca Added ore bag of holding (#22680)
* Added ore bag of holding

* Now its in industrial tecnologi

Yeah, I fixed it with Tunguso4ka

Co-Authored-By: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>

* Update ore_bag_holding.yml

Now the "magnet" has a larger radius of attraction

* Changed location

---------

Co-authored-by: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
2023-12-20 09:28:56 +11:00
Velcroboy
a4ed13af4a Remove duplicate milks (#22721)
* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-18 15:51:39 -07:00
Emisse
8c1eecffd4 Svalinn Experimental Battery Ammo Research [T3] (#22045) 2023-12-16 19:43:49 -08:00
brainfood1183
f262aaaac0 crystals drop shards and ore crab tweaks. (#20930)
* crystals drop shards and ore crab tweaks

* crystals drop shards, shards can be crafted into colored light tubes and silver ore crab.

* crystals can now be unanchored.

* added silver crab to rock anom spawn

* fixes

* sorted out the parenting for crystal light tubes.
2023-12-16 15:20:14 -07:00
deltanedas
d8ee36d7b0 add power sensor (#20400)
* clean up logic gate / edge detector components

* logic gate usedelay support

* new codersprite

* PowerSensor component and system

* add power sensor

* port locale

* fix

* minecraft

* fixy

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 11:32:42 -07:00
Ubaser
db74ca0e2c Add vials (#22587)
* vial

* yea

* s

* fix something

* yaml

* fixer

* aaaaaaaaaaa

* update

* sprite changes

* a

* fix'd
2023-12-16 09:29:53 -05:00
NkoKirkto
3e0f3bd198 Added urn (#22488)
* Changes Stuff( ͡° ͜ʖ ͡°)

* Changes Suff(Fucked Sprites)

* Chages Stuff(New Sprite)

* Changes Stuff(Hope this works)

* Changes Stuff(Renamed the Urn.rsi)

---------

Co-authored-by: NkoKirkto <halloleute640mail.com>
2023-12-16 03:31:12 -07:00
Ubaser
6e38fed896 Luxury pens (#22542)
* add

* spawns

* fix

* spacing

* cut down a bit

* componenets sdsstsdsds
2023-12-16 01:21:24 -07:00
Kara
8399d0a9eb Faux astro-tiles for science & mappers (#22586)
* Faux astro-tiles for science

* didnt mean to commit dode
2023-12-16 01:20:57 -07:00
Flareguy
e31cf20871 Ports the /tg/ shotgun sprites (#22539)
* ports the /tg/ shotgun sprites

* webedit fail

* i'm wario and my furniture is broken

* hopefully finally actually fix tests? maybe? my couch is broken

* update shotgun cabinet

* update shotgun cabinet MORE

* ohhhhhh my god...
2023-12-15 23:23:57 -05:00
Ubaser
57c6e503d1 Crayon boxes get white crayons (#22553) 2023-12-15 19:20:39 -08:00
deltanedas
7dd472c934 smoke grenades (#20996)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 17:49:30 -08:00
deltanedas
81b4276b0a blood-red phone (#22538)
* add blood-red phone

* add to nukie planet

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 04:59:10 -07:00
Ed
0a8a6693a8 add content (#22518) 2023-12-15 02:55:57 -07:00
themias
6ef2673c8a Add mining drill inhand sprites (#22494) 2023-12-14 11:47:48 -05:00
Danger Revolution!
78c67a4d91 Add extended/double emergency nitrogen tanks (#22354)
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-12-13 20:35:38 -08:00
Arendian
3e766402b9 Cluster grenades for uplink and security (#22029)
* clustergrenades go boom

* Small tweaks

* Some tweaks and soaplet

* clustergrenadesystem changes and launcher types

* small tweaks

* typo

* whitespace

* rsi edit

* another typo

* add containers

* Some changes related to merge

* Forgot to change name

* Made changes based on review

* Removed new china lake ammo based on feedback in other PR

* Unneeded nested loop moment

* Nested loop needed after all moment
2023-12-13 22:30:42 -05:00
Ubaser
0552cd2e10 New pinpointer sprites (#22435)
* add

* fix?

* a

* maybe

* aaa
2023-12-13 01:53:05 -07:00
themias
e7de7fa075 Add fill layers to Hot Cocoa drink (#22419) 2023-12-12 17:01:24 -07:00
IProduceWidgets
6ab7ecdd53 Instruments, plushies, gunpet, and bibles. (#22398)
* Some instrument sizes and gunpet sidearm

* Cello

* bagpipe

* Crippling balance PR made bananium horn Small not Tiny

* plushie and toy sizes.

* Scroll bigger

* Make bible same size as other books.

* size rgb staff to other staffs.

* add sprite update json
2023-12-12 01:03:47 -07:00
IProduceWidgets
b279f5c910 Jar now fills (#22384)
* Jar

* jar rsi
2023-12-12 00:54:15 -07:00
Flareguy
ae1a1b9e07 adds lime tiles (#22235) 2023-12-08 12:49:07 -06:00
Nim
460bfdc73c Space cobra 1.1 (#20298)
* space cobra again

* didn't see

* fix

* Dirty

* space spider

* license

* component

* sprite update

* visibility

* fix

* fix visibility
2023-12-06 20:25:57 -05:00
Nemanja
8000428e6a tweak crowbar storage sprites (#22202)
* grid inventory sprite rotation

* eek
2023-12-06 20:04:30 -05:00
Nemanja
c047f19fdc Inventory sprite rotation (#22201) 2023-12-07 11:59:16 +11:00
Danger Revolution!
3ad5bbe6ae Adds Emergency Nitrogen Tanks (#22142)
* Added Emergency Nitrogen tanks and added both variants to the Emergency Closet loot pool.

* Restored O2 tank I deleted :)

* Fixed accident with extended emergency oxygen tanks

* Fixed an issue with emergency oxygen tanks

---------

Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
2023-12-05 02:41:39 -07:00
SaveliyM360
fe2672744f Decorative Flags (also handheld flags) (#19670)
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-12-04 17:27:02 +11:00
Nemanja
e2eb80c0fe RNG timers for IEDs + small tweaks (#22099) 2023-12-03 13:21:51 +11:00
Velcroboy
c4ec57e4d3 adjust sprite offsets for paper bins and hotplates (#22075)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-02 18:14:17 -05:00
Boaz1111
a263a17f72 Cryostasis syringe (#22021)
* Added cryo syringe, sprite courtesy of Ubaser

* I failed to put a comma in meta.json file because I was so shocked by jeneral that I couldn't think clearly

* IN MY DEFENSE JENERAL IS SCARY I THINK THE FORMATTING IS FIXED NOW

* added canReact at the wrong place, fixed now

* made the transfer good

* more issues with the sprites

* not much to say, one must imagine sisyphus happy

* mmm yes give me 0 of layers

* I oughta double check shit more

* Should be all done!

* I didn't add it to the lathe, I am le stupide

* Forgot to add the recipe somewhere

* final touches, can actually be made at the medlathe now

* added the recipe to the protolathe as well
2023-11-30 19:40:34 -05:00
DoubleRiceEddiedd
33fb768791 New mutation species plant, Lemoon Tree (#22023)
* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete
2023-11-30 16:44:23 -05:00
Ubaser
1aa07dbb56 add custom PDA for nukie medic (#22016) 2023-11-30 16:39:08 -05:00
Ubaser
de601208ea Add metamorphic "Blood" sprite (#21596)
* add

* forgot to remove

* maybe fix
2023-11-28 00:09:55 -07:00
NULL882
f268e626a7 Mining things (#21909)
* mining-doors

* mining-tiles

* mining-window

* Change copyright in meta.json

* Change license in attributions.yml
2023-11-27 14:25:15 -07:00
Feluk6174
0da68ddc6c Added Bananadine (#21759)
* added bananadine and its functionallity (and backed banana peel)

* added baked banana peals sprites

* fixed typos and changed the sprite used by backed banan peel to the right one

* Changed the cooktime and now grinded baked banana leaves have carbon

* Updated bananadine description

* Ficed typo in ragent-desc-bananadine

* Reverted actidental change to nocturine
2023-11-21 20:08:53 -05:00
Velcroboy
808555ade6 Adds slices for banana cream pie and mime tart (#21043) 2023-11-19 12:15:02 -08:00
Ed
786bb79ebc Pet Carrier (Zookeeper gameplay?) (#21545)
* add visual

* fix item + entityStorage problem, add generation in maints

* make pet carrier two-handed

* added to cargo

* add resistlocker component
2023-11-13 16:55:47 -07:00
Ed
c99e265435 Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551)
* add some stuff

* finish pack

* Update encryption_keys.yml

* revert secret channels

* revert spy key

* add spy crew monitor

* add invisible crate

* add void cloak
2023-11-12 16:41:45 -07:00
Doru991
d7810e6d6a Borg QOL, part 3 (#21567)
* Basic and advanced cleaning modules

* Roundstart entry level modules

* Oops forgot recipe

* Gold
2023-11-10 23:43:13 -07:00
DoubleRiceEddiedd
2ef29fb222 New crop: Cotton (#21536)
* Add cotton plant

* Adddescription and tag to cotton bal allow moth eat it

* Fix typo. Add cotton seed into MegaSeed

* Fix typo

* Fix typo

* Fix cottonbol component typo

* Fix the amount of cotton that bol gives

* Adding correct component to make cotton bol edible

* Change cotton bol parent to see if it is edible

* Adding flavor to cotton bol, and fix typo

* Replace image

* fixing plant image position

* Increase the Megaseed restock crate price to avoid money farming loop hole
2023-11-08 18:54:07 -07:00
Boaz1111
4220b098a3 Sling Resprites (#21538)
* DB texture on back changed

* cheese

* test

* CR20 Syndie Sling

* NT slings implemented

* finished SMGS, starting on Laser Weapons

* added more laser slings

* laser weapons done

* small changes to laser weapons and pie cannon slings

* added chinalake and l6 slings

* finished launcher catagory, almost finished rifle catagory

* almost done, just missing the heavy sniper

* Replaced L6, Chinalake and Heavy Sniper resprite because my old heavy sling was ugly af

* all slings done

* added copyright to the .meta files

* Revert "cheese"

This reverts commit a1f7ac7b70709a6789a7b6fc0dc00a2c0734b83a.

* fixed sln file, in theory at least
2023-11-08 14:18:33 -07:00
KingFroozy
3f4d9983e3 nitrile gloves (#21509) 2023-11-08 13:31:24 -07:00