Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upstream merge 04/01/2024 #14

Merged
merged 73 commits into from
Jan 4, 2025
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
abee27c
UI improvements for holopads (#34055)
chromiumboy Dec 28, 2024
296aeda
Automatic changelog update
PJBot Dec 28, 2024
55f6017
Update Credits (#34109)
github-actions[bot] Dec 29, 2024
8ebf67a
Added support so that smile can use hats (#33924)
zHonys Dec 29, 2024
0d3572f
Automatic changelog update
PJBot Dec 29, 2024
69b1572
Add a guaranteed cotton pizza to pizza crates (#33997)
ewokswagger Dec 29, 2024
5693a64
Automatic changelog update
PJBot Dec 29, 2024
8896d66
Corrected Cotton Dough Recipe (#33988)
Booblesnoot42 Dec 29, 2024
8950bf0
New cotton baguette, crostini, chevre-chaud, bagel, and croissant foo…
ArtisticRoomba Dec 29, 2024
dad2234
Automatic changelog update
PJBot Dec 29, 2024
ca1ffcd
Rolling joints no longer requires a filter (#34106)
IamVelcroboy Dec 29, 2024
7204f3c
Automatic changelog update
PJBot Dec 29, 2024
818d9e9
fix interdimensional teleporter desc (#34108)
lzk228 Dec 29, 2024
8459376
Adds kitchen/botany-locked maints airlock (#34116)
IamVelcroboy Dec 29, 2024
b4afb6c
Added ID entry for captain on Bagel (#34120)
DylanWhittingham Dec 29, 2024
f0c29e7
Amber Station Overhaul (#34113)
southbridge-fur Dec 30, 2024
03fb8d3
Box Station - Dechristmassified (#34135)
southbridge-fur Dec 30, 2024
d768beb
Marathon Station - Dechristmassified (#34136)
southbridge-fur Dec 30, 2024
b9f644c
Loop Station Decal and maints additions (#34103)
TytosB Dec 30, 2024
48a3835
Rename cryobed yml file (#34134)
Booblesnoot42 Dec 30, 2024
61e45ce
Cog update (not very merry) (#34144)
Spessmann Dec 31, 2024
2b26b9a
bagel update (#34145)
Emisse Dec 31, 2024
1b95dbd
Add hair pulato (#34117)
DreamlyJack Dec 31, 2024
cc44f0f
Automatic changelog update
PJBot Dec 31, 2024
18f34eb
Holopad UI tweak for incoming calls (#34137)
chromiumboy Dec 31, 2024
844d250
Holopads no longer log broadcasted speech and emotes in the chat (#34…
chromiumboy Dec 31, 2024
01b849a
Automatic changelog update
PJBot Dec 31, 2024
4fd6ac3
Fixes borgs not being able to check their laws in crit (#34133)
PopGamer45 Dec 31, 2024
d430497
Add contraband parent to laser gun safe (#34132)
crazybrain23 Dec 31, 2024
14ab3ba
Automatic changelog update
PJBot Dec 31, 2024
5454bc0
Add Holopad Circuit Board to A/V Communication Technology (#34150)
amatwiedle Dec 31, 2024
5303cbc
Automatic changelog update
PJBot Dec 31, 2024
4016950
Fix disposal signal routers sprites (#34139)
justdie12 Dec 31, 2024
dd01b78
Automatic changelog update
PJBot Dec 31, 2024
74fcd17
Meta station overhaul (#33506)
Nox38 Dec 31, 2024
b88e0ef
Standardize shotgun ammo in storagefills (#34156)
ArtisticRoomba Dec 31, 2024
c7e60bd
Automatic changelog update
PJBot Dec 31, 2024
f7eabb2
meta update (#34158)
Emisse Jan 1, 2025
35c555c
Amber Station Adjustments (#34126)
southbridge-fur Jan 1, 2025
a4bf776
Fix friendly vent spiders (#34153)
Booblesnoot42 Jan 1, 2025
3bfae55
Removed UseDelay component from RCD (#34149)
Booblesnoot42 Jan 1, 2025
586cba1
Automatic changelog update
PJBot Jan 1, 2025
0619d50
Decrease hp for rusted walls (#34043)
lzk228 Jan 1, 2025
51527db
Automatic changelog update
PJBot Jan 1, 2025
22a2c1a
FIX: Thief beacon doubled steal targets (#33750)
ReeZer2 Jan 1, 2025
62ebdcb
Automatic changelog update
PJBot Jan 1, 2025
2e9190f
remove nukemass song (#34066)
Errant-4 Jan 1, 2025
17ef5ff
Automatic changelog update
PJBot Jan 1, 2025
e30849c
Corrected all ghost role names to title case. (#34155)
Alpaccalypse Jan 1, 2025
51ba9b4
Packed Update (Remove Christmas & New Evac) (#34168)
spanky-spanky Jan 1, 2025
a8eb5b2
Omega Update (Remove Christmas) (#34174)
spanky-spanky Jan 2, 2025
c516cb0
Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)
Alpaccalypse Jan 2, 2025
2864608
Automatic changelog update
PJBot Jan 2, 2025
9e42501
Bugfix for the AI player's eye getting stuck when their broadcast is …
chromiumboy Jan 2, 2025
5811faf
Speech is relayed by holopad holograms (#33978)
chromiumboy Jan 2, 2025
8555758
Make JPEG a PNG (#34176)
Aeshus Jan 2, 2025
d1aa553
Removed Undesirable Ion Storm Verbs (#34175)
Aeshus Jan 2, 2025
70f46ff
added basic admin logs for PDA notekeeper notes (#34118)
DylanWhittingham Jan 2, 2025
8026869
Automatic changelog update
PJBot Jan 2, 2025
02525fb
Sprites defined for all non-generic computer boards. Added new syndic…
Alpaccalypse Jan 2, 2025
56a7968
Added pricegun sound (#34119)
DylanWhittingham Jan 2, 2025
6afa314
Automatic changelog update
PJBot Jan 2, 2025
ef673ea
Separate Tables n' Counters (#32673)
ps3moira Jan 2, 2025
6d39b2f
Automatic changelog update
PJBot Jan 2, 2025
ec35df7
Add Chameleon PDA (#30514)
SlamBamActionman Jan 2, 2025
ad9ac02
Automatic changelog update
PJBot Jan 2, 2025
18e8794
Add some ion storm actions to replace removed ones (#34180)
FairlySadPanda Jan 2, 2025
2f27f9b
Automatic changelog update
PJBot Jan 2, 2025
040d899
Amber Station and Science Spawner Tweaks (#34187)
southbridge-fur Jan 3, 2025
41ed345
Core update (#34201)
UbaserB Jan 3, 2025
1cf4da2
Elkridge Depot (The station formerly known as Cell) (#34085)
Deerstop Jan 3, 2025
ccbb4c5
Add Elkridge Depot into Map Rotation (#34206)
Deerstop Jan 4, 2025
202b5e6
Automatic changelog update
PJBot Jan 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Amber Station Adjustments (#34126)
* Made a couple fixes to various decals, cleaned up some entities, gave the clown their bag and the bartender a handlabeler

* Several changes, more cameras, lighting fixes, adjusted hydro a bit, gave sec a bunch of shutters

* Added new random spawners for science and added them to Amber

* fixed the science spawners and modified amber slightly

* Fixed the random instrument entry

(cherry picked from commit 10d94ad336537097aa43e621546052d8ea195eb6)
southbridge-fur authored and MilonPL committed Jan 4, 2025
commit 35c555c46d33dc111f78bc0b96ab87729d7cee87
4,496 changes: 2,532 additions & 1,964 deletions Resources/Maps/amber.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
# Minor science loot spawner
# Use case: Common areas that aren't science
- type: entity
name: science supplies spawner
id: LootSpawnerScienceMinor
parent: MarkerBase
suffix: Minor, 80%
components:
- type: Sprite
layers:
- state: red
- sprite: Objects/Specific/Research/anomalyscanner.rsi
state: icon
- type: RandomSpawner
rarePrototypes:
- AnomalyScanner
- NodeScanner
- Multitool
- Igniter
rareChance: 0.1
prototypes:
- ClothingHandsGlovesLatex
- ClothingMaskSterile
- ClothingOuterCoatRnd
- NetworkConfigurator
- PowerCellSmall
- FlashlightLantern
- MatterBinStockPart
- CapacitorStockPart
- MicroManipulatorStockPart
- Beaker
chance: 0.8
offset: 0.2

- type: entityTable
id: ScienceMajorTable
table: !type:GroupSelector
children:
# Common Group
- !type:GroupSelector
weight: 75
children:
- id: AnomalyScanner
- id: NodeScanner
- id: NetworkConfigurator
- id: Multitool
- id: Beaker
- id: Igniter
- id: MatterBinStockPart
- id: CapacitorStockPart
- id: MicroManipulatorStockPart
- id: LootSpawnerIndustrial
weight: 20
# Rare Group
- !type:GroupSelector
weight: 5
children:
- id: ResearchDisk
- id: ResearchDisk5000
- id: RandomInstruments

# Major science loot spawner
# Use case: Loot in science areas only
- type: entity
name: science supplies spawner
id: LootSpawnerScienceMajor
parent: MarkerBase
suffix: Major
components:
- type: Sprite
layers:
- state: red
- sprite: Objects/Specific/Research/researchdisk.rsi
state: icon
- type: EntityTableSpawner
table: !type:NestedSelector
tableId: MaintToolsTable
offset: 0.2

# Borg Module Spawner
# Use case: One or two in robotics or as valuable loot
- type: entity
name: robotics board spawner
id: LootSpawnerRoboticsBorgModule
parent: MarkerBase
components:
- type: Sprite
layers:
- state: red
- sprite: Objects/Specific/Robotics/borgmodule.rsi
state: generic
- type: RandomSpawner
rarePrototypes:
- BorgModuleDefibrillator
- BorgModuleAdvancedCleaning
- BorgModuleClowning
- BorgModuleGardening
- BorgModuleHarvesting
rareChance: 0.1
prototypes:
- BorgModuleCable
- BorgModuleFireExtinguisher
- BorgModuleGPS
- BorgModuleRadiationDetection
- BorgModuleTool
- BorgModuleArtifact
- BorgModuleAnomaly
chance: 0.9
offset: 0.2