juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,517 Commits 57 Branches 0 Tags
e6b52cc294a9ecafadda75ff62b91c60152b7d96
Commit Graph

13639 Commits

Author SHA1 Message Date
lzk
e6b52cc294 Fix nettle seeds inhand sprite (#22891) 
fix
 2023-12-23 22:25:50 -07:00
StanTheCarpenter
734da59202 Added Santa's hardsuit and helmet. (#22898) 
* Added Santa's hardsuit and helmet.

* Fixed missing files
 2023-12-23 22:25:12 -07:00
lzk
54a2f84fda Fix missing pipe on barratry (#22889) 
* Update barratry.yml

* Revert "Update barratry.yml"

This reverts commit c8bbaae930c4129a45c65ddbdf003f4378716e41.

* Update barratry.yml
 2023-12-23 22:13:13 -07:00
lzk
5d0624bd34 fix cargo backpack inhand sprite (#22888) 
Update inhand-right.png
 2023-12-23 20:56:01 -05:00
github-actions[bot]
1db2230ecf Update Credits (#22906) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2023-12-23 20:21:46 -05:00
deathride58
3addd3e32c fixes drug shader in compatibility mode FOR REAL THIS TIME (#22903) 
fixes drug shader FOR REAL THIS TIME
 2023-12-23 14:27:46 -08:00
deathride58
9870c7f9eb Fixes GLES2 crashing when compiling the drug shader (#22899) 
fixes drug shader not compiling in gles2 and also applies DRY
 2023-12-24 05:36:56 +11:00
SpaceyLady
9103061ac0 Correct spelling mistakes for daily tips (#22893) 
Update tips.yml
 2023-12-23 07:57:58 -06:00
Chief-Engineer
0f6d062da4 temporarily override WizDen admin names (#22878) 
update global WizDen cvars
 2023-12-23 05:49:14 -06:00
Velcroboy
dfa71af1f8 Add Chef's Belt (#22868) 
* Add Chef's Belt

* Reduce contents in filled belt to just s&p

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2023-12-23 00:11:30 -07:00
Alzore
a09efd47cd Add a bottle of water to the survival box (#22881) 
* BO'OH'O'WA'ER

* smallbottle

* extendedbox
 2023-12-22 23:33:20 -07:00
Nemanja
06a663d3ab Move HUD options to general options tab (#22884) 2023-12-22 23:32:56 -07:00
Nemanja
9b18357a88 Corner Clothing UI (#22883) 
* Corner clothing (save point)

* IT WORKS. YIPPEE

* the last of it

* template rejigs
 2023-12-22 23:32:23 -07:00
liltenhead
33399db6c2 Vial Drinking (#22886) 
vial drink
 2023-12-22 23:32:13 -07:00
lapatison
6baf564fa0 Cargo request plasma canister locale (#22858) 
* name and desc removal

* locale

* shouldnt have touch that for now
 2023-12-23 00:42:19 -05:00
deathride58
e61b7d105c Drug overlay shader rework - a little more motion-sickness friendly, a little less shonky (#22872) 
* reworks the drug overlay effect to be less motion-sickness inducing and a bit less shonky

* UNAUTHORIZED fucking THING. DESTROY it immediately

* further tweaks - adds another gradient to control the color effect too
 2023-12-23 00:35:46 -05:00
Moomoobeef
c64c98ec1d New sprites for books on bookshelves in order to look less sad. (#22874) 
Changed sprites for books on bookshelves, added one missing sprite
 2023-12-23 00:34:19 -05:00
Ed
3f8ad3a13d Anomaly synchronizer buff (#22771) 
* Update production.yml

* Update electronics.yml

* Wat

* Update anomaly_sync.yml

* Update anomaly_sync.yml
 2023-12-22 23:46:51 -05:00
lzk
8604efc520 add saturation to TC inhand sprites (#22870) 
change
 2023-12-22 20:26:01 -07:00
deltanedas
ffe4569854 jaws cant pry bolted doors (#22860) 
* jaws cant pry bolted doors valid jaws can

* no valid jaw

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-22 20:22:12 -07:00
Ed
def4e0f60e Doggy Ears (#22832) 
* add content

* sprite update

* goodbuy nose
 2023-12-22 20:20:08 -07:00
Chief-Engineer
e559c080ff Update WizDen's borg definition of crew (#22873) 
update borg definition of crew
 2023-12-22 18:27:22 -06:00
lzk
fe8e0e6f9f Remove job specific traitor items from vendors (#22867) 
Update chapel.yml
 2023-12-22 14:54:54 -08:00
LordCarve
7d69055291 Use different chatbox placeholder when dependent keys unbound (#22747) 2023-12-22 11:39:29 -08:00
magmodius
053c1e877f Rigged boxing gloves have variant TC costs. (#22851) 
Made the rigged boxing gloves have variant TC costs.O[Oi
 2023-12-22 02:54:20 -07:00
Ed
5a1e317e0f It's time to build a barbershop! (#22565) 
* barber!

* 5% change to maintenance
 2023-12-22 02:54:00 -07:00
Emisse
5d185483b4 Reach update (#22854) 
* reach update

* lights n shit
 2023-12-22 20:53:42 +11:00
lzk
3389955648 hotfix for party hats (#22852) 
lololo
 2023-12-22 00:32:11 -07:00
Kevin Zheng
054321d2c2 Add YAML gas reactions (#22803) 
* Add YAML gas reactions

* Convert more reactions

* Use enum names

* Convert more names

* Add migration for MiasmaCanister

* Prevent reactants from going negative

* Fix energy conservation, lift energy calculation

* Fix comment

* Comment

* Add rate multiplier
 2023-12-22 00:30:56 -07:00
MACMAN2003
0828c32abf Add some clothes to the uniform printer (#22829) 
all the clothes (ft. emag)
 2023-12-22 00:26:38 -07:00
2013HORSEMEATSCANDAL
af753c13a5 Glossary (#22840) 
* Added a glossary to the guidebook to help new players understand slang.

🆑 2013HORSEMEATSCANDAL
- add: What's a Greytide ? The new edition of your employee guidebook now has a glossary !

* added one more definition
 2023-12-22 00:25:56 -07:00
lzk
279d345e6c PARTY HATS YIPPIE (#22850) 
* :party:

* a little trolling
 2023-12-22 00:25:20 -07:00
Emisse
d066b6a2c9 add gambling to cargo (#22842) 
* gambling

* fix typos
 2023-12-21 21:24:00 -07:00
Guilherme Ornel
fb47c4c83b Added ashtrays (#22837) 
added
 2023-12-21 21:21:01 -07:00
RiceMar1244
c7052f5a6c Adds top surgery scar markings to the character creator (#22806) 
* Adds top surgery scar markings to the character creator

* Darkens scars and adds new short and long variants
 2023-12-21 21:20:21 -07:00
Ilya246
fcd1a4dde8 adds embedding + throw damage to cybersun pen (#22822) 
cyberpen throw damage
 2023-12-21 21:20:02 -07:00
JoeHammad1844
02ede7d4a8 nukie planet update (#22818) 
* whole lotta shebang

* no more powercreep

* shot dead
 2023-12-21 20:25:30 -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
Kevin Zheng
2189c6feb3 Add migration for MiasmaCanister (#22830) 2023-12-21 15:52:53 -07:00
Guilherme Ornel
456deea19e Makes sabre sheathe use ItemSlots (#22792) 
* added item slot

* fixed filled

* localized verbs

* github check was acting up
 2023-12-21 14:16:42 -08:00
PJBot
2f4d27779c Automatic changelog update 2023-12-21 17:44:48 +00: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
PJBot
3af39ff0f0 Automatic changelog update 2023-12-21 10:19:30 -05:00
PJBot
0c8b186e3a Automatic changelog update 2023-12-21 09:18:13 -05:00
Kara
fdf718e586 Reimplement smart equipping (#22815) 
* Reimplement smart equipping

* inv prediction fix

* oops
 2023-12-22 01:17:09 +11:00
Emisse
f1241ff9c3 infiltrator update (#22820) 2023-12-21 06:52:19 -07:00
PJBot
4a0f3ae218 Automatic changelog update 2023-12-21 05:38:38 -05:00
Łukasz Mędrek
d6f5ff7865 Fix gas canister random item insertion prediction (#22809) 
* Fix gas canister random item insertion prediction

Fix #22652

* Revert Component changes, just rename in prototype
 2023-12-21 21:37:34 +11:00
PJBot
ad281a4a78 Automatic changelog update 2023-12-21 05:24:05 -05:00
Repo
af76a4a76b Prevent mice from spilling containers. (#22812) 
Added component on mouse prototype to prevent spill verb from being added
 2023-12-21 03:23:01 -07:00