juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-20-11-2024-upstream-sync

Browse Source 
# Conflicts:
#	Resources/Maps/cog.yml
This commit is contained in:
Ed
2024-11-20 00:34:51 +03:00
parent e79b046c4a 895648aa2c
commit ed638c94a8
69 changed files with 1480 additions and 1791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
View File

@@ -30,7 +30,7 @@
- id: MedkitOxygenFilled
prob: 0.2
- id: WeaponFlareGun
prob: 0.05
prob: 0.1
- id: BoxMRE
prob: 0.1

7
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -1784,6 +1784,11 @@
# intended for swarms that eat pills so only temporary
- type: TimedDespawn
lifetime: 60
- type: Hunger
baseDecayRate: 10 # always hungry
starvingSlowdownModifier: 1
- type: Thirst
baseDecayRate: 10 # always thirsty
- type: entity
parent: MobMouse
@@ -3381,7 +3386,7 @@
- type: HTN
rootTask:
task: RuminantCompound
- type: entity
name: diona nymph
parent: [SimpleMobBase, StripableInventoryBase]

5
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
View File

@@ -69,8 +69,6 @@
canShuttle: false
title: comms-console-announcement-title-station-ai
color: "#2ed2fd"
- type: Speech
speechVerb: Robotic
- type: ShowJobIcons
- type: entity
@@ -395,6 +393,9 @@
drawFov: false
- type: Examiner
- type: InputMover
- type: Speech
speechVerb: Robotic
speechSounds: Borg
- type: Tag
tags:
- HideContextMenu

24
Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
View File

@@ -17,15 +17,12 @@
blacklist:
components:
- ChameleonDisguise # no becoming kleiner
- InsideEntityStorage # no clark kent going in phone booth and becoming superman
- MindContainer # no
- Pda # PDAs currently make you invisible /!\
polymorph:
entity: ChameleonDisguise
disguiseProto: ChameleonDisguise
- type: entity
categories: [ HideSpawnMenu ]
parent: BaseMob
id: ChameleonDisguise
name: Urist McKleiner
components:
@@ -33,20 +30,11 @@
- type: Sprite
sprite: /Textures/Mobs/Species/Human/parts.rsi
state: full
# so people can attempt to pick it up
- type: Item
# so it can take damage
# projector system sets health to be proportional to mass
- type: Transform
noRot: true # players rotation and anchor is used instead
- type: InteractionOutline
- type: Clickable
- type: Damageable
- type: MobState
- type: MobThresholds
thresholds:
0: Alive
1: Critical
200: Dead
- type: MovementSpeedModifier
baseWalkSpeed: 1 # precise movement for the perfect spot
baseSprintSpeed: 5 # the jig is up
- type: ChameleonDisguise
# actions
@@ -57,6 +45,7 @@
components:
- type: InstantAction
icon: Interface/VerbIcons/refresh.svg.192dpi.png
itemIconStyle: BigAction
event: !type:DisguiseToggleNoRotEvent
- type: entity
@@ -68,4 +57,5 @@
icon:
sprite: Objects/Tools/wrench.rsi
state: icon
itemIconStyle: BigAction
event: !type:DisguiseToggleAnchoredEvent

20
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
View File

@@ -24,6 +24,11 @@
name: shell (.50 beanbag)
parent: BaseShellShotgun
components:
- type: Tag
tags:
- Cartridge
- ShellShotgun
- ShellShotgunLight
- type: Sprite
layers:
- state: beanbag
@@ -52,6 +57,11 @@
name: shell (.50 flare)
parent: BaseShellShotgun
components:
- type: Tag
tags:
- Cartridge
- ShellShotgun
- ShellShotgunLight
- type: Sprite
layers:
- state: flare
@@ -106,6 +116,11 @@
name: shell (.50 tranquilizer)
parent: BaseShellShotgun
components:
- type: Tag
tags:
- Cartridge
- ShellShotgun
- ShellShotgunLight
- type: Sprite
layers:
- state: tranquilizer
@@ -130,6 +145,11 @@
description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
parent: BaseShellShotgun
components:
- type: Tag
tags:
- Cartridge
- ShellShotgun
- ShellShotgunLight
- type: Sprite
layers:
- state: improvised

13
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View File

@@ -19,6 +19,7 @@
minAngle: 2
maxAngle: 16
fireRate: 8
burstFireRate: 8
angleIncrease: 3
angleDecay: 16
selectedMode: FullAuto
@@ -27,6 +28,7 @@
- FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/smg.ogg
defaultDirection: 1, 0
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/Weapons/Guns/Cock/smg_cock.ogg
@@ -140,12 +142,15 @@
- type: Gun
minAngle: 21
maxAngle: 32
fireRate: 6
selectedMode: FullAuto
fireRate: 12
burstFireRate: 12
selectedMode: Burst
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
availableModes:
- FullAuto
- Burst
shotsPerBurst: 3
burstCooldown: 0.25
- type: ItemSlots
slots:
gun_magazine:
@@ -250,6 +255,8 @@
angleDecay: 6
selectedMode: FullAuto
shotsPerBurst: 5
burstCooldown: 0.2
burstFireRate: 7
availableModes:
- SemiAuto
- Burst

76
Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
View File

@@ -1,17 +1,44 @@
- type: entity
name: flare gun
parent: BaseWeaponLauncher
parent: BaseItem
id: WeaponFlareGun
description: A compact, single-shot pistol that fires shotgun shells.
description: A compact, single-shot pistol that fires shotgun shells. Comes with a safety feature that prevents the user from fitting lethal shells inside.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
layers:
- state: icon
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Item
size: Small
sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
- type: ItemSlots
slots:
gun_chamber:
name: Chamber
startingItem: ShellShotgunFlare
priority: 1
whitelist:
tags: ## TODO: Add a risk of the gun blowing up if using non-light shotgun shells, and then re-enable them.
## - ShellShotgun
- ShellShotgunLight
- type: ContainerContainer
containers:
gun_chamber: !type:ContainerSlot
- type: ChamberMagazineAmmoProvider
autoCycle: false
boltClosed: true
canRack: false
soundBoltClosed: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
soundBoltOpened: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
soundRack: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
quickEquip: false
slots:
- Belt
- suitStorage
- type: Appearance
- type: Gun
fireRate: 8
selectedMode: SemiAuto
@@ -19,21 +46,30 @@
- SemiAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
- type: BallisticAmmoProvider
whitelist:
tags:
- ShellShotgun
proto: ShellShotgunFlare
capacity: 1
soundInsert:
path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
ents: []
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
quickEquip: false
- type: entity
name: security shell gun
parent: [WeaponFlareGun, BaseSecurityContraband]
id: WeaponFlareGunSecurity
description: A modified flare gun originally designed to be used by security to launch non-lethal shotgun shells, however it can also fire lethal shells without risk.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/flaregun_security.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Item
size: Small
sprite: Objects/Weapons/Guns/Shotguns/flaregun_security.rsi
- type: ItemSlots
slots:
- Belt
- suitStorage
gun_chamber:
name: Chamber
priority: 1
whitelist:
tags:
- ShellShotgun
- type: Tag
tags:
- Sidearm

1
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -768,6 +768,7 @@
- TargetHuman
- TargetSyndicate
- WeaponDisablerPractice
- WeaponFlareGunSecurity
- WeaponLaserCarbinePractice
- Zipties
dynamicRecipes:

2
Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
View File

@@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: clockworkWindowDiagonal
node: clockworkWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/mining.yml
View File

@@ -91,4 +91,4 @@
- East
- type: DamageVisuals
damageOverlay:
sprite: Structures/Windows/cracks_diagonal.rsi
sprite: Structures/Windows/cracks_diagonal.rsi

2
Resources/Prototypes/Entities/Structures/Windows/plasma.yml
View File

@@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: plasmaWindowDiagonal
node: plasmaWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
View File

@@ -195,4 +195,4 @@
doAfterDelay: 3
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: RGlass
damageModifierSet: RGlass

2
Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
View File

@@ -159,4 +159,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedWindowDiagonal
node: reinforcedWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
View File

@@ -155,4 +155,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedPlasmaWindowDiagonal
node: reinforcedPlasmaWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
View File

@@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedUraniumWindowDiagonal
node: reinforcedUraniumWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
View File

@@ -94,4 +94,4 @@
- East
- type: DamageVisuals
damageOverlay:
sprite: Structures/Windows/cracks_diagonal.rsi
sprite: Structures/Windows/cracks_diagonal.rsi

2
Resources/Prototypes/Entities/Structures/Windows/uranium.yml
View File

@@ -147,4 +147,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: uraniumWindowDiagonal
node: uraniumWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/window.yml
View File

@@ -284,4 +284,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: windowDiagonal
node: windowDiagonal

8
Resources/Prototypes/GameRules/roundstart.yml
View File

@@ -191,12 +191,17 @@
- type: entity
id: TraitorReinforcement
parent: Traitor
parent: BaseTraitorRule
components:
- type: TraitorRule
giveUplink: false
giveCodewords: false # It would actually give them a different set of codewords than the regular traitors, anyway
giveBriefing: false
- type: AntagSelection
definitions:
- prefRoles: [ Traitor ]
mindRoles:
- MindRoleTraitor
- type: entity
id: Revolutionary
@@ -280,7 +285,6 @@
tableId: CalmPestEventsTable
- !type:NestedSelector
tableId: SpicyPestEventsTable
- type: entityTable
id: SpaceTrafficControlTable

271
Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
View File

@@ -4,63 +4,61 @@
graph:
- node: start
edges:
- to: window # 50 hp
steps:
- material: Glass
amount: 2
doAfter: 2
- to: tintedWindow # 50 hp
steps:
- material: Glass
amount: 2
- material: Plastic
amount: 2
doAfter: 2
- to: plasmaWindow # 75 hp
- to: plasmaWindow
steps:
- material: PlasmaGlass
amount: 2
doAfter: 3
doAfter: 2
- to: uraniumWindow # 75 hp
steps:
- material: UraniumGlass
amount: 2
doAfter: 3
- to: clockworkWindow # 75 hp reinforced damage mod
steps:
- material: ClockworkGlass
amount: 2
doAfter: 3
- to: reinforcedWindow # 75 hp reinforced damage mod
- to: reinforcedWindow
steps:
- material: ReinforcedGlass
amount: 2
doAfter: 3
doAfter: 2
- to: reinforcedPlasmaWindow # 150 hp reinforced damage mod
- to: tintedWindow
steps:
- material: ReinforcedGlass
amount: 2
doAfter: 2
- to: reinforcedPlasmaWindow
steps:
- material: ReinforcedPlasmaGlass
amount: 2
doAfter: 4
doAfter: 3
- to: reinforcedUraniumWindow # 150 hp reinforced damage mod
- to: uraniumWindow
steps:
- material: UraniumGlass
amount: 2
doAfter: 2
- to: reinforcedUraniumWindow
steps:
- material: ReinforcedUraniumGlass
amount: 2
doAfter: 4
doAfter: 3
- to: shuttleWindow # 500 hp reinforced damage mod (wow)
- to: window
steps:
- material: Glass
amount: 2
doAfter: 3
- to: shuttleWindow
steps:
- material: Plasteel
amount: 2
- material: ReinforcedGlass
amount: 2
doAfter: 6
doAfter: 4
- to: clockworkWindow
steps:
- material: ClockworkGlass
amount: 2
doAfter: 3
- node: window
entity: Window
@@ -76,120 +74,6 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: tintedWindow
steps:
- material: Plastic
amount: 2
doAfter: 0.5
- to: plasmaWindow
steps:
- material: Plasma
amount: 2
doAfter: 1
- to: uraniumWindow
steps:
- material: Uranium
amount: 2
doAfter: 1
- to: clockworkWindow
steps:
- material: Brass
amount: 2
doAfter: 2
- to: reinforcedWindow
steps:
- material: MetalRod
amount: 2
doAfter: 2
- node: tintedWindow
entity: TintedWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetGlass1
amount: 2
- !type:SpawnPrototype
prototype: SheetPlastic1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- node: plasmaWindow
entity: PlasmaWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedPlasmaWindow
steps:
- material: MetalRod
amount: 2
doAfter: 1
- node: uraniumWindow
entity: UraniumWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedUraniumWindow
steps:
- material: MetalRod
amount: 2
doAfter: 1
- node: clockworkWindow
entity: ClockworkWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedWindow
entity: ReinforcedWindow
@@ -213,20 +97,43 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: reinforcedPlasmaWindow
steps:
- material: Plasma
- node: tintedWindow
entity: TintedWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetRGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 1
- to: reinforcedUraniumWindow
steps:
- material: Uranium
amount: 2
- tool: Prying
doAfter: 2
- tool: Screwing
doAfter: 1
- to: shuttleWindow
steps:
- material: Plasteel
- tool: Anchoring
doAfter: 2
- node: plasmaWindow
entity: PlasmaWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedPlasmaWindow
@@ -252,6 +159,25 @@
- tool: Anchoring
doAfter: 3
- node: uraniumWindow
entity: UraniumWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedUraniumWindow
entity: ReinforcedUraniumWindow
edges:
@@ -274,6 +200,29 @@
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: clockworkWindow
entity: ClockworkWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: shuttleWindow
entity: ShuttleWindow
@@ -304,4 +253,4 @@
- tool: Welding
doAfter: 4
- tool: Anchoring
doAfter: 1
doAfter: 1

194
Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml
View File

@@ -4,30 +4,12 @@
graph:
- node: start
edges:
- to: windowDiagonal
steps:
- material: Glass
amount: 2
doAfter: 2
- to: plasmaWindowDiagonal
steps:
- material: PlasmaGlass
amount: 2
doAfter: 2
- to: uraniumWindowDiagonal
steps:
- material: UraniumGlass
amount: 2
doAfter: 2
- to: clockworkWindowDiagonal
steps:
- material: ClockworkGlass
amount: 2
doAfter: 3
- to: reinforcedWindowDiagonal
steps:
- material: ReinforcedGlass
@@ -40,12 +22,30 @@
amount: 2
doAfter: 3
- to: uraniumWindowDiagonal
steps:
- material: UraniumGlass
amount: 2
doAfter: 2
- to: reinforcedUraniumWindowDiagonal
steps:
- material: ReinforcedUraniumGlass
amount: 2
doAfter: 3
- to: clockworkWindowDiagonal
steps:
- material: ClockworkGlass
amount: 2
doAfter: 3
- to: windowDiagonal
steps:
- material: Glass
amount: 2
doAfter: 3
- node: windowDiagonal
entity: WindowDiagonal
edges:
@@ -60,97 +60,6 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: plasmaWindowDiagonal
steps:
- material: Plasma
amount: 2
doAfter: 1
- to: uraniumWindowDiagonal
steps:
- material: Uranium
amount: 2
doAfter: 1
- to: clockworkWindowDiagonal
steps:
- material: Brass
amount: 2
doAfter: 2
- to: reinforcedWindowDiagonal
steps:
- material: MetalRod
amount: 2
doAfter: 2
- node: plasmaWindowDiagonal
entity: PlasmaWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedPlasmaWindowDiagonal
steps:
- material: MetalRod
amount: 2
doAfter: 1
- node: uraniumWindowDiagonal
entity: UraniumWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedUraniumWindowDiagonal
steps:
- material: MetalRod
amount: 2
doAfter: 1
- node: clockworkWindowDiagonal
entity: ClockworkWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- node: reinforcedWindowDiagonal
entity: ReinforcedWindowDiagonal
@@ -174,16 +83,48 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: reinforcedPlasmaWindowDiagonal
steps:
- material: Plasma
- node: clockworkWindowDiagonal
entity: ClockworkWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
amount: 2
doAfter: 1
- to: reinforcedUraniumWindowDiagonal
- !type:DeleteEntity {}
steps:
- material: Uranium
amount: 2
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- node: plasmaWindowDiagonal
entity: PlasmaWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedPlasmaWindowDiagonal
entity: ReinforcedPlasmaWindowDiagonal
@@ -208,6 +149,25 @@
- tool: Anchoring
doAfter: 3
- node: uraniumWindowDiagonal
entity: UraniumWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedUraniumWindowDiagonal
entity: ReinforcedUraniumWindowDiagonal
edges:
@@ -229,4 +189,4 @@
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
doAfter: 3

174
Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
View File

@@ -4,55 +4,47 @@
graph:
- node: start
edges:
- to: windowDirectional # 25 hp
- to: windowDirectional
steps:
- material: Glass
amount: 1
doAfter: 1
doAfter: 2
- to: windowFrostedDirectional # 25 hp
steps:
- material: Glass
amount: 1
- material: Plastic
amount: 1
doAfter: 1
- to: plasmaWindowDirectional # 37 hp
steps:
- material: PlasmaGlass
amount: 1
doAfter: 1.5
- to: uraniumWindowDirectional # 37 hp
steps:
- material: UraniumGlass
amount: 1
doAfter: 1.5
- to: windowClockworkDirectional # 37 hp reinforced damage mod
steps:
- material: ClockworkGlass
amount: 1
doAfter: 1.5
- to: windowReinforcedDirectional # 37 hp reinforced damage mod
- to: windowReinforcedDirectional
steps:
- material: ReinforcedGlass
amount: 1
doAfter: 1.5
doAfter: 3
- to: plasmaReinforcedWindowDirectional # 75 hp reinforced damage mod
- to: plasmaWindowDirectional
steps:
- material: PlasmaGlass
amount: 1
doAfter: 2
- to: plasmaReinforcedWindowDirectional
steps:
- material: ReinforcedPlasmaGlass
amount: 1
doAfter: 3
- to: uraniumWindowDirectional
steps:
- material: UraniumGlass
amount: 1
doAfter: 2
- to: uraniumReinforcedWindowDirectional # 75 hp reinforced damage mod
- to: uraniumReinforcedWindowDirectional
steps:
- material: ReinforcedUraniumGlass
amount: 1
doAfter: 2
doAfter: 3
- to: windowClockworkDirectional
steps:
- material: ClockworkGlass
amount: 1
doAfter: 3
- node: windowDirectional
entity: WindowDirectional
@@ -68,45 +60,21 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: windowFrostedDirectional
steps:
- material: Plastic
amount: 1
doAfter: 0.5
- to: plasmaWindowDirectional
steps:
- material: Plasma
amount: 1
doAfter: 0.5
- to: uraniumWindowDirectional
steps:
- material: Uranium
amount: 1
doAfter: 0.5
- to: windowClockworkDirectional
steps:
- material: Brass
amount: 1
doAfter: 1
- to: windowReinforcedDirectional
steps:
- material: MetalRod
amount: 1
doAfter: 1
- node: windowFrostedDirectional
entity: WindowFrostedDirectional
- node: windowReinforcedDirectional
entity: WindowReinforcedDirectional
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetGlass1
amount: 1
- !type:SpawnPrototype
prototype: SheetPlastic1
prototype: SheetRGlass1
amount: 1
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Screwing
doAfter: 1
- tool: Anchoring
@@ -130,35 +98,6 @@
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: plasmaReinforcedWindowDirectional
steps:
- material: MetalRod
amount: 1
doAfter: 0.5
- node: uraniumWindowDirectional
entity: UraniumWindowDirectional
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 1
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: uraniumReinforcedWindowDirectional
steps:
- material: MetalRod
amount: 1
doAfter: 0.5
- node: windowClockworkDirectional
entity: WindowClockworkDirectional
@@ -179,35 +118,6 @@
- tool: Anchoring
doAfter: 3
- node: windowReinforcedDirectional
entity: WindowReinforcedDirectional
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetRGlass1
amount: 1
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: plasmaReinforcedWindowDirectional
steps:
- material: Plasma
amount: 1
doAfter: 0.5
- to: uraniumReinforcedWindowDirectional
steps:
- material: Uranium
amount: 1
doAfter: 0.5
- node: plasmaReinforcedWindowDirectional
entity: PlasmaReinforcedWindowDirectional
edges:
@@ -226,6 +136,24 @@
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: uraniumWindowDirectional
entity: UraniumWindowDirectional
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 1
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: uraniumReinforcedWindowDirectional
entity: UraniumReinforcedWindowDirectional
@@ -244,4 +172,4 @@
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
doAfter: 3

2
Resources/Prototypes/Recipes/Construction/structures.yml
View File

@@ -1746,4 +1746,4 @@
sprite: Structures/Doors/secret_door.rsi
state: closed
conditions:
- !type:TileNotBlocked
- !type:TileNotBlocked

9
Resources/Prototypes/Recipes/Lathes/security.yml
View File

@@ -603,6 +603,15 @@
Plastic: 320
Uranium: 240
- type: latheRecipe
parent: BaseWeaponRecipe
id: WeaponFlareGunSecurity
result: WeaponFlareGunSecurity
completetime: 6
materials:
Plastic: 100
Steel: 400
- type: latheRecipe
parent: BaseWeaponRecipe
id: WeaponDisabler

1
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View File

@@ -19,7 +19,6 @@
weight: 10
startingGear: QuartermasterGear
icon: "JobIconQuarterMaster"
requireAdminNotify: true
supervisors: job-supervisors-captain
canBeAntag: false
access:

1
Resources/Prototypes/Roles/Jobs/Command/captain.yml
View File

@@ -20,7 +20,6 @@
weight: 20
startingGear: CaptainGear
icon: "JobIconCaptain"
requireAdminNotify: true
joinNotifyCrew: true
supervisors: job-supervisors-centcom
canBeAntag: false

1
Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
View File

@@ -20,7 +20,6 @@
weight: 20
startingGear: HoPGear
icon: "JobIconHeadOfPersonnel"
requireAdminNotify: true
supervisors: job-supervisors-captain
canBeAntag: false
access:

1
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
View File

@@ -19,7 +19,6 @@
weight: 10
startingGear: ChiefEngineerGear
icon: "JobIconChiefEngineer"
requireAdminNotify: true
supervisors: job-supervisors-captain
canBeAntag: false
access:

1
Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
View File

@@ -21,7 +21,6 @@
weight: 10
startingGear: CMOGear
icon: "JobIconChiefMedicalOfficer"
requireAdminNotify: true
supervisors: job-supervisors-captain
canBeAntag: false
access:

1
Resources/Prototypes/Roles/Jobs/Science/research_director.yml
View File

@@ -13,7 +13,6 @@
weight: 10
startingGear: ResearchDirectorGear
icon: "JobIconResearchDirector"
requireAdminNotify: true
supervisors: job-supervisors-captain
canBeAntag: false
access:

1
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View File

@@ -19,7 +19,6 @@
weight: 10
startingGear: HoSGear
icon: "JobIconHeadOfSecurity"
requireAdminNotify: true
supervisors: job-supervisors-captain
canBeAntag: false
access:

1
Resources/Prototypes/Roles/Jobs/Security/warden.yml
View File

@@ -10,7 +10,6 @@
time: 36000 #10 hrs
startingGear: WardenGear
icon: "JobIconWarden"
requireAdminNotify: true
supervisors: job-supervisors-hos
canBeAntag: false
access:

3
Resources/Prototypes/tags.yml
View File

@@ -1198,6 +1198,9 @@
- type: Tag
id: ShellShotgun
- type: Tag
id: ShellShotgunLight # shotgun shells that are compatible with the flare gun.
- type: Tag
id: Shiv