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

31842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alpha-Two
d83b5acb22 Replace ERT Medic's Advanced Medkits with 2 Combat Medkits (#34380) 
Replaced Adv kits with 2 combat kits
 2025-01-15 16:49:55 +01:00
Alpaccalypse
e446889315 Added missing details from worn capes to head of department beadsheets (#34396) 
* Added key and missing details from worn cape to HOP bedsheet

* Corrected canvas size for sprite

* Subtle tweak to shading to reduce color blurring at pillow edge

* Matched Hue and tone to cape

* Tweak chekered pattern marks for gold trim

* Removed accidental palette inclusion

* Clearer wording and corrected attribution name.

* Tweaked shading on key image to fit in better with bed aesthetics

* Added CE cape icon to bedsheet

* Added cape image to HOP bedsheet. Made gold trim better match cape visuals

* RD cape icon added. Colour tweaked to better match cape.

* Updates json

* Tweaks to gold trim shading to match bed aesthetics

* Added better shading for HOP sheet side. Halved file size.

* Optimised HOS RD and CE sheet sprites

* Corrected sprite title in attribution
 2025-01-15 16:15:56 +01:00
Nim
02cfcd620c Inter-Monster tolerance (#761) 
* Insects ai

* monster
 2025-01-15 17:34:38 +03:00
Alpha-Two
332fc18aa5 Fixed Thief starting gear failing on specific bag inventories. (#34430) 
Fixed it yayyy
 2025-01-14 22:51:08 -08:00
PJBot
9d5ef57df8 Automatic changelog update 2025-01-15 00:33:30 +00:00
Palladinium
87779250ee Add Discord webhook on watchlist connection (#33483) 2025-01-15 01:32:24 +01:00
PJBot
bb1a3c42ed Automatic changelog update 2025-01-15 00:11:46 +00:00
themias
771278df54 Fix muzzle accent (#34419) 2025-01-15 01:10:39 +01:00
Pieter-Jan Briers
e885a8f1ce Minor client packaging changes (#33787) 2025-01-15 01:08:06 +01:00
Pieter-Jan Briers
2dead48280 STAThread client content start (#34212) 2025-01-15 01:07:24 +01:00
PJBot
99580e0118 Automatic changelog update 2025-01-14 23:47:51 +00:00
Pieter-Jan Briers
c2e050ced0 Persist deadmin to database, add admin suspension system (#34048) 2025-01-15 00:46:45 +01:00
Pieter-Jan Briers
47042cc8dd Disable meta-atlas for big rare RSIs (#33643) 2025-01-15 00:43:48 +01:00
Pieter-Jan Briers
ca96aeb0ec Fix bad Rider analysis error in AccessOverriderWindow.xaml.cs (#34213) 2025-01-15 00:31:50 +01:00
Julian Giebel
a967fc7486 Adds omnisexual pin (#34439) 
* Make important change (#7)

This is to help julian test his bot

* Omnibus

* Remove random test file from testing a gh bot

* Add pin to vendor, spawners and loadout

---------

Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
 2025-01-14 23:41:04 +01:00
PJBot
198dd820f1 Automatic changelog update 2025-01-14 22:35:12 +00:00
Killerqu00
786d4d5557 craftable pet carrier (#34431) 
* craftable pet carrier

* epic integration test fail

* Update Resources/Prototypes/Recipes/Crafting/improvised.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* extra tab begone

* epic linter fail

* how did linter not see this???

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-01-14 23:34:04 +01:00
Ed
e6097da7cc Update CP14MagicEnergyPhotosynthesisComponent.cs 2025-01-15 01:05:28 +03:00
Ed
925738afc2 Workbench update (#760) 
* fix workbench icons

* workbench search

* fix 1

* UI finalize

* fix material localization

* restore shard sprite

* Update sewing_table.yml
 2025-01-15 00:34:08 +03:00
Myra
13edd308bf Fix IPIntel causing frequent errors with the cleanup job. (#34428) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2025-01-14 21:38:26 +01:00
Ed
cf41cabcea Remove OP (#757) 
* remove outdated content

* Update migration.yml

* Update twoHandedStaffs.yml
 2025-01-14 14:36:10 +03:00
Ed
87d57df0e6 Omsoyk epic clothing pack (#756) 
* new shirts

* pants and dresses

* blue cloak
 2025-01-14 12:03:10 +03:00
ArtisticRoomba
8e7f440243 Oasis Power Rebalance + Misc fixes (#34425) 
* balance oasis power as a stopgap

* change waste color to proper waste color
 2025-01-14 00:59:15 -07:00
Ed
51a47eaffc Bunch of gameplay issues (#754) 
* fix demiplane contetn filtering

* fix day demiplanes

* remove filled crystals from demiplanes

* remove armored zombies

* added candles in town crates

* remove 20% unefficient of mana moving spells

* fix #622

* revert random Viator commit

* Update demiplane_rifts.yml
 2025-01-14 01:41:11 +03:00
Nim
c7c5b4dc4c bench fix (#755) 2025-01-13 23:24:33 +03:00
Nim
2644fe26ea Ashes and Russian translation edits with a couple of minor fixes (#735) 
* ash++++

* fix

* по запросу
 2025-01-13 23:01:34 +03:00
Nim
732bc267f7 Bench (#751) 
* bench

* anchored
 2025-01-13 22:59:57 +03:00
PJBot
2bebaa753a Automatic changelog update 2025-01-13 18:50:09 +00:00
Southbridge
6c41d967e5 Porting Pride-O-Mat to Upstream (#34412) 
* Pride-O-Mat (#1322)

* Added Pride-O-Mat

* Yep

* Updated license to the correct one

* Added more lines, reconfigured settings a bit, also added cloaks to inventory, set coder socks to emag inventory

* Removed bunny ears, fixed typo

* Made requested changes 

Webedit lmao

---------

Co-authored-by: Dorragon <101672978+Dorragon@users.noreply.github.com>
 2025-01-13 19:49:02 +01:00
Viator-MV
ddd61df7b8 изменение текстуры книги законов 
текстура книги законов изменена на подходящую к новым книгам
 2025-01-13 21:37:30 +03:00
Ed
025753e689 revert 2025-01-13 18:09:40 +03:00
PJBot
b308589428 Automatic changelog update 2025-01-13 10:08:40 +00:00
Coolsurf6
de78bedc5f Fixed Jazz Instrument for Electric Guitars (#33363) 
* fixed jazz midi program byte

* swapped around jazz and clean in instrumentList
 2025-01-13 13:07:33 +03:00
zHonys
25a01b00b6 Fixed doors being blocked with mousetraps, and other Collidable items (#34045) 
* Changed SharedDoorSystem.GetColliding() to allow non-LowImpassible mask entities to stay in the door while it closes

* Update Content.Shared/Doors/Systems/SharedDoorSystem.cs

Clarifies comment of how the mask is used

Co-authored-by: Centronias <charlie.t.santos@gmail.com>

---------

Co-authored-by: Centronias <charlie.t.santos@gmail.com>
 2025-01-13 13:07:18 +03:00
JustinWinningham
423e48a9f2 Anomaly dragging exploit fix and QOL changes (#34280) 
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods

* APE dragging exploit fix
 2025-01-13 13:06:57 +03:00
hyperDelegate
182f0c0bce Raise syndicate kobold reinforcement HP crit threshold from 75 to 100 to match monkey. (#34409) 
kobold ops have 100 health
 2025-01-13 13:06:30 +03:00
Ed
368839dd68 Bugixes (#750) 
* fix #746

* fix #745

* fix #747

* fix #744

* fix #743

* fix #741

* fix #722
 2025-01-13 12:54:46 +03:00
TytosB
9cf4cba346 loop station door access fixes and air sink (#34414) 
small fixes
 2025-01-13 00:17:08 -07:00
PJBot
f2cd615512 Automatic changelog update 2025-01-13 07:08:37 +00:00
Deerstop
ac0a8d1f60 Manual Valves Resprite (#34378) 
* resprited manual valves to be colourblind friendly

* Update Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
 2025-01-13 08:07:29 +01:00
Southbridge
b00bf40e64 Insuls Spawner (#34407) 
* Added insuls spawner, time to test

* adjusted whitespace since that was causing issues

* Update Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-01-13 05:28:20 +01:00
Southbridge
5fff6bb1d2 Amber Station - Moved Vents Around (#34410) 
* Moved all vents around, made some small changes

* Finished work

* Removed insuls spawner since they're not merged yet
 2025-01-12 17:49:44 -07:00
frobnic8
91bc1f8cac Darkened Service job interface icons for better contrast (#34270) 
* Darkened Service job interface icons for better contrast

* Fixed Botanist job interface icon dark handle hole

* Change to new, darker, service color in all resource yml files

* Revert Map file service color changes

* Use new darker service color on id cards

* Revert Service color change in mapping_actions.yml

* Revert salvage difficulties service color

* Redo service ID and job colors to match advanced palette

* Revert all service color yml file changes

* Switch icons to use existing service pallete colors from advanced pallete

* Update meta.json for darkened service icons

---------

Co-authored-by: Erskin Cherry <frobnic8@gmail.com>
 2025-01-13 01:24:58 +01:00
Booblesnoot42
606e452433 Add a high-capacity water tank to the janitor's closet of Oasis (#34366) 
added high capacity water tank
 2025-01-12 16:40:22 -07:00
PJBot
8bc4c35aae Automatic changelog update 2025-01-12 23:33:58 +00:00
SlimSlam
72ddc50142 Fland Reporters Room (#34408) 
changed the command checkpoint to a reporters room.
 2025-01-12 16:32:50 -07:00
vladimir.s
f5edf03bf6 double hp and mana alerts (#749) 
* double hp and mana alerts

* Update alerts.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-12 23:05:19 +03:00
PJBot
9cc76d93bf Automatic changelog update 2025-01-12 19:42:35 +00:00
Myra
96d913b147 Add IPIntel API support. (#33339) 
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
 2025-01-12 20:41:26 +01:00
Ed
b5f70616c3 New lobby art (#748) 
* lobby

* back to rus
 2025-01-12 22:39:33 +03:00