MadisonBarks/Monolith
1
0
Fork 0
forked from SpaceStation14-Shenanigans/Monolith
Code Pull Requests Activity

Respriting the codebase (#4820)

Browse Source 
* Walls

* Airlocks mostly ported

* Disposal Unit

* Tiles

* Lighting

* Catwalk

* Windows

* Some vending machine work

* More Vending Machines

* Rest of vending machine sprites ported

* Fixes to vending machines

* Tables (This took a lot of work)

* Fixes low walls being required for window smoothing
- Also replaces window damage visualization

* Plasma Window

* APC

* SMES + Reorganized parts.yml

* Furniture and Organization and Removed Shelf

* Renamed seats.yml to chairs.yml

* Dispensers

* Lazy-fixed the glass airlocks

* Don't need this no more

* Tilez

* blue circuit my fucking beloved

* Switches lights to cev one

* Conveyors and Switch

* Reorients lights

* !ALERT! MAP CHANGES !ALERT!

Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
This commit is contained in:
Swept
2021-10-15 02:58:40 -07:00
committed by GitHub
parent ca90025005
commit e34888373a
966 changed files with 3493 additions and 5394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+2 -1
View File
@@ -4,8 +4,9 @@
description: A booze dispenser with a single slot for a container to be filled.
parent: ReagentDispenserBase
components:
- type: Rotatable
- type: Sprite
sprite: Structures/dispensers.rsi
state: booze_dispenser
state: booze
- type: ReagentDispenser
pack: BoozeDispenserInventory
Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+1 -4
View File
@@ -6,10 +6,7 @@
components:
- type: Sprite
sprite: Structures/dispensers.rsi
state: industrial_dispenser
- type: Icon
sprite: Structures/dispensers.rsi
state: industrial_dispenser
state: industrial-working
- type: ReagentDispenser
pack: ChemDispenserStandardInventory
- type: ApcPowerReceiver
Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+2 -1
View File
@@ -4,8 +4,9 @@
parent: ReagentDispenserBase
description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
components:
- type: Rotatable
- type: Sprite
sprite: Structures/dispensers.rsi
state: soda_dispenser
state: soda
- type: ReagentDispenser
pack: SodaDispenserInventory
Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+33 -60
View File
@@ -64,66 +64,6 @@
graph: table
node: Table
- type: entity
id: TableBar
parent: TableBase
name: bar table
description: Fancy table. Perfect for serving drinks.
components:
- type: Sprite
sprite: Structures/Furniture/Tables/bar.rsi
- type: Icon
sprite: Structures/Furniture/Tables/bar.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 1
MaterialCloth1:
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Construction
graph: table
node: TableBar
- type: entity
id: TableMetal
parent: TableBase
name: metal table
description: Just a metal table.
components:
- type: Sprite
sprite: Structures/Furniture/Tables/metal.rsi
- type: Icon
sprite: Structures/Furniture/Tables/metal.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 15
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: entity
id: TableReinforced
parent: TableBase
@@ -217,6 +157,39 @@
graph: table
node: TableReinforcedGlass
- type: entity
id: TablePlasmaGlass
parent: TableBase
name: plasma glass table
description: A square piece of plasma glass, standing on four metal legs. Pretty!
components:
- type: Sprite
sprite: Structures/Furniture/Tables/plasma.rsi
- type: Icon
sprite: Structures/Furniture/Tables/plasma.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 20
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/glass_break2.ogg
- !type:SpawnEntitiesBehavior
spawn:
ShardGlassPlasma:
min: 1
max: 1
PartRodMetal1:
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Construction
graph: table
node: TablePlasmaGlass
- type: entity
id: TableWood
parent: TableBase
Resources/Prototypes/Entities/Structures/Furniture/seats.yml → Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+8 -12
View File
@@ -19,7 +19,7 @@
- VaultImpassable
- SmallImpassable
- type: Sprite
sprite: Structures/Furniture/furniture.rsi
sprite: Structures/Furniture/chairs.rsi
noRot: true
- type: Strap
position: Stand
@@ -50,7 +50,6 @@
- type: Rotatable
- type: Sprite
state: chair
color: "#8e9799"
- type: Physics
fixtures:
- shape:
@@ -72,8 +71,7 @@
components:
- type: Anchorable
- type: Sprite
state: stool_base
color: "#8e9799"
state: stool
- type: Physics
bodyType: Static
fixtures:
@@ -99,7 +97,7 @@
rotateWhileAnchored: true
- type: Anchorable
- type: Sprite
state: bar_stool
state: bar
- type: Physics
bodyType: Static
fixtures:
@@ -122,7 +120,7 @@
- type: Rotatable
rotateWhileAnchored: true
- type: Sprite
state: officechair_white
state: office-white
- type: Physics
fixtures:
- shape:
@@ -142,7 +140,7 @@
parent: ChairOfficeLight
components:
- type: Sprite
state: officechair_dark
state: office-dark
- type: Construction
graph: seat
node: chairOfficeDark
@@ -157,7 +155,7 @@
anchored: true
- type: Anchorable
- type: Sprite
state: comfychair_preview
state: comfy
- type: Physics
bodyType: Static
fixtures:
@@ -178,8 +176,7 @@
parent: SeatBase
components:
- type: Sprite
state: wooden_chair
color: "white"
state: wooden
- type: Rotatable
- type: Physics
fixtures:
@@ -226,8 +223,7 @@
- type: Anchorable
- type: Rotatable
- type: Sprite
sprite: Structures/Furniture/furniture.rsi
state: shuttle_chair
state: shuttle
netsync: false
- type: Physics
bodyType: Static
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+1
View File
@@ -498,6 +498,7 @@
visuals:
- type: VendingMachineVisualizer
normalUnshaded: true
ejectUnshaded: true
denyUnshaded: true
broken: true
- type: WiresVisualizer
Resources/Prototypes/Entities/Structures/Power/parts.yml → Resources/Prototypes/Entities/Structures/Power/apc.yml
-45
View File
@@ -1,48 +1,3 @@
- type: entity
abstract: true
id: BaseSubstation
parent: BaseMachine
name: substation
description: Reduces the voltage of electricity put into it.
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: Structures/Power/substation.rsi
layers:
- state: substation
- state: screen
shader: unshaded
- state: full
shader: unshaded
- type: Battery
maxCharge: 1000
startingCharge: 1000
- type: ExaminableBattery
- type: PointLight
radius: 1.5
energy: 1.6
color: "#3db83b"
castShadows: false
- type: NodeContainer
examinable: true
nodes:
input:
!type:CableDeviceNode
nodeGroupID: HVPower
output:
!type:CableDeviceNode
nodeGroupID: MVPower
- type: BatteryCharger
voltage: High
- type: BatteryDischarger
voltage: Medium
- type: PowerNetworkBattery
maxSupply: 150000
maxChargeRate: 5000
supplyRampTolerance: 5000
supplyRampRate: 1000
- type: entity
abstract: true
id: BaseApc
Resources/Prototypes/Entities/Structures/Power/smes.yml
-2
View File
@@ -16,8 +16,6 @@
sprite: Structures/Power/smes.rsi
layers:
- state: smes
- state: smes-display
shader: unshaded
- type: Smes
- type: Appearance
visuals:
Resources/Prototypes/Entities/Structures/Power/substation.yml
+44
View File
@@ -0,0 +1,44 @@
- type: entity
abstract: true
id: BaseSubstation
parent: BaseMachine
name: substation
description: Reduces the voltage of electricity put into it.
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: Structures/Power/substation.rsi
layers:
- state: substation
- state: screen
shader: unshaded
- state: full
shader: unshaded
- type: Battery
maxCharge: 1000
startingCharge: 1000
- type: ExaminableBattery
- type: PointLight
radius: 1.5
energy: 1.6
color: "#3db83b"
castShadows: false
- type: NodeContainer
examinable: true
nodes:
input:
!type:CableDeviceNode
nodeGroupID: HVPower
output:
!type:CableDeviceNode
nodeGroupID: MVPower
- type: BatteryCharger
voltage: High
- type: BatteryDischarger
voltage: Medium
- type: PowerNetworkBattery
maxSupply: 150000
maxChargeRate: 5000
supplyRampTolerance: 5000
supplyRampRate: 1000
Resources/Prototypes/Entities/Structures/Storage/storage.yml
-9
View File
@@ -46,12 +46,3 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: entity
id: Shelf
parent: Rack
name: shelf
description: A shelf for storing things on.
components:
- type: Sprite
state: shelf
Resources/Prototypes/Entities/Structures/Walls/grille.yml
+1
View File
@@ -4,6 +4,7 @@
name: grille
description: A flimsy framework of iron rods.
components:
- type: CanBuildWindowOnTop
- type: Sprite
netsync: false
drawdepth: Walls
Resources/Prototypes/Entities/Structures/Walls/walls.yml
-2
View File
@@ -306,7 +306,6 @@
name: reinforced wall
components:
- type: Sprite
color: "#889192"
sprite: Structures/Walls/solid.rsi
- type: Icon
sprite: Structures/Walls/solid.rsi
@@ -421,7 +420,6 @@
components:
- type: RCDDeconstructWhitelist
- type: Sprite
color: "#889192"
sprite: Structures/Walls/solid.rsi
- type: Construction
graph: girder
Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+1 -1
View File
@@ -27,7 +27,7 @@
max: 2
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Window
- type: IconSmooth
base: pwindow
- type: Construction
graph: window
Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+1 -1
View File
@@ -27,7 +27,7 @@
max: 2
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Window
- type: IconSmooth
base: rwindow
- type: Construction
graph: window
Resources/Prototypes/Entities/Structures/Windows/window.yml
+3 -2
View File
@@ -10,7 +10,6 @@
components:
- type: RCDDeconstructWhitelist
- type: Sprite
color: "#DDDDDD"
netsync: false
drawdepth: WallTops
sprite: Structures/Windows/window.rsi
@@ -50,8 +49,10 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Airtight
- type: Window
- type: IconSmooth
key: windows
base: window
- type: Window
- type: Construction
graph: window
node: window
Resources/Prototypes/Recipes/Construction/Graphs/tables.yml
+18 -18
View File
@@ -51,6 +51,12 @@
amount: 1
doAfter: 1
- to: TablePlasmaGlass
steps:
- material: PlasmaGlass
amount: 1
doAfter: 1
- to: TableWood
steps:
- material: WoodPlank
@@ -69,24 +75,6 @@
- tool: Anchoring
doAfter: 1
- to: TableBar
steps:
- material: Cloth
amount: 1
doAfter: 1
- node: TableBar
entity: TableBar
edges:
- to: Table
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 1
steps:
- tool: Prying
doAfter: 1
- node: TableReinforced
entity: TableReinforced
edges:
@@ -123,6 +111,18 @@
- tool: Anchoring
doAfter: 1
- node: TablePlasmaGlass
entity: TablePlasmaGlass
edges:
- to: TableFrame
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 1
steps:
- tool: Anchoring
doAfter: 1
- node: TableWood
entity: TableWood
edges:
Resources/Prototypes/Recipes/Construction/furniture.yml
+13 -13
View File
@@ -7,7 +7,7 @@
category: Furniture
description: You sit in this. Either by will or force.
icon:
sprite: Structures/Furniture/furniture.rsi
sprite: Structures/Furniture/chairs.rsi
state: chair
objectType: Structure
placementMode: SnapgridCenter
@@ -24,8 +24,8 @@
category: Furniture
description: You sit in this. Either by will or force.
icon:
sprite: Structures/Furniture/furniture.rsi
state: stool_base
sprite: Structures/Furniture/chairs.rsi
state: stool
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
@@ -41,8 +41,8 @@
category: Furniture
description: You sit in this. Either by will or force.
icon:
sprite: Structures/Furniture/furniture.rsi
state: bar_stool
sprite: Structures/Furniture/chairs.rsi
state: bar
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
@@ -58,8 +58,8 @@
category: Furniture
description: You sit in this. Either by will or force.
icon:
sprite: Structures/Furniture/furniture.rsi
state: officechair_white
sprite: Structures/Furniture/chairs.rsi
state: office-white
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
@@ -75,8 +75,8 @@
category: Furniture
description: You sit in this. Either by will or force.
icon:
sprite: Structures/Furniture/furniture.rsi
state: officechair_dark
sprite: Structures/Furniture/chairs.rsi
state: office-dark
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
@@ -92,8 +92,8 @@
category: Furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/furniture.rsi
state: comfychair_preview
sprite: Structures/Furniture/chairs.rsi
state: comfy
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
@@ -109,8 +109,8 @@
category: Furniture
description: You sit in this. Either by will or force.
icon:
sprite: Structures/Furniture/furniture.rsi
state: wooden_chair
sprite: Structures/Furniture/chairs.rsi
state: wooden
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
Resources/Prototypes/Recipes/Construction/tables.yml
+18 -18
View File
@@ -15,23 +15,6 @@
conditions:
- !type:TileNotBlocked {}
- type: construction
name: bar table
id: TableBar
graph: table
startNode: start
targetNode: TableBar
category: Structures
description: A fancy table. Perfect for serving drinks.
icon:
sprite: Structures/Furniture/Tables/bar.rsi
state: full
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked {}
- type: construction
name: reinforced table
id: TableReinforced
@@ -83,6 +66,23 @@
conditions:
- !type:TileNotBlocked {}
- type: construction
name: plasma glass table
id: TablePlasmaGlass
graph: table
startNode: start
targetNode: TablePlasmaGlass
category: Structures
description: A square piece of plasma glass, standing on four metal legs. Pretty!
icon:
sprite: Structures/Furniture/Tables/plasma.rsi
state: full
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked {}
- type: construction
name: wood table
id: TableWood
@@ -115,4 +115,4 @@
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked {}
- !type:TileNotBlocked {}
Resources/Prototypes/Tiles/floors.yml
+25 -49
View File
@@ -6,7 +6,7 @@
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds:
footstep_sounds:
collection: footstep_floor
friction: 0.30
item_drop: FloorTileItemDark
@@ -61,6 +61,18 @@
friction: 0.30
item_drop: FloorTileItemGCircuit
- type: tile
name: floor_blue_circuit
display_name: Blue circuit floor
texture: "blue_circuit"
base_turfs:
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds:
collection: footstep_floor
friction: 0.30
- type: tile
name: floor_lino
display_name: Linoleum floor
@@ -274,6 +286,18 @@
friction: 0.30
item_drop: FloorTileItemGold
- type: tile
name: floor_silver
display_name: Silver Tile
texture: silver
base_turfs:
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds:
collection: footstep_floor
friction: 0.30
- type: tile
name: floor_glass
display_name: glass floor
@@ -300,54 +324,6 @@
friction: 0.30
item_drop: SheetRGlass1
- type: tile
name: floor_warning1
display_name: Warning Tile
texture: steel_warning1
base_turfs:
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds:
collection: footstep_floor
friction: 0.30
- type: tile
name: floor_warning2
display_name: Beware Tile
texture: steel_warning2
base_turfs:
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds:
collection: footstep_floor
friction: 0.30
- type: tile
name: floor_white_warning1
display_name: White Warning Tile
texture: white_warning1
base_turfs:
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds:
collection: footstep_floor
friction: 0.30
- type: tile
name: floor_white_warning2
display_name: White Beware Tile
texture: white_warning2
base_turfs:
- plating
is_subfloor: false
can_crowbar: true
footstep_sounds:
collection: footstep_floor
friction: 0.30
- type: tile
name: floor_blue
display_name: Blue Tile