juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ae3cbd6092bb8a418a92d6e90beaccfb0b72aef3
crystall-punk-14/Resources/Prototypes
History
Ed ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
2024-10-29 11:16:56 +03:00
..
_CP14
biological weapon (#518)
2024-10-28 13:05:01 +03:00
Accents
Cargo system (#487)
2024-10-15 15:22:06 +03:00
Access
remove firefighting remote and bolting firelocks (#28330)
2024-05-28 10:04:32 +10:00
Actions
Anomalous infections (#31876)
2024-09-17 12:49:19 +03:00
AlertLevels
Change siren.ogg to gamma.ogg (#30836)
2024-08-10 15:31:28 +03:00
Alerts
Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2
2024-09-17 11:54:36 +03:00
Anomaly
New anomaly behaviour: Invisibility (#29120)
2024-07-03 11:14:39 -04:00
Atmospherics
lower frezon/n2o sale prices, make frezon take more trit (#32407)
2024-09-26 14:46:17 +02:00
Body
Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream
2024-10-29 11:16:56 +03:00
Catalog
Adding intellicard functionality. (#32347)
2024-10-22 15:49:39 +02:00
Chemistry
Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream
2024-07-12 12:53:42 +03:00
Damage
add structural damage taken to a lot of prototypes (#30790)
2024-09-04 15:37:06 +02:00
Datasets
Added a number of new and very nerdy names for the AI (#31951)
2024-09-18 00:09:55 +02:00
Decals
Make fire leave burnt decals on the tiles (#31939)
2024-09-19 10:23:50 +10:00
Device
malf killer 9000 (robotics console) (#24855)
2024-05-08 23:36:07 -07:00
DeviceLinking
Change the syndicate charge to start a timer on signal (#32423)
2024-10-04 11:34:48 +02:00
Entities
Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream
2024-10-29 11:16:56 +03:00
EntityLists/Tools
…
Flavors
Flora anomaly seeds (#31987)
2024-09-21 21:54:56 +02:00
GameRules
Fix loneop spawnrate by reverting it to not use the shuttle event system. (#32942)
2024-10-28 18:52:21 +01:00
GhostRoleRaffles
shorten short raffle (#28685)
2024-06-19 12:41:41 +10:00
Guidebook
guide on agrichem and botanicals guidebook update (#31896)
2024-09-07 16:23:00 +10:00
Hydroponics
Disable bioluminescence plant mutations because it breaks the engine (#32561)
2024-10-02 15:52:14 +02:00
InventoryTemplates
Mothroaches can now wear hamster-wearable clothes + pet inventory tweaks (#28956)
2024-08-20 14:20:12 +10:00
Loadouts
Add Towels (#32235)
2024-10-18 17:24:43 +02:00
LootTables
…
Magic
Lowercase some prototypes names (#29990)
2024-07-23 11:16:11 +03:00
Maps
Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream
2024-09-27 10:22:05 +03:00
NPCs
Firebot Tweaks (#32629)
2024-10-13 15:55:51 +11:00
Objectives
Mind Role Entities (#31318)
2024-10-10 10:48:56 +02:00
Palettes
…
Parallaxes
…
Polymorphs
Remove rest of Geras files (#30912)
2024-08-11 14:01:00 -04:00
Procedural
Hivelord mob (#31322)
2024-09-11 09:52:27 -04:00
RCD
fix rcd blacklist (#32102)
2024-09-14 11:53:14 +10:00
Reagents
Mutetoxin buff (#32915)
2024-10-20 22:43:14 -05:00
Recipes
Add Nuclear Cola centrifuge recipe (#32441)
2024-10-22 19:01:18 +02:00
Research
makes advanced atmospherics require the basic atmospherics tech (#32048)
2024-09-11 00:19:17 +02:00
Roles
Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream
2024-10-29 11:16:56 +03:00
Shaders
Add haloperidol, potassium iodide (#27454)
2024-08-03 03:12:08 +10:00
Shuttles
Fix loneop spawnrate by reverting it to not use the shuttle event system. (#32942)
2024-10-28 18:52:21 +01:00
SoundCollections
Rubber chicken toy (#29637)
2024-09-16 01:57:53 +02:00
Species
Merge remote-tracking branch 'upstream/master' into ed-29-08-2024
2024-08-29 14:32:09 +03:00
Stacks
Red circuit floor (#32557)
2024-10-01 23:35:48 -06:00
StatusIcon
Station AI (#30944)
2024-08-28 10:57:12 +10:00
Store
feat: #26107 uplink discounts for traitors (no nukies for now) (#26297)
2024-09-05 22:12:39 +10:00
StoryGen
Random book story generator refactor (#28082)
2024-05-18 12:20:00 -04:00
Tiles
Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream
2024-10-03 17:34:08 +03:00
Traits
Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2
2024-09-17 11:54:36 +03:00
Voice
Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream
2024-10-29 11:16:56 +03:00
Wires
AI can use fire alarm (#32467)
2024-09-30 11:56:05 +02:00
World
…
XenoArch
New chemical based artifact nodes (#30873)
2024-09-03 17:11:33 +02:00
ai_factions.yml
…
audio.yml
Ambient loops (#323)
2024-07-15 23:18:14 +03:00
bar_signs.yml
Selectable Bar Signs (#29068)
2024-07-01 02:20:57 +10:00
contraband_severities.yml
First Review Pass Contraband Fixes (#30930)
2024-08-12 02:17:26 -06:00
edge_spreaders.yml
metal foam grenades (#29428)
2024-07-08 00:26:58 +10:00
explosion.yml
…
floor_trap.yml
Floor trap (#26314)
2024-04-20 16:09:00 +10:00
fonts.yml
…
game_presets.yml
Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2
2024-09-17 11:54:36 +03:00
holidays.yml
Lowercase some prototypes names (#29990)
2024-07-23 11:16:11 +03:00
hud.yml
Some issues (#452)
2024-09-23 18:34:04 +03:00
item_size.yml
…
lobbyscreens.yml
2 new Lobby image, some bugfix (#468)
2024-09-28 01:29:02 +03:00
name_identifier_groups.yml
fix cargo teleporter (#27255)
2024-04-23 22:07:12 +10:00
ore.yml
Mining Rebalance (#30920)
2024-08-16 11:43:54 +10:00
radio_channels.yml
Change the science radio channel color (#31319)
2024-08-26 22:02:57 +10:00
round_announcements.yml
…
secret_weights.yml
d
2024-08-20 22:52:25 +03:00
silicon-laws.yml
Added many old ion lawsets for borgs and AI. (#31664)
2024-09-03 19:45:46 +10:00
status_effects.yml
Hivelord mob (#31322)
2024-09-11 09:52:27 -04:00
tags.yml
Syringe gun! (#32112)
2024-10-23 00:03:42 +11:00
themes.yml
Some issues (#452)
2024-09-23 18:34:04 +03:00
threats.yml
…
tool_qualities.yml
Revert "plutonium core steal objective" (#29578)
2024-06-30 01:23:03 +10:00
typing_indicator.yml
…
weather.yml
…
whitelists.yml
Automated whitelists (#23985)
2024-08-27 18:01:17 +02:00
wizardsDenWhitelists.yml
Automated whitelists (#23985)
2024-08-27 18:01:17 +02:00