juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,069 Commits 57 Branches 0 Tags
4c2fd55720923ea897fbc3bbc02b7ae26c25ffae
Commit Graph

22069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TruePaInt
4c2fd55720 Gun cyborg module (#19629) 
* Update borg_modules.yml

* Update uplink_catalog.yml

* Update uplink-catalog.ftl

* Add files via upload

* Update meta.json

* Update uplink-catalog.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-01-08 00:03:18 +03:00
Ubaser
875f24bfbd Core update (#23690) 
yes
 2024-01-07 13:48:02 -07:00
lzk
ee21939066 Red racoon suit (#22862) 
* comit

* 🚯 🐼

* stupid

* stupid x2

* fix tests

* Update cargo_vending.yml
 2024-01-07 23:37:56 +03:00
GreyMario
19e41011b8 Pies and tarts categorized in meal_recipes.yml, added their recipes where possible (#23266) 
pies and tarts categorized, added recipes where possible
 2024-01-07 23:20:14 +03:00
Adrian16199
7c87ba3b41 Adds ties to the uniform printer. (#23686) 
To not bloat the vendors but to still allow one to be fancy if they bother head of personel enough.
 2024-01-07 22:55:41 +03:00
Trevor Day
aa7fcb19ec Update ChemicalReaction and ReagentEffect logs. (#23649) 
* Update ChemicalReaction and ReagentEffect logs.

* Updated explosion log as well, and small cleanup.
 2024-01-07 14:23:18 -05:00
lapatison
c6e829ca6e Ninja and Syndie reinforcement ghost role locale (#23691) 
ghost role locale
 2024-01-07 14:23:09 -05:00
Ubaser
d9d28627a8 Butcher-able gloves (#23216) 
* ya

* something

* fixe
 2024-01-07 09:54:16 -08:00
Nemanja
a78e9a854e Hellfire Thermomachines (#23543) 
* hellfire thermomachines

* slight nerf? idk

* ilya review

* Improve clarity

* Update Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2024-01-07 08:55:22 -05:00
metalgearsloth
bc07cbc97c Fix audio fades (#23684) 
Audio refactor casualty
 2024-01-08 00:23:22 +11:00
metalgearsloth
5d1fcf9dff Fix magnet re-parenting (#23680) 
Me when I test at default position and forgor to store localposition.
 2024-01-07 23:57:54 +11:00
DrSmugleaf
c05a458de2 Revert "Game server api (#23129)" (#23672) 
This reverts commit dfc8ea6aee.
 2024-01-07 02:04:21 -08:00
Aleksander Warzyniak
3e3ff025ed Onion Rings can now be dipped (#23582) 
Updated onion rings

Changed maxVol of onion rings to 4 in order to allow dip
 2024-01-07 12:07:03 +03:00
Ubaser
627aa56551 Tweak vodka martini description (#23669) 
* add

* tweak
 2024-01-07 11:17:16 +03:00
Aexxie
f724291c2a Adds the central commanders cloak. (#23666) 
* Adds the central commanders cloak.

* Adds it to CentDrobe, and also matches it to other naming schemes

* oops fucked up a capital letter. fixed
 2024-01-07 00:12:12 -07:00
Ubaser
93a77e89fe Flower wreaths (#23662) 
* add

* fix
 2024-01-07 00:03:46 -07:00
brainfood1183
bb294a7aa2 Rock Anom effects (#23633) 
* Rock Anom effects

* fix

* fix
 2024-01-06 23:44:04 -07:00
metalgearsloth
0fc5bf5546 Fix magnet despawning deletion (#23657) 
Silly mechanic.
 2024-01-06 23:40:49 -07:00
2013HORSEMEATSCANDAL
23ec7d8554 added the pride cloaks to maint spawns (#23658) 2024-01-06 23:40:30 -07:00
Minty642
8fd8ca6a59 Add Food Recipe for food bounty in chef guidebook (#23659) 
add recipe
 2024-01-06 23:39:56 -07:00
metalgearsloth
3c8d78c0d3 Disable magnet wrecks (#23664) 
Until we can manage these code-wise better and not rely upon people who aren't even around anymore to balance them.
 2024-01-06 23:36:18 -07:00
Ubaser
1a2c3baf8e Observation kit sunglasses actually look like sunglasses now. (#23621) 
* add

* suffix
 2024-01-07 01:24:35 -05:00
metalgearsloth
fe91132f4e Bump blob asteroid iterations (#23660) 
Occasionally the big blob is too small.
 2024-01-07 15:21:16 +11:00
metalgearsloth
d0f51def1a Fix asteroid UI determinism (#23661) 2024-01-07 15:21:05 +11:00
metalgearsloth
3452521021 Fix exped dungeons (#23654) 
mapBounds was null after one of my last changes. I changed the transform so it's just passed in directly as I don't think there was an easy way around it.

I checked magnet + roomfills still work.
 2024-01-07 14:23:53 +11:00
metalgearsloth
fb24f9accf Fix salvage magnet determinism (#23655) 
Machine-specific moment, you'd think I'd remember from expeditions.
 2024-01-07 14:23:44 +11:00
metalgearsloth
fed15b0330 Fix master (#23656) 
Proximity didn't pass CI.
 2024-01-07 14:23:25 +11:00
Matt
40e4d43c3b feat: add xsl stylesheet to changelogs (#21930) 2024-01-07 04:02:36 +01:00
MaloTV
b85a9d7688 Bullet Type Visual Indicator (#21068) 
* Bullet Class indicators

* New Practice Sprite

* Removed re-specified values

* fixes up whitespace to get this merged

---------

Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
 2024-01-06 21:36:51 -05:00
Ed
d22fe3f921 SyndiCat (#22554) 
* add content

* 4 tk to 8 tk

* replace to autoinject, now cat can explode in any moment. increase cost to 10tk

* Update animals.yml
 2024-01-06 17:52:41 -08:00
Simon
dfc8ea6aee Game server api (#23129) 
* Stuff

* Fix RoundStatus Action

* Rename stuff

* Also needs to run on the main thread

* minor stuff

* Move to not be an EntitySystem

* Part 1 of making this less shit

* Make some more stuff run on main thread

* Actor check, logging and remove token from log.

* Better log

* Change ActionKick to use Guid instead of username

* Fix build

* Bandaid fix for test fails
 2024-01-06 17:47:29 -08:00
github-actions[bot]
5f8eab71ce Update Credits (#23651) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-01-06 18:40:37 -07:00
Trevor Day
39e59cb77f Update dice state handling (#23643) 
* Auto generate dice component state handling, and update data field annotations

* Missed one.
 2024-01-06 17:30:21 -08:00
Ubaser
8b107b5a9f Update tips (#23611) 
* add

* fix
 2024-01-06 20:19:09 -05:00
deathride58
21ec29bfa6 Microwaves no longer instantly gib living creatures Microwaves now heat in real-time 
* Animal cruelty nerf - microwaves no longer instantly gib, and now heat in realtime

* While we're at it there's honestly no need for this shit to be hardcoded
 2024-01-06 17:16:39 -08:00
deathride58
e57b47242f Kobold noises! Gently the kobolds (and monkeys)! Monkey YAML cleanup! 
* modular monkeys - you can now gently the monkeys and kobolds
* kobolds are clumsy critters!!
* that's baseline now
 2024-01-06 17:08:51 -08:00
Ubaser
94d4d22f2d Add trench coats (#23563) 2024-01-06 17:06:15 -08:00
Jezithyr
3261962f8c Fixing performance issue with Proximity Detector (#23557) 
* fixing access levels and removed strings from data defs

* Fixing proximity detector performance

- Re-added component filtering for the close entity search.
- Changed criteria functionality to only allow for searching for entities with all specified comps (matching any would be too unperformant)
 2024-01-06 17:04:33 -08:00
Leon Friedrich
4ddb3db1ec Fix NavMap exception (#23636) 2024-01-06 16:06:52 -05:00
Ubaser
eb46918d7e Remove a couple translations to the archaic accent (#23614) 
add
 2024-01-06 15:42:20 -05:00
deathride58
abfa9ff856 Fixes NPCs that lack a UseDelay component failing to interact with objects (#23638) 
fixes NPCs failing to interact with objects
 2024-01-06 15:32:50 -05:00
metalgearsloth
f5909f68ae Fix more tag ordering (#23634) 2024-01-06 15:16:25 -05:00
Alekshhh
a3f40c239e Ore Visual Change (#23618) 
* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* ore

* banona

* glo

* shadwe
 2024-01-06 14:34:11 -05:00
Ubaser
7858dad9e4 Darken syndicate implanter sprite (#23622) 
add
 2024-01-06 11:10:56 -05:00
Ubaser
172fcaf2d4 Rename Goldschläger to Gildlager (#23223) 
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-01-07 02:34:15 +11:00
Pieter-Jan Briers
d8cbddf1f4 Fix bad sawmill IPostInjectInit (#23626) 
Same issue as 359811f71e
 2024-01-07 02:33:53 +11:00
Ubaser
1299c81df6 Add Flippo lighter to the cig vend (#23620) 
add
 2024-01-06 17:56:41 +03:00
MACMAN2003
04cf1c3c49 Add hats and berets to the uniform printer (take 2) (#23556) 
* hates and beretes

welcome to team 4tress, after eighteen millennia in development, hopefully it will have been worth the wait

* EEYIKES!! How will I ever "fix" these "typos"???

* SPELL WARS 2: ATTACK OF THE TYPOS

hlep me i catn' stop speeling bad

* put hats above associated uniforms
 2024-01-06 17:54:57 +03:00
Ubaser
17da2f0bee Fix a stray pixel on the large lizard tail (#23619) 
add
 2024-01-07 00:07:34 +11:00
DrSmugleaf
d79ead6fb1 Make DamageOtherOnHitSystem only flash an entity red if damage was dealt (#23612) 2024-01-06 23:13:01 +11:00