juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
cd736e4fd4fd5e7d5eb538b6b026addf1787473c
crystall-punk-14/Resources/Prototypes
History
Ed cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml
2024-12-11 14:49:02 +03:00
..
_CP14
Ed 10 12 2024 aah (#656)
2024-12-10 21:24:06 +03:00
Accents
Cargo system (#487)
2024-10-15 15:22:06 +03:00
Access
Adds Store on Collide and Wand of the Locker (#33710)
2024-12-04 17:49:54 +01:00
Actions
Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync
2024-11-23 01:48:24 +03:00
AlertLevels
Change siren.ogg to gamma.ogg (#30836)
2024-08-10 15:31:28 +03:00
Alerts
Bank progression mechanic (#633)
2024-12-07 00:39:05 +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/master' into ed-20-11-2024-upstream-sync
2024-11-23 01:48:24 +03:00
Catalog
set n2 survival box sprite layers (#33733)
2024-12-05 22:39:39 +01: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
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
2024-12-11 14:49:02 +03:00
Decals
Improve crayon UI to not be stuck in 1996 (#33101)
2024-11-15 21:25:06 -06:00
Device
…
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-11-12-2024-upstream
2024-12-11 14:49:02 +03:00
EntityLists/Tools
…
Flavors
Flora anomaly seeds (#31987)
2024-09-21 21:54:56 +02:00
GameRules
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
2024-12-11 14:49:02 +03:00
GhostRoleRaffles
…
Guidebook
guide on agrichem and botanicals guidebook update (#31896)
2024-09-07 16:23:00 +10:00
Hydroponics
Made the SpeciesChange mutation no longer transfer with Sterile Swabs. (#33126)
2024-11-03 21:09:07 -06:00
InventoryTemplates
Borg type switching. (#32586)
2024-11-14 11:08:35 -06:00
Loadouts
Localize ai dataset names (#33608)
2024-12-06 16:38:00 +01:00
LootTables
…
Magic
Wizard Summon Guns/Magic (#32692)
2024-11-17 17:46:31 +01:00
Maps
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
2024-12-11 14:49:02 +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
Ethereal Jaunt Spell for Wizard & Jaunt ECS (#33201)
2024-11-14 00:36:37 +01:00
Procedural
Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"
2024-11-06 16:52:08 +03: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
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
2024-12-11 14:49:02 +03:00
Research
Borg type switching. (#32586)
2024-11-14 11:08:35 -06:00
Roles
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
2024-12-11 14:49:02 +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/stable' into ed-11-12-2024-upstream
2024-12-11 14:49:02 +03:00
Stacks
Capacitor Crafting Change (#31966)
2024-11-20 18:18:37 +11: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
…
Tiles
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
2024-12-11 14:49:02 +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
Add a maintenance panel to bar signs (#33467)
2024-12-05 23:27:52 -06:00
World
…
XenoArch
fix artifact debug assert (#33171)
2024-11-05 23:12:35 +01:00
ai_factions.yml
…
audio.yml
Fix space ambient music (#33594)
2024-11-27 16:32:39 +11:00
bar_signs.yml
Selectable Bar Signs (#29068)
2024-07-01 02:20:57 +10:00
borg_types.yml
Borg type switching. (#32586)
2024-11-14 11:08:35 -06: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
…
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
…
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
Borg type switching. (#32586)
2024-11-14 11:08:35 -06: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