juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,365 Commits 57 Branches 0 Tags
84bc7ee2bb5a88a0b45cecb3d5ad3545041b18a0
Commit Graph

5899 Commits

Author SHA1 Message Date
TsjipTsjip
84bc7ee2bb SO gets sec beret (#21433) 2023-11-04 13:52:07 -04:00
daerSeebaer
10be264125 adjust radiation blockers (#21286) 2023-11-04 11:25:55 -04:00
Ubaser
34c69b2c38 Senior Physician Beret (#21426) 
* add

* fix
 2023-11-04 11:20:09 -04:00
TheEmber
7d0070d99e Soap dont have 100% vomit chance (#21428) 
People using soap spears and darts too often as weapon. It shouldnt have better vomit chance than ipecac
 2023-11-04 11:19:29 -04:00
deltanedas
bda8a9c82e microwave can be turned on with signal (#21138) 
* microwave can be turned on with signal

* update prototype

* mapinit

* init for storage

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-11-04 15:44:59 +03:00
Ed
aa713ea7e6 Candles (#21087) 
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
 2023-11-03 22:53:51 -07:00
PursuitInAshes
6be2ef0c73 Fixes A Anomaly Core Description Typo (#21424) 2023-11-03 22:44:55 -07:00
CMDR-Piboy314
5a5e39f47d Added a penguin plushie! (#21097) 2023-11-03 22:07:16 -07:00
Nemanja
a96563c78a fix anomaly core size (#21418) 2023-11-03 22:09:49 -04:00
Alzore
6e90eef108 Security Chunk Salvage (#21403) 
* Security Chunk

* More fish, less bullets.
 2023-11-03 14:06:19 -06:00
Fromoriss
188cbba26e Fix roaches weight to match new system (#21414) 2023-11-03 14:03:27 -06:00
deltanedas
c7f74f79fa fish petting (#21412) 
* fish petting

* evil

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-11-03 13:57:11 -06:00
IProduceWidgets
f1c9935f4c Makes a syndicate chemvend so they dont have to hack it on nukie planet. (#21416) 
Adds a few goodies to the vendor's inventories.
 2023-11-03 13:56:48 -06:00
Tunguso4ka
a68b1d2222 fixed rat kebab parents (#21409) 2023-11-03 10:50:32 -07:00
deltanedas
268bd105a5 buff bag of holding (#21411) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-11-03 07:31:02 -04:00
liltenhead
751ffdca55 Return the nukie hypo (#21391) 
* hypo

* Bag hypo
 2023-11-02 13:35:56 -06:00
Nemanja
85f09cae86 More Storage Rebalancing (#21373) 
* the changes...

* eek
 2023-11-01 17:19:41 -06:00
MilenVolf
9e7cac2ac9 Fix tests fail (#21384) 2023-11-01 18:06:23 -04:00
Repo
222c025cd3 Revert "Enable skeletons temporarily for Halloween (#21356)" (#21385) 
This reverts commit 4f81a561ae.
 2023-11-01 17:47:55 -04:00
Ed
96ff529c82 Anomaly Cores (#21306) 
* add first anomaly core

* meme

* 5 min to 10 min
fix yml

* fix

* Update doc

* no static price
 2023-10-31 19:20:52 -04:00
Nairod
3b10c88c8c Command Styled QM Card (#21368) 2023-10-31 16:42:00 -04:00
brainfood1183
15fc7b1e92 blue blood now requires copper instead of iron to cure bloodloss (#20863) 
* blue blood now requires copper instead of iron to cure bloodloss

* arachnid species now needs copper to cure bloodloss and copper pills added to medkits.

* fix puddlesystem proto

* remove the cool

* no longer uses hastag, instead uses custom heart organ and hasorgan.

* fix
 2023-10-31 13:41:25 -07:00
Psychpsyo
6a18bdc023 Soapy Water & Edible Soap (#20364) 
* soap reagent and soapy water

* make soapy water recognizable

* Fix tile cleaning bug

CleanDecalsReaction was able to take more than the reactVolume it was given.

* make soapy water an evaporating reagent

* Tile reactions when mopping

* Fix indescribably soap flavor

* Adjust soap flavours

Soap and soapy water now taste clean and syndie soap tastes like punishment.

* Better soap numbers & DeleteOnSolutionEmpty

* Changed TrashOnEmpty to TrashOnSolutionEmpty

* Last TrashOnSolutionEmpty change

* Fix merged code not compiling

* Requested changes.
 2023-10-31 13:39:12 -07:00
potato1234_x
1c604a41a5 Cockroach + Glockroach Admeme + Mothroach (#19752) 
* cockroach

* Update Resources/Textures/Mobs/Animals/cockroach.rsi/meta.json

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

* parenting fixe

* d

* rsi fail

* mothroach!!!!

* cockroach vent event + critters in trashcart

* linter

* fix

* commit

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2023-10-31 13:28:42 -07:00
deltanedas
49f0b20b0a make bloodred large size (#21362) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-10-31 15:37:39 -04:00
Bixkitts
74f1098008 Candy Bucket for Halloween (#21257) 
* Added candy bucket and component to update appearance of held containers akin to it

* cleanup newline

* newline was load-bearing

* moved component to Shared, cleanup

* newline is spooky

* You build and run without errors, stop pretending otherwise

* Updated for new storage system in master branch
 2023-10-31 11:54:41 -04:00
LankLTE
1a9f3bc86b Fix the organtype (#21347) 2023-10-31 06:57:26 -06:00
Nemanja
a05ef80cb0 fix smoke not transferring (#21332) 2023-10-31 06:43:18 -06:00
ZeroDayDaemon
a302775ac0 Pea Plants (#20504) 
* Add Pea Plants

* Pea soup

* Update flavor-profiles.ftl

* Update seeds.yml

* Add seeds to vendors

* Make things more expensive to fix free money exploit

* Update textures

* Revert "Update textures"

This reverts commit b1b7046504afc7468742b0722f601d98684a1c89.

Vines dont grow straight into the air.

* Shift up 4 pixels

* Fuck autofix conflitcs

* Shift up 3 more pizels

* I finally got byond working so I made sure they were EXACTLY the same

* Address Reviews? I think?

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-10-31 00:09:13 -04:00
Nemanja
0c329ed661 Storage Standardization [Take 2] (#21270) 2023-10-30 20:55:55 -07:00
Nemanja
4f81a561ae Enable skeletons temporarily for Halloween (#21356) 2023-10-30 20:40:11 -07:00
I.K
01d57a0210 fix fireaxe swing (#21346) 2023-10-30 23:30:58 -04:00
Ed
1659a14d5c Update ground_lighting.yml (#21350) 2023-10-30 23:16:28 -04:00
Doru991
e1440cb493 Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176) 
* Pumpkin textures

* Pumpkin prototypes

* Jack o lantern prototypes and pumpkin cake

* Finishing touches

* Arbitrageloose

* Restore old pumpkin helmet sprites (God I hope it works)
 2023-10-30 23:12:23 -04:00
Vasilis
1a45c32355 1984 mouse AI (#21353) 2023-10-30 18:49:05 -07:00
metalgearsloth
b3b0d0c567 Thicken thindow bounds (#21280) 2023-10-30 22:48:11 +11:00
Psychpsyo
e22d3a4cb0 Space Asshole Gear (#21243) 
* Add Space Asshole Coat

* Add sledgehammer

* Adjust sledgehammer damage values

* Add copyright string to sledgehammer
 2023-10-29 20:09:18 -04:00
nmajask
014d3a36c4 Added thermal insulation to flannel jackets (#21273) 2023-10-29 20:08:06 -04:00
Subversionary
a6448cb87d Fix bola stam damage, bring back old construction requirements (#21340) 2023-10-29 18:27:43 -04:00
brainfood1183
00523b5260 New foam sprites (edge sprites) (#21308) 
* New foam sprites (icon smoothing)

* changed to edge sprites for foam

* fix

* edges for metal foams

* fix
 2023-10-29 10:13:41 -04:00
Yousifb26
b5c21bcd00 Update belt.yml (#21317) 
changes the chief engineer's belt to remove the lv wires (they take up a lot of space and are easy to get anyways) in exchange for a holofan, a t-ray, and a gas analyzer (first time coding ever this might have to be edited)
 2023-10-29 10:11:51 -04:00
kerisargit
f2bc0ff128 Atomic bomb add uranium (#21143) 
* fix: Incendiary bullets no longer deal cold, acid, or shock damage that ignores all armor.

* Atomic bomb
 2023-10-28 23:24:46 -07:00
metalgearsloth
5b8f3c48c4 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed Content audio (#20862) 2023-10-29 14:58:23 +11:00
Whisper
cd280eef6b remove pulse rifle from ert medic (#21310) 2023-10-28 20:56:33 -07:00
Ubaser
d08a9e2b94 Wearable bee plush (#20623) 
* add

* fix

* temporary change, needs fixing

* mayb fix

* actually fix FR

* yes
 2023-10-28 20:55:15 -07:00
TemporalOroboros
b223e7d6ed Generalizes solution overflow & slightly increases space lube yield (#21094) 
* generalize SolutionSpikeOverflowEvent

* let reactions overflow

* spacelube: 3 -> 5

* restore TryMixAndOverflow threshold cap
 2023-10-28 12:46:59 -04:00
Whisper
e11d33b68d fix cburn bag issue, make new bag entity for them and filled bag entity (#21295) 2023-10-28 00:30:59 -04:00
Morb
d27df9705d Fix hijack objective (#21241) 
* Fix hijack

* Max difficulty
 2023-10-27 22:33:18 -04:00
metalgearsloth
1f59770ac1 Make crystals noRot (#21279) 
IDK might be better. Ideally the anchoring would be offset 0-0 but this is the world we live in atm.
 2023-10-27 22:27:16 -04:00