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

7690 Commits

Author SHA1 Message Date
Ed
dd84d48fed Refactors, bugfixs + Crystals (#127) 
* fix dwarf displacement map

* Big Fireplace update

* add crystalls placeholder

* bonfire update

* displaccement update

* Update wallmount_torch.yml
 2024-05-03 20:40:31 +03:00
Ed
e5246f1e76 doors update (#126) 2024-05-03 18:22:10 +03:00
Ed
7d11ff5562 Merge remote-tracking branch 'space-station-14/master' into 02-05-2024-upstream 2024-05-02 20:46:45 +03:00
Ed
4c692d7d4a Alchemy + Guidebook initialization (#124) 
* remove Guidebook

* water and blood

* localization things

* added vital extract

* some fixes

* added bloodgrass

* guidebook localization

* fixes icons and remove unnecesary fields

* added inhand cauldron

* fix wallmount board

* Update bonfire.yml

* Update bonfire.yml

* alchemy furnace + mist

* fixes

* Guidebook localization

* Update drinks.yml

* Revert "remove Guidebook"

This reverts commit 7924cf235f.

* fix filtering guidebook

* test fix

* Update heater.yml
 2024-05-02 20:41:11 +03:00
deltanedas
8909dc7d40 make ducky slippers waddle (#27628) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-05-02 20:09:38 +03:00
slarticodefast
eab276a12d small SpawnItemsOnUse cleanup (#27625) 
* small SpawnItemsOnUse cleanup

* that one was not needed
 2024-05-02 20:08:26 +03:00
Lamrr
b728f36f30 Wine and beer bottles can be inserted into booze dispenser (#27626) 
Fixes tags on wine and beer bottles
 2024-05-02 12:17:36 -04:00
Vasilis
a4b0a34bc7 Remove airtight flaps from the construction menu (#27619) 
They are meant to be mapping only items.
 2024-05-02 10:49:53 -04:00
Michael
131c269e2b Improve CMO's lab coat (#27551) 
This Aims at balancing the viability of the CMO's lab coat compared to his other available options, those being his winter coat (which is just a straight up upgrade) and his hardsuit.

and also its suppose to level him with RD since RD's lab coat has special rad protection

Co-authored-by: Michael <107807667+Bugfinder1@users.noreply.github.com>
 2024-05-02 15:37:12 +03:00
nao fujiwara
316a3d7f4d added a bunch more fox noises (#27578) 
* fuck it we ball

* added recommended copyright information

* revised copyright license

* revised copyright license x2

* finalized the fops

# reduced the number of audio clips
# adjusted the volume of all fox sounds to be consistent with each other

* added new sounds to the overall fox parent mob because we forgot oopsie
 2024-05-02 14:35:10 +02:00
Mr. 27
6680bd4c60 emote wheel fixes (#27545) 
* cheese

* Update disease_emotes.yml
 2024-05-02 15:33:51 +03:00
lzk
efceaa89e0 Make immovable rod announce at the end of the event (#27587) 2024-05-01 18:26:22 -04:00
Simon
c00987500f Add DoorBumpOpener to BaseMobAdultSlimes (#27591) 2024-05-01 18:24:31 -04:00
FungiFellow
7cd1e4e30d Grilles now take Structural Damage (#27596) 
damageContainer: Inorganic -> StructuralInorganic
 2024-05-01 18:23:42 -04:00
Ed
2c34befbcb Fireplace (#123) 
* bonfire!

* fix

* update torch

* docs

* add audio, fix errors

* loc string + fix errors
 2024-05-01 19:55:48 +03:00
ShadowCommander
577106251b Fix pinpointer errors for missing sprite layer (#27582) 2024-05-01 11:51:12 -04:00
NotSoDana
9ca1d01218 Gildlager empty bottle fix (#27581) 
* rename goldschlager bottle

* migration

* fix rsi
 2024-05-01 11:24:05 -04:00
Verm
133d9280ae Add correct lawyer bags to loadouts (#27573) 
* add lawyerbackpack to locale

* lawyer backpack group

* Add bags

* add loadout group

* Be less lazy and spot formatting problems
 2024-05-01 18:48:28 +10:00
K-Dynamic
446f516590 Simplified and consistent honkbot & jonkbot recipes (#27535) 
simplified honkbot & jonkbot recipes
 2024-05-01 13:27:21 +10:00
no
81e553401c Make female reptilians use female cry sound instead of male (#27563) 2024-05-01 13:09:31 +10:00
lzk
c0e3c4fac7 add noSpawn: true to tippy (#27538) 2024-05-01 01:07:30 +03:00
metalgearsloth
2a0fe88aaf Reduce rusty wall occurrences (#27522) 
Every station looks like barratry as there will be many rusty walls onscreen everywhere.
 2024-04-30 17:54:22 -04:00
Ed
0169cb55d8 Alchemy instruments (#122) 
* add beer barrel

* add vet

* add storage to vat

* make bucket viable!

* bandage vat item fix

* Update vat.yml

* add small vial

* tiny vial

* Update SharedStorageSystem.cs

* Create biological.yml

* spilable and bonfire climbing
 2024-04-30 16:48:08 +03:00
ERROR404
e57f5fadc5 Add chameleon projector in thief toolbox (#27491) 
Base
 2024-04-30 15:14:06 +03:00
T-Stalker
bf3e9fe3b4 Add neckfull frills for lizards (#27523) 
* light

* neckfrills

* Delete Resources/Prototypes/XenoArch/Effects/normal_effects.yml

* Revert "Delete Resources/Prototypes/XenoArch/Effects/normal_effects.yml"

This reverts commit 6e6fad609a66a0615abcd545009cdb2f52c9b955.

* Revert "light"

This reverts commit d1f111d4c64da4d2a64907f7dfead104892d1462.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-04-30 19:18:00 +10:00
T-Stalker
d9d36b050a Makes flares quieter (#27521) 
* light

* flares quieter
 2024-04-30 16:49:35 +10:00
Mr. 27
a7bf9583dd monkeys get a different deathgasp emote (#27497) 
a
 2024-04-30 00:14:45 -04:00
Mr. 27
0c8a499a66 give cap sabre the cane blade noises (#27508) 
Update belts.yml
 2024-04-30 00:13:56 -04:00
lzk
9631fee7f2 Remove barozine from mutatuion (#27512) 
Remove barozine from mutatuib
 2024-04-30 05:01:38 +02:00
FungiFellow
657d9ab740 Syndi-Cat QoL Changes (#27408) 
* Syndi-Cat Wideswing, Shoes, and Explosion Resist

* Damn you Plykiya

* 10/10Pierce/Structural -> 6/6/15 Pierce/Slash/Structural

* Update animals.yml
 2024-04-29 20:09:30 +03:00
Ed
9520f63aa1 Merge remote-tracking branch 'space-station-14/master' into 29-04-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
 2024-04-29 16:28:04 +03:00
Ed
bf8002569c Throwing into disposals logic splitting (#27487) 
* wtf

* fix
 2024-04-29 23:12:42 +10:00
metalgearsloth
386454706b Fix snappop (#27264) 
* Fix snappop

Bunch of stuff slipped through.

* name
 2024-04-29 19:54:40 +10:00
Plykiya
7dae58c9f8 Late join thieves! (#27466) 
Co-authored-by: Plykiya <plykiya@protonmail.com>
 2024-04-28 23:38:38 -07:00
MilenVolf
7ee18433c8 New borg sounds (#27205) 
* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor
 2024-04-28 21:38:31 -07:00
Morb
16b3e2233a Emotes Menu (#26702) 
* Basic emote radial menu

* Move out from corvax

* Move to UI controller & add to top menu bar and key bind

* Make emote play

* Add name localization for emotes

* Localize chat messages

* Fix emote menu

* Add categories localization

* Fixes

* Fix

* Add emotes entity blacklist

* Fix entity whitelist required all logic

* Remove unused wagging emote

* Revert sprite

* Set default texture for emote icon

* Update Resources/keybinds.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:38:23 -07:00
SlamBamActionman
373c368b94 Tippy, the helpful hint clown! (#26767) 
* Tippy is BACK

* Clean up clippy from aprils fools

* Changed names from clippy to tippy, added localization, removed local_clippy command, made it easier to target a specific player

* Rename clippy.yml to tippy.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:38:16 -07:00
lzk
eb9ee4541f Add more telecomms variations (#26822) 
* Add more telecomms variations

* fox :fox:

* oops
 2024-04-28 21:26:17 -07:00
Mangohydra
8afae8a1f1 Martyr Cyborg Module, borg law 2 explode (#25815) 
* borg law 2 explode

* attributions fix + CL fix

* please dear god work i beg you

* maybe this will work :godo:

* 50% off deal + disc change

* absolving merge conflict

* merge conflict fix

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml

* Apply suggestions from code review

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:16:04 -07:00
Gotimanga
eb41f1da5f Adding new Cryogenics Reagent - Opporozidone (Attempt 2) (#24074) 
* Fixing mistakes

* How did I make the same mistake twice

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:13:14 -07:00
Leon Friedrich
7c7d8eb645 ActivatableUI tweaks (#27448) 
* ActivatableUI tweaks

* EntGotRemovedFromContainerMessage

* A
 2024-04-29 14:06:43 +10:00
potato1234_x
cd90c05ce5 Rainbow Weed (#25759) 
* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents
 2024-04-28 21:06:27 -07:00
Hanz
33e1752a49 HoP and QM Stamps (#25604) 
the meat and potatoes

yup
 2024-04-28 20:38:45 -07:00
Magnus Larsen
5118865d47 Allow more items to be recycled (#24435) 
Give more items a PhysicalComposition for recycling
 2024-04-28 20:36:11 -07:00
beck-thompson
cdd900cef6 Infinate chem dupe fixed (Toilet, drain) + dirty water toilet fix (#27446) 
innital commit
 2024-04-29 13:08:41 +10:00
Plykiya
4416a21dd5 Make Smile the Slime grabbable like geras (#27458) 
Make smile grabbable like geras

Co-authored-by: Plykiya <plykiya@protonmail.com>
 2024-04-29 12:44:54 +10:00
Ed
6cb97502aa KBAS5 clothing + Jaraten Structures (#120) 
* add barbarian clothes

* add jaraten floors and wall

* locale

* add stonebrick walls and gold\silver ore cave walls

* fix brick black, update cave arena

* Update roundstart.yml

* Update cave-arena.yml
 2024-04-28 22:47:01 +03:00
Ubaser
008935f6ec New plant mutation: Pyrotton (#27200) 
* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent
 2024-04-28 13:07:36 +02:00
osjarw
f3e9db0141 DelayedForce and Rapid anom behaviors fixed (#27435) 2024-04-28 12:28:16 +03:00
FungiFellow
1efdf4a40a Bows fit on Airtank Slot (#27433) 
Update bow.yml
 2024-04-28 18:23:28 +10:00