juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,081 Commits 57 Branches 0 Tags
3a0a4c17ea07fcc78c81eae0c8ea46a6d41929c1
Commit Graph

9787 Commits

Author SHA1 Message Date
Nim
3a0a4c17ea Сrafting changes (#932) 
* crafting

* tweak
 2025-02-25 10:31:59 +03:00
Ed
ae5b1118d8 Update shield.yml 2025-02-24 00:17:41 +03:00
Ed
b8575aba8f roofs update 2025-02-23 23:29:45 +03:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
 2025-02-23 23:07:55 +03:00
keronshb
3192914fc5 Fix/Addition - Wizard Survivor Antag Status (#35226) 2025-02-23 12:24:36 -05:00
pathetic meowmeow
b7414d85b4 Add microwave recipes to the guidebook (#34105) 2025-02-23 16:24:44 +01:00
slarticodefast
55e22b6a94 Remove disablers from emagged lathe (#35423) 2025-02-23 10:05:23 -05:00
chromiumboy
066c773965 Sentry turrets - Part 2: Basic prototype (#35031) 2025-02-24 00:39:44 +11:00
ScarKy0
fad0b6a137 Swap price of EMAG and AD. (#35354) 
init
 2025-02-23 14:01:06 +01:00
K-Dynamic
17218b7277 Lattice tiles footsteps now sound like catwalks (#35421) 
change lattice from FootstepPlating to FootstepCatwalk
 2025-02-23 12:43:15 +01:00
Southbridge
f9c9ffadcc Amber Station Improvements (#35384) 
* Redid TEG, minor fixes around

* Ran fixgridatmos, variantize, fixrotations, tileswalls
 2025-02-23 01:31:04 -07:00
metalgearsloth
a457551108 Roof data rework (#35388) 2025-02-23 18:23:00 +11:00
GrownSamoyedDog
91678f75da Fixed Guidebook Sorting / Ordering (#34960) 
* fixed all yml and cs

* Subjective Rearranging

* fixed my accidentally removed xml endline

* Accidentally included for a different PR

* Added .ThenBy and cleaned up newplayer.yml
 2025-02-23 02:00:10 +01:00
keronshb
c922b4f843 Wizard: Smoke Spell (#35403) 
* Adds smoke spell for wizard

* Adds the actual sprites oops

* Removes repulse attract change

* Removes change again?
 2025-02-22 15:04:42 -08:00
Sparlight
e631fa893e Give dogs speech noises (#35383) 2025-02-22 22:34:29 +01:00
keronshb
ee31a1f293 Wizard: Repulse Spell (#35377) 2025-02-22 10:56:54 -05:00
Nim
d383d329c1 Reduces gauze (#928) 
* size

* ref

* hmm
 2025-02-22 17:28:32 +03:00
Ed
1020288d12 Epic alchemy buff (#931) 
* alchemy update

* damage heat
 2025-02-22 12:45:55 +03:00
Ed
36916b0952 returns ru CBT 2025-02-22 00:51:50 +03:00
Boaz1111
54bb2a31b7 Adds Colored Light Bulbs (#35333) 
* goober

* changes parenting
 2025-02-21 19:01:31 +01:00
lzk
b41a348ebf fix rubber hammer attack rotation (#35357) 2025-02-21 11:01:29 -05:00
KittenColony
93350c80e8 Alchemy Remaster - Foundation (T0 / T1) (#827) 
* Ported from broken repo

* Missed something

* Unfucks the port

* RU locale + EN typo fixes

* Simple solvent & Dye temperature / orgnization

* cleansing salt + reactions

* Healing solution stems bleeding

* Removed biological.yml duplicate

* Guidebook updating

* Update dye_brewing.yml

* Single character typos

* missed typos

* Salt dehydrating

* Dye now needs water (catalyst) to form

* Biological > Organic, Archaic > Arcane / Alchemized,+ RU Locale

* Adjusting & patches

* Chromium in Arcane

* Removed 0.1u empty from purification

* Update chromium_slime.yml

* test commenting out

* Uncommenting InverseEffect

* Revert "Uncommenting InverseEffect"

This reverts commit 19aaaa9246.

* Potential solution

* Revert Potential solution

* This might fix it.

* Suffering

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-21 17:58:40 +03:00
Nim
a39ea84e78 aprons (#926) 2025-02-21 17:38:03 +03:00
spderman3333
d6cc167506 Fixed Veggie pizza slice having 40u of reagent space (#35343) 
* Fixed Veg pizza slice having 40u of reagent space

* Changed FoodPizzaVegetableSlice to hold 10u rather than 6u

* Fixed donk pocket slice having 50u reagent space.
 2025-02-20 20:50:30 -08:00
keronshb
a9054c5e9c Mjollnir and Singularity Hammer for Wizard (#34446) 2025-02-20 18:38:52 -05:00
lzk
53c82ebdd6 2 lines yaml cleanup (#35338) 2025-02-20 20:24:21 +01:00
Deserty0
b8cc4c8c20 Fix (#922) 2025-02-20 19:22:29 +03:00
Deserty0
225d9b27f9 fix (#923) 2025-02-20 19:21:50 +03:00
Zokkie
580f908ca2 Fix to make all corpses butcher able and better disposable (#33727) 
* Made all corpses disposable. Argocytes, Mimics, Butterflies, Bees, Space Kangaroos, Laser Raptors and Watchers their corpses can now be butchered.

* Accidentally removed a line break. restored it.

* Removed a dash that did not belong there.

* Changed mimic giving a "Changeling Sting Can" when butchered instead of normal meat.
 2025-02-20 17:12:55 +01:00
creamybag
d32ed931b3 lightgreendress (#919) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-20 15:44:45 +03:00
Winkarst
3e449f755f Fix: Toys sounds (#33449) 
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-20 12:12:06 +11:00
FungiFellow
f189bdcf6e Removed Contraband Status from Flares (#34705) 
* Update shotgun.yml

* Update shotgun.yml

* Update shotgun.yml
 2025-02-19 16:27:34 -08:00
creamybag
b29cfaf2a8 Winter is coming... (#918) 2025-02-20 02:12:17 +03:00
Nim
88462e5a1b Modular arrows (#906) 
* arrow

* sprite

* slots

* migration

* fix

* fix2

* del

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-19 22:36:21 +03:00
SeamLesss
33b9149a56 Space Lizard Plushie In-hands (#35295) 
* space lizard

* attributions

* attribution fix
 2025-02-19 20:27:57 +01:00
robinthedragon
22254a14e6 ports two barsigns from frontier (#35296) 
* adds two new barsigns

* webedit to fix a typo

* the typo was in two locations

* reformatted meta.json and added attribution links
 2025-02-19 20:25:17 +01:00
Nim
dfd1603b64 meat and damag (#916) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-19 22:16:35 +03:00
Nim
275cff86b7 New crossbolt (#912) 
* bolt

* eee

* closets

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-19 22:15:39 +03:00
Ed
224d96bd34 Sociopath delete (#917) 
* fuck sociopath and grass seel position

* Update PostMapInitTest.cs

* fix
 2025-02-19 21:56:29 +03:00
MilenVolf
cc18ba72a6 Fix ExaminableHunger spelling (#35309) 
Fix ExaminableHunger spelling mistake
 2025-02-19 09:23:53 -05:00
Winkarst
9b7339e497 Make OuterClothing hide PDA and belt sprites under it. (#33448) 
Make OuterClothing hide the PDA sprite
 2025-02-19 14:13:21 +01:00
K-Dynamic
5f41726cc9 Returns Explosive Technology recipes to Protolathes (#35303) 
add scienceexplosives to dynamic pack
 2025-02-19 06:34:40 -05:00
SpaceLizard
5642d7c252 Saxophone fix (#35257) 
Saxophone-Fix
 2025-02-18 22:05:47 -08:00
lzk
2a124adcc3 Fix some emotes not respecting pronounces (#35289) 
* guys let's not allow those things

* fix those too
 2025-02-19 00:14:44 -05:00
lizelive
b3cea81863 add ShowJobIcons to AiHeldIntellicard (#35282) 
so crew is still crew when you are icard
 2025-02-18 23:23:32 +01:00
Pronana
0df6bfb0e9 Crusher Dagger Knife Component (#35259) 
* Added Knife Component to Crusher dagger, allowing
it to be used in a few new crafting recipes such
as baseball bats.

* Changed BaseKnife to CombatKnife, reordered parents

* now inherits from baseknife, throwing and disarm added manually
 2025-02-18 16:16:47 +01:00
creamybag
fa21ad93ff added (#914) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-18 17:41:41 +03:00
BramvanZijp
b85253df01 Fix contraband parenting defaulting to security. (#35281) 
Fix an issue with contraband parenting that made janitor restricted gear available to security.
 2025-02-18 14:07:09 +01:00
War Pigeon
c0e5c18d7d Add radiation shielding to metal crates (#35168) 2025-02-18 23:56:14 +11:00
Winkarst
63f640dcdb Make `ShuttleGunBase child of BaseStructure` (#35085) 2025-02-18 23:47:50 +11:00