diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9f4faf469c..3e597191a3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -308,6 +308,7 @@ - FauxTileAstroGrass - FauxTileAstroIce - OreBagOfHolding + - ClothingEyesNightVisionGoggles # WD EDIT - type: EmagLatheRecipes emagDynamicRecipes: - ExplosivePayload diff --git a/Resources/Prototypes/White/Catalog/Fills/misc.yml b/Resources/Prototypes/White/Catalog/Fills/misc.yml new file mode 100644 index 0000000000..3e018c180d --- /dev/null +++ b/Resources/Prototypes/White/Catalog/Fills/misc.yml @@ -0,0 +1,9 @@ +- type: entity + id: CratePaper + name: ящик бумаги + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: SheetPaper + amount: 3 diff --git a/Resources/Prototypes/White/Catalog/cargo.yml b/Resources/Prototypes/White/Catalog/cargo.yml new file mode 100644 index 0000000000..34ea2aeba9 --- /dev/null +++ b/Resources/Prototypes/White/Catalog/cargo.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: CratePaper + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: paper + product: CratePaper + cost: 1000 + category: Materials + group: market \ No newline at end of file diff --git a/Resources/Prototypes/White/Construction/Paperworks/graphs.yml b/Resources/Prototypes/White/Construction/Paperworks/graphs.yml new file mode 100644 index 0000000000..de1e1e6cbd --- /dev/null +++ b/Resources/Prototypes/White/Construction/Paperworks/graphs.yml @@ -0,0 +1,27 @@ +# Paper window constructiom +- type: constructionGraph + id: WindowPaperGraph + start: start + graph: + - node: start + actions: + - !type:DestroyEntity { } + edges: + - to: paperDoor + completed: + - !type:SnapToGrid { } + steps: + - material: Paper + amount: 10 + doAfter: 10 + - node: paperDoor + entity: WindowPaper + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetPaper1 + amount: 10 + steps: + - tool: Anchoring + doAfter: 15 \ No newline at end of file diff --git a/Resources/Prototypes/White/Construction/Paperworks/structures.yml b/Resources/Prototypes/White/Construction/Paperworks/structures.yml new file mode 100644 index 0000000000..7f83e9f054 --- /dev/null +++ b/Resources/Prototypes/White/Construction/Paperworks/structures.yml @@ -0,0 +1,15 @@ +# Paper window construction +- type: construction + name: сёдзи + id: WindowPaper + graph: WindowPaperGraph + startNode: start + targetNode: paperDoor + category: construction-category-structures + description: Окно, но только из бумаги + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + icon: + sprite: White/Structures/Windows/paperwindow.rsi + state: full diff --git a/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml b/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml index 8d813d12e0..16c2174118 100644 --- a/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml +++ b/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml @@ -52,69 +52,69 @@ drawdepth: SmallObjects layers: - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] + map: [ "enum.LatheVisualLayers.IsRunning" ] - state: unlit shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] + map: [ "enum.PowerDeviceVisualLayers.Powered" ] - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] + map: [ "enum.MaterialStorageVisualLayers.Inserting" ] - type: Lathe producingSound: /Audio/Machines/scanning.ogg idleState: icon runningState: printing staticRecipes: - - BoxFolderGreenBAN - - PaperRequestTargetStation - - PaperReportCC - - PaperCompletedStation - - PaperFailedStation - - PaperRequestCentComm - - PaperRequestERT - - PaperRequestRXBZZ - - PaperRequestExecution - - PaperRequestMagistrat - - BoxFolderBlueBAN - - PaperDomotionComm - - PaperDismissalReq - - PaperRequestHeadCouncil - - PaperHeadCouncilEnd - - BoxFolderRedBAN - - PaperOrderSec - - PaperDonos - - PaperLic - - PaperTimeRequestWeapon - - PaperRequestExecutionSec - - PaperOrderWeapon - - PaperRequestGuard - - BoxFolderRYellowBAN - - PaperRequestBuild - - PaperRequestMaterial - - PaperReportElect - - PaperReportAtmos - - BoxFolderWhiteBAN - - PaperRequestNarco - - PaperRequestExecutionMed - - PaperWaiverOfClaims - - PaperDurka - - BoxFolderPurpleBAN - - PaperRequestReasonable - - PaperRequestLaw - - PaperBrain - - BoxFolderYellowBAN - - PaperCargoOrder - - BoxFolderGreyBAN - - PaperRequestUpID - - PaperRequestWork - - PaperRequestTrash - - PaperEndTrash - - PaperRequestCourt - - PaperDismissalSer - - PaperPromotion - - PaperRequestBotan + - BoxFolderGreenBAN + - PaperRequestTargetStation + - PaperReportCC + - PaperCompletedStation + - PaperFailedStation + - PaperRequestCentComm + - PaperRequestERT + - PaperRequestRXBZZ + - PaperRequestExecution + - PaperRequestMagistrat + - BoxFolderBlueBAN + - PaperDomotionComm + - PaperDismissalReq + - PaperRequestHeadCouncil + - PaperHeadCouncilEnd + - BoxFolderRedBAN + - PaperOrderSec + - PaperDonos + - PaperLic + - PaperTimeRequestWeapon + - PaperRequestExecutionSec + - PaperOrderWeapon + - PaperRequestGuard + - BoxFolderRYellowBAN + - PaperRequestBuild + - PaperRequestMaterial + - PaperReportElect + - PaperReportAtmos + - BoxFolderWhiteBAN + - PaperRequestNarco + - PaperRequestExecutionMed + - PaperWaiverOfClaims + - PaperDurka + - BoxFolderPurpleBAN + - PaperRequestReasonable + - PaperRequestLaw + - PaperBrain + - BoxFolderYellowBAN + - PaperCargoOrder + - BoxFolderGreyBAN + - PaperRequestUpID + - PaperRequestWork + - PaperRequestTrash + - PaperEndTrash + - PaperRequestCourt + - PaperDismissalSer + - PaperPromotion + - PaperRequestBotan - type: EmagLatheRecipes emagStaticRecipes: - - BoxFolderBlackBAN - - PaperSyndicat + - BoxFolderBlackBAN + - PaperSyndicat - type: MaterialStorage # Recipe Paper @@ -122,63 +122,63 @@ - type: latheRecipe id: PaperRequestTargetStation # Tide result: PaperRequestTargetStation - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperReportCC # Tide result: PaperReportCC - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperCompletedStation # Tide result: PaperCompletedStation - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperFailedStation # Tide result: PaperFailedStation - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestCentComm # Tide result: PaperRequestCentComm - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestERT # Tide result: PaperRequestERT - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestRXBZZ # Tide result: PaperRequestRXBZZ - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestExecution # Tide result: PaperRequestExecution - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestMagistrat # Tide result: PaperRequestMagistrat - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -186,28 +186,28 @@ - type: latheRecipe id: PaperDomotionComm # Tide result: PaperDomotionComm - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperDismissalReq # Tide result: PaperDismissalReq - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestHeadCouncil # Tide result: PaperRequestHeadCouncil - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperHeadCouncilEnd # Tide result: PaperHeadCouncilEnd - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -215,49 +215,49 @@ - type: latheRecipe id: PaperOrderSec # Tide result: PaperOrderSec - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestExecutionSec # Tide result: PaperRequestExecutionSec - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperDonos # Tide result: PaperDonos - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperLic # Tide result: PaperLic - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperTimeRequestWeapon # Tide result: PaperTimeRequestWeapon - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperOrderWeapon # Tide result: PaperOrderWeapon - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestGuard # Tide result: PaperRequestGuard - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -265,28 +265,28 @@ - type: latheRecipe id: PaperRequestBuild # Tide result: PaperRequestBuild - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestMaterial # Tide result: PaperRequestMaterial - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperReportElect # Tide result: PaperReportElect - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperReportAtmos # Tide result: PaperReportAtmos - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -294,28 +294,28 @@ - type: latheRecipe id: PaperRequestNarco # Tide result: PaperRequestNarco - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestExecutionMed # Tide result: PaperRequestExecutionMed - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperWaiverOfClaims # Tide result: PaperWaiverOfClaims - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperDurka # Tide result: PaperDurka - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -323,21 +323,21 @@ - type: latheRecipe id: PaperRequestReasonable # Tide result: PaperRequestReasonable - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestLaw # Tide result: PaperRequestLaw - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperBrain # Tide result: PaperBrain - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -345,7 +345,7 @@ - type: latheRecipe id: PaperCargoOrder # Tide result: PaperCargoOrder - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -353,56 +353,56 @@ - type: latheRecipe id: PaperRequestUpID # Tide result: PaperRequestUpID - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestWork # Tide result: PaperRequestWork - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestTrash # Tide result: PaperRequestTrash - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperEndTrash # Tide result: PaperEndTrash - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestCourt # Tide result: PaperRequestCourt - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperDismissalSer # Tide result: PaperDismissalSer - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperPromotion # Tide result: PaperPromotion - completetime: 1 + completetime: 5 materials: Paper: 0 - type: latheRecipe id: PaperRequestBotan # Tide result: PaperRequestBotan - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -410,7 +410,7 @@ - type: latheRecipe id: PaperSyndicat # Tide result: PaperSyndicat - completetime: 1 + completetime: 5 materials: Paper: 0 @@ -924,62 +924,62 @@ - type: latheRecipe id: BoxFolderGreenBAN # Tide result: BoxFolderGreenBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 - type: latheRecipe id: BoxFolderGreyBAN # Tide result: BoxFolderGreyBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 - type: latheRecipe id: BoxFolderWhiteBAN # Tide result: BoxFolderWhiteBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 - type: latheRecipe id: BoxFolderYellowBAN # Tide result: BoxFolderYellowBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 - type: latheRecipe id: BoxFolderBlueBAN # Tide result: BoxFolderBlueBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 - type: latheRecipe id: BoxFolderRedBAN # Tide result: BoxFolderRedBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 - type: latheRecipe id: BoxFolderRYellowBAN # Tide result: BoxFolderRYellowBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 - type: latheRecipe id: BoxFolderPurpleBAN # Tide result: BoxFolderPurpleBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 - type: latheRecipe id: BoxFolderBlackBAN # Tide result: BoxFolderBlackBAN - completetime: 1 + completetime: 5 materials: - Paper: 1 + Paper: 999 diff --git a/Resources/Prototypes/White/Research/experimental.yml b/Resources/Prototypes/White/Research/experimental.yml index 5df1e504e2..6ea76940a5 100644 --- a/Resources/Prototypes/White/Research/experimental.yml +++ b/Resources/Prototypes/White/Research/experimental.yml @@ -32,7 +32,7 @@ # Night Vision Tech - type: technology id: NightVisionTech - name: night vision technology + name: Технологии ночного видиния icon: sprite: White/Clothing/Head/nightvision.rsi state: icon diff --git a/Resources/Prototypes/White/Structures/Windows/paper.yml b/Resources/Prototypes/White/Structures/Windows/paper.yml new file mode 100644 index 0000000000..12da8ec076 --- /dev/null +++ b/Resources/Prototypes/White/Structures/Windows/paper.yml @@ -0,0 +1,62 @@ +# Window Paper +- type: entity + id: WindowPaper + parent: BaseStructure + name: сёдзи + description: Окно, но только из бумаги + placement: + mode: SnapgridCenter + snap: + - Window + components: + - type: WallMount + arc: 360 # interact despite grilles + - type: Tag + tags: + - RCDDeconstructWhitelist + - ForceFixRotations + - Window + - type: Sprite + drawdepth: WallTops + sprite: White/Structures/Windows/paperwindow.rsi + - type: Icon + sprite: White/Structures/Windows/paperwindow.rsi + state: full + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb { } + mask: + - FullTileMask + layer: + - GlassLayer + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 #excess damage (nuke?). avoid computational cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Airtight + - type: IconSmooth + key: windows + base: window + - type: Construction + graph: WindowPaperGraph + node: paperDoor + - type: Appearance + - type: StaticPrice + price: 100 diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/full.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/full.png new file mode 100644 index 0000000000..d602799c0c Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/full.png differ diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/meta.json b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/meta.json new file mode 100644 index 0000000000..677f0a1ff7 --- /dev/null +++ b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "window0", + "directions": 4 + }, + { + "name": "window1", + "directions": 4 + }, + { + "name": "window2", + "directions": 4 + }, + { + "name": "window3", + "directions": 4 + }, + { + "name": "window4", + "directions": 4 + }, + { + "name": "window5", + "directions": 4 + }, + { + "name": "window6", + "directions": 4 + }, + { + "name": "window7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window0.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window0.png new file mode 100644 index 0000000000..21a6118338 Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window0.png differ diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window1.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window1.png new file mode 100644 index 0000000000..edd94e8c14 Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window1.png differ diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window2.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window2.png new file mode 100644 index 0000000000..21a6118338 Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window2.png differ diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window3.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window3.png new file mode 100644 index 0000000000..edd94e8c14 Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window3.png differ diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window4.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window4.png new file mode 100644 index 0000000000..a5c5add73e Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window4.png differ diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window5.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window5.png new file mode 100644 index 0000000000..428fcf6304 Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window5.png differ diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window6.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window6.png new file mode 100644 index 0000000000..a5c5add73e Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window6.png differ diff --git a/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window7.png b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window7.png new file mode 100644 index 0000000000..26774e626e Binary files /dev/null and b/Resources/Textures/White/Structures/Windows/paperwindow.rsi/window7.png differ