Commit Graph

20965 Commits

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

* tweak
2025-02-25 10:31:59 +03:00
Ed
a847b9be71 Merge branch 'master' into Comoss_update_22.02.25 2025-02-24 00:55:25 +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
PJBot
408c6ab443 Automatic changelog update 2025-02-23 19:30:21 +00:00
PJBot
9f4d6abd30 Automatic changelog update 2025-02-23 19:02:23 +00:00
Errant
cc74880061 version watermark (#35284)
* version watermark

* force version watermarks on vulture
2025-02-23 20:01:17 +01:00
PJBot
40fbbe3ae4 Automatic changelog update 2025-02-23 18:49:44 +00:00
keronshb
3192914fc5 Fix/Addition - Wizard Survivor Antag Status (#35226) 2025-02-23 12:24:36 -05:00
Viator-MV
8de115e7d2 Merge branch 'crystallpunk-14:master' into Comoss_update_22.02.25 2025-02-23 19:55:35 +03:00
Viator-MV
aace9aafd1 Update comoss_d.yml
Atmos fix
2025-02-23 19:55:19 +03:00
PJBot
326bd7f93a Automatic changelog update 2025-02-23 15:25:51 +00: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
PJBot
b742afbe2c Automatic changelog update 2025-02-23 13:02:12 +00:00
ScarKy0
fad0b6a137 Swap price of EMAG and AD. (#35354)
init
2025-02-23 14:01:06 +01:00
PJBot
fd4988e3c5 Automatic changelog update 2025-02-23 12:59:04 +00:00
PJBot
1d210b52e0 Automatic changelog update 2025-02-23 11:44:22 +00: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
Deerstop
f65183edb9 Elkridge Science 2.0 + misc fixes (#35392)
* added radationblockercontainer component to pacman fuel crate so it doesnt leak rads, also more rad suits

* reworked science, misc fixes and changes
2025-02-23 01:35:36 -07: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
PJBot
cb0d2b3472 Automatic changelog update 2025-02-23 02:02:39 +00:00
PJBot
54e0931836 Automatic changelog update 2025-02-23 01:01:18 +00: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
github-actions[bot]
a6d2948f75 Update Credits (#35410)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2025-02-23 01:46:28 +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
PJBot
1bd3887fa7 Automatic changelog update 2025-02-22 21:35:38 +00:00
Sparlight
e631fa893e Give dogs speech noises (#35383) 2025-02-22 22:34:29 +01:00
PJBot
a33189feb9 Automatic changelog update 2025-02-22 17:46:57 +00:00
Winkarst
b912dedbfc New Feature: Admin Only messages in AHelp (#35283)
* Feature

* Update

* Update

* Update

* Update Resources/Locale/en-US/administration/bwoink.ftl

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Yes

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2025-02-22 09:45:50 -08: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
Viator-MV
79967a0ad3 Update comoss_d.yml 2025-02-22 17:21:33 +03:00
Viator-MV
05042d3bf3 Update comoss.yml 2025-02-22 17:20:28 +03:00
Ed
1020288d12 Epic alchemy buff (#931)
* alchemy update

* damage heat
2025-02-22 12:45:55 +03:00
PJBot
879234c576 Automatic changelog update 2025-02-22 09:21:51 +00:00
Ed
36916b0952 returns ru CBT 2025-02-22 00:51:50 +03:00
PJBot
17f3db1936 Automatic changelog update 2025-02-21 18:02:40 +00:00
Boaz1111
54bb2a31b7 Adds Colored Light Bulbs (#35333)
* goober

* changes parenting
2025-02-21 19:01:31 +01:00
Ed
1c433ed581 Eng OBT (#930)
* fuck sociopath and grass seel position

* Update PostMapInitTest.cs

* fix

* en obt
2025-02-21 20:29:37 +03: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
ddeda2eb15 fix migration.yml (#35339)
https://github.com/space-wizards/space-station-14/pull/34293
2025-02-20 20:28:15 +01:00
lzk
53c82ebdd6 2 lines yaml cleanup (#35338) 2025-02-20 20:24:21 +01:00