diff --git a/Resources/Maps/_CP14/tavern.yml b/Resources/Maps/_CP14/tavern.yml index b30845b0a1..1029e1860c 100644 --- a/Resources/Maps/_CP14/tavern.yml +++ b/Resources/Maps/_CP14/tavern.yml @@ -107,7 +107,7 @@ entities: version: 6 -1,1: ind: -1,1 - tiles: CQAAAAAKGgAAAAADGgAAAAAOGgAAAAALHAAAAAABHAAAAAADHAAAAAADHAAAAAAFHAAAAAAFHAAAAAAFHQAAAAAFGgAAAAAHGgAAAAAPGgAAAAADHAAAAAAEHQAAAAAFCQAAAAABCQAAAAADCQAAAAAEGgAAAAAFHAAAAAADHAAAAAABHAAAAAADHAAAAAADHAAAAAAAHQAAAAAAGgAAAAAIGgAAAAAOHgAAAAACHQAAAAAFHQAAAAACHQAAAAACGgAAAAAHGgAAAAAJHAAAAAAAHAAAAAADHAAAAAAAHAAAAAACHAAAAAACHAAAAAAAHAAAAAAFGgAAAAAJGgAAAAAJHQAAAAABHQAAAAABHQAAAAAFHQAAAAADHAAAAAAFHAAAAAACHAAAAAABHAAAAAAFHAAAAAACHAAAAAAFHAAAAAACHQAAAAADHQAAAAAAGgAAAAADGgAAAAAIHQAAAAACHQAAAAAAHQAAAAAEHQAAAAADHAAAAAACHAAAAAABHQAAAAABHQAAAAAFHAAAAAAEHQAAAAAEHQAAAAACHQAAAAACAQAAAAAAAQAAAAAFCwAAAAACAQAAAAACAQAAAAABAQAAAAABAQAAAAABAQAAAAAAAQAAAAAEAQAAAAACHAAAAAACHAAAAAAAHAAAAAAEHAAAAAACHAAAAAABHAAAAAACAQAAAAADCAAAAAAACwAAAAAACwAAAAAACwAAAAABCwAAAAAACwAAAAACCwAAAAABCwAAAAABAQAAAAADHAAAAAAEHAAAAAACHAAAAAABHAAAAAAEHAAAAAACHAAAAAABAQAAAAAACAAAAAABCwAAAAADCwAAAAADCwAAAAADCwAAAAACCwAAAAADCgAAAAAACgAAAAACAQAAAAACHAAAAAABHAAAAAACHAAAAAAFHAAAAAABHAAAAAABHAAAAAAAAQAAAAAACgAAAAACCgAAAAADCwAAAAABCwAAAAAACwAAAAACCwAAAAAACgAAAAAACgAAAAADAQAAAAADHQAAAAABHQAAAAAEHAAAAAAEHAAAAAAAHAAAAAABHAAAAAABAQAAAAAACgAAAAADCgAAAAADCAAAAAAACAAAAAACAQAAAAADAQAAAAADAQAAAAABAQAAAAAAAQAAAAAEHgAAAAABHQAAAAABHQAAAAAAHAAAAAAEHAAAAAABHQAAAAABAQAAAAABAQAAAAAFAQAAAAAFAQAAAAAEAQAAAAADAQAAAAAFHQAAAAAAHQAAAAAFHQAAAAAFHQAAAAABHgAAAAACHQAAAAAAHAAAAAABHAAAAAABHAAAAAAFHAAAAAAEHAAAAAAEHAAAAAAFHAAAAAABHQAAAAAFHQAAAAACHQAAAAAFHQAAAAADHQAAAAAFHQAAAAABHgAAAAADHgAAAAAAHAAAAAADHAAAAAADHAAAAAACHAAAAAACHAAAAAABHAAAAAADHAAAAAAAHAAAAAAAHAAAAAADHQAAAAADHQAAAAAEHQAAAAAEHgAAAAAAHQAAAAACHQAAAAADHgAAAAACHAAAAAADHAAAAAABHAAAAAABHAAAAAACHAAAAAAAHAAAAAACHAAAAAADHAAAAAAFHAAAAAAEHAAAAAACHAAAAAAFHQAAAAAFHgAAAAADHQAAAAAFHQAAAAADHgAAAAABHQAAAAACHAAAAAACHAAAAAACHAAAAAAEHAAAAAAAHAAAAAAEHAAAAAADHAAAAAAFHAAAAAADHAAAAAAFHAAAAAADHQAAAAAFHgAAAAABHQAAAAADHQAAAAABHgAAAAAFHQAAAAADHAAAAAABHAAAAAAFHAAAAAAAHAAAAAADHAAAAAAEHQAAAAAAHAAAAAAAHAAAAAAFHQAAAAAFHQAAAAAFHgAAAAAAHgAAAAABHQAAAAAEHQAAAAAAHgAAAAAEHQAAAAADHQAAAAACHQAAAAACHAAAAAADHAAAAAAFHQAAAAACHQAAAAAFHQAAAAAEHQAAAAAFHgAAAAAFHgAAAAABHgAAAAAFHgAAAAABHgAAAAAFHgAAAAAF + tiles: CQAAAAAKGgAAAAADGgAAAAAOGgAAAAALHAAAAAABHAAAAAADHAAAAAADHAAAAAAFHAAAAAAFHAAAAAAFHQAAAAAFGgAAAAAHGgAAAAAPGgAAAAADHAAAAAAEHQAAAAAFCQAAAAABCQAAAAADCQAAAAAEGgAAAAAFHAAAAAADHAAAAAABHAAAAAADHAAAAAADHAAAAAAAHQAAAAAAGgAAAAAIGgAAAAAOHgAAAAACHQAAAAAFHQAAAAACHQAAAAACGgAAAAAHGgAAAAAJHAAAAAAAHAAAAAADHAAAAAAAHAAAAAACHAAAAAACHAAAAAAAHAAAAAAFGgAAAAAJGgAAAAAJHQAAAAABHQAAAAABHQAAAAAFHQAAAAADHAAAAAAFHAAAAAACHAAAAAABHAAAAAAFHAAAAAACHAAAAAAFHAAAAAACHQAAAAADHQAAAAAAGgAAAAADGgAAAAAIHQAAAAACHQAAAAAAHQAAAAAEHQAAAAADHAAAAAACHAAAAAABHQAAAAABHQAAAAAFHAAAAAAEHQAAAAAEHQAAAAACHQAAAAACAQAAAAAAAQAAAAAFCwAAAAACAQAAAAACAQAAAAABAQAAAAABAQAAAAABAQAAAAAAAQAAAAAEAQAAAAACHAAAAAACHAAAAAAAHAAAAAAEHAAAAAACHAAAAAABHAAAAAACAQAAAAADCAAAAAAACwAAAAAACwAAAAAACwAAAAABCwAAAAAACwAAAAACCwAAAAABCwAAAAABAQAAAAADHAAAAAAEHAAAAAACHAAAAAABHAAAAAAEHAAAAAACHAAAAAABAQAAAAAACAAAAAABCwAAAAADCwAAAAADCwAAAAADCwAAAAACCwAAAAADCgAAAAAACgAAAAACAQAAAAACHAAAAAABHAAAAAACHAAAAAAFHAAAAAABHAAAAAABHAAAAAAAAQAAAAAACgAAAAACCgAAAAADCwAAAAABCwAAAAAACwAAAAACCwAAAAAACgAAAAAACgAAAAADAQAAAAADHQAAAAABHQAAAAAEHAAAAAAEHAAAAAAAHAAAAAABHAAAAAABAQAAAAAACgAAAAADCgAAAAADCAAAAAAACAAAAAACAQAAAAADAQAAAAADAQAAAAABAQAAAAAAAQAAAAAEHgAAAAABHQAAAAABHQAAAAAAHAAAAAAEHAAAAAABHQAAAAABCwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAHQAAAAAAHQAAAAAFHQAAAAAFHQAAAAABHgAAAAACHQAAAAAAHAAAAAABHAAAAAABHAAAAAAFHAAAAAAECwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAHQAAAAADHQAAAAAFHQAAAAABHgAAAAADHgAAAAAAHAAAAAADHAAAAAADHAAAAAACHAAAAAACHAAAAAABCwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAHQAAAAAEHgAAAAAAHQAAAAACHQAAAAADHgAAAAACHAAAAAADHAAAAAABHAAAAAABHAAAAAACHAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAHQAAAAAFHgAAAAADHQAAAAAFHQAAAAADHgAAAAABHQAAAAACHAAAAAACHAAAAAACHAAAAAAEHAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAHQAAAAAFHgAAAAABHQAAAAADHQAAAAABHgAAAAAFHQAAAAADHAAAAAABHAAAAAAFHAAAAAAAHAAAAAADCwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAHgAAAAAAHgAAAAABHQAAAAAEHQAAAAAAHgAAAAAEHQAAAAADHQAAAAACHQAAAAACHAAAAAADHAAAAAAFHQAAAAACHQAAAAAFHQAAAAAEHQAAAAAFHgAAAAAFHgAAAAABHgAAAAAFHgAAAAABHgAAAAAFHgAAAAAF version: 6 1,-3: ind: 1,-3 @@ -403,51 +403,34 @@ entities: pendingMarkers: {} loadedChunks: - -32,24 - - 24,-40 - - 24,24 - - 24,16 - - 24,8 - - 24,0 - -32,16 - -32,8 - 16,24 - 16,16 - - 16,-24 - - 8,-24 - - 0,-24 + - 24,-16 + - 16,-16 - -32,0 - -32,-8 - - -8,-24 - - 16,-40 + - 8,-16 - 16,8 - - 8,-40 - 16,0 - 16,-8 - - 16,-16 - - 24,-8 - - -16,-24 - - -32,-16 - - 0,-40 - - 24,-16 - - -8,-40 + - 0,-16 + - -8,-16 + - -16,-16 + - -24,-16 - 0,24 - 0,16 - 0,8 - 0,0 - 0,-8 - - 0,-16 - - -40,24 - - -16,-40 - - -24,-24 - -8,24 - -8,16 - -8,8 - -8,0 - -8,-8 - - -8,-16 - - -40,16 - - -24,-40 - - -32,-40 + - 24,48 + - -32,-16 - -16,24 - -16,16 - -24,24 @@ -457,79 +440,79 @@ entities: - -24,8 - -24,0 - -24,-8 - - -24,-16 - - -40,8 - - -40,-40 + - 24,40 + - 16,40 + - 8,40 - -16,-8 - - -16,-16 - - -40,0 - - 24,-24 - - -32,-24 - - 24,-32 - - -40,-24 - - 16,-32 + - 24,32 + - 0,40 + - 24,24 + - 24,16 + - -40,40 + - -8,40 + - -40,32 - 8,24 - 8,16 - 8,8 - 8,0 - 8,-8 - - 8,-16 - - 8,-32 - - 0,-32 - - -8,-32 - - -16,-32 - - -24,-32 - - -32,-32 - - -40,-32 + - 24,8 + - -40,24 + - -40,16 + - -40,8 + - -40,0 - -40,-8 + - 24,0 + - -16,40 + - -24,40 + - -32,40 + - -32,32 + - -24,32 + - -16,32 + - -8,32 + - 0,32 + - 8,32 + - 16,32 - -40,-16 + - 24,-8 + - 16,48 + - 8,48 + - 0,48 + - -8,48 + - -16,48 + - -24,48 + - -32,48 + - -40,48 entities: -32,24: {} - 24,-40: {} - 24,24: {} - 24,16: {} - 24,8: {} - 24,0: {} -32,16: {} -32,8: {} 16,24: {} 16,16: {} - 16,-24: {} - 8,-24: {} - 0,-24: {} + 24,-16: {} + 16,-16: {} -32,0: {} -32,-8: {} - -8,-24: {} - 16,-40: {} + 8,-16: {} 16,8: {} - 8,-40: {} 16,0: {} 16,-8: {} - 16,-16: {} - 24,-8: {} - -16,-24: {} - -32,-16: {} - 0,-40: {} - 24,-16: {} - -8,-40: {} + 0,-16: {} + -8,-16: {} + -16,-16: {} + -24,-16: {} 0,24: {} 0,16: {} 0,8: {} 0,0: {} 0,-8: {} - 0,-16: {} - -40,24: {} - -16,-40: {} - -24,-24: {} -8,24: {} -8,16: {} -8,8: {} -8,0: {} -8,-8: {} - -8,-16: {} - -40,16: {} - -24,-40: {} - -32,-40: {} + 24,48: {} + -32,-16: {} -16,24: {} -16,16: {} -24,24: {} @@ -539,79 +522,79 @@ entities: -24,8: {} -24,0: {} -24,-8: {} - -24,-16: {} - -40,8: {} - -40,-40: {} + 24,40: {} + 16,40: {} + 8,40: {} -16,-8: {} - -16,-16: {} - -40,0: {} - 24,-24: {} - -32,-24: {} - 24,-32: {} - -40,-24: {} - 16,-32: {} + 24,32: {} + 0,40: {} + 24,24: {} + 24,16: {} + -40,40: {} + -8,40: {} + -40,32: {} 8,24: {} 8,16: {} 8,8: {} 8,0: {} 8,-8: {} - 8,-16: {} - 8,-32: {} - 0,-32: {} - -8,-32: {} - -16,-32: {} - -24,-32: {} - -32,-32: {} - -40,-32: {} + 24,8: {} + -40,24: {} + -40,16: {} + -40,8: {} + -40,0: {} -40,-8: {} + 24,0: {} + -16,40: {} + -24,40: {} + -32,40: {} + -32,32: {} + -24,32: {} + -16,32: {} + -8,32: {} + 0,32: {} + 8,32: {} + 16,32: {} -40,-16: {} + 24,-8: {} + 16,48: {} + 8,48: {} + 0,48: {} + -8,48: {} + -16,48: {} + -24,48: {} + -32,48: {} + -40,48: {} decals: -32,24: {} - 24,-40: {} - 24,24: {} - 24,16: {} - 24,8: {} - 24,0: {} -32,16: {} -32,8: {} 16,24: {} 16,16: {} - 16,-24: {} - 8,-24: {} - 0,-24: {} + 24,-16: {} + 16,-16: {} -32,0: {} -32,-8: {} - -8,-24: {} - 16,-40: {} + 8,-16: {} 16,8: {} - 8,-40: {} 16,0: {} 16,-8: {} - 16,-16: {} - 24,-8: {} - -16,-24: {} - -32,-16: {} - 0,-40: {} - 24,-16: {} - -8,-40: {} + 0,-16: {} + -8,-16: {} + -16,-16: {} + -24,-16: {} 0,24: {} 0,16: {} 0,8: {} 0,0: {} 0,-8: {} - 0,-16: {} - -40,24: {} - -16,-40: {} - -24,-24: {} -8,24: {} -8,16: {} -8,8: {} -8,0: {} -8,-8: {} - -8,-16: {} - -40,16: {} - -24,-40: {} - -32,-40: {} + 24,48: {} + -32,-16: {} -16,24: {} -16,16: {} -24,24: {} @@ -621,32 +604,49 @@ entities: -24,8: {} -24,0: {} -24,-8: {} - -24,-16: {} - -40,8: {} - -40,-40: {} + 24,40: {} + 16,40: {} + 8,40: {} -16,-8: {} - -16,-16: {} - -40,0: {} - 24,-24: {} - -32,-24: {} - 24,-32: {} - -40,-24: {} - 16,-32: {} + 24,32: {} + 0,40: {} + 24,24: {} + 24,16: {} + -40,40: {} + -8,40: {} + -40,32: {} 8,24: {} 8,16: {} 8,8: {} 8,0: {} 8,-8: {} - 8,-16: {} - 8,-32: {} - 0,-32: {} - -8,-32: {} - -16,-32: {} - -24,-32: {} - -32,-32: {} - -40,-32: {} + 24,8: {} + -40,24: {} + -40,16: {} + -40,8: {} + -40,0: {} -40,-8: {} + 24,0: {} + -16,40: {} + -24,40: {} + -32,40: {} + -32,32: {} + -24,32: {} + -16,32: {} + -8,32: {} + 0,32: {} + 8,32: {} + 16,32: {} -40,-16: {} + 24,-8: {} + 16,48: {} + 8,48: {} + 0,48: {} + -8,48: {} + -16,48: {} + -24,48: {} + -32,48: {} + -40,48: {} modifiedTiles: -40,-24: - -34,-18 @@ -17112,26 +17112,11 @@ entities: parent: 1 - proto: CP14BiomeSpawnerCave entities: - - uid: 6 - components: - - type: Transform - pos: -13.5,28.5 - parent: 1 - uid: 7 components: - type: Transform pos: -12.5,29.5 parent: 1 - - uid: 9 - components: - - type: Transform - pos: -11.5,29.5 - parent: 1 - - uid: 10 - components: - - type: Transform - pos: -10.5,29.5 - parent: 1 - uid: 11 components: - type: Transform @@ -25594,16 +25579,6 @@ entities: - type: Transform pos: -35.5,49.5 parent: 1 - - uid: 1831 - components: - - type: Transform - pos: -7.5,30.5 - parent: 1 - - uid: 1836 - components: - - type: Transform - pos: -9.5,30.5 - parent: 1 - uid: 1871 components: - type: Transform @@ -25833,11 +25808,6 @@ entities: - type: Transform pos: -58.5,15.5 parent: 1 - - uid: 2349 - components: - - type: Transform - pos: -7.5,29.5 - parent: 1 - uid: 2364 components: - type: Transform @@ -31952,56 +31922,16 @@ entities: - type: Transform pos: -17.5,26.5 parent: 1 - - uid: 4025 - components: - - type: Transform - pos: -13.5,26.5 - parent: 1 - - uid: 4026 - components: - - type: Transform - pos: -12.5,26.5 - parent: 1 - - uid: 4027 - components: - - type: Transform - pos: -12.5,25.5 - parent: 1 - - uid: 4029 - components: - - type: Transform - pos: -11.5,26.5 - parent: 1 - - uid: 4042 - components: - - type: Transform - pos: -10.5,26.5 - parent: 1 - uid: 4043 components: - type: Transform pos: -24.5,23.5 parent: 1 - - uid: 4045 - components: - - type: Transform - pos: -4.5,30.5 - parent: 1 - uid: 4046 components: - type: Transform pos: -4.5,31.5 parent: 1 - - uid: 4062 - components: - - type: Transform - pos: -6.5,30.5 - parent: 1 - - uid: 4063 - components: - - type: Transform - pos: -5.5,30.5 - parent: 1 - uid: 4081 components: - type: Transform @@ -33047,31 +32977,6 @@ entities: - type: Transform pos: -16.5,27.5 parent: 1 - - uid: 5058 - components: - - type: Transform - pos: -14.5,27.5 - parent: 1 - - uid: 5062 - components: - - type: Transform - pos: -13.5,27.5 - parent: 1 - - uid: 5063 - components: - - type: Transform - pos: -12.5,27.5 - parent: 1 - - uid: 5064 - components: - - type: Transform - pos: -11.5,27.5 - parent: 1 - - uid: 5065 - components: - - type: Transform - pos: -10.5,27.5 - parent: 1 - uid: 5066 components: - type: Transform @@ -33087,21 +32992,6 @@ entities: - type: Transform pos: -10.5,30.5 parent: 1 - - uid: 5069 - components: - - type: Transform - pos: -8.5,30.5 - parent: 1 - - uid: 5070 - components: - - type: Transform - pos: -8.5,29.5 - parent: 1 - - uid: 5072 - components: - - type: Transform - pos: -12.5,28.5 - parent: 1 - uid: 5108 components: - type: Transform @@ -33112,11 +33002,6 @@ entities: - type: Transform pos: 32.5,47.5 parent: 1 - - uid: 5146 - components: - - type: Transform - pos: -11.5,28.5 - parent: 1 - uid: 5162 components: - type: Transform @@ -33152,36 +33037,6 @@ entities: - type: Transform pos: 33.5,49.5 parent: 1 - - uid: 5525 - components: - - type: Transform - pos: -10.5,28.5 - parent: 1 - - uid: 5526 - components: - - type: Transform - pos: -9.5,28.5 - parent: 1 - - uid: 5527 - components: - - type: Transform - pos: -8.5,28.5 - parent: 1 - - uid: 5528 - components: - - type: Transform - pos: -7.5,28.5 - parent: 1 - - uid: 5529 - components: - - type: Transform - pos: -6.5,28.5 - parent: 1 - - uid: 5530 - components: - - type: Transform - pos: -9.5,29.5 - parent: 1 - uid: 5533 components: - type: Transform @@ -33207,16 +33062,6 @@ entities: - type: Transform pos: -13.5,30.5 parent: 1 - - uid: 5542 - components: - - type: Transform - pos: -6.5,29.5 - parent: 1 - - uid: 5543 - components: - - type: Transform - pos: -5.5,29.5 - parent: 1 - uid: 5732 components: - type: Transform @@ -60115,11 +59960,6 @@ entities: - type: Transform pos: -52.5,-1.5 parent: 1 - - uid: 2047 - components: - - type: Transform - pos: -17.5,19.5 - parent: 1 - uid: 2048 components: - type: Transform @@ -60595,11 +60435,6 @@ entities: - type: Transform pos: -54.5,12.5 parent: 1 - - uid: 2200 - components: - - type: Transform - pos: -17.5,18.5 - parent: 1 - uid: 2212 components: - type: Transform @@ -61494,24 +61329,6 @@ entities: rot: -1.5707963267948966 rad pos: -17.5,23.5 parent: 1 - - uid: 3492 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,22.5 - parent: 1 - - uid: 3493 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,21.5 - parent: 1 - - uid: 3494 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,20.5 - parent: 1 - uid: 3495 components: - type: Transform @@ -61578,36 +61395,6 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,26.5 parent: 1 - - uid: 3507 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,25.5 - parent: 1 - - uid: 3508 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,24.5 - parent: 1 - - uid: 3509 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,23.5 - parent: 1 - - uid: 3510 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,22.5 - parent: 1 - - uid: 3511 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,21.5 - parent: 1 - uid: 3512 components: - type: Transform @@ -61644,30 +61431,6 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,9.5 parent: 1 - - uid: 3524 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,26.5 - parent: 1 - - uid: 3525 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,25.5 - parent: 1 - - uid: 3526 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,24.5 - parent: 1 - - uid: 3527 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,23.5 - parent: 1 - uid: 3528 components: - type: Transform @@ -61716,30 +61479,6 @@ entities: rot: -1.5707963267948966 rad pos: -15.5,9.5 parent: 1 - - uid: 3542 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,26.5 - parent: 1 - - uid: 3543 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,25.5 - parent: 1 - - uid: 3544 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,24.5 - parent: 1 - - uid: 3545 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,23.5 - parent: 1 - uid: 3546 components: - type: Transform @@ -61803,24 +61542,6 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,9.5 parent: 1 - - uid: 3561 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,25.5 - parent: 1 - - uid: 3562 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,24.5 - parent: 1 - - uid: 3563 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,23.5 - parent: 1 - uid: 3564 components: - type: Transform @@ -61884,18 +61605,6 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,9.5 parent: 1 - - uid: 3580 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,24.5 - parent: 1 - - uid: 3581 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,23.5 - parent: 1 - uid: 3582 components: - type: Transform @@ -61944,24 +61653,6 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,9.5 parent: 1 - - uid: 3597 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,25.5 - parent: 1 - - uid: 3598 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,24.5 - parent: 1 - - uid: 3599 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,23.5 - parent: 1 - uid: 3600 components: - type: Transform @@ -62046,12 +61737,6 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,9.5 parent: 1 - - uid: 3615 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,25.5 - parent: 1 - uid: 3619 components: - type: Transform @@ -62128,12 +61813,6 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,9.5 parent: 1 - - uid: 3632 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,26.5 - parent: 1 - uid: 3633 components: - type: Transform @@ -62204,12 +61883,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,9.5 parent: 1 - - uid: 3650 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,26.5 - parent: 1 - uid: 3658 components: - type: Transform @@ -62264,12 +61937,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,9.5 parent: 1 - - uid: 3668 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,26.5 - parent: 1 - uid: 3674 components: - type: Transform @@ -62328,12 +61995,6 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,9.5 parent: 1 - - uid: 3686 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,26.5 - parent: 1 - uid: 3691 components: - type: Transform @@ -62396,12 +62057,6 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,9.5 parent: 1 - - uid: 3704 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,26.5 - parent: 1 - uid: 3705 components: - type: Transform @@ -65234,12 +64889,6 @@ entities: - type: Transform pos: 14.5,24.5 parent: 1 - - uid: 4942 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,26.5 - parent: 1 - uid: 4943 components: - type: Transform @@ -65571,32 +65220,6 @@ entities: - type: Transform pos: 1.5,0.5 parent: 1 - - uid: 5041 - components: - - type: Transform - pos: -9.5,27.5 - parent: 1 - - uid: 5042 - components: - - type: Transform - pos: -8.5,27.5 - parent: 1 - - uid: 5043 - components: - - type: Transform - pos: -7.5,27.5 - parent: 1 - - uid: 5044 - components: - - type: Transform - pos: -6.5,27.5 - parent: 1 - - uid: 5045 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,27.5 - parent: 1 - uid: 5046 components: - type: Transform @@ -65607,29 +65230,12 @@ entities: - type: Transform pos: 1.5,-1.5 parent: 1 - - uid: 5059 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,28.5 - parent: 1 - - uid: 5060 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,28.5 - parent: 1 - uid: 5061 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,28.5 parent: 1 - - uid: 5073 - components: - - type: Transform - pos: -4.5,29.5 - parent: 1 - uid: 5074 components: - type: Transform @@ -65640,12 +65246,6 @@ entities: - type: Transform pos: -2.5,29.5 parent: 1 - - uid: 5079 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,27.5 - parent: 1 - uid: 5080 components: - type: Transform @@ -80387,7 +79987,7 @@ entities: - uid: 9875 components: - type: Transform - pos: -5.4819155,24.721102 + pos: -5.3577614,28.217354 parent: 1 - proto: CP14ChairWooden entities: @@ -80894,7 +80494,7 @@ entities: - uid: 3672 components: - type: Transform - pos: -6.0984416,24.80094 + pos: -5.5267277,27.4278 parent: 1 - uid: 8798 components: @@ -81046,6 +80646,7 @@ entities: showEnts: False occludes: True ents: + - 12951 - 2057 paper_label: !type:ContainerSlot showEnts: False @@ -81239,6 +80840,18 @@ entities: parent: 1 - proto: CP14CurtainsWhite entities: + - uid: 3770 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,28.5 + parent: 1 + - uid: 3771 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,27.5 + parent: 1 - uid: 8645 components: - type: Transform @@ -81630,6 +81243,20 @@ entities: - type: Transform pos: 33.5,-2.5 parent: 1 +- proto: CP14FenceWoodSmallCorner + entities: + - uid: 2210 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,28.5 + parent: 1 + - uid: 3544 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,29.5 + parent: 1 - proto: CP14FenceWoodSmallGate entities: - uid: 13120 @@ -81639,6 +81266,54 @@ entities: parent: 1 - proto: CP14FenceWoodSmallStraight entities: + - uid: 6 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,23.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,23.5 + parent: 1 + - uid: 10 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,23.5 + parent: 1 + - uid: 2200 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,29.5 + parent: 1 + - uid: 2208 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,25.5 + parent: 1 + - uid: 3493 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,23.5 + parent: 1 + - uid: 3494 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,24.5 + parent: 1 + - uid: 3562 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,28.5 + parent: 1 - uid: 3587 components: - type: Transform @@ -82209,6 +81884,18 @@ entities: parent: 1 - proto: CP14GatherableBloodFlower entities: + - uid: 3545 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,24.5 + parent: 1 + - uid: 3563 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,25.5 + parent: 1 - uid: 4064 components: - type: Transform @@ -82254,8 +81941,48 @@ entities: - type: Transform pos: -55.5,6.5 parent: 1 +- proto: CP14GatherableBlueAmanita + entities: + - uid: 3581 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,27.5 + parent: 1 + - uid: 3599 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,28.5 + parent: 1 +- proto: CP14GatherableFlowersYellow + entities: + - uid: 3542 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,29.5 + parent: 1 + - uid: 3543 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,24.5 + parent: 1 - proto: CP14GatherableFlyAgaric entities: + - uid: 3561 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,28.5 + parent: 1 + - uid: 3580 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,26.5 + parent: 1 - uid: 10105 components: - type: Transform @@ -82306,6 +82033,24 @@ entities: parent: 1 - proto: CP14GatherableLumiMushroom entities: + - uid: 3597 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,25.5 + parent: 1 + - uid: 3598 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,28.5 + parent: 1 + - uid: 3615 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,24.5 + parent: 1 - uid: 3776 components: - type: Transform @@ -82522,7 +82267,7 @@ entities: - uid: 9873 components: - type: Transform - pos: -6.5374928,24.638227 + pos: -5.3079777,27.700558 parent: 1 - proto: CP14Nail1 entities: @@ -82570,9 +82315,10 @@ entities: - uid: 12951 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -10.240829,23.881886 - parent: 1 + parent: 9899 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 12953 components: - type: Transform @@ -82608,7 +82354,7 @@ entities: - uid: 8896 components: - type: Transform - pos: -6.239724,24.541193 + pos: -5.6361027,27.770607 parent: 1 - proto: CP14PlantCabbage entities: @@ -83213,6 +82959,11 @@ entities: parent: 1 - proto: CP14SpawnPointAlchemist entities: + - uid: 3632 + components: + - type: Transform + pos: -7.5,27.5 + parent: 1 - uid: 8687 components: - type: Transform @@ -83325,18 +83076,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,24.5 parent: 1 - - uid: 2285 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,24.5 - parent: 1 - - uid: 2302 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,24.5 - parent: 1 - uid: 2332 components: - type: Transform @@ -83367,12 +83106,48 @@ entities: rot: 3.141592653589793 rad pos: -45.5,34.5 parent: 1 + - uid: 3492 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,29.5 + parent: 1 + - uid: 3508 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,29.5 + parent: 1 + - uid: 3509 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,28.5 + parent: 1 + - uid: 3510 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,27.5 + parent: 1 - uid: 3515 components: - type: Transform rot: 1.5707963267948966 rad pos: 28.5,37.5 parent: 1 + - uid: 3524 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,26.5 + parent: 1 + - uid: 3525 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,25.5 + parent: 1 - uid: 3533 components: - type: Transform @@ -83808,25 +83583,25 @@ entities: parent: 1 - proto: CP14VialSmall entities: - - uid: 9483 + - uid: 2285 components: - type: Transform - pos: -7.3173532,24.728182 + pos: -5.2741523,29.506973 parent: 1 - - uid: 9485 + - uid: 3511 components: - type: Transform - pos: -7.2348685,24.61574 + pos: -5.5554023,29.350723 parent: 1 - - uid: 9490 + - uid: 3773 components: - type: Transform - pos: -7.084895,24.743176 + pos: -5.2897773,29.788223 parent: 1 - - uid: 9872 + - uid: 3774 components: - type: Transform - pos: -6.9949117,24.61574 + pos: -5.5866523,29.663223 parent: 1 - uid: 11980 components: @@ -83835,25 +83610,40 @@ entities: parent: 1 - proto: CP14VialTiny entities: - - uid: 8965 + - uid: 3775 components: - type: Transform - pos: -7.9472413,24.743176 + pos: -5.4147773,28.928848 parent: 1 - - uid: 8975 + - uid: 3794 components: - type: Transform - pos: -7.827263,24.660717 + pos: -5.5554023,28.803848 parent: 1 - - uid: 8976 + - uid: 3795 components: - type: Transform - pos: -7.7147827,24.795649 + pos: -5.1960273,29.006973 parent: 1 - - uid: 8977 + - uid: 3796 components: - type: Transform - pos: -7.6397963,24.65322 + pos: -5.7741523,28.694473 + parent: 1 + - uid: 3797 + components: + - type: Transform + pos: -5.6179023,28.600723 + parent: 1 + - uid: 3798 + components: + - type: Transform + pos: -5.3522773,28.725723 + parent: 1 + - uid: 3799 + components: + - type: Transform + pos: -5.1960273,28.819473 parent: 1 - proto: CP14WallDirt entities: @@ -83909,6 +83699,21 @@ entities: fixtures: {} - proto: CP14WallmountLamp entities: + - uid: 3526 + components: + - type: Transform + pos: -6.5,29.5 + parent: 1 + - type: Fixtures + fixtures: {} + - uid: 3527 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,25.5 + parent: 1 + - type: Fixtures + fixtures: {} - uid: 3671 components: - type: Transform @@ -84067,7 +83872,7 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: CP14WallpaperPurple30 +- proto: CP14WallpaperPurple entities: - uid: 2057 components: @@ -84572,26 +84377,31 @@ entities: parent: 1 - proto: CP14WallWhitebrick entities: + - uid: 1831 + components: + - type: Transform + pos: -7.5,30.5 + parent: 1 + - uid: 1836 + components: + - type: Transform + pos: -6.5,30.5 + parent: 1 + - uid: 2047 + components: + - type: Transform + pos: -5.5,30.5 + parent: 1 - uid: 2111 components: - type: Transform pos: -9.5,20.5 parent: 1 - - uid: 2208 - components: - - type: Transform - pos: -6.5,25.5 - parent: 1 - uid: 2209 components: - type: Transform pos: -9.5,21.5 parent: 1 - - uid: 2210 - components: - - type: Transform - pos: -7.5,25.5 - parent: 1 - uid: 2211 components: - type: Transform @@ -84630,17 +84440,17 @@ entities: - uid: 2268 components: - type: Transform - pos: -8.5,25.5 + pos: -4.5,30.5 parent: 1 - uid: 2284 components: - type: Transform pos: -9.5,24.5 parent: 1 - - uid: 2320 + - uid: 2302 components: - type: Transform - pos: -5.5,25.5 + pos: -4.5,29.5 parent: 1 - uid: 2337 components: @@ -84662,6 +84472,11 @@ entities: - type: Transform pos: -1.5,24.5 parent: 1 + - uid: 3650 + components: + - type: Transform + pos: -8.5,30.5 + parent: 1 - uid: 3652 components: - type: Transform @@ -84682,11 +84497,36 @@ entities: - type: Transform pos: -1.5,20.5 parent: 1 + - uid: 3668 + components: + - type: Transform + pos: -9.5,30.5 + parent: 1 - uid: 3669 components: - type: Transform pos: -9.5,25.5 parent: 1 + - uid: 3686 + components: + - type: Transform + pos: -9.5,29.5 + parent: 1 + - uid: 3704 + components: + - type: Transform + pos: -9.5,28.5 + parent: 1 + - uid: 3766 + components: + - type: Transform + pos: -9.5,26.5 + parent: 1 + - uid: 3768 + components: + - type: Transform + pos: -4.5,26.5 + parent: 1 - proto: CP14WallWooden entities: - uid: 2059 @@ -85248,6 +85088,16 @@ entities: rot: 3.141592653589793 rad pos: 17.5,35.5 parent: 1 + - uid: 3769 + components: + - type: Transform + pos: -4.5,27.5 + parent: 1 + - uid: 3772 + components: + - type: Transform + pos: -4.5,28.5 + parent: 1 - uid: 4952 components: - type: Transform @@ -85432,6 +85282,19 @@ entities: rot: 1.5707963267948966 rad pos: 30.5,26.5 parent: 1 +- proto: CP14WoodenCabinetAlchemist + entities: + - uid: 3507 + components: + - type: Transform + pos: -8.5,29.5 + parent: 1 + - uid: 3767 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,26.5 + parent: 1 - proto: CP14WoodenChestFrame entities: - uid: 5145 @@ -85439,7 +85302,7 @@ entities: - type: Transform pos: -1.5129044,1.9403481 parent: 1 -- proto: CP14WoodenCupboard +- proto: CP14WoodenCloset entities: - uid: 11943 components: @@ -85449,6 +85312,173 @@ entities: parent: 1 - type: Physics bodyType: Static +- proto: CP14WoodenClosetAlchemyFilled + entities: + - uid: 2349 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,25.5 + parent: 1 + - type: StorageFill + contents: + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 1 + id: HandLabeler + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 1 + id: CP14ClothingEyesAlchemyGlasses + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 1 + id: CP14Cauldron + - maxAmount: 1 + amount: 2 + orGroup: null + prob: 1 + id: CP14Pestle + - maxAmount: 1 + amount: 2 + orGroup: null + prob: 1 + id: CP14Mortar + - maxAmount: 1 + amount: 2 + orGroup: null + prob: 1 + id: CP14Dropper + - maxAmount: 1 + amount: 7 + orGroup: null + prob: 1 + id: CP14VialTiny + - maxAmount: 1 + amount: 5 + orGroup: null + prob: 1 + id: CP14VialSmall + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.9 + id: CP14VialSmallGroundQuartz + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.7 + id: CP14VialSmallBloodFlowerSap + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.7 + id: CP14VialSmallAgaricMushroom + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.7 + id: CP14VialSmallWildSage + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.7 + id: CP14VialSmallBlueAmanita + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.3 + id: CP14VialTinyChromiumSlime + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.3 + id: CP14VialTinyLumiMushroom + - uid: 3800 + components: + - type: Transform + pos: -7.5,29.5 + parent: 1 + - type: StorageFill + contents: + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 1 + id: HandLabeler + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 1 + id: CP14ClothingEyesAlchemyGlasses + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 1 + id: CP14Cauldron + - maxAmount: 1 + amount: 2 + orGroup: null + prob: 1 + id: CP14Pestle + - maxAmount: 1 + amount: 2 + orGroup: null + prob: 1 + id: CP14Mortar + - maxAmount: 1 + amount: 2 + orGroup: null + prob: 1 + id: CP14Dropper + - maxAmount: 1 + amount: 7 + orGroup: null + prob: 1 + id: CP14VialTiny + - maxAmount: 1 + amount: 5 + orGroup: null + prob: 1 + id: CP14VialSmall + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.9 + id: CP14VialSmallGroundQuartz + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.7 + id: CP14VialSmallBloodFlowerSap + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.7 + id: CP14VialSmallAgaricMushroom + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.7 + id: CP14VialSmallWildSage + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.7 + id: CP14VialSmallBlueAmanita + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.3 + id: CP14VialTinyChromiumSlime + - maxAmount: 1 + amount: 1 + orGroup: null + prob: 0.3 + id: CP14VialTinyLumiMushroom - proto: CP14WoodenDoor entities: - uid: 1973 @@ -85459,6 +85489,12 @@ entities: parent: 1 - proto: CP14WoodenDoorTavernAlchemy entities: + - uid: 2320 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,27.5 + parent: 1 - uid: 8964 components: - type: Transform diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml new file mode 100644 index 0000000000..22e2644aaf --- /dev/null +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -0,0 +1,34 @@ +- type: entity + parent: CP14WoodenCloset + id: CP14WoodenClosetAlchemyFilled + suffix: Alchemist, Filled + components: + - type: StorageFill + contents: + - id: HandLabeler #TODO custom cp14 labeler + - id: CP14Cauldron + - id: CP14Pestle + amount: 2 + - id: CP14Mortar + amount: 2 + - id: CP14Dropper + amount: 2 + - id: CP14VialTiny + amount: 7 + - id: CP14VialSmall + amount: 5 + #Random start resource + - id: CP14VialSmallGroundQuartz + prob: 0.9 + - id: CP14VialSmallBloodFlowerSap + prob: 0.7 + - id: CP14VialSmallAgaricMushroom + prob: 0.7 + - id: CP14VialSmallWildSage + prob: 0.7 + - id: CP14VialSmallBlueAmanita + prob: 0.7 + - id: CP14VialTinyChromiumSlime + prob: 0.3 + - id: CP14VialTinyLumiMushroom + prob: 0.3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml new file mode 100644 index 0000000000..0a72d4a09b --- /dev/null +++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml @@ -0,0 +1,17 @@ +- type: entity + parent: CP14WoodenCabinet + id: CP14WoodenCabinetAlchemist + suffix: Alchemist, Filled + components: + - type: StorageFill + contents: + - id: CP14ClothingEyesAlchemyGlasses + prob: 0.5 + - id: CP14ClothingEyesAlchemyMonocle + prob: 0.2 + - id: CP14ClothingCloakAlchemist + prob: 0.6 + - id: CP14ClothingHeadAlchemistBeret + prob: 0.6 + - id: CP14ClothingHeadAlchemistBandana + prob: 0.6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index 9626275700..d3f52e29c3 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -34,14 +34,14 @@ juiceSolution: reagents: - ReagentId: CP14BloodFlowerSap - Quantity: 5 + Quantity: 12 - type: SolutionContainerManager solutions: food: - maxVol: 8 + maxVol: 14 reagents: - ReagentId: CP14BloodFlowerSap - Quantity: 5 + Quantity: 12 - type: entity id: CP14AgaricMushroom @@ -70,7 +70,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 5 + maxVol: 4 reagents: - ReagentId: CP14AgaricMushroom Quantity: 3 @@ -99,14 +99,14 @@ juiceSolution: reagents: - ReagentId: CP14ChromiumSlime - Quantity: 7 + Quantity: 4 - type: SolutionContainerManager solutions: food: - maxVol: 10 + maxVol: 5 reagents: - ReagentId: CP14ChromiumSlime - Quantity: 7 + Quantity: 4 - type: FoodSequenceElement entries: CP14Plate: CP14PlateChromiumSlime @@ -136,14 +136,14 @@ juiceSolution: reagents: - ReagentId: CP14WildSageSap - Quantity: 8 + Quantity: 15 - type: SolutionContainerManager solutions: food: - maxVol: 10 + maxVol: 17 reagents: - ReagentId: CP14WildSageSap - Quantity: 8 + Quantity: 15 - type: FoodSequenceElement entries: CP14Plate: CP14PlateWildSage @@ -176,7 +176,7 @@ juiceSolution: reagents: - ReagentId: CP14GroundQuartz - Quantity: 3 + Quantity: 7 - type: entity id: CP14LumiMushroom @@ -236,12 +236,12 @@ juiceSolution: reagents: - ReagentId: CP14BlueAmanita - Quantity: 4 + Quantity: 5 - type: SolutionContainerManager solutions: food: - maxVol: 5 + maxVol: 6 reagents: - ReagentId: CP14BlueAmanita - Quantity: 4 + Quantity: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml index 17c1d1855c..c0c1b667d6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml @@ -141,7 +141,7 @@ fillBaseName: liq- -# Filled +# Filled small - type: entity id: CP14VialSmallBloodFlowerSap @@ -192,7 +192,21 @@ Quantity: 10 - type: entity - id: CP14VialSmallChromiumSlime + id: CP14VialSmallBlueAmanita + parent: CP14VialSmall + suffix: Blue Amanita + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14BlueAmanita + Quantity: 10 + +# Filled tiny + +- type: entity + id: CP14VialTinyChromiumSlime parent: CP14VialTiny suffix: Chromium Slime components: @@ -204,7 +218,7 @@ Quantity: 5 - type: entity - id: CP14VialSmallLumiMushroom + id: CP14VialTinyLumiMushroom parent: CP14VialTiny suffix: LumiShroom components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml similarity index 53% rename from Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml index ebf977acc6..61eab9c206 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/dressers.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml @@ -43,63 +43,6 @@ - type: Rotatable - type: Appearance -- type: entity - id: CP14ClosetBase - parent: BaseStructureDynamic - categories: [ ForkFiltered ] - name: closet - description: Just an ordinary, decrepit closet. - abstract: true - components: - - type: ResistLocker - - type: Sprite - drawdepth: Mobs - layers: - - state: base - map: ["enum.StorageVisualLayers.Base"] - - state: base_door - map: ["enum.StorageVisualLayers.Door"] - - type: ItemSlots - - type: DamageOnHighSpeedImpact - damage: - types: - Blunt: 5 - soundHit: - collection: MetalThud - - type: InteractionOutline - - type: Physics - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.45,-0.05,0.45,0.45" - density: 75 - mask: - - MachineMask - layer: - - MachineLayer - - type: EntityStorage - isCollidableWhenOpen: true - enteringOffset: 0, -0.4 - enteringRange: 0.06 - - type: ContainerContainer - containers: - entity_storage: !type:Container - paper_label: !type:ContainerSlot - - type: PlaceableSurface - placeCentered: true - isPlaceable: false - - type: Appearance - - type: EntityStorageVisuals - stateBaseClosed: base - stateDoorOpen: base_open - stateDoorClosed: base_door - - type: StaticPrice - price: 50 - - type: Anchorable - - type: Rotatable - - type: entity name: wooden cabinet parent: @@ -158,43 +101,4 @@ name: money box description: An armored vault for storing money for trade with the city. City workers will unload their earnings here, or take them from here when you want to buy something. components: - - type: CP14CargoMoneyBox - -- type: entity - name: wooden cupboard - parent: - - CP14ClosetBase - - CP14BaseFlammable - id: CP14WoodenCupboard - description: It's a regular wooden cabinet. - components: - - type: Sprite - sprite: _CP14/Structures/Storage/Dressers/wood_cupboard.rsi - state: icons - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroyHeavy - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14WoodenPlanks1: - min: 2 - max: 5 + - type: CP14CargoMoneyBox \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml new file mode 100644 index 0000000000..72b5c15f79 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml @@ -0,0 +1,95 @@ +- type: entity + id: CP14ClosetBase + parent: BaseStructureDynamic + categories: [ ForkFiltered ] + name: closet + description: Just an ordinary, decrepit closet. + abstract: true + components: + - type: ResistLocker + - type: Sprite + drawdepth: Mobs + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + - state: base_door + map: ["enum.StorageVisualLayers.Door"] + - type: ItemSlots + - type: DamageOnHighSpeedImpact + damage: + types: + Blunt: 5 + soundHit: + collection: MetalThud + - type: InteractionOutline + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.05,0.45,0.45" + density: 75 + mask: + - MachineMask + layer: + - MachineLayer + - type: EntityStorage + isCollidableWhenOpen: true + enteringOffset: 0, -0.4 + enteringRange: 0.06 + - type: ContainerContainer + containers: + entity_storage: !type:Container + paper_label: !type:ContainerSlot + - type: PlaceableSurface + placeCentered: true + isPlaceable: false + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: base + stateDoorOpen: base_open + stateDoorClosed: base_door + - type: StaticPrice + price: 50 + - type: Anchorable + - type: Rotatable + +- type: entity + name: wooden closet + parent: + - CP14ClosetBase + - CP14BaseFlammable + id: CP14WoodenCloset + description: It's a regular wooden closet. + components: + - type: Sprite + sprite: _CP14/Structures/Storage/Dressers/wood_cupboard.rsi + state: icons + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: WoodDestroyHeavy + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 2 + max: 5 \ No newline at end of file diff --git a/Resources/migration.yml b/Resources/migration.yml index 45f40d2249..cc898acb6e 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -111,6 +111,10 @@ CP14WallpaperPurple30: CP14WallpaperPurple CP14WallpaperGreen1: CP14WallpaperGreen CP14WallpaperGreen30: CP14WallpaperGreen +#2024-10-18 +CP14WoodenCupboard: CP14WoodenCloset +CP14VialSmallChromiumSlime: CP14VialTinyChromiumSlime +CP14VialSmallLumiMushroom: CP14VialTinyLumiMushroom # <---> CrystallPunk migration zone end