From 3011c064604d6f587fa27b4964f291bce83ae9c9 Mon Sep 17 00:00:00 2001 From: Acruid Date: Thu, 27 Feb 2020 02:12:57 -0800 Subject: [PATCH 01/16] You can now pick up items that are not on a grid. API changes for IMapManager.TryGetGridAt(). --- .../Components/Items/Storage/ItemComponent.cs | 11 +++++++--- .../EntitySystems/Click/InteractionSystem.cs | 20 ++++++++++--------- .../GameObjects/EntitySystems/HandsSystem.cs | 2 +- RobustToolbox | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index 22a87d717f..f3c30211e4 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -78,11 +78,16 @@ namespace Content.Server.GameObjects public bool CanPickup(IEntity user) { - var coords = Owner.Transform.GridPosition; - if (!ActionBlockerSystem.CanPickup(user)) return false; + + if (user.Transform.MapID != Owner.Transform.MapID) + return false; + + var userPos = user.Transform.MapPosition; + var itemPos = Owner.Transform.WorldPosition; + return _entitySystemManager.GetEntitySystem() - .InRangeUnobstructed(coords, user.Transform.GridPosition, ignoredEnt:Owner); + .InRangeUnobstructed(userPos, itemPos, ignoredEnt: Owner); } public bool AttackHand(AttackHandEventArgs eventArgs) diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index e8297572f2..9f633b3c08 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -273,24 +273,26 @@ namespace Content.Server.GameObjects.EntitySystems /// If the is zero or negative, /// this method will only check if nothing obstructs the two sets of coordinates.. /// - /// Map manager containing the two GridIds. /// Set of coordinates to use. /// Other set of coordinates to use. /// maximum distance between the two sets of coordinates. /// the mask to check for collisions /// the entity to be ignored when checking for collisions. + /// Map manager containing the two GridIds. /// True if the two points are within a given range without being obstructed. - public bool InRangeUnobstructed(GridCoordinates coords, GridCoordinates otherCoords, float range = InteractionRange, int collisionMask = (int)CollisionGroup.Impassable, IEntity ignoredEnt = null) + public bool InRangeUnobstructed(MapCoordinates coords, Vector2 otherCoords, float range = InteractionRange, + int collisionMask = (int) CollisionGroup.Impassable, IEntity ignoredEnt = null) { - if (range > 0f && !coords.InRange(_mapManager, otherCoords, range)) - { - return false; - } + var dir = otherCoords - coords.Position; + + if (dir.LengthSquared.Equals(0f)) + return true; + + if (range > 0f && !(dir.LengthSquared <= range*range)) + return false; - var dir = (otherCoords.Position - coords.Position); - if (!(dir.Length > 0f)) return true; var ray = new CollisionRay(coords.Position, dir.Normalized, collisionMask); - var rayResults = _physicsManager.IntersectRay(_mapManager.GetGrid(coords.GridID).ParentMapId, ray, dir.Length, ignoredEnt); + var rayResults = _physicsManager.IntersectRay(coords.MapId, ray, dir.Length, ignoredEnt); return !rayResults.DidHitObject; } diff --git a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs index ff0ba8f614..79d0048f76 100644 --- a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs @@ -126,7 +126,7 @@ namespace Content.Server.GameObjects.EntitySystems var interactionSystem = _entitySystemManager.GetEntitySystem(); - if(interactionSystem.InRangeUnobstructed(coords, ent.Transform.GridPosition, 0f, ignoredEnt:ent)) + if(interactionSystem.InRangeUnobstructed(coords.ToMap(_mapManager), ent.Transform.WorldPosition, 0f, ignoredEnt: ent)) if (coords.InRange(_mapManager, ent.Transform.GridPosition, InteractionSystem.InteractionRange)) { handsComp.Drop(handsComp.ActiveIndex, coords); diff --git a/RobustToolbox b/RobustToolbox index 643c76b28e..8f968760cb 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 643c76b28ea9d0612a38326d08c277de013153b6 +Subproject commit 8f968760cbc3a4d4ce84b38d51845ee2ff435c0f From 37c13099adbff392be483cad73f50aa2d371e6bf Mon Sep 17 00:00:00 2001 From: Swept Date: Fri, 28 Feb 2020 05:57:25 -0800 Subject: [PATCH 02/16] Fixes a problem with gloves (#754) --- .../Entities/items/clothing/gloves.yml | 26 ------------------ .../chal_appara_1.rsi/equipped-HAND.png | Bin 348 -> 0 bytes .../Gloves/chal_appara_1.rsi/icon.png | Bin 111 -> 0 bytes .../Gloves/chal_appara_1.rsi/inhand-left.png | Bin 189 -> 0 bytes .../Gloves/chal_appara_1.rsi/inhand-right.png | Bin 185 -> 0 bytes .../Gloves/chal_appara_1.rsi/meta.json | 1 - .../chal_appara_12.rsi/equipped-HAND.png | Bin 172 -> 0 bytes .../Gloves/chal_appara_12.rsi/icon.png | Bin 111 -> 0 bytes .../Gloves/chal_appara_12.rsi/inhand-left.png | Bin 146 -> 0 bytes .../chal_appara_12.rsi/inhand-right.png | Bin 143 -> 0 bytes .../Gloves/chal_appara_12.rsi/meta.json | 1 - 11 files changed, 28 deletions(-) delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/equipped-HAND.png delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/equipped-HAND.png delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/meta.json diff --git a/Resources/Prototypes/Entities/items/clothing/gloves.yml b/Resources/Prototypes/Entities/items/clothing/gloves.yml index 1d9a52225f..a6b84530c3 100644 --- a/Resources/Prototypes/Entities/items/clothing/gloves.yml +++ b/Resources/Prototypes/Entities/items/clothing/gloves.yml @@ -167,32 +167,6 @@ - type: Clothing sprite: Clothing/Gloves/ce_rig_sealed.rsi -- type: entity - parent: GlovesBase - id: GlovesChalAppara1 - name: Chal Appara 1 gloves - description: '' - components: - - type: Sprite - sprite: Clothing/Gloves/chal_appara_1.rsi - - type: Icon - sprite: Clothing/Gloves/chal_appara_1.rsi - - type: Clothing - sprite: Clothing/Gloves/chal_appara_1.rsi - -- type: entity - parent: GlovesBase - id: GlovesChalAppara12 - name: Chal Appara 12 gloves - description: '' - components: - - type: Sprite - sprite: Clothing/Gloves/chal_appara_12.rsi - - type: Icon - sprite: Clothing/Gloves/chal_appara_12.rsi - - type: Clothing - sprite: Clothing/Gloves/chal_appara_12.rsi - - type: entity parent: GlovesBase id: GlovesEngineeringRig diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/equipped-HAND.png deleted file mode 100644 index 6772914e47113b3d920314584571dd6196961855..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{v;WaSW-L^LExoz9t6&R`IPn z8s<*PjG--z^lyw^i@$5%bT8olknQzd@SmN-OS?l#eaDk~CeN(h;=G}Q jL3PbP?FHxte`cxJ>Fe{N;h`}w)EGQn{an^LB{Ts5#LtLs diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/icon.png b/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/icon.png deleted file mode 100644 index 589b660b6915b4327654594c1fc7ea272017881d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzGfx-Ckcv5P&utV0N-!9f7`dgJ zm``A`o-D>^$MoawE3s8sUlfejf41HAuYrM)iG@Qzf#CteAroeWO}Dc)15IG?boFyt I=akR{0PN`>W&i*H diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/inhand-left.png b/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/inhand-left.png deleted file mode 100644 index f7f8a3bbb16037c5662e694bc1e824c4bb90d841..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EuJopAr*7p-a5$H;vmB6Xu65B z*2$P9@%UE3)$f$gTA#Xa22}MR``cCiGnV-$e%zHve)+f1|5&x;0=^YEFi-I diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/meta.json b/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/meta.json deleted file mode 100644 index 2d32e01e74..0000000000 --- a/Resources/Textures/Clothing/Gloves/chal_appara_1.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/equipped-HAND.png deleted file mode 100644 index da3fe9a12349763975735972cc922bb249711d0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0IPZ!6KiaBqu8}cTO@1%5&!@Rf@p!E!% Lu6{1-oD!M<5L!4i diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/icon.png b/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/icon.png deleted file mode 100644 index 589b660b6915b4327654594c1fc7ea272017881d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzGfx-Ckcv5P&utV0N-!9f7`dgJ zm``A`o-D>^$MoawE3s8sUlfejf41HAuYrM)iG@Qzf#CteAroeWO}Dc)15IG?boFyt I=akR{0PN`>W&i*H diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/inhand-left.png b/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/inhand-left.png deleted file mode 100644 index 48f38e4dbe06c4313a3cb59c57b2843b93c4d38f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k)AG&Ar*7pUbx8FU?9MHFe6pd zc4_1hMQw}E^Y47R#spOI@7b)nf^(94?^pW^yS@AJi(O&?-wH|W7^oZ!DsD3$Kf|o> SaJDW7i0|p@=d#Wzp$P!d&Mz+j diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/inhand-right.png b/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/inhand-right.png deleted file mode 100644 index dff87f083c14b2441462ea40f92294df266315e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=VV*9IAr*7pUI^rEFc4um*tE&3 z{*r*>$vOk&2b*?o1*&M+zccOG)dTl_dw4uu$DGBt0w)G427`Uy7}{?$E0nlN{RZ(p MUHx3vIVCg!0P0^Xe*gdg diff --git a/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/meta.json b/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/meta.json deleted file mode 100644 index c64ccbd100..0000000000 --- a/Resources/Textures/Clothing/Gloves/chal_appara_12.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 1}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file From 3e9b93faee80dca8ff87055dc17d47b612066498 Mon Sep 17 00:00:00 2001 From: Swept Date: Fri, 28 Feb 2020 05:58:25 -0800 Subject: [PATCH 03/16] Adds Skub (#740) * Added Skub * Added Skub crafting recipe --- Resources/Audio/items/skub.ogg | Bin 0 -> 23181 bytes Resources/Prototypes/Construction/misc.yml | 12 +++++++++ .../Prototypes/Construction/structures.yml | 2 +- Resources/Prototypes/Entities/items/skub.yml | 24 ++++++++++++++++++ .../Textures/Buildings/window.rsi/meta.json | 2 +- .../Textures/Objects/Misc/skub.rsi/icon.png | Bin 0 -> 490 bytes .../Objects/Misc/skub.rsi/inhand-left.png | Bin 0 -> 555 bytes .../Objects/Misc/skub.rsi/inhand-right.png | Bin 0 -> 563 bytes .../Textures/Objects/Misc/skub.rsi/meta.json | 1 + 9 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 Resources/Audio/items/skub.ogg create mode 100644 Resources/Prototypes/Construction/misc.yml create mode 100644 Resources/Prototypes/Entities/items/skub.yml create mode 100644 Resources/Textures/Objects/Misc/skub.rsi/icon.png create mode 100644 Resources/Textures/Objects/Misc/skub.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/skub.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/skub.rsi/meta.json diff --git a/Resources/Audio/items/skub.ogg b/Resources/Audio/items/skub.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a58bde51cefd76322eefd0c815f0a9e8301fd7f4 GIT binary patch literal 23181 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≷7>yRTqg9=}EPQ4Z}^KY_deFSQZcF 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 SKQ78xGyon^)HKHCivj>(#og=x literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Construction/misc.yml b/Resources/Prototypes/Construction/misc.yml new file mode 100644 index 0000000000..d2cd4a1b5c --- /dev/null +++ b/Resources/Prototypes/Construction/misc.yml @@ -0,0 +1,12 @@ +- type: construction + name: Skub + id: skub + category: Items/Misc + keywords: [misc] + description: In the end, there is only Skub. + icon: Objects/Misc/skub.rsi/icon.png + result: Skub + objecttype: Item + steps: + - material: Metal + amount: 1 diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml index 94afc1dd03..15dbd08963 100644 --- a/Resources/Prototypes/Construction/structures.yml +++ b/Resources/Prototypes/Construction/structures.yml @@ -25,7 +25,7 @@ name: Table id: table category: Structures - icon: + icon: sprite: Buildings/table_solid.rsi state: plain_preview result: table diff --git a/Resources/Prototypes/Entities/items/skub.yml b/Resources/Prototypes/Entities/items/skub.yml new file mode 100644 index 0000000000..ff932bbc62 --- /dev/null +++ b/Resources/Prototypes/Entities/items/skub.yml @@ -0,0 +1,24 @@ +- type: entity + name: Skub + parent: BaseItem + id: Skub + description: Skub is the fifth Chaos God. + components: + - type: Sprite + sprite: Objects/Misc/skub.rsi + state: icon + + - type: Icon + sprite: Objects/Misc/skub.rsi + state: icon + + - type: Item + sprite: Objects/Misc/skub.rsi + - type: ItemCooldown + + - type: Sound + - type: EmitSoundOnUse + sound: /Audio/items/skub.ogg + + - type: UseDelay + delay: 2.0 diff --git a/Resources/Textures/Buildings/window.rsi/meta.json b/Resources/Textures/Buildings/window.rsi/meta.json index bb6a983f12..906d239759 100644 --- a/Resources/Textures/Buildings/window.rsi/meta.json +++ b/Resources/Textures/Buildings/window.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [{"name": "window0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [{"name": "window0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} diff --git a/Resources/Textures/Objects/Misc/skub.rsi/icon.png b/Resources/Textures/Objects/Misc/skub.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7d74e875b24da716593c3432cfc200ce3ab11ebb GIT binary patch literal 490 zcmVHrDhN|Cml<;*#_D!s5ETd} zGe<&Q0R+%05KKF}284>3EWkS)$ZRyU0kAGJz}N8@&#U#iQdQXh%jpyXV0|+S0ErMn zCjb+U0T2u!n2ME)@R%1_N3z7Rm;h0Vt{}*@0Ui z=$L93m@Hs5n}r9ELnO`l9OK)39)tFVLvkmRe73+ajH`d#Fs%cC1$Zvka1|ti(1kQ{ z7~BF>pW8KjwC&1=+R0 g&mDmNL4^bS0OUux;A`rkr2qf`07*qoM6N<$f}Q!*jQ{`u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/skub.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/skub.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..60d6a257118ffaec78433a4949931c65803f6183 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEp9i;uumf=k3ge`G*`tj@eIB z<%rNtN}1i7!f_{{*uy{~N3{N|N?Q~U+npyOJ394J%Dg!|C$EwgUEw!%!?xQmzLxg) zeGhJVef|5p#dl(VF*Yf1Kv6-Fh(`Xi-*yZSYRx{c?sZG4NxjX`@Y+v(+q!jn3j#ds zWP_ORExUY!vnBH8x9KNq%s<{QNi5;9@LuyHeS*}6ve-2_($VL;W$#zXO?jN~c9)73 z*SVGX5+<1;S{l<%YfSUHQ6;x+Ht&?jZ`R$ek9od$;O5o!0RGO z$<NGvC%#+qY`%ZL){Lh)WcoCpc?}KEKUx^c`AqVfF7|2igF~DCMD6YCo)Q1XSyN+a z!PPwRZ{fwUu{+FudluAdM@59C#P2db8@qP{qt&j0Tv=w1i+8&%vrh-k*v*)Cgy9|A z4ngJ}(huBt9^^Gh8#Z7H&YokT*F-&NaPhbB(1(%63|6TNWI4=11 hu{sK{ICeZ0UKyfs{M3Z9UBE=Z;OXk;vd$@?2>>7p_a^`V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/skub.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/skub.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..87a2189b37d0b85569bf90b2d30c0d6259ac64b7 GIT binary patch literal 563 zcmV-30?hr1P)_y~e8D*?buw>xoQ(gr?<@RRW({Ul-g^fUlis$7-lECIX?hxC(#QJPL%G)hy{ zV8GjO_^;wjvGLLPJ`519ud}?m%JRwzqcmmo@qro)@`3E$@sYdB%c*^2j0 zutH3IHKaXDzHR6umC|EnpQuUD{-@d!J^`>lFM(;L#*P30002ovPDHLkV1gyM B`|SV# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/skub.rsi/meta.json b/Resources/Textures/Objects/Misc/skub.rsi/meta.json new file mode 100644 index 0000000000..6d9510462d --- /dev/null +++ b/Resources/Textures/Objects/Misc/skub.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation", "states": [{"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} From bd773aef3bbe8e5804758ae706d02d3dafae5587 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Fri, 28 Feb 2020 05:58:43 -0800 Subject: [PATCH 04/16] Fix CargoProducts (#750) --- Resources/Prototypes/Cargo/products.yml | 8 +- .../Entities/buildings/computers.yml | 11 +- .../buildings/storage/crate_types.yml | 124 +++++++++--------- 3 files changed, 78 insertions(+), 65 deletions(-) diff --git a/Resources/Prototypes/Cargo/products.yml b/Resources/Prototypes/Cargo/products.yml index db4cae1029..8871008d50 100644 --- a/Resources/Prototypes/Cargo/products.yml +++ b/Resources/Prototypes/Cargo/products.yml @@ -70,7 +70,9 @@ name: "Bike Horn" id: cargo.bikehorn description: HONK! - icon: Objects/Fun/bikehorn.rsi + icon: + sprite: Objects/Fun/bikehorn.rsi + state: icon product: crate_bikehorn cost: 300 category: Other @@ -102,7 +104,9 @@ name: "Medical Scanner" id: cargo.medscanner description: Scans patients. First we stick this probe... - icon: Buildings/medical_scanner.rsi + icon: + sprite: Buildings/medical_scanner.rsi + state: scanner_open product: crate_medscanner cost: 400 category: Medical diff --git a/Resources/Prototypes/Entities/buildings/computers.yml b/Resources/Prototypes/Entities/buildings/computers.yml index ec0609296e..fff70844a8 100644 --- a/Resources/Prototypes/Entities/buildings/computers.yml +++ b/Resources/Prototypes/Entities/buildings/computers.yml @@ -83,8 +83,17 @@ static: true products: - cargo.dice - - cargo.flashlight - cargo.Medkit + - cargo.flashlight + - cargo.lightblub + - cargo.fireextinguisher + - cargo.pen + - cargo.bikehorn + - cargo.cleaver + - cargo.fueltank + - cargo.medscanner + - cargo.glass + - cargo.cable - type: UserInterface interfaces: - key: enum.CargoConsoleUiKey.Key diff --git a/Resources/Prototypes/Entities/buildings/storage/crate_types.yml b/Resources/Prototypes/Entities/buildings/storage/crate_types.yml index 6e571c5e11..737e723379 100644 --- a/Resources/Prototypes/Entities/buildings/storage/crate_types.yml +++ b/Resources/Prototypes/Entities/buildings/storage/crate_types.yml @@ -124,119 +124,119 @@ name: Flashlight Crate (x5) parent: crate_generic components: - - type: StorageFill - contents: - - Flashlight - - Flashlight - - Flashlight - - Flashlight - - Flashlight + - type: StorageFill + contents: + - FlashlightLantern + - FlashlightLantern + - FlashlightLantern + - FlashlightLantern + - FlashlightLantern - type: entity id: crate_light_bulb name: Light Bulb Crate (x10) parent: crate_generic components: - - type: StorageFill - contents: - - Light Bulb - - Light Bulb - - Light Bulb - - Light Bulb - - Light Bulb - - Light Bulb - - Light Bulb - - Light Bulb - - Light Bulb - - Light Bulb + - type: StorageFill + contents: + - LightBulb + - LightBulb + - LightBulb + - LightBulb + - LightBulb + - LightBulb + - LightBulb + - LightBulb + - LightBulb + - LightBulb - type: entity id: crate_fire_extinguisher name: Fire Extinguisher Crate (x3) parent: crate_generic components: - - type: StorageFill - contents: - - Fire Extinguisher - - Fire Extinguisher - - Fire Extinguisher + - type: StorageFill + contents: + - fire_extinguisher + - fire_extinguisher + - fire_extinguisher - type: entity id: crate_pen name: Pen Crate (x10) parent: crate_generic components: - - type: StorageFill - contents: - - Pen - - Pen - - Pen - - Pen - - Pen - - Pen - - Pen - - Pen - - Pen - - Pen + - type: StorageFill + contents: + - Pen + - Pen + - Pen + - Pen + - Pen + - Pen + - Pen + - Pen + - Pen + - Pen - type: entity id: crate_bikehorn name: Bike Horn Crate (x5) parent: crate_generic components: - - type: StorageFill - contents: - - Bike Horn - - Bike Horn - - Bike Horn - - Bike Horn - - Bike Horn + - type: StorageFill + contents: + - BikeHorn + - BikeHorn + - BikeHorn + - BikeHorn + - BikeHorn - type: entity id: crate_cleaver name: Cleaver Crate (x5) parent: crate_generic components: - - type: StorageFill - contents: - - Cleaver - - Cleaver - - Cleaver - - Cleaver - - Cleaver + - type: StorageFill + contents: + - ButchCleaver + - ButchCleaver + - ButchCleaver + - ButchCleaver + - ButchCleaver - type: entity id: crate_fueltank name: Fuel Tank parent: crate_generic components: - - type: StorageFill - contents: - - Fuel Tank + - type: StorageFill + contents: + - weldtank - type: entity id: crate_medscanner name: Medical Scanner parent: crate_generic components: - - type: StorageFill - contents: - - Medical Scanner + - type: StorageFill + contents: + - medical_scanner - type: entity id: crate_glass name: Glass Sheet Crate (x50) parent: crate_generic components: - - type: StorageFill - contents: - - GlassStack + - type: StorageFill + contents: + - GlassStack - type: entity id: crate_cable name: Cable Coil Crate (x50) parent: crate_generic components: - - type: StorageFill - contents: - - CableStack + - type: StorageFill + contents: + - CableStack From bdfdc2d63fb1f3f2ac8cd3fab60a70cb8da53988 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 28 Feb 2020 16:28:32 +0100 Subject: [PATCH 05/16] Update submodule --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 8f968760cb..0a306514a2 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 8f968760cbc3a4d4ce84b38d51845ee2ff435c0f +Subproject commit 0a306514a2c927d3e19f2f6fcec9eee64b488ce4 From 2df0f884baa8559302ef12e57ed4d3186562dfb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Fri, 28 Feb 2020 16:29:45 +0100 Subject: [PATCH 06/16] =?UTF-8?q?Fix=20bug=20where=20InRangeUnobstructed?= =?UTF-8?q?=20wouldn't=20check=20for=20hard=20collid=E2=80=A6=20(#748)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Check for hard collidables too. * ...and that's why you don't code at 7 AM! * fugg --- .../GameObjects/EntitySystems/Click/InteractionSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 9f633b3c08..08daa1fdb8 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -292,7 +292,7 @@ namespace Content.Server.GameObjects.EntitySystems return false; var ray = new CollisionRay(coords.Position, dir.Normalized, collisionMask); - var rayResults = _physicsManager.IntersectRay(coords.MapId, ray, dir.Length, ignoredEnt); + var rayResults = _physicsManager.IntersectRay(coords.MapId, ray, dir.Length, ignoredEnt, true); return !rayResults.DidHitObject; } From 60d6b4af7d2a87dc33a754f1095598242bffd148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Fri, 28 Feb 2020 17:52:18 +0100 Subject: [PATCH 07/16] You can now pickup items inside obstructions (#759) --- .../GameObjects/Components/Items/Storage/ItemComponent.cs | 2 +- .../GameObjects/EntitySystems/Click/InteractionSystem.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index f3c30211e4..745510e850 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -87,7 +87,7 @@ namespace Content.Server.GameObjects var itemPos = Owner.Transform.WorldPosition; return _entitySystemManager.GetEntitySystem() - .InRangeUnobstructed(userPos, itemPos, ignoredEnt: Owner); + .InRangeUnobstructed(userPos, itemPos, ignoredEnt: Owner, insideBlockerValid:true); } public bool AttackHand(AttackHandEventArgs eventArgs) diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 08daa1fdb8..6ed819e814 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -279,9 +279,10 @@ namespace Content.Server.GameObjects.EntitySystems /// the mask to check for collisions /// the entity to be ignored when checking for collisions. /// Map manager containing the two GridIds. + /// if coordinates inside obstructions count as obstructed or not /// True if the two points are within a given range without being obstructed. public bool InRangeUnobstructed(MapCoordinates coords, Vector2 otherCoords, float range = InteractionRange, - int collisionMask = (int) CollisionGroup.Impassable, IEntity ignoredEnt = null) + int collisionMask = (int) CollisionGroup.Impassable, IEntity ignoredEnt = null, bool insideBlockerValid = false) { var dir = otherCoords - coords.Position; @@ -294,7 +295,9 @@ namespace Content.Server.GameObjects.EntitySystems var ray = new CollisionRay(coords.Position, dir.Normalized, collisionMask); var rayResults = _physicsManager.IntersectRay(coords.MapId, ray, dir.Length, ignoredEnt, true); - return !rayResults.DidHitObject; + + + return !rayResults.DidHitObject || (insideBlockerValid && rayResults.DidHitObject && rayResults.Distance < 1f); } private bool HandleActivateItemInWorld(ICommonSession session, GridCoordinates coords, EntityUid uid) From 4b1fd4cfd171a43da839ebddd08c3e87b25230c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Sat, 29 Feb 2020 16:09:03 +0100 Subject: [PATCH 08/16] Don't unvisit before transferring mind (#760) --- Content.Server/Administration/ControlMob.cs | 3 --- Content.Server/GlobalVerbs/ControlMobVerb.cs | 3 --- 2 files changed, 6 deletions(-) diff --git a/Content.Server/Administration/ControlMob.cs b/Content.Server/Administration/ControlMob.cs index ed170cac3f..4a72b5dd89 100644 --- a/Content.Server/Administration/ControlMob.cs +++ b/Content.Server/Administration/ControlMob.cs @@ -55,9 +55,6 @@ namespace Content.Server.Administration return; } - if(mind.IsVisitingEntity) - mind.UnVisit(); - mindComponent.Mind?.TransferTo(null); mind.TransferTo(target); diff --git a/Content.Server/GlobalVerbs/ControlMobVerb.cs b/Content.Server/GlobalVerbs/ControlMobVerb.cs index c9892beba5..d67391c202 100644 --- a/Content.Server/GlobalVerbs/ControlMobVerb.cs +++ b/Content.Server/GlobalVerbs/ControlMobVerb.cs @@ -40,9 +40,6 @@ namespace Content.Server.GlobalVerbs var userMind = user.GetComponent().playerSession.ContentData().Mind; var targetMind = target.GetComponent(); - if(userMind.IsVisitingEntity) - userMind.UnVisit(); - targetMind.Mind?.TransferTo(null); userMind.TransferTo(target); } From 196950fb7efdc4e1a9f32f9ad90c8a14081eb762 Mon Sep 17 00:00:00 2001 From: py01 <60152240+collinlunn@users.noreply.github.com> Date: Sat, 29 Feb 2020 11:09:41 -0600 Subject: [PATCH 09/16] Gun Code Modularization + Magazine Fed Shotgun (#751) * Adds shotgun YAML files * Adds shotgu ammo and magazine enum value, modularizes some projectile weapon methods * Fixes guns consuming two bullets on fire * Finishes shotgun behavior in Projectile Weapon Components * Gun and ammo modularization * Updates BallisticMagazineWeapons to be compatible with new AmmoWeapon * Fixes shotgun spread angles, Fixes shogun YAML * Gun documentation and ViewVariable specifications * Removes todo messsage in gun code * Default gun evenspread fix * AmmoComponent Name fix * Fixes Component name * Projectile refactor code review fixes --- .../Projectile/BallisticBulletComponent.cs | 98 ++++++++++-- .../Projectile/BallisticMagazineComponent.cs | 11 +- .../BallisticMagazineWeaponComponent.cs | 70 +++----- .../Ranged/Projectile/BallisticWeapon.cs | 149 ++++++++++++++++++ .../Projectile/BallisticWeaponComponent.cs | 121 -------------- .../BaseProjectileWeaponComponent.cs | 95 +++++++++++ .../Ranged/Projectile/ProjectileWeapon.cs | 130 --------------- .../Weapons/Ammunition/12g/ammunition.yml | 54 +++++++ .../Entities/Weapons/Ammunition/12g/boxes.yml | 34 ++++ .../Weapons/Ammunition/12g/projectiles.yml | 10 ++ .../Entities/Weapons/Shotguns/shotguns.yml | 47 ++++++ 11 files changed, 506 insertions(+), 313 deletions(-) create mode 100644 Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs delete mode 100644 Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs create mode 100644 Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs delete mode 100644 Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/12g/ammunition.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/12g/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs index 93176615a1..5060a28b9d 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs @@ -1,32 +1,106 @@ -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { + /// + /// Passes information about the projectiles to be fired by AmmoWeapons + /// [RegisterComponent] public class BallisticBulletComponent : Component { public override string Name => "BallisticBullet"; private BallisticCaliber _caliber; - private string _projectileType; - private bool _spent; + /// + /// Cartridge calibre, restricts what AmmoWeapons this ammo can be fired from. + /// + [ViewVariables(VVAccess.ReadWrite)] + public BallisticCaliber Caliber { get => _caliber; set => _caliber = value; } - public string ProjectileType => _projectileType; - public BallisticCaliber Caliber => _caliber; - public bool Spent - { - get => _spent; - set => _spent = value; - } + private string _projectileID; + /// + /// YAML ID of the projectiles to be created when firing this ammo. + /// + [ViewVariables(VVAccess.ReadWrite)] + public string ProjectileID { get => _projectileID; set => _projectileID = value; } + + private int _projectilesFired; + /// + /// How many copies of the projectile are shot. + /// + [ViewVariables(VVAccess.ReadWrite)] + public int ProjectilesFired { get => _projectilesFired; set => _projectilesFired = value; } + + private float _spreadStdDev_Ammo; + /// + /// Weapons that fire projectiles from ammo types. + /// + [ViewVariables(VVAccess.ReadWrite)] + public float SpreadStdDev_Ammo { get => _spreadStdDev_Ammo; set => _spreadStdDev_Ammo = value; } + + private float _evenSpreadAngle_Ammo; + /// + /// Arc angle of shotgun pellet spreads, only used if multiple projectiles are being fired. + /// + [ViewVariables(VVAccess.ReadWrite)] + public float EvenSpreadAngle_Ammo { get => _evenSpreadAngle_Ammo; set => _evenSpreadAngle_Ammo = value; } + + private float _velocity_Ammo; + /// + /// Adds additional velocity to the projectile, on top of what it already has. + /// + [ViewVariables(VVAccess.ReadWrite)] + public float Velocity_Ammo { get => _velocity_Ammo; set => _velocity_Ammo = value; } + + private bool _spent; + /// + /// If the ammo cartridge has been shot already. + /// + [ViewVariables(VVAccess.ReadWrite)] + public bool Spent { get => _spent; set => _spent = value; } public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); - serializer.DataField(ref _projectileType, "projectile", null); + serializer.DataField(ref _projectileID, "projectile", null); serializer.DataField(ref _spent, "spent", false); + serializer.DataField(ref _projectilesFired, "projectilesfired", 1); + serializer.DataField(ref _spreadStdDev_Ammo, "ammostddev", 0); + serializer.DataField(ref _evenSpreadAngle_Ammo, "ammospread", 0); + serializer.DataField(ref _velocity_Ammo, "ammovelocity", 0); } } + public enum BallisticCaliber + { + Unspecified = 0, + // .32 + A32, + // .357 + A357, + // .44 + A44, + // .45mm + A45mm, + // .50 cal + A50, + // 5.56mm + A556mm, + // 6.5mm + A65mm, + // 7.62mm + A762mm, + // 9mm + A9mm, + // 10mm + A10mm, + // 20mm + A20mm, + // 24mm + A24mm, + // 12g + A12g, + } } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs index 280628b2bb..0fa594fa6b 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs @@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile } } - _updateAppearance(); + UpdateAppearance(); OnAmmoCountChanged?.Invoke(); _appearance.SetData(BallisticMagazineVisuals.AmmoCapacity, Capacity); @@ -99,7 +99,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile _bulletContainer.Insert(bullet); _loadedBullets.Push(bullet); - _updateAppearance(); + UpdateAppearance(); OnAmmoCountChanged?.Invoke(); } @@ -122,7 +122,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile _bulletContainer.Remove(bullet); } - _updateAppearance(); + UpdateAppearance(); OnAmmoCountChanged?.Invoke(); return bullet; } @@ -224,7 +224,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile return false; } - private void _updateAppearance() + private void UpdateAppearance() { _appearance.SetData(BallisticMagazineVisuals.AmmoLeft, CountLoaded); } @@ -278,5 +278,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile // 24mm A24mm, + + // 12g + A12g, } } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs index d38bc355e6..ed93dfe541 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs @@ -21,6 +21,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { + /// + /// Guns that have a magazine. + /// [RegisterComponent] public class BallisticMagazineWeaponComponent : BallisticWeaponComponent, IUse, IAttackBy, IMapInit { @@ -46,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile [ViewVariables] private bool _autoEjectMagazine; [ViewVariables] private AppearanceComponent _appearance; - private static readonly Direction[] _randomBulletDirs = + private static readonly Direction[] RandomBulletDirs = { Direction.North, Direction.East, @@ -54,12 +57,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile Direction.West }; - protected override int ChamberCount => 1; - public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(ref _magazineTypes, "magazines", new List {BallisticMagazineType.Unspecified}); serializer.DataField(ref _defaultMagazine, "default_magazine", null); @@ -72,7 +72,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile public override void Initialize() { base.Initialize(); - _appearance = Owner.GetComponent(); } @@ -80,57 +79,44 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile protected override void Startup() { base.Startup(); - _magazineSlot = ContainerManagerComponent.Ensure("ballistic_gun_magazine", Owner); - if (Magazine != null) { // Already got magazine from loading a container. - Magazine.GetComponent().OnAmmoCountChanged += _magazineAmmoCountChanged; + Magazine.GetComponent().OnAmmoCountChanged += MagazineAmmoCountChanged; } - - _updateAppearance(); + UpdateAppearance(); } public bool InsertMagazine(IEntity magazine, bool playSound = true) { - if (!magazine.TryGetComponent(out BallisticMagazineComponent component)) + if (!magazine.TryGetComponent(out BallisticMagazineComponent magazinetype)) { throw new ArgumentException("Not a magazine", nameof(magazine)); } - - if (!MagazineTypes.Contains(component.MagazineType)) + if (!MagazineTypes.Contains(magazinetype.MagazineType)) { throw new ArgumentException("Wrong magazine type", nameof(magazine)); } - - if (component.Caliber != Caliber) - { - throw new ArgumentException("Wrong caliber", nameof(magazine)); - } - if (!_magazineSlot.Insert(magazine)) { return false; } - if (_magInSound != null) { Owner.GetComponent().Play(_magInSound); } - - component.OnAmmoCountChanged += _magazineAmmoCountChanged; + magazinetype.OnAmmoCountChanged += MagazineAmmoCountChanged; if (GetChambered(0) == null) { // No bullet in chamber, load one from magazine. - var bullet = component.TakeBullet(); + var bullet = magazinetype.TakeBullet(); if (bullet != null) { LoadIntoChamber(0, bullet); } } - - _updateAppearance(); + UpdateAppearance(); Dirty(); return true; } @@ -142,7 +128,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { return false; } - if (_magazineSlot.Remove(entity)) { entity.Transform.GridPosition = Owner.Transform.GridPosition; @@ -150,14 +135,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { Owner.GetComponent().Play(_magOutSound, AudioParams.Default.WithVolume(20)); } - - _updateAppearance(); + UpdateAppearance(); Dirty(); - entity.GetComponent().OnAmmoCountChanged -= _magazineAmmoCountChanged; + entity.GetComponent().OnAmmoCountChanged -= MagazineAmmoCountChanged; return true; } - - _updateAppearance(); + UpdateAppearance(); Dirty(); return false; } @@ -168,9 +151,13 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile // Eject chambered bullet. var entity = RemoveFromChamber(chamber); + if (entity == null) + { + return; + } var offsetPos = (CalcBulletOffset(), CalcBulletOffset()); entity.Transform.GridPosition = Owner.Transform.GridPosition.Offset(offsetPos); - entity.Transform.LocalRotation = _bulletDropRandom.Pick(_randomBulletDirs).ToAngle(); + entity.Transform.LocalRotation = _bulletDropRandom.Pick(RandomBulletDirs).ToAngle(); var effect = $"/Audio/Guns/Casings/casingfall{_bulletDropRandom.Next(1, 4)}.ogg"; Owner.GetComponent().Play(effect, AudioParams.Default.WithVolume(-3)); @@ -188,9 +175,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile DoAutoEject(); } } - Dirty(); - _updateAppearance(); + UpdateAppearance(); } private float CalcBulletOffset() @@ -206,7 +192,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { Owner.GetComponent().Play(_autoEjectSound, AudioParams.Default.WithVolume(-5)); } - Dirty(); } @@ -221,7 +206,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { Owner.PopupMessage(eventArgs.User, "No magazine"); } - return true; } @@ -231,29 +215,26 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { return false; } - if (Magazine != null) { Owner.PopupMessage(eventArgs.User, "Already got a magazine."); return false; } - - if (!MagazineTypes.Contains(component.MagazineType) || component.Caliber != Caliber) + if (!MagazineTypes.Contains(component.MagazineType)) { Owner.PopupMessage(eventArgs.User, "Magazine doesn't fit."); return false; } - return InsertMagazine(eventArgs.AttackWith); } - private void _magazineAmmoCountChanged() + private void MagazineAmmoCountChanged() { Dirty(); - _updateAppearance(); + UpdateAppearance(); } - private void _updateAppearance() + private void UpdateAppearance() { if (Magazine != null) { @@ -273,15 +254,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile public override ComponentState GetComponentState() { var chambered = GetChambered(0) != null; - (int, int)? count = null; - if (Magazine != null) { var magComponent = Magazine.GetComponent(); count = (magComponent.CountLoaded, magComponent.Capacity); } - return new BallisticMagazineWeaponComponentState(chambered, count); } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs new file mode 100644 index 0000000000..6332e89f20 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs @@ -0,0 +1,149 @@ +using Content.Server.GameObjects.Components.Sound; +using Robust.Server.GameObjects.Components.Container; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; +using System; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile +{ + /// + /// Handles firing projectiles from a contained . + /// + public abstract class BallisticWeaponComponent : BaseProjectileWeaponComponent + { + private Chamber[] _chambers; + + /// + /// Number of chambers created during initialization. + /// + private int _chamberCount; + + [ViewVariables] + private BallisticCaliber _caliber ; + /// + /// What type of ammo this gun can fire. + /// + + private string _soundGunEmpty; + /// + /// Sound played when trying to shoot if there is no ammo available. + /// + [ViewVariables(VVAccess.ReadWrite)] + public string SoundGunEmpty { get => _soundGunEmpty; set => _soundGunEmpty = value; } + + private float _spreadStdDevGun; + /// + /// Increases the standard deviation of the ammo being fired. + /// + [ViewVariables(VVAccess.ReadWrite)] + public float SpreadStdDevGun { get => _spreadStdDevGun; set => _spreadStdDevGun = value; } + + private float _evenSpreadAngleGun; + /// + /// Increases the evenspread of the ammo being fired. + /// + [ViewVariables(VVAccess.ReadWrite)] + public float EvenSpreadAngleGun { get => _evenSpreadAngleGun; set => _evenSpreadAngleGun = value; } + + private float _velocityGun; + /// + /// Increases the velocity of the ammo being fired. + /// + [ViewVariables(VVAccess.ReadWrite)] + public float VelocityGun { get => _velocityGun; set => _velocityGun = value; } + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _soundGunEmpty, "sound_empty", "/Audio/Guns/Empty/empty.ogg"); + serializer.DataField(ref _spreadStdDevGun, "spreadstddev", 0); + serializer.DataField(ref _evenSpreadAngleGun, "evenspread", 0); + serializer.DataField(ref _velocityGun, "gunvelocity", 0); + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _chamberCount, "chambers", 1); + } + + public override void Initialize() + { + base.Initialize(); + Owner.GetComponent().FireHandler = TryShoot; + _chambers = new Chamber[_chamberCount]; + for (var i = 0; i < _chambers.Length; i++) + { + var container = ContainerManagerComponent.Ensure($"ballistics_chamber_{i}", Owner); + _chambers[i] = new Chamber(container); + } + } + + /// + /// Fires projectiles based on loaded ammo from entity to a coordinate. + /// + protected void TryShoot(IEntity user, GridCoordinates clickLocation) + { + var ammo = GetChambered(FirstChamber)?.GetComponent(); + CycleChamberedBullet(FirstChamber); + if (ammo == null || ammo?.Spent == true || ammo?.Caliber != _caliber) + { + PlayEmptySound(); + return; + } + ammo.Spent = true; + var total_stdev = _spreadStdDevGun + ammo.SpreadStdDev_Ammo; + var final_evenspread = _evenSpreadAngleGun + ammo.EvenSpreadAngle_Ammo; + var final_velocity = _velocityGun + ammo.Velocity_Ammo; + FireAtCoord(user, clickLocation, ammo.ProjectileID, total_stdev, ammo.ProjectilesFired, final_evenspread, final_velocity); + } + + protected IEntity GetChambered(int chamber) => _chambers[chamber].Slot.ContainedEntity; + + /// + /// Loads the next ammo casing into the chamber. + /// + protected virtual void CycleChamberedBullet(int chamber) { } + + public IEntity RemoveFromChamber(int chamber) + { + var c = _chambers[chamber]; + var loaded = c.Slot.ContainedEntity; + if (loaded != null) + { + c.Slot.Remove(loaded); + } + return loaded; + } + + protected bool LoadIntoChamber(int chamber, IEntity bullet) + { + if (!bullet.TryGetComponent(out BallisticBulletComponent component)) + { + throw new ArgumentException("entity isn't a bullet.", nameof(bullet)); + } + if (component.Caliber != _caliber) + { + throw new ArgumentException("entity is of the wrong caliber.", nameof(bullet)); + } + if (GetChambered(chamber) != null) + { + return false; + } + _chambers[chamber].Slot.Insert(bullet); + return true; + } + + private void PlayEmptySound() => Owner.GetComponent().Play(_soundGunEmpty); + + protected sealed class Chamber + { + public Chamber(ContainerSlot slot) + { + Slot = slot; + } + + public ContainerSlot Slot { get; } + } + + private const int FirstChamber = 0; + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs deleted file mode 100644 index 50bf07b847..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs +++ /dev/null @@ -1,121 +0,0 @@ -using System; -using Content.Server.GameObjects.Components.Sound; -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Serialization; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile -{ - public abstract class BallisticWeaponComponent : ProjectileWeaponComponent - { - private BallisticCaliber _caliber; - private Chamber[] _chambers; - - public BallisticCaliber Caliber => _caliber; - protected abstract int ChamberCount { get; } - - private string _soundGunEmpty; - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - - serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); - serializer.DataField(ref _soundGunEmpty, "sound_empty", null); - } - - public override void Initialize() - { - base.Initialize(); - - _chambers = new Chamber[ChamberCount]; - for (var i = 0; i < _chambers.Length; i++) - { - var container = ContainerManagerComponent.Ensure($"ballistics_chamber_{i}", Owner); - _chambers[i] = new Chamber(container); - } - } - - public IEntity GetChambered(int chamber) => _chambers[chamber].Slot.ContainedEntity; - - public bool LoadIntoChamber(int chamber, IEntity bullet) - { - if (!bullet.TryGetComponent(out BallisticBulletComponent component)) - { - throw new ArgumentException("entity isn't a bullet.", nameof(bullet)); - } - - if (component.Caliber != Caliber) - { - throw new ArgumentException("entity is of the wrong caliber.", nameof(bullet)); - } - - if (GetChambered(chamber) != null) - { - return false; - } - - _chambers[chamber].Slot.Insert(bullet); - return true; - } - - protected sealed override IEntity GetFiredProjectile() - { - void PlayEmpty() - { - if (_soundGunEmpty != null) - { - Owner.GetComponent().Play(_soundGunEmpty); - } - } - var chambered = GetChambered(0); - if (chambered != null) - { - var bullet = chambered.GetComponent(); - if (bullet.Spent) - { - PlayEmpty(); - return null; - } - - var projectile = Owner.EntityManager.SpawnEntity(bullet.ProjectileType, Owner.Transform.GridPosition); - bullet.Spent = true; - - CycleChamberedBullet(0); - - // Load a new bullet into the chamber from magazine. - return projectile; - } - - PlayEmpty(); - return null; - } - - protected virtual void CycleChamberedBullet(int chamber) - { - - } - - public IEntity RemoveFromChamber(int chamber) - { - var c = _chambers[chamber]; - var loaded = c.Slot.ContainedEntity; - if (loaded != null) - { - c.Slot.Remove(loaded); - } - return loaded; - } - - private sealed class Chamber - { - public Chamber(ContainerSlot slot) - { - Slot = slot; - } - - public ContainerSlot Slot { get; } - } - - } -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs new file mode 100644 index 0000000000..3090ebdcfc --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs @@ -0,0 +1,95 @@ +using Content.Server.GameObjects.Components.Mobs; +using Content.Server.GameObjects.Components.Projectiles; +using Content.Server.GameObjects.Components.Sound; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Random; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; +using System.Collections.Generic; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile +{ + /// + /// Methods to shoot projectiles. + /// + public abstract class BaseProjectileWeaponComponent : Component + { + private string _soundGunshot; + [ViewVariables(VVAccess.ReadWrite)] + public string SoundGunshot + { get => _soundGunshot; set => _soundGunshot = value; } + +#pragma warning disable 649 + [Dependency] private IRobustRandom _spreadRandom; +#pragma warning restore 649 + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _soundGunshot, "sound_gunshot", "/Audio/Guns/Gunshots/smg.ogg"); + } + + /// + /// Fires projectile from an entity at a coordinate. + /// + protected void FireAtCoord(IEntity source, GridCoordinates coord, string projectileType, double spreadStdDev, int projectilesFired = 1, double evenSpreadAngle = 0, float velocity = 0) + { + var angle = GetAngleFromClickLocation(source, coord); + FireAtAngle(source, angle, projectileType, spreadStdDev, projectilesFired, evenSpreadAngle, velocity); + } + + /// + /// Fires projectile in the direction of an angle. + /// + protected void FireAtAngle(IEntity source, Angle angle, string projectileType = null, double spreadStdDev = 0, int projectilesFired = 1, double evenSpreadAngle = 0, float velocity = 0) + { + List sprayanglechange = null; + if (evenSpreadAngle != 0 & projectilesFired > 1) + { + sprayanglechange = Linspace(-evenSpreadAngle/2, evenSpreadAngle/2, projectilesFired); + } + for (var i = 1; i <= projectilesFired; i++) + { + Angle finalangle = angle + Angle.FromDegrees(_spreadRandom.NextGaussian(0, spreadStdDev)) + (sprayanglechange != null ? sprayanglechange[i - 1] : 0); + var projectile = Owner.EntityManager.SpawnEntity(projectileType, Owner.Transform.GridPosition); + projectile.Transform.GridPosition = source.Transform.GridPosition; //move projectile to entity it is being fired from + projectile.GetComponent().IgnoreEntity(source);//make sure it doesn't hit the source entity + var finalvelocity = projectile.GetComponent().Velocity + velocity;//add velocity + projectile.GetComponent().LinearVelocity = finalangle.ToVec() * finalvelocity;//Rotate the bullets sprite to the correct direction + projectile.Transform.LocalRotation = finalangle.Theta; + } + PlayFireSound(); + if (source.TryGetComponent(out CameraRecoilComponent recoil)) + { + var recoilVec = angle.ToVec() * -0.15f; + recoil.Kick(recoilVec); + } + } + + private void PlayFireSound() => Owner.GetComponent().Play(_soundGunshot); + + /// + /// Gets the angle from an entity to a coordinate. + /// + protected Angle GetAngleFromClickLocation(IEntity source, GridCoordinates clickLocation) => new Angle(clickLocation.Position - source.Transform.GridPosition.Position); + + /// + /// Returns a list of numbers that form a set of equal intervals between the start and end value. Used to calculate shotgun spread angles. + /// + protected List Linspace(double start, double end, int intervals) + { + var linspace = new List { }; + for (var i = 0; i <= intervals - 1; i++) + { + linspace.Add(Angle.FromDegrees(start + (end - start) * i / (intervals - 1))); + } + return linspace; + } + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs deleted file mode 100644 index e79b680082..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs +++ /dev/null @@ -1,130 +0,0 @@ -using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Projectiles; -using Content.Server.GameObjects.Components.Sound; -using Robust.Server.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; -using Robust.Shared.Map; -using Robust.Shared.Maths; -using Robust.Shared.Random; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile -{ - public abstract class ProjectileWeaponComponent : Component - { - private float _spreadStdDev = 3; - private bool _spread = true; - private string _soundGunshot; - -#pragma warning disable 649 - [Dependency] private IRobustRandom _spreadRandom; -#pragma warning restore 649 - - [ViewVariables(VVAccess.ReadWrite)] - public bool Spread - { - get => _spread; - set => _spread = value; - } - - [ViewVariables(VVAccess.ReadWrite)] - public float SpreadStdDev - { - get => _spreadStdDev; - set => _spreadStdDev = value; - } - - public override void Initialize() - { - base.Initialize(); - - var rangedWeapon = Owner.GetComponent(); - rangedWeapon.FireHandler = Fire; - } - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - - serializer.DataField(ref _spread, "spread", true); - serializer.DataField(ref _spreadStdDev, "spreadstddev", 3); - serializer.DataField(ref _soundGunshot, "sound_gunshot", "/Audio/Guns/Gunshots/smg.ogg"); - } - - private void Fire(IEntity user, GridCoordinates clickLocation) - { - var projectile = GetFiredProjectile(); - if (projectile == null) - { - return; - } - - var userPosition = user.Transform.GridPosition; //Remember world positions are ephemeral and can only be used instantaneously - var angle = new Angle(clickLocation.Position - userPosition.Position); - - if (user.TryGetComponent(out CameraRecoilComponent recoil)) - { - var recoilVec = angle.ToVec() * -0.15f; - recoil.Kick(recoilVec); - } - - if (Spread) - { - angle += Angle.FromDegrees(_spreadRandom.NextGaussian(0, SpreadStdDev)); - } - - projectile.Transform.GridPosition = userPosition; - - //Give it the velocity we fire from this weapon, and make sure it doesn't shoot our character - projectile.GetComponent().IgnoreEntity(user); - var velocity = projectile.GetComponent().Velocity; - - //Give it the velocity this weapon gives to things it fires from itself - projectile.GetComponent().LinearVelocity = angle.ToVec() * velocity; - - //Rotate the bullets sprite to the correct direction, from north facing I guess - projectile.Transform.LocalRotation = angle.Theta; - - // Sound! - Owner.GetComponent().Play(_soundGunshot); - } - - /// - /// Try to get a projectile for firing. If null, nothing will be fired. - /// - protected abstract IEntity GetFiredProjectile(); - } - - public enum BallisticCaliber - { - Unspecified = 0, - // .32 - A32, - // .357 - A357, - // .44 - A44, - // .45mm - A45mm, - // .50 cal - A50, - // 5.56mm - A556mm, - // 6.5mm - A65mm, - // 7.62mm - A762mm, - // 9mm - A9mm, - // 10mm - A10mm, - // 20mm - A20mm, - // 24mm - A24mm, - } -} diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/ammunition.yml new file mode 100644 index 0000000000..fcc8c63695 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/ammunition.yml @@ -0,0 +1,54 @@ +# Empty mags +- type: entity + id: magazine_12g_empty + name: "12g magazine - empty" + parent: BaseItem + abstract: true + components: + - type: BallisticMagazine + caliber: A12g + magazine: A12g + capacity: 8 + - type: Sprite + netsync: false + +#Magazines +- type: entity + id: magazine_12g_shotgun + name: "12g Magazine" + parent: magazine_12g_empty + components: + - type: BallisticMagazine + fill: ammo_casing_12g + caliber: A12g + magazine: A12g + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi + state: 12mml-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi + state: 12mml-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: 12mml + steps: 2 + +# Casings +- type: entity + id: ammo_casing_12g + name: "12g casing" + parent: BaseItem + components: + - type: BallisticBullet + caliber: A12g + projectile: pellet_12g + projectilesfired : 6 + - type: Sprite + sprite: Objects/Guns/Ammunition/ammo_casing.rsi + state: s-casing + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/ammo_casing.rsi + state: s-casing \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/boxes.yml new file mode 100644 index 0000000000..090417ae78 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/boxes.yml @@ -0,0 +1,34 @@ +# Empty boxes +- type: entity + id: box_12g_empty + name: "12g box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A12g + capacity: 30 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_12g + name: "12g box" + parent: box_12g_empty + components: + - type: AmmoBox + fill: ammo_casing_12g + caliber: A12g + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi + state: box10mm-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi + state: box10mm-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box10mm + steps: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml new file mode 100644 index 0000000000..3d2172cbfc --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml @@ -0,0 +1,10 @@ +- type: entity + id: pellet_12g + name: 12g Pellet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 10 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml new file mode 100644 index 0000000000..00552cf73c --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml @@ -0,0 +1,47 @@ +- type: entity + name: Shotgun + parent: BaseItem + id: BaseShotgun + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sound + - type: RangedWeapon + automatic: false + firerate: 20 + - type: BallisticMagazineWeapon + caliber: A12g + evenspread : 40 + magazines: + - A12g + default_magazine: magazine_12g_shotgun + auto_eject_magazine: false + sound_auto_eject: /Audio/Guns/EmptyAlarm/smg_empty_alarm.ogg + sound_magazine_in: /Audio/Guns/MagIn/smg_magin.ogg + sound_magazine_out: /Audio/Guns/MagOut/smg_magout.ogg + sound_empty: /Audio/Guns/Empty/empty.ogg + sound_gunshot: /Audio/Guns/Gunshots/smg.ogg + +- type: entity + name: Magazine Fed Shotgun + parent: BaseShotgun + id: MagazineFedShotgun + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/SMGs/c20r.rsi + state: c20r-5 + - type: Icon + sprite: Objects/Guns/SMGs/c20r.rsi + state: c20r-5 + - type: Appearance + visuals: + - type: BallisticMagazineWeaponVisualizer2D + base_state: c20r + steps: 6 + - type: Item + Size: 24 + sprite: Objects/Guns/SMGs/c20r.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/SMGs/wt550.rsi From 81ab31659bfa74b46cbf23f599c76b5f65113c27 Mon Sep 17 00:00:00 2001 From: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Date: Sun, 1 Mar 2020 04:09:30 -0400 Subject: [PATCH 10/16] Little projectile enhancements (#764) * Little projectile enhancements * Lets see if this fixes my fuck up * Im a weapon smoothbrain. This fixes caliber folders name --- .../Entities/Weapons/Ammunition/10mm/projectiles.yml | 12 ++++++------ .../Entities/Weapons/Ammunition/12g/projectiles.yml | 4 ++-- .../Entities/Weapons/Ammunition/20mm/projectiles.yml | 4 ++-- .../Entities/Weapons/Ammunition/24mm/projectiles.yml | 12 ++++++------ .../Ammunition/{.45mm => 45mm}/ammunition.yml | 0 .../Weapons/Ammunition/{.45mm => 45mm}/boxes.yml | 0 .../Ammunition/{.45mm => 45mm}/projectiles.yml | 12 ++++++------ .../Weapons/Ammunition/5.56mm/projectiles.yml | 12 ++++++------ .../Weapons/Ammunition/6.5mm/projectiles.yml | 12 ++++++------ .../Weapons/Ammunition/7.62mm/projectiles.yml | 12 ++++++------ .../Entities/Weapons/Ammunition/9mm/projectiles.yml | 12 ++++++------ .../Ammunition/{.32 => Point32}/ammunition.yml | 0 .../Weapons/Ammunition/{.32 => Point32}/boxes.yml | 0 .../Ammunition/{.32 => Point32}/projectiles.yml | 12 ++++++------ .../Ammunition/{.357 => Point357}/ammunition.yml | 0 .../Weapons/Ammunition/{.357 => Point357}/boxes.yml | 0 .../Ammunition/{.357 => Point357}/projectiles.yml | 12 ++++++------ .../Ammunition/{.44 => Point44}/ammunition.yml | 0 .../Weapons/Ammunition/{.44 => Point44}/boxes.yml | 0 .../Ammunition/{.44 => Point44}/projectiles.yml | 12 ++++++------ .../Ammunition/{.50 => Point50}/ammunition.yml | 0 .../Weapons/Ammunition/{.50 => Point50}/boxes.yml | 0 .../Ammunition/{.50 => Point50}/projectiles.yml | 12 ++++++------ .../Entities/Weapons/Projectiles/projectiles.yml | 8 ++------ 24 files changed, 72 insertions(+), 76 deletions(-) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.45mm => 45mm}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.45mm => 45mm}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.45mm => 45mm}/projectiles.yml (77%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.32 => Point32}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.32 => Point32}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.32 => Point32}/projectiles.yml (77%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.357 => Point357}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.357 => Point357}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.357 => Point357}/projectiles.yml (77%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.44 => Point44}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.44 => Point44}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.44 => Point44}/projectiles.yml (77%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.50 => Point50}/ammunition.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.50 => Point50}/boxes.yml (100%) rename Resources/Prototypes/Entities/Weapons/Ammunition/{.50 => Point50}/projectiles.yml (77%) diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml index 2ce204b9f6..da62a0d23c 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_10mm name: 10mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_10mmf name: 10mm Bullet (Flash) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_10mmhv name: 10mm Bullet (High-Velocity) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_10mml name: 10mm Bullet (L) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_10mmp name: 10mm Bullet (Practice) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_10mmr name: 10mm Bullet (Rubber) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml index 3d2172cbfc..1faf5bb8e7 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml @@ -2,9 +2,9 @@ id: pellet_12g name: 12g Pellet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 damages: - Brute: 10 \ No newline at end of file + Brute: 10 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml index 73a4d15034..4dd3e89acf 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml @@ -2,9 +2,9 @@ id: bullet_20mm name: 20mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 damages: - Brute: 10 \ No newline at end of file + Brute: 10 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml index 27ce860395..56a78855b9 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_24mm name: 24mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_24mmf name: 24mm Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_24mmhv name: 24mm Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 27 @@ -35,7 +35,7 @@ id: bullet_24mml name: 24mm Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_24mmp name: 24mm Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_24mmr name: 24mm Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/45mm/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/45mm/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml index 6fdc3e21d3..063bc93049 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_45mm name: .45mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_45mmf name: .45mm Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_45mmhv name: .45mm Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_45mml name: .45mm Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_45mmp name: .45mm Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_45mmr name: .45mm Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml index 2f86125130..40570dbb26 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_556mm name: 5.56mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_556mmf name: 5.56mm Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_556mmhv name: 5.56mm Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_556mml name: 5.56mm Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_556mmp name: 5.56mm Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_556mmr name: 5.56mm Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml index 06e0f3b781..2cf342d083 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_65mm name: 6.5mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_65mmf name: 6.5mm Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_65mmhv name: 6.5mm Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_65mml name: 6.5mm Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_65mmp name: 6.5mm Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_65mmr name: 6.5mm Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml index f31376d364..ac9b8d6438 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_762mm name: 7.62mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_762mmf name: 7.62mm Bullet (Flash) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_762mmhv name: 7.62mm Bullet (High-Velocity) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_762mml name: 7.62mm Bullet (L) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_762mmp name: 7.62mm Bullet (Practice) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_762mmr name: 7.62mm Bullet (Rubber) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml index 21446d1819..5e31b0c78c 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_9mm name: 9mm Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_9mmf name: 9mm Bullet (Flash) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_9mmhv name: 9mm Bullet (High-Velocity) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_9mml name: 9mm Bullet (L) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_9mmp name: 9mm Bullet (Practice) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_9mmr name: 9mm Bullet (Rubber) parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.32/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point32/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.32/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point32/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.32/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml index 52a78851ed..a33b869e8f 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_32 name: .32 Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_32f name: .32 Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_32hv name: .32 Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_32l name: .32 Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_32p name: .32 Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_32r name: .32 Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.357/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point357/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.357/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point357/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.357/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml index ba346205df..30b6b8cc51 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_357 name: .357 Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_357f name: .357 Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_357hv name: .357 Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_357l name: .357 Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_357p name: .357 Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_357r name: .357 Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.44/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point44/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.44/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point44/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.44/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml index 38ae4f742a..8af1cc8f82 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_44 name: .44 Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_44f name: .44 Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_44hv name: .44 Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_44l name: .44 Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_44p name: .44 Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_44r name: .44 Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/ammunition.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point50/ammunition.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/boxes.yml similarity index 100% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.50/boxes.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point50/boxes.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml similarity index 77% rename from Resources/Prototypes/Entities/Weapons/Ammunition/.50/projectiles.yml rename to Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml index e89e1e1d2b..bb5b0fb55e 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml @@ -2,7 +2,7 @@ id: bullet_50 name: .50 cal Bullet parent: bullet_base - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -13,7 +13,7 @@ id: bullet_50f name: .50 cal Bullet (Flash) parent: bullet_basef - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -24,7 +24,7 @@ id: bullet_50hv name: .50 cal Bullet (High-Velocity) parent: bullet_basehv - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 30 @@ -35,7 +35,7 @@ id: bullet_50l name: .50 cal Bullet (L) parent: bullet_basel - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -46,7 +46,7 @@ id: bullet_50p name: .50 cal Bullet (Practice) parent: bullet_basep - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 @@ -57,7 +57,7 @@ id: bullet_50r name: .50 cal Bullet (Rubber) parent: bullet_baser - description: If you can see this you're dead! + abstract: true components: - type: Projectile velocity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml index 95aaae6364..78e354f747 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -2,9 +2,10 @@ - type: entity id: bullet_base name: bullet_base - description: If you can see this you're dead! + description: If you can see this you're probably dead! abstract: true components: + - type: Clickable - type: Sprite directional: false texture: Objects/Projectiles/bullet.png @@ -34,7 +35,6 @@ id: bullet_basef name: Base Bullet Flash parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile @@ -46,7 +46,6 @@ id: bullet_basehv name: Base Bullet High-Velocity parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile @@ -58,7 +57,6 @@ id: bullet_basel name: Base Bullet L parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile @@ -70,7 +68,6 @@ id: bullet_basep name: Base Bullet Practice parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile @@ -82,7 +79,6 @@ id: bullet_baser name: Base Bullet Rubber parent: bullet_base - description: If you can see this you're dead! abstract: true components: - type: Projectile From 9580003a452f9d251c108155b41aa6cee3c2d46e Mon Sep 17 00:00:00 2001 From: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Date: Tue, 3 Mar 2020 09:40:35 -0400 Subject: [PATCH 11/16] Fixing map collisions (#765) * Git please work as i want you to work * There were some collision remanants, everything is clean now --- Resources/Maps/stationstation.yml | 3779 ----------------------------- 1 file changed, 3779 deletions(-) diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index 26c4a75c41..980e40102d 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -101,10 +101,6 @@ entities: type: Transform - index: 0 type: MapGrid - - shapes: - - !type:PhysShapeGrid - grid: 0 - type: Collidable - uid: 1 type: LaserGun components: @@ -114,12 +110,6 @@ entities: type: Transform - charge: 1200 type: HitscanWeaponCapacitor - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 2 type: LaserGun components: @@ -129,12 +119,6 @@ entities: type: Transform - charge: 1200 type: HitscanWeaponCapacitor - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 3 type: Brutepack components: @@ -142,12 +126,6 @@ entities: pos: -2.106966,-1.457896 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 4 type: Ointment components: @@ -155,12 +133,6 @@ entities: pos: -1.481966,-1.317271 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 5 type: Spear components: @@ -168,12 +140,6 @@ entities: pos: -4.144312,7.499083 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 6 type: Spear components: @@ -181,12 +147,6 @@ entities: pos: -1.238062,7.436583 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 7 type: PowerCellSmallHigh components: @@ -194,10 +154,6 @@ entities: pos: -2.67511,-10.351 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.15,-0.3,0.2,0.3 - type: Collidable - uid: 8 type: PowerCellSmallHigh components: @@ -205,10 +161,6 @@ entities: pos: -2.55011,-10.6635 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.15,-0.3,0.2,0.3 - type: Collidable - uid: 9 type: OuterclothingVest components: @@ -216,12 +168,6 @@ entities: pos: 1.412994,7.507263 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 10 type: solid_wall components: @@ -229,10 +175,6 @@ entities: pos: -7.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 11 type: solid_wall components: @@ -240,10 +182,6 @@ entities: pos: -7.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 12 type: solid_wall components: @@ -251,10 +189,6 @@ entities: pos: -7.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 13 type: solid_wall components: @@ -262,10 +196,6 @@ entities: pos: -7.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 14 type: solid_wall components: @@ -273,10 +203,6 @@ entities: pos: -7.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 15 type: solid_wall components: @@ -284,10 +210,6 @@ entities: pos: 0.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 16 type: solid_wall components: @@ -295,10 +217,6 @@ entities: pos: -0.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 17 type: solid_wall components: @@ -306,10 +224,6 @@ entities: pos: 3.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 18 type: solid_wall components: @@ -317,10 +231,6 @@ entities: pos: 4.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 19 type: solid_wall components: @@ -328,10 +238,6 @@ entities: pos: -7.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 20 type: solid_wall components: @@ -339,10 +245,6 @@ entities: pos: -7.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 21 type: solid_wall components: @@ -350,10 +252,6 @@ entities: pos: -7.5,-12.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 22 type: solid_wall components: @@ -361,10 +259,6 @@ entities: pos: -7.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 23 type: solid_wall components: @@ -372,10 +266,6 @@ entities: pos: 2.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 24 type: solid_wall components: @@ -383,10 +273,6 @@ entities: pos: 1.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 25 type: solid_wall components: @@ -394,10 +280,6 @@ entities: pos: -1.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 26 type: poweredsmalllight components: @@ -405,9 +287,6 @@ entities: pos: -4.5,-5 rot: 1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -425,12 +304,6 @@ entities: pos: -15.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 28 type: Wire components: @@ -438,9 +311,6 @@ entities: pos: 8.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 29 type: poweredsmalllight components: @@ -448,9 +318,6 @@ entities: pos: 0.5,-5 rot: 1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -466,12 +333,6 @@ entities: components: - parent: 26 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 31 type: Wire components: @@ -479,9 +340,6 @@ entities: pos: -6.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 32 type: solid_wall components: @@ -489,10 +347,6 @@ entities: pos: -7.5,-9.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 33 type: solid_wall components: @@ -500,10 +354,6 @@ entities: pos: -10.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 34 type: airlock_engineering components: @@ -511,12 +361,6 @@ entities: pos: -12.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 35 type: solid_wall components: @@ -524,10 +368,6 @@ entities: pos: -10.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 36 type: solid_wall components: @@ -535,10 +375,6 @@ entities: pos: -10.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 37 type: solid_wall components: @@ -546,10 +382,6 @@ entities: pos: -10.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 38 type: solid_wall components: @@ -557,10 +389,6 @@ entities: pos: -10.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 39 type: solid_wall components: @@ -568,10 +396,6 @@ entities: pos: -10.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 40 type: solid_wall components: @@ -579,10 +403,6 @@ entities: pos: -3.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 41 type: solid_wall components: @@ -590,10 +410,6 @@ entities: pos: 1.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 42 type: solid_wall components: @@ -601,10 +417,6 @@ entities: pos: 0.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 43 type: solid_wall components: @@ -612,10 +424,6 @@ entities: pos: -0.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 44 type: solid_wall components: @@ -623,10 +431,6 @@ entities: pos: -1.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 45 type: solid_wall components: @@ -634,10 +438,6 @@ entities: pos: -2.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 46 type: solid_wall components: @@ -645,10 +445,6 @@ entities: pos: -3.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 47 type: solid_wall components: @@ -656,10 +452,6 @@ entities: pos: -4.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 48 type: solid_wall components: @@ -667,10 +459,6 @@ entities: pos: -5.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 49 type: solid_wall components: @@ -678,10 +466,6 @@ entities: pos: -6.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 50 type: solid_wall components: @@ -689,10 +473,6 @@ entities: pos: 4.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 51 type: solid_wall components: @@ -700,10 +480,6 @@ entities: pos: 5.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 52 type: solid_wall components: @@ -711,10 +487,6 @@ entities: pos: 6.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 53 type: solid_wall components: @@ -722,10 +494,6 @@ entities: pos: -7.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 54 type: solid_wall components: @@ -733,10 +501,6 @@ entities: pos: -2.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 55 type: solid_wall components: @@ -744,10 +508,6 @@ entities: pos: -6.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 56 type: solid_wall components: @@ -755,10 +515,6 @@ entities: pos: -5.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 57 type: solid_wall components: @@ -766,10 +522,6 @@ entities: pos: -4.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 58 type: solid_wall components: @@ -777,10 +529,6 @@ entities: pos: 6.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 59 type: solid_wall components: @@ -788,10 +536,6 @@ entities: pos: 6.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 60 type: solid_wall components: @@ -799,10 +543,6 @@ entities: pos: 6.5,-12.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 61 type: solid_wall components: @@ -810,10 +550,6 @@ entities: pos: 6.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 62 type: solid_wall components: @@ -821,10 +557,6 @@ entities: pos: 6.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 63 type: solid_wall components: @@ -832,10 +564,6 @@ entities: pos: 5.5,-14.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 64 type: solid_wall components: @@ -843,10 +571,6 @@ entities: pos: -7.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 65 type: solid_wall components: @@ -854,10 +578,6 @@ entities: pos: -7.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 66 type: solid_wall components: @@ -865,10 +585,6 @@ entities: pos: -8.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 67 type: solid_wall components: @@ -876,10 +592,6 @@ entities: pos: -9.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 68 type: solid_wall components: @@ -887,10 +599,6 @@ entities: pos: -10.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 69 type: solid_wall components: @@ -898,10 +606,6 @@ entities: pos: -7.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 70 type: catwalk components: @@ -909,9 +613,6 @@ entities: pos: -6.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 71 type: catwalk components: @@ -919,9 +620,6 @@ entities: pos: -8.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 72 type: solid_wall components: @@ -929,10 +627,6 @@ entities: pos: 5.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 73 type: solid_wall components: @@ -940,10 +634,6 @@ entities: pos: 5.5,-9.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 74 type: solid_wall components: @@ -951,10 +641,6 @@ entities: pos: 6.5,-9.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 75 type: solid_wall components: @@ -962,10 +648,6 @@ entities: pos: 6.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 76 type: catwalk components: @@ -973,9 +655,6 @@ entities: pos: 4.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 77 type: LargeBeaker components: @@ -983,12 +662,6 @@ entities: pos: 23.494947,7.0422435 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 78 type: solid_wall components: @@ -996,10 +669,6 @@ entities: pos: 7.5,-9.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 79 type: airlock_external components: @@ -1007,12 +676,6 @@ entities: pos: 7.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 80 type: airlock_external components: @@ -1020,12 +683,6 @@ entities: pos: 5.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 81 type: airlock_engineering components: @@ -1033,12 +690,6 @@ entities: pos: -7.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 82 type: airlock_engineering components: @@ -1046,12 +697,6 @@ entities: pos: 3.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 83 type: airlock_engineering components: @@ -1059,12 +704,6 @@ entities: pos: 2.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 84 type: solid_wall components: @@ -1072,10 +711,6 @@ entities: pos: 6.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 85 type: solid_wall components: @@ -1083,10 +718,6 @@ entities: pos: 6.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 86 type: table components: @@ -1094,10 +725,6 @@ entities: pos: -3.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 87 type: table components: @@ -1105,10 +732,6 @@ entities: pos: -2.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 88 type: table components: @@ -1116,10 +739,6 @@ entities: pos: -1.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 89 type: table components: @@ -1127,10 +746,6 @@ entities: pos: -0.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 90 type: WirelessMachine components: @@ -1138,11 +753,6 @@ entities: pos: 5.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 91 type: crate_generic components: @@ -1150,12 +760,6 @@ entities: pos: 5.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.4,-0.4,0.4,0.4 - type: Collidable - containers: storagebase: entities: [] @@ -1171,9 +775,6 @@ entities: pos: -6.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 93 type: Wire components: @@ -1181,9 +782,6 @@ entities: pos: -7.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 94 type: Wire components: @@ -1191,9 +789,6 @@ entities: pos: -8.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 95 type: Wire components: @@ -1201,9 +796,6 @@ entities: pos: -8.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 96 type: Wire components: @@ -1211,9 +803,6 @@ entities: pos: -8.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 97 type: Wire components: @@ -1221,9 +810,6 @@ entities: pos: -8.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 98 type: Wire components: @@ -1231,9 +817,6 @@ entities: pos: -8.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 99 type: Wire components: @@ -1241,9 +824,6 @@ entities: pos: -8.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 100 type: Wire components: @@ -1251,9 +831,6 @@ entities: pos: -6.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 101 type: Wire components: @@ -1261,9 +838,6 @@ entities: pos: -6.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 102 type: Wire components: @@ -1271,9 +845,6 @@ entities: pos: -6.5,-9.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 103 type: Wire components: @@ -1281,9 +852,6 @@ entities: pos: -6.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 104 type: Wire components: @@ -1291,9 +859,6 @@ entities: pos: 4.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 105 type: Wire components: @@ -1301,9 +866,6 @@ entities: pos: 4.5,-9.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 106 type: Wire components: @@ -1311,9 +873,6 @@ entities: pos: 4.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 107 type: Wire components: @@ -1321,9 +880,6 @@ entities: pos: 4.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 108 type: Wire components: @@ -1331,9 +887,6 @@ entities: pos: 5.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 109 type: Wire components: @@ -1341,9 +894,6 @@ entities: pos: 6.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 110 type: Wire components: @@ -1351,9 +901,6 @@ entities: pos: 7.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 111 type: catwalk components: @@ -1361,9 +908,6 @@ entities: pos: 2.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 112 type: catwalk components: @@ -1371,9 +915,6 @@ entities: pos: -4.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 113 type: Wire components: @@ -1381,9 +922,6 @@ entities: pos: 3.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 114 type: Wire components: @@ -1391,9 +929,6 @@ entities: pos: 2.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 115 type: Wire components: @@ -1401,9 +936,6 @@ entities: pos: 1.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 116 type: Wire components: @@ -1411,9 +943,6 @@ entities: pos: 0.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 117 type: Wire components: @@ -1421,9 +950,6 @@ entities: pos: -0.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 118 type: Wire components: @@ -1431,9 +957,6 @@ entities: pos: -1.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 119 type: Wire components: @@ -1441,9 +964,6 @@ entities: pos: -2.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 120 type: Wire components: @@ -1451,9 +971,6 @@ entities: pos: -3.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 121 type: Wire components: @@ -1461,9 +978,6 @@ entities: pos: -4.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 122 type: Wire components: @@ -1471,9 +985,6 @@ entities: pos: -5.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 123 type: Wire components: @@ -1481,9 +992,6 @@ entities: pos: 1.5,-12.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 124 type: Wire components: @@ -1491,9 +999,6 @@ entities: pos: 1.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 125 type: Wire components: @@ -1501,9 +1006,6 @@ entities: pos: 2.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 126 type: Wire components: @@ -1511,9 +1013,6 @@ entities: pos: -2.5,-12.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 127 type: Wire components: @@ -1521,9 +1020,6 @@ entities: pos: -2.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 128 type: Wire components: @@ -1531,9 +1027,6 @@ entities: pos: -3.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 129 type: Wire components: @@ -1541,9 +1034,6 @@ entities: pos: -1.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 130 type: Generator components: @@ -1551,11 +1041,6 @@ entities: pos: 2.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.5,0.3,0.5 - type: Collidable - uid: 131 type: Generator components: @@ -1563,11 +1048,6 @@ entities: pos: 1.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.5,0.3,0.5 - type: Collidable - uid: 132 type: smes_dry components: @@ -1575,10 +1055,6 @@ entities: pos: -1.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - charge: 3000 type: PowerStorage - uid: 133 @@ -1588,10 +1064,6 @@ entities: pos: -2.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - charge: 3000 type: PowerStorage - uid: 134 @@ -1601,10 +1073,6 @@ entities: pos: -3.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - charge: 3000 type: PowerStorage - uid: 135 @@ -1614,12 +1082,6 @@ entities: pos: -1.249865,-10.43489 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 136 type: catwalk components: @@ -1627,9 +1089,6 @@ entities: pos: -2.5,-12.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 137 type: catwalk components: @@ -1637,9 +1096,6 @@ entities: pos: 1.5,-12.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 138 type: spawn_point_latejoin components: @@ -1661,10 +1117,6 @@ entities: pos: -3.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 141 type: table components: @@ -1672,10 +1124,6 @@ entities: pos: -2.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 142 type: table components: @@ -1683,10 +1131,6 @@ entities: pos: -1.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 143 type: table components: @@ -1694,10 +1138,6 @@ entities: pos: -0.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 144 type: solid_wall components: @@ -1705,10 +1145,6 @@ entities: pos: -7.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 145 type: spawn_point_latejoin components: @@ -1723,12 +1159,6 @@ entities: pos: 0.5223687,7.507263 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 147 type: locker_generic components: @@ -1736,12 +1166,6 @@ entities: pos: 1.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -1760,12 +1184,6 @@ entities: pos: -3.209215,-1.486604 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -1778,12 +1196,6 @@ entities: pos: -4.146715,-1.408479 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -1796,12 +1208,6 @@ entities: pos: 0.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -1820,12 +1226,6 @@ entities: pos: -1.297692,-5.396082 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 152 type: spawn_point_latejoin components: @@ -1847,11 +1247,6 @@ entities: pos: 0.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - products: - cargo.dice - cargo.flashlight @@ -1864,11 +1259,6 @@ entities: pos: 0.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - products: - cargo.dice - cargo.flashlight @@ -1881,10 +1271,6 @@ entities: pos: -4.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 157 type: table components: @@ -1892,10 +1278,6 @@ entities: pos: -1.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 158 type: table components: @@ -1903,10 +1285,6 @@ entities: pos: -2.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 159 type: table components: @@ -1914,10 +1292,6 @@ entities: pos: -3.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 160 type: WirelessMachine components: @@ -1925,11 +1299,6 @@ entities: pos: -6.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 161 type: catwalk components: @@ -1937,9 +1306,6 @@ entities: pos: 4.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 162 type: catwalk components: @@ -1947,9 +1313,6 @@ entities: pos: -5.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 163 type: Wire components: @@ -1957,9 +1320,6 @@ entities: pos: -6.5,-12.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 164 type: Wire components: @@ -1967,9 +1327,6 @@ entities: pos: -6.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 165 type: Wire components: @@ -1977,9 +1334,6 @@ entities: pos: 5.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 166 type: Wire components: @@ -1987,9 +1341,6 @@ entities: pos: 5.5,-12.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 167 type: Wire components: @@ -1997,9 +1348,6 @@ entities: pos: 5.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 168 type: WiredMachine components: @@ -2007,11 +1355,6 @@ entities: pos: 5.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 169 type: WiredMachine components: @@ -2019,22 +1362,11 @@ entities: pos: -6.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 170 type: LightBulb components: - parent: 29 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 171 type: wall_light components: @@ -2042,9 +1374,6 @@ entities: pos: -0.5,-14 rot: 1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 172 type: spawn_point_latejoin components: @@ -2087,9 +1416,6 @@ entities: pos: 9.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 178 type: catwalk components: @@ -2097,9 +1423,6 @@ entities: pos: 9.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 179 type: catwalk components: @@ -2107,9 +1430,6 @@ entities: pos: 9.5,2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 180 type: catwalk components: @@ -2117,9 +1437,6 @@ entities: pos: 9.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 181 type: catwalk components: @@ -2127,9 +1444,6 @@ entities: pos: 9.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 182 type: vending_machine_youtool components: @@ -2139,11 +1453,6 @@ entities: type: Transform - sprite: Buildings/VendingMachines/youtool.rsi type: Sprite - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 183 type: Generator components: @@ -2151,11 +1460,6 @@ entities: pos: 0.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.5,0.3,0.5 - type: Collidable - uid: 184 type: Wire components: @@ -2163,9 +1467,6 @@ entities: pos: 3.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 185 type: Wire components: @@ -2173,9 +1474,6 @@ entities: pos: 0.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 186 type: Generator components: @@ -2183,11 +1481,6 @@ entities: pos: 3.5,-13.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.5,0.3,0.5 - type: Collidable - uid: 187 type: table components: @@ -2195,10 +1488,6 @@ entities: pos: -6.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 188 type: table components: @@ -2206,10 +1495,6 @@ entities: pos: -5.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 189 type: table components: @@ -2217,10 +1502,6 @@ entities: pos: -4.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 190 type: table components: @@ -2228,10 +1509,6 @@ entities: pos: -3.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 191 type: table components: @@ -2239,10 +1516,6 @@ entities: pos: -2.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 192 type: table components: @@ -2250,10 +1523,6 @@ entities: pos: -1.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 193 type: table components: @@ -2261,10 +1530,6 @@ entities: pos: -0.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 194 type: table components: @@ -2272,10 +1537,6 @@ entities: pos: 0.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 195 type: table components: @@ -2283,10 +1544,6 @@ entities: pos: 1.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 196 type: table components: @@ -2294,10 +1551,6 @@ entities: pos: -4.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 197 type: table components: @@ -2305,10 +1558,6 @@ entities: pos: -3.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 198 type: table components: @@ -2316,10 +1565,6 @@ entities: pos: -2.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 199 type: table components: @@ -2327,10 +1572,6 @@ entities: pos: -1.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 200 type: table components: @@ -2338,10 +1579,6 @@ entities: pos: -0.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 201 type: airlock_medical_glass components: @@ -2349,12 +1586,6 @@ entities: pos: 26.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 202 type: airlock_medical_glass components: @@ -2362,12 +1593,6 @@ entities: pos: 28.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 203 type: catwalk components: @@ -2375,9 +1600,6 @@ entities: pos: -9.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 204 type: Wire components: @@ -2385,9 +1607,6 @@ entities: pos: -8.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 205 type: Wire components: @@ -2395,9 +1614,6 @@ entities: pos: -8.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 206 type: Wire components: @@ -2405,9 +1621,6 @@ entities: pos: -9.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 207 type: Wire components: @@ -2415,9 +1628,6 @@ entities: pos: -9.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 208 type: solid_wall components: @@ -2425,10 +1635,6 @@ entities: pos: -10.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 209 type: solid_wall components: @@ -2436,10 +1642,6 @@ entities: pos: -10.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 210 type: airlock components: @@ -2447,23 +1649,11 @@ entities: pos: -9.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 211 type: LightTube components: - parent: 212 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 212 type: poweredlight components: @@ -2471,9 +1661,6 @@ entities: pos: 0.5,1 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -2491,9 +1678,6 @@ entities: pos: -3.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 214 type: chairOfficeDark components: @@ -2501,9 +1685,6 @@ entities: pos: 0.5,-6.5 rot: 1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 215 type: poweredlight components: @@ -2511,9 +1692,6 @@ entities: pos: -6.5,1 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -2531,12 +1709,6 @@ entities: pos: -15.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 217 type: stool components: @@ -2544,9 +1716,6 @@ entities: pos: -1.5,-9.5 rot: 1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 218 type: chairOfficeLight components: @@ -2554,9 +1723,6 @@ entities: pos: -3.5,-2.5 rot: 1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 219 type: chairOfficeLight components: @@ -2564,9 +1730,6 @@ entities: pos: -2.5,-2.5 rot: 1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 220 type: chairOfficeLight components: @@ -2574,9 +1737,6 @@ entities: pos: -2.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 221 type: stool components: @@ -2584,20 +1744,11 @@ entities: pos: -2.5,-6.5 rot: 1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 222 type: LightBulb components: - parent: 251 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 223 type: APC components: @@ -2605,10 +1756,6 @@ entities: pos: -6.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 224 type: Wire components: @@ -2616,9 +1763,6 @@ entities: pos: -9.5,2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 225 type: Wire components: @@ -2626,9 +1770,6 @@ entities: pos: -9.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 226 type: Wire components: @@ -2636,9 +1777,6 @@ entities: pos: -8.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 227 type: Wire components: @@ -2646,9 +1784,6 @@ entities: pos: -7.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 228 type: Wire components: @@ -2656,9 +1791,6 @@ entities: pos: -6.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 229 type: Wire components: @@ -2666,9 +1798,6 @@ entities: pos: -5.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 230 type: Wire components: @@ -2676,9 +1805,6 @@ entities: pos: -4.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 231 type: Wire components: @@ -2686,9 +1812,6 @@ entities: pos: -3.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 232 type: Wire components: @@ -2696,9 +1819,6 @@ entities: pos: -2.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 233 type: Wire components: @@ -2706,9 +1826,6 @@ entities: pos: -1.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 234 type: Wire components: @@ -2716,9 +1833,6 @@ entities: pos: -0.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 235 type: Wire components: @@ -2726,9 +1840,6 @@ entities: pos: 0.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 236 type: LargeBeaker components: @@ -2736,12 +1847,6 @@ entities: pos: 23.510572,7.7141185 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 237 type: catwalk components: @@ -2749,9 +1854,6 @@ entities: pos: 9.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 238 type: catwalk components: @@ -2759,9 +1861,6 @@ entities: pos: 9.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 239 type: catwalk components: @@ -2769,9 +1868,6 @@ entities: pos: 9.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 240 type: catwalk components: @@ -2779,9 +1875,6 @@ entities: pos: 9.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 241 type: catwalk components: @@ -2789,9 +1882,6 @@ entities: pos: 9.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 242 type: catwalk components: @@ -2799,9 +1889,6 @@ entities: pos: 9.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 243 type: catwalk components: @@ -2809,9 +1896,6 @@ entities: pos: 9.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 244 type: catwalk components: @@ -2819,9 +1903,6 @@ entities: pos: 9.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 245 type: catwalk components: @@ -2829,9 +1910,6 @@ entities: pos: 9.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 246 type: catwalk components: @@ -2839,9 +1917,6 @@ entities: pos: 9.5,-9.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 247 type: catwalk components: @@ -2849,9 +1924,6 @@ entities: pos: 9.5,-10.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 248 type: catwalk components: @@ -2859,9 +1931,6 @@ entities: pos: 9.5,-11.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 249 type: catwalk components: @@ -2869,9 +1938,6 @@ entities: pos: 8.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 250 type: APC components: @@ -2879,19 +1945,12 @@ entities: pos: 4.5,-9.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 251 type: poweredsmalllight components: - parent: 0 pos: 5,-9.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -2909,10 +1968,6 @@ entities: pos: 7.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 253 type: YellowToolboxItemFilled components: @@ -2920,12 +1975,6 @@ entities: pos: -0.8099712,-5.21454 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -2938,12 +1987,6 @@ entities: pos: -0.5597038,-5.679647 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -2956,12 +1999,6 @@ entities: pos: -1.934832,-5.154238 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: flashlight_cell_container: entities: [] @@ -2974,12 +2011,6 @@ entities: pos: -2.017696,-5.71715 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: flashlight_cell_container: entities: [] @@ -2992,12 +2023,6 @@ entities: pos: -2.861032,-5.524786 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 258 type: UniformEngineering components: @@ -3005,12 +2030,6 @@ entities: pos: -0.6474335,-10.27245 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 259 type: GasMaskClothing components: @@ -3018,12 +2037,6 @@ entities: pos: -0.2880585,-10.69432 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 260 type: OuterclothingVest components: @@ -3031,12 +2044,6 @@ entities: pos: -0.9130585,-10.66307 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 261 type: UtilityBeltClothingFilled components: @@ -3044,12 +2051,6 @@ entities: pos: -1.895102,-10.33495 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -3062,12 +2063,6 @@ entities: pos: -1.770102,-10.63182 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -3080,12 +2075,6 @@ entities: pos: -6.605512,7.638151 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: magazine_bullet_container: entities: [] @@ -3098,12 +2087,6 @@ entities: pos: -6.339887,7.669401 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: magazine_bullet_container: entities: [] @@ -3116,12 +2099,6 @@ entities: pos: -6.027387,7.622526 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: magazine_bullet_container: entities: [] @@ -3134,12 +2111,6 @@ entities: pos: -5.089887,7.591276 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -3152,12 +2123,6 @@ entities: pos: -4.683637,7.606901 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -3170,12 +2135,6 @@ entities: pos: -3.386762,7.466276 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 269 type: SmgC20r components: @@ -3183,12 +2142,6 @@ entities: pos: -2.524035,7.579326 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: ballistics_chamber_0: entities: [] @@ -3207,12 +2160,6 @@ entities: pos: -1.94591,7.485576 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: ballistics_chamber_0: entities: [] @@ -3231,10 +2178,6 @@ entities: pos: -10.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 272 type: solid_wall components: @@ -3242,10 +2185,6 @@ entities: pos: -11.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 273 type: solid_wall components: @@ -3253,10 +2192,6 @@ entities: pos: -10.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 274 type: solid_wall components: @@ -3264,10 +2199,6 @@ entities: pos: -9.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 275 type: solid_wall components: @@ -3275,10 +2206,6 @@ entities: pos: -8.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 276 type: solid_wall components: @@ -3286,10 +2213,6 @@ entities: pos: -7.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 277 type: solid_wall components: @@ -3297,10 +2220,6 @@ entities: pos: -8.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 278 type: solid_wall components: @@ -3308,10 +2227,6 @@ entities: pos: -5.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 279 type: solid_wall components: @@ -3319,10 +2234,6 @@ entities: pos: -6.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 280 type: solid_wall components: @@ -3330,10 +2241,6 @@ entities: pos: -7.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 281 type: solid_wall components: @@ -3341,10 +2248,6 @@ entities: pos: -0.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 282 type: solid_wall components: @@ -3352,10 +2255,6 @@ entities: pos: 0.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 283 type: solid_wall components: @@ -3363,10 +2262,6 @@ entities: pos: 1.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 284 type: solid_wall components: @@ -3374,10 +2269,6 @@ entities: pos: 1.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 285 type: solid_wall components: @@ -3385,10 +2276,6 @@ entities: pos: 1.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 286 type: solid_wall components: @@ -3396,10 +2283,6 @@ entities: pos: 4.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 287 type: solid_wall components: @@ -3407,10 +2290,6 @@ entities: pos: 4.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 288 type: solid_wall components: @@ -3418,10 +2297,6 @@ entities: pos: 4.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 289 type: solid_wall components: @@ -3429,10 +2304,6 @@ entities: pos: 4.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 290 type: solid_wall components: @@ -3440,10 +2311,6 @@ entities: pos: 4.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 291 type: solid_wall components: @@ -3451,10 +2318,6 @@ entities: pos: 4.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 292 type: solid_wall components: @@ -3462,10 +2325,6 @@ entities: pos: 4.5,2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 293 type: solid_wall components: @@ -3473,10 +2332,6 @@ entities: pos: 4.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 294 type: solid_wall components: @@ -3484,10 +2339,6 @@ entities: pos: 4.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 295 type: solid_wall components: @@ -3495,10 +2346,6 @@ entities: pos: 4.5,5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 296 type: solid_wall components: @@ -3506,10 +2353,6 @@ entities: pos: 4.5,6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 297 type: solid_wall components: @@ -3517,10 +2360,6 @@ entities: pos: 4.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 298 type: solid_wall components: @@ -3528,10 +2367,6 @@ entities: pos: 4.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 299 type: solid_wall components: @@ -3539,10 +2374,6 @@ entities: pos: 1.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 300 type: solid_wall components: @@ -3550,10 +2381,6 @@ entities: pos: 0.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 301 type: solid_wall components: @@ -3561,10 +2388,6 @@ entities: pos: -0.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 302 type: solid_wall components: @@ -3572,10 +2395,6 @@ entities: pos: -1.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 303 type: solid_wall components: @@ -3583,10 +2402,6 @@ entities: pos: -2.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 304 type: solid_wall components: @@ -3594,10 +2409,6 @@ entities: pos: -3.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 305 type: solid_wall components: @@ -3605,10 +2416,6 @@ entities: pos: -4.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 306 type: solid_wall components: @@ -3616,10 +2423,6 @@ entities: pos: -5.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 307 type: solid_wall components: @@ -3627,10 +2430,6 @@ entities: pos: -6.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 308 type: solid_wall components: @@ -3638,10 +2437,6 @@ entities: pos: -7.5,8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 309 type: solid_wall components: @@ -3649,10 +2444,6 @@ entities: pos: -7.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 310 type: solid_wall components: @@ -3660,10 +2451,6 @@ entities: pos: -7.5,6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 311 type: solid_wall components: @@ -3671,10 +2458,6 @@ entities: pos: -7.5,5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 312 type: GlovesLeather components: @@ -3682,12 +2465,6 @@ entities: pos: -4.332221,4.64238 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 313 type: GlovesLeather components: @@ -3695,12 +2472,6 @@ entities: pos: -3.519721,4.64238 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 314 type: GlovesLeather components: @@ -3708,12 +2479,6 @@ entities: pos: -2.597846,4.61113 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 315 type: LedLightTube components: @@ -3723,23 +2488,11 @@ entities: type: Transform - color: '#EEEEFFFF' type: Sprite - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 316 type: LightTube components: - parent: 215 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 317 type: poweredlight components: @@ -3747,9 +2500,6 @@ entities: pos: -1.5,8 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -3765,12 +2515,6 @@ entities: components: - parent: 317 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 319 type: poweredlight components: @@ -3778,9 +2522,6 @@ entities: pos: 4,3.5 rot: 3.14159265358979 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -3796,21 +2537,12 @@ entities: components: - parent: 319 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 321 type: wall_light components: - parent: 0 pos: -7,-10.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 322 type: poweredsmalllight components: @@ -3818,9 +2550,6 @@ entities: pos: -10,-5.5 rot: 3.14159265358979 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -3836,12 +2565,6 @@ entities: components: - parent: 322 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 324 type: solid_wall components: @@ -3849,10 +2572,6 @@ entities: pos: -15.5,2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 325 type: solid_wall components: @@ -3860,10 +2579,6 @@ entities: pos: -15.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 326 type: solid_wall components: @@ -3871,10 +2586,6 @@ entities: pos: -15.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 327 type: solid_wall components: @@ -3882,10 +2593,6 @@ entities: pos: -14.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 328 type: solid_wall components: @@ -3893,10 +2600,6 @@ entities: pos: -12.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 329 type: solid_wall components: @@ -3904,10 +2607,6 @@ entities: pos: -15.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 330 type: solid_wall components: @@ -3915,10 +2614,6 @@ entities: pos: -14.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 331 type: solid_wall components: @@ -3926,10 +2621,6 @@ entities: pos: -11.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 332 type: solid_wall components: @@ -3937,10 +2628,6 @@ entities: pos: -14.5,5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 333 type: solid_wall components: @@ -3948,10 +2635,6 @@ entities: pos: -14.5,6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 334 type: solid_wall components: @@ -3959,10 +2642,6 @@ entities: pos: -12.5,6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 335 type: solid_wall components: @@ -3970,10 +2649,6 @@ entities: pos: -12.5,5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 336 type: solid_wall components: @@ -3981,10 +2656,6 @@ entities: pos: -16.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 337 type: solid_wall components: @@ -3992,10 +2663,6 @@ entities: pos: -16.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 338 type: solid_wall components: @@ -4003,10 +2670,6 @@ entities: pos: -16.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 339 type: solid_wall components: @@ -4014,10 +2677,6 @@ entities: pos: -16.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 340 type: solid_wall components: @@ -4025,10 +2684,6 @@ entities: pos: -16.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 341 type: solid_wall components: @@ -4036,10 +2691,6 @@ entities: pos: -16.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 342 type: solid_wall components: @@ -4047,10 +2698,6 @@ entities: pos: -16.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 343 type: solid_wall components: @@ -4058,10 +2705,6 @@ entities: pos: -16.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 344 type: solid_wall components: @@ -4069,10 +2712,6 @@ entities: pos: -16.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 345 type: solid_wall components: @@ -4080,10 +2719,6 @@ entities: pos: -16.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 346 type: solid_wall components: @@ -4091,10 +2726,6 @@ entities: pos: -16.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 347 type: solid_wall components: @@ -4102,10 +2733,6 @@ entities: pos: -15.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 348 type: solid_wall components: @@ -4113,10 +2740,6 @@ entities: pos: -14.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 349 type: solid_wall components: @@ -4124,10 +2747,6 @@ entities: pos: -13.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 350 type: solid_wall components: @@ -4135,10 +2754,6 @@ entities: pos: -12.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 351 type: solid_wall components: @@ -4146,10 +2761,6 @@ entities: pos: -11.5,-8.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 352 type: airlock_external components: @@ -4157,12 +2768,6 @@ entities: pos: -13.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 353 type: airlock_external components: @@ -4170,12 +2775,6 @@ entities: pos: -13.5,6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 354 type: airlock_engineering components: @@ -4183,12 +2782,6 @@ entities: pos: -13.5,1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 355 type: table components: @@ -4196,10 +2789,6 @@ entities: pos: -15.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 356 type: table components: @@ -4207,10 +2796,6 @@ entities: pos: -15.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 357 type: Wire components: @@ -4218,9 +2803,6 @@ entities: pos: -9.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 358 type: Wire components: @@ -4228,9 +2810,6 @@ entities: pos: -13.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 359 type: Wire components: @@ -4238,9 +2817,6 @@ entities: pos: -9.5,3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 360 type: table components: @@ -4248,10 +2824,6 @@ entities: pos: -15.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 361 type: catwalk components: @@ -4259,9 +2831,6 @@ entities: pos: -14.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 362 type: catwalk components: @@ -4269,9 +2838,6 @@ entities: pos: -13.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 363 type: catwalk components: @@ -4279,9 +2845,6 @@ entities: pos: -12.5,7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 364 type: locker_tool_filled components: @@ -4289,12 +2852,6 @@ entities: pos: -11.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -4307,12 +2864,6 @@ entities: pos: -11.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -4325,12 +2876,6 @@ entities: pos: -11.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -4343,12 +2888,6 @@ entities: pos: -11.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -4361,12 +2900,6 @@ entities: pos: -11.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -4379,12 +2912,6 @@ entities: pos: -15.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 370 type: airlock_engineering components: @@ -4392,12 +2919,6 @@ entities: pos: -10.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 371 type: autolathe components: @@ -4405,10 +2926,6 @@ entities: pos: -14.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - type: Collidable - recipes: - Brutepack - Ointment @@ -4431,10 +2948,6 @@ entities: pos: -13.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - type: Collidable - recipes: - Brutepack - Ointment @@ -4457,10 +2970,6 @@ entities: pos: -12.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - type: Collidable - recipes: - Brutepack - Ointment @@ -4483,9 +2992,6 @@ entities: pos: -11,-5.5 rot: 3.14159265358979 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -4501,12 +3007,6 @@ entities: components: - parent: 374 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 376 type: poweredlight components: @@ -4514,9 +3014,6 @@ entities: pos: -11,-0.5 rot: 3.14159265358979 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -4532,21 +3029,12 @@ entities: components: - parent: 376 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 378 type: poweredlight components: - parent: 0 pos: -16,-0.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -4562,21 +3050,12 @@ entities: components: - parent: 378 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 380 type: poweredlight components: - parent: 0 pos: -16,-5.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -4592,21 +3071,12 @@ entities: components: - parent: 380 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 382 type: poweredlight components: - parent: 0 pos: -15,3.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -4622,12 +3092,6 @@ entities: components: - parent: 382 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 384 type: poweredsmalllight components: @@ -4635,9 +3099,6 @@ entities: pos: -14.5,7 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -4653,12 +3114,6 @@ entities: components: - parent: 384 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 386 type: CableStack components: @@ -4666,12 +3121,6 @@ entities: pos: -15.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 387 type: CableStack components: @@ -4679,12 +3128,6 @@ entities: pos: -15.5,-0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 388 type: Wire components: @@ -4692,9 +3135,6 @@ entities: pos: -14.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 389 type: Wire components: @@ -4702,9 +3142,6 @@ entities: pos: -12.5,-7.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 390 type: catwalk components: @@ -4712,9 +3149,6 @@ entities: pos: -11.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 391 type: catwalk components: @@ -4722,9 +3156,6 @@ entities: pos: -9.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 392 type: poweredlight components: @@ -4732,9 +3163,6 @@ entities: pos: -10.5,4 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -4750,12 +3178,6 @@ entities: components: - parent: 392 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 394 type: MetalStack components: @@ -4763,12 +3185,6 @@ entities: pos: -15.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 395 type: MetalStack components: @@ -4776,12 +3192,6 @@ entities: pos: -15.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 396 type: APC components: @@ -4789,10 +3199,6 @@ entities: pos: -9.5,4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 397 type: APC components: @@ -4800,10 +3206,6 @@ entities: pos: -16.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 398 type: Wire components: @@ -4811,9 +3213,6 @@ entities: pos: -16.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 399 type: Wire components: @@ -4821,9 +3220,6 @@ entities: pos: -15.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 400 type: Wire components: @@ -4831,9 +3227,6 @@ entities: pos: -14.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 401 type: Wire components: @@ -4841,9 +3234,6 @@ entities: pos: -13.5,-2.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 402 type: Wire components: @@ -4851,9 +3241,6 @@ entities: pos: -13.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 403 type: Wire components: @@ -4861,9 +3248,6 @@ entities: pos: -13.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 404 type: Wire components: @@ -4871,9 +3255,6 @@ entities: pos: -13.5,-5.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 405 type: Wire components: @@ -4881,9 +3262,6 @@ entities: pos: -13.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 406 type: Wire components: @@ -4891,9 +3269,6 @@ entities: pos: -12.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 407 type: Wire components: @@ -4901,9 +3276,6 @@ entities: pos: -11.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 408 type: Wire components: @@ -4911,9 +3283,6 @@ entities: pos: -10.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 409 type: Wire components: @@ -4921,9 +3290,6 @@ entities: pos: -9.5,-6.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 410 type: table components: @@ -4931,10 +3297,6 @@ entities: pos: -15.5,-4.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 411 type: table components: @@ -4942,10 +3304,6 @@ entities: pos: -15.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 412 type: table components: @@ -4953,10 +3311,6 @@ entities: pos: -15.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 413 type: CableStack components: @@ -4964,12 +3318,6 @@ entities: pos: -15.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 414 type: CableStack components: @@ -4977,12 +3325,6 @@ entities: pos: -15.5,0.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 415 type: GlassStack components: @@ -4990,12 +3332,6 @@ entities: pos: -15.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 416 type: GlassStack components: @@ -5003,12 +3339,6 @@ entities: pos: -15.5,-1.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 417 type: GlassStack components: @@ -5016,12 +3346,6 @@ entities: pos: -15.5,-3.5 rot: -1.5707963267949 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 418 type: vending_machine_engivend components: @@ -5031,11 +3355,6 @@ entities: type: Transform - sprite: Buildings/VendingMachines/engivend.rsi type: Sprite - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 419 type: table components: @@ -5043,10 +3362,6 @@ entities: pos: 18.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 420 type: table components: @@ -5054,10 +3369,6 @@ entities: pos: 21.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 421 type: table components: @@ -5065,10 +3376,6 @@ entities: pos: 20.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 422 type: table components: @@ -5076,10 +3383,6 @@ entities: pos: 18.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 423 type: table components: @@ -5087,10 +3390,6 @@ entities: pos: 19.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 424 type: table components: @@ -5098,10 +3397,6 @@ entities: pos: 18.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 425 type: table components: @@ -5109,10 +3404,6 @@ entities: pos: 22.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 426 type: table components: @@ -5120,10 +3411,6 @@ entities: pos: 24.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 427 type: chairOfficeLight components: @@ -5131,9 +3418,6 @@ entities: pos: 19.5,4.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 428 type: chairOfficeLight components: @@ -5141,9 +3425,6 @@ entities: pos: 20.5,5.5 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 429 type: chairOfficeLight components: @@ -5151,9 +3432,6 @@ entities: pos: 23.5,8.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 430 type: chairOfficeLight components: @@ -5161,47 +3439,30 @@ entities: pos: 24.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 431 type: chair components: - parent: 0 pos: 14.5,6.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 432 type: chair components: - parent: 0 pos: 14.5,8.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 433 type: chair components: - parent: 0 pos: 14.5,7.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 434 type: chem_dispenser components: - parent: 0 pos: 23.5,9.5 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.4,-0.25,0.4,0.25 - type: Collidable - containers: ReagentDispenser-reagentContainerContainer: entities: [] @@ -5214,10 +3475,6 @@ entities: pos: 23.5,7.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 436 type: catwalk components: @@ -5225,9 +3482,6 @@ entities: pos: 0.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 437 type: table components: @@ -5235,10 +3489,6 @@ entities: pos: 25.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 438 type: table components: @@ -5246,10 +3496,6 @@ entities: pos: 23.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 439 type: table components: @@ -5257,10 +3503,6 @@ entities: pos: 24.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 440 type: table components: @@ -5268,10 +3510,6 @@ entities: pos: 26.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 441 type: table components: @@ -5279,10 +3517,6 @@ entities: pos: 27.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 442 type: computerMedicalRecords components: @@ -5290,11 +3524,6 @@ entities: pos: 21.5,5.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 443 type: medical_scanner components: @@ -5302,11 +3531,6 @@ entities: pos: 18.5,-1.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: MedicalScanner-bodyContainer: entities: [] @@ -5319,11 +3543,6 @@ entities: pos: 18.5,-5.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: MedicalScanner-bodyContainer: entities: [] @@ -5336,10 +3555,6 @@ entities: pos: 13.5,2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 446 type: table components: @@ -5347,10 +3562,6 @@ entities: pos: 13.5,0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 447 type: table components: @@ -5358,10 +3569,6 @@ entities: pos: 13.5,1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 448 type: solid_wall components: @@ -5369,10 +3576,6 @@ entities: pos: 22.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 449 type: solid_wall components: @@ -5380,10 +3583,6 @@ entities: pos: 17.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 450 type: solid_wall components: @@ -5391,10 +3590,6 @@ entities: pos: 18.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 451 type: solid_wall components: @@ -5402,10 +3597,6 @@ entities: pos: 20.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 452 type: solid_wall components: @@ -5413,10 +3604,6 @@ entities: pos: 21.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 453 type: solid_wall components: @@ -5424,10 +3611,6 @@ entities: pos: 19.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 454 type: solid_wall components: @@ -5435,10 +3618,6 @@ entities: pos: 14.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 455 type: solid_wall components: @@ -5446,10 +3625,6 @@ entities: pos: 13.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 456 type: solid_wall components: @@ -5457,10 +3632,6 @@ entities: pos: 12.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 457 type: solid_wall components: @@ -5468,10 +3639,6 @@ entities: pos: 12.5,2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 458 type: solid_wall components: @@ -5479,10 +3646,6 @@ entities: pos: 12.5,1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 459 type: solid_wall components: @@ -5490,10 +3653,6 @@ entities: pos: 12.5,0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 460 type: solid_wall components: @@ -5501,10 +3660,6 @@ entities: pos: 12.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 461 type: solid_wall components: @@ -5512,10 +3667,6 @@ entities: pos: 13.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 462 type: solid_wall components: @@ -5523,10 +3674,6 @@ entities: pos: 14.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 463 type: solid_wall components: @@ -5534,10 +3681,6 @@ entities: pos: 13.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 464 type: solid_wall components: @@ -5545,10 +3688,6 @@ entities: pos: 13.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 465 type: solid_wall components: @@ -5556,10 +3695,6 @@ entities: pos: 13.5,-5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 466 type: solid_wall components: @@ -5567,10 +3702,6 @@ entities: pos: 13.5,-4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 467 type: solid_wall components: @@ -5578,10 +3709,6 @@ entities: pos: 13.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 468 type: solid_wall components: @@ -5589,10 +3716,6 @@ entities: pos: 13.5,-2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 469 type: solid_wall components: @@ -5600,10 +3723,6 @@ entities: pos: 14.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 470 type: solid_wall components: @@ -5611,10 +3730,6 @@ entities: pos: 15.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 471 type: solid_wall components: @@ -5622,10 +3737,6 @@ entities: pos: 16.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 472 type: solid_wall components: @@ -5633,10 +3744,6 @@ entities: pos: 17.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 473 type: solid_wall components: @@ -5644,10 +3751,6 @@ entities: pos: 18.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 474 type: solid_wall components: @@ -5655,10 +3758,6 @@ entities: pos: 19.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 475 type: solid_wall components: @@ -5666,10 +3765,6 @@ entities: pos: 20.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 476 type: solid_wall components: @@ -5677,10 +3772,6 @@ entities: pos: 21.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 477 type: solid_wall components: @@ -5688,10 +3779,6 @@ entities: pos: 22.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 478 type: solid_wall components: @@ -5699,10 +3786,6 @@ entities: pos: 23.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 479 type: solid_wall components: @@ -5710,10 +3793,6 @@ entities: pos: 24.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 480 type: solid_wall components: @@ -5721,10 +3800,6 @@ entities: pos: 25.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 481 type: solid_wall components: @@ -5732,10 +3807,6 @@ entities: pos: 26.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 482 type: solid_wall components: @@ -5743,10 +3814,6 @@ entities: pos: 26.5,-5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 483 type: solid_wall components: @@ -5754,10 +3821,6 @@ entities: pos: 26.5,-4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 484 type: solid_wall components: @@ -5765,10 +3828,6 @@ entities: pos: 27.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 485 type: solid_wall components: @@ -5776,10 +3835,6 @@ entities: pos: 28.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 486 type: solid_wall components: @@ -5787,10 +3842,6 @@ entities: pos: 29.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 487 type: solid_wall components: @@ -5798,10 +3849,6 @@ entities: pos: 30.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 488 type: solid_wall components: @@ -5809,10 +3856,6 @@ entities: pos: 31.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 489 type: solid_wall components: @@ -5820,10 +3863,6 @@ entities: pos: 32.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 490 type: solid_wall components: @@ -5831,10 +3870,6 @@ entities: pos: 33.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 491 type: solid_wall components: @@ -5842,10 +3877,6 @@ entities: pos: 34.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 492 type: solid_wall components: @@ -5853,10 +3884,6 @@ entities: pos: 34.5,-5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 493 type: solid_wall components: @@ -5864,10 +3891,6 @@ entities: pos: 34.5,-4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 494 type: solid_wall components: @@ -5875,10 +3898,6 @@ entities: pos: 34.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 495 type: solid_wall components: @@ -5886,10 +3905,6 @@ entities: pos: 34.5,-2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 496 type: solid_wall components: @@ -5897,10 +3912,6 @@ entities: pos: 34.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 497 type: solid_wall components: @@ -5908,10 +3919,6 @@ entities: pos: 34.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 498 type: solid_wall components: @@ -5919,10 +3926,6 @@ entities: pos: 33.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 499 type: solid_wall components: @@ -5930,10 +3933,6 @@ entities: pos: 32.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 500 type: solid_wall components: @@ -5941,10 +3940,6 @@ entities: pos: 31.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 501 type: solid_wall components: @@ -5952,10 +3947,6 @@ entities: pos: 30.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 502 type: solid_wall components: @@ -5963,10 +3954,6 @@ entities: pos: 29.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 503 type: solid_wall components: @@ -5974,10 +3961,6 @@ entities: pos: 30.5,0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 504 type: solid_wall components: @@ -5985,10 +3968,6 @@ entities: pos: 30.5,1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 505 type: solid_wall components: @@ -5996,10 +3975,6 @@ entities: pos: 30.5,2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 506 type: solid_wall components: @@ -6007,10 +3982,6 @@ entities: pos: 30.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 507 type: solid_wall components: @@ -6018,10 +3989,6 @@ entities: pos: 30.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 508 type: solid_wall components: @@ -6029,10 +3996,6 @@ entities: pos: 29.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 509 type: solid_wall components: @@ -6040,10 +4003,6 @@ entities: pos: 28.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 510 type: solid_wall components: @@ -6051,10 +4010,6 @@ entities: pos: 27.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 511 type: solid_wall components: @@ -6062,10 +4017,6 @@ entities: pos: 27.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 512 type: solid_wall components: @@ -6073,10 +4024,6 @@ entities: pos: 26.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 513 type: solid_wall components: @@ -6084,10 +4031,6 @@ entities: pos: 25.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 514 type: solid_wall components: @@ -6095,10 +4038,6 @@ entities: pos: 26.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 515 type: solid_wall components: @@ -6106,10 +4045,6 @@ entities: pos: 26.5,-2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 516 type: solid_wall components: @@ -6117,10 +4052,6 @@ entities: pos: 28.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 517 type: solid_wall components: @@ -6128,10 +4059,6 @@ entities: pos: 28.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 518 type: solid_wall components: @@ -6139,10 +4066,6 @@ entities: pos: 28.5,7.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 519 type: solid_wall components: @@ -6150,10 +4073,6 @@ entities: pos: 28.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 520 type: solid_wall components: @@ -6161,10 +4080,6 @@ entities: pos: 28.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 521 type: solid_wall components: @@ -6172,10 +4087,6 @@ entities: pos: 28.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 522 type: solid_wall components: @@ -6183,10 +4094,6 @@ entities: pos: 28.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 523 type: solid_wall components: @@ -6194,10 +4101,6 @@ entities: pos: 27.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 524 type: solid_wall components: @@ -6205,10 +4108,6 @@ entities: pos: 26.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 525 type: solid_wall components: @@ -6216,10 +4115,6 @@ entities: pos: 25.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 526 type: solid_wall components: @@ -6227,10 +4122,6 @@ entities: pos: 24.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 527 type: solid_wall components: @@ -6238,10 +4129,6 @@ entities: pos: 23.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 528 type: solid_wall components: @@ -6249,10 +4136,6 @@ entities: pos: 22.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 529 type: solid_wall components: @@ -6260,10 +4143,6 @@ entities: pos: 21.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 530 type: solid_wall components: @@ -6271,10 +4150,6 @@ entities: pos: 22.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 531 type: solid_wall components: @@ -6282,10 +4157,6 @@ entities: pos: 22.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 532 type: solid_wall components: @@ -6293,10 +4164,6 @@ entities: pos: 22.5,7.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 533 type: solid_wall components: @@ -6304,10 +4171,6 @@ entities: pos: 22.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 534 type: solid_wall components: @@ -6315,10 +4178,6 @@ entities: pos: 22.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 535 type: solid_wall components: @@ -6326,10 +4185,6 @@ entities: pos: 22.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 536 type: solid_wall components: @@ -6337,10 +4192,6 @@ entities: pos: 22.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 537 type: solid_wall components: @@ -6348,10 +4199,6 @@ entities: pos: 21.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 538 type: solid_wall components: @@ -6359,10 +4206,6 @@ entities: pos: 19.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 539 type: solid_wall components: @@ -6370,10 +4213,6 @@ entities: pos: 18.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 540 type: solid_wall components: @@ -6381,10 +4220,6 @@ entities: pos: 17.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 541 type: solid_wall components: @@ -6392,10 +4227,6 @@ entities: pos: 23.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 542 type: solid_wall components: @@ -6403,10 +4234,6 @@ entities: pos: 25.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 543 type: solid_wall components: @@ -6414,10 +4241,6 @@ entities: pos: 13.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 544 type: solid_wall components: @@ -6425,10 +4248,6 @@ entities: pos: 13.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 545 type: solid_wall components: @@ -6436,10 +4255,6 @@ entities: pos: 13.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 546 type: solid_wall components: @@ -6447,10 +4262,6 @@ entities: pos: 13.5,7.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 547 type: solid_wall components: @@ -6458,10 +4269,6 @@ entities: pos: 13.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 548 type: solid_wall components: @@ -6469,10 +4276,6 @@ entities: pos: 13.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 549 type: solid_wall components: @@ -6480,10 +4283,6 @@ entities: pos: 14.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 550 type: solid_wall components: @@ -6491,10 +4290,6 @@ entities: pos: 13.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 551 type: solid_wall components: @@ -6502,10 +4297,6 @@ entities: pos: 12.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 552 type: solid_wall components: @@ -6513,10 +4304,6 @@ entities: pos: 11.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 553 type: solid_wall components: @@ -6524,10 +4311,6 @@ entities: pos: 10.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 554 type: solid_wall components: @@ -6535,10 +4318,6 @@ entities: pos: 9.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 555 type: solid_wall components: @@ -6546,10 +4325,6 @@ entities: pos: 8.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 556 type: solid_wall components: @@ -6557,10 +4332,6 @@ entities: pos: 7.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 557 type: solid_wall components: @@ -6568,10 +4339,6 @@ entities: pos: 6.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 558 type: solid_wall components: @@ -6579,10 +4346,6 @@ entities: pos: 5.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 559 type: solid_wall components: @@ -6590,10 +4353,6 @@ entities: pos: 4.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 560 type: solid_wall components: @@ -6601,10 +4360,6 @@ entities: pos: 5.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 561 type: solid_wall components: @@ -6612,10 +4367,6 @@ entities: pos: 6.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 562 type: solid_wall components: @@ -6623,10 +4374,6 @@ entities: pos: 7.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 563 type: solid_wall components: @@ -6634,10 +4381,6 @@ entities: pos: 8.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 564 type: solid_wall components: @@ -6645,10 +4388,6 @@ entities: pos: 9.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 565 type: solid_wall components: @@ -6656,10 +4395,6 @@ entities: pos: 10.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 566 type: solid_wall components: @@ -6667,10 +4402,6 @@ entities: pos: 11.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 567 type: solid_wall components: @@ -6678,10 +4409,6 @@ entities: pos: 12.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 568 type: solid_wall components: @@ -6689,10 +4416,6 @@ entities: pos: 4.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 569 type: solid_wall components: @@ -6700,10 +4423,6 @@ entities: pos: 1.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 570 type: solid_wall components: @@ -6711,10 +4430,6 @@ entities: pos: 1.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 571 type: solid_wall components: @@ -6722,10 +4437,6 @@ entities: pos: 0.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 572 type: solid_wall components: @@ -6733,10 +4444,6 @@ entities: pos: -0.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 573 type: solid_wall components: @@ -6744,10 +4451,6 @@ entities: pos: -1.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 574 type: solid_wall components: @@ -6755,10 +4458,6 @@ entities: pos: -2.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 575 type: solid_wall components: @@ -6766,10 +4465,6 @@ entities: pos: -3.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 576 type: solid_wall components: @@ -6777,10 +4472,6 @@ entities: pos: -4.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 577 type: solid_wall components: @@ -6788,10 +4479,6 @@ entities: pos: -5.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 578 type: solid_wall components: @@ -6799,10 +4486,6 @@ entities: pos: -6.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 579 type: solid_wall components: @@ -6810,10 +4493,6 @@ entities: pos: -7.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 580 type: solid_wall components: @@ -6821,10 +4500,6 @@ entities: pos: 1.5,12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 581 type: solid_wall components: @@ -6832,10 +4507,6 @@ entities: pos: 1.5,13.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 582 type: solid_wall components: @@ -6843,10 +4514,6 @@ entities: pos: 1.5,14.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 583 type: catwalk components: @@ -6854,9 +4521,6 @@ entities: pos: 5.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 584 type: catwalk components: @@ -6864,9 +4528,6 @@ entities: pos: 12.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 585 type: table components: @@ -6874,10 +4535,6 @@ entities: pos: 23.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 586 type: table components: @@ -6885,10 +4542,6 @@ entities: pos: 23.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 587 type: airlock_medical_glass components: @@ -6896,12 +4549,6 @@ entities: pos: 15.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 588 type: airlock_medical_glass components: @@ -6909,12 +4556,6 @@ entities: pos: 16.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 589 type: airlock_medical_glass components: @@ -6922,12 +4563,6 @@ entities: pos: 20.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 590 type: airlock_medical_glass components: @@ -6935,12 +4570,6 @@ entities: pos: 26.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 591 type: Beaker components: @@ -6948,12 +4577,6 @@ entities: pos: 26.416822,10.651619 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 592 type: Beaker components: @@ -6961,12 +4584,6 @@ entities: pos: 24.541822,10.635994 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 593 type: Beaker components: @@ -6974,12 +4591,6 @@ entities: pos: 25.291822,10.667244 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 594 type: Wire components: @@ -6987,9 +4598,6 @@ entities: pos: 1.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 595 type: Wire components: @@ -6997,9 +4605,6 @@ entities: pos: 2.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 596 type: Wire components: @@ -7007,9 +4612,6 @@ entities: pos: 2.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 597 type: Wire components: @@ -7017,9 +4619,6 @@ entities: pos: 2.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 598 type: Wire components: @@ -7027,9 +4626,6 @@ entities: pos: 2.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 599 type: Wire components: @@ -7037,9 +4633,6 @@ entities: pos: 2.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 600 type: Wire components: @@ -7047,9 +4640,6 @@ entities: pos: 2.5,7.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 601 type: Wire components: @@ -7057,9 +4647,6 @@ entities: pos: 2.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 602 type: Wire components: @@ -7067,9 +4654,6 @@ entities: pos: 2.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 603 type: Wire components: @@ -7077,9 +4661,6 @@ entities: pos: 3.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 604 type: Wire components: @@ -7087,9 +4668,6 @@ entities: pos: 4.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 605 type: Wire components: @@ -7097,9 +4675,6 @@ entities: pos: 5.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 606 type: Wire components: @@ -7107,9 +4682,6 @@ entities: pos: 5.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 607 type: Wire components: @@ -7117,9 +4689,6 @@ entities: pos: 6.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 608 type: Wire components: @@ -7127,9 +4696,6 @@ entities: pos: 7.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 609 type: Wire components: @@ -7137,9 +4703,6 @@ entities: pos: 8.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 610 type: Wire components: @@ -7147,9 +4710,6 @@ entities: pos: 9.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 611 type: Wire components: @@ -7157,9 +4717,6 @@ entities: pos: 10.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 612 type: Wire components: @@ -7167,9 +4724,6 @@ entities: pos: 11.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 613 type: Wire components: @@ -7177,9 +4731,6 @@ entities: pos: 12.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 614 type: Wire components: @@ -7187,9 +4738,6 @@ entities: pos: 12.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 615 type: Wire components: @@ -7197,9 +4745,6 @@ entities: pos: 13.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 616 type: Wire components: @@ -7207,9 +4752,6 @@ entities: pos: 14.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 617 type: Wire components: @@ -7217,9 +4759,6 @@ entities: pos: 15.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 618 type: Wire components: @@ -7227,9 +4766,6 @@ entities: pos: 16.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 619 type: Wire components: @@ -7237,9 +4773,6 @@ entities: pos: 16.5,9.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 620 type: Wire components: @@ -7247,9 +4780,6 @@ entities: pos: 16.5,8.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 621 type: Wire components: @@ -7257,9 +4787,6 @@ entities: pos: 16.5,7.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 622 type: Wire components: @@ -7267,9 +4794,6 @@ entities: pos: 16.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 623 type: Wire components: @@ -7277,9 +4801,6 @@ entities: pos: 16.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 624 type: Wire components: @@ -7287,9 +4808,6 @@ entities: pos: 16.5,4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 625 type: Wire components: @@ -7297,9 +4815,6 @@ entities: pos: 16.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 626 type: Wire components: @@ -7307,9 +4822,6 @@ entities: pos: 16.5,2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 627 type: Wire components: @@ -7317,9 +4829,6 @@ entities: pos: 17.5,2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 628 type: Wire components: @@ -7327,9 +4836,6 @@ entities: pos: 18.5,2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 629 type: Wire components: @@ -7337,9 +4843,6 @@ entities: pos: 18.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 630 type: APC components: @@ -7347,10 +4850,6 @@ entities: pos: 18.5,3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 631 type: Wire components: @@ -7358,9 +4857,6 @@ entities: pos: 1.5,2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 632 type: Wire components: @@ -7368,9 +4864,6 @@ entities: pos: 1.5,1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 633 type: APC components: @@ -7378,10 +4871,6 @@ entities: pos: 1.5,1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 634 type: airlock components: @@ -7389,12 +4878,6 @@ entities: pos: 1.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 635 type: airlock components: @@ -7402,12 +4885,6 @@ entities: pos: 4.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 636 type: airlock components: @@ -7415,50 +4892,30 @@ entities: pos: 13.5,10.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 637 type: APC components: - parent: 0 pos: 13.5,6.5 type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 638 type: Wire components: - parent: 0 pos: 13.5,6.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 639 type: APC components: - parent: 0 pos: 28.5,8.5 type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 640 type: Wire components: - parent: 0 pos: 25.5,4.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 641 type: poweredlight components: @@ -7466,9 +4923,6 @@ entities: pos: 17.5,4 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -7484,12 +4938,6 @@ entities: components: - parent: 641 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 643 type: poweredlight components: @@ -7497,9 +4945,6 @@ entities: pos: 22.5,3 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -7515,12 +4960,6 @@ entities: components: - parent: 643 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 645 type: poweredlight components: @@ -7528,9 +4967,6 @@ entities: pos: 13.5,3 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -7546,12 +4982,6 @@ entities: components: - parent: 645 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 647 type: Wire components: @@ -7559,9 +4989,6 @@ entities: pos: 27.5,8.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 648 type: Wire components: @@ -7569,54 +4996,36 @@ entities: pos: 26.5,8.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 649 type: Wire components: - parent: 0 pos: 15.5,8.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 650 type: Wire components: - parent: 0 pos: 14.5,8.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 651 type: Wire components: - parent: 0 pos: 13.5,8.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 652 type: Wire components: - parent: 0 pos: 15.5,6.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 653 type: Wire components: - parent: 0 pos: 14.5,6.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 654 type: APC components: @@ -7624,91 +5033,60 @@ entities: pos: 30.5,2.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 655 type: Wire components: - parent: 0 pos: 19.5,2.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 656 type: Wire components: - parent: 0 pos: 20.5,2.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 657 type: Wire components: - parent: 0 pos: 21.5,2.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 658 type: Wire components: - parent: 0 pos: 22.5,2.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 659 type: Wire components: - parent: 0 pos: 23.5,2.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 660 type: Wire components: - parent: 0 pos: 24.5,2.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 661 type: Wire components: - parent: 0 pos: 25.5,2.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 662 type: Wire components: - parent: 0 pos: 25.5,3.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 663 type: poweredlight components: - parent: 0 pos: 14,9.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -7724,12 +5102,6 @@ entities: components: - parent: 663 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 665 type: poweredlight components: @@ -7737,9 +5109,6 @@ entities: pos: 22,9.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -7755,12 +5124,6 @@ entities: components: - parent: 665 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 667 type: Wire components: @@ -7768,9 +5131,6 @@ entities: pos: 30.5,2.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 668 type: Wire components: @@ -7778,9 +5138,6 @@ entities: pos: 29.5,2.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 669 type: poweredlight components: @@ -7788,9 +5145,6 @@ entities: pos: 16.5,-6 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -7806,12 +5160,6 @@ entities: components: - parent: 669 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 671 type: table components: @@ -7819,10 +5167,6 @@ entities: pos: 23.5,-5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 672 type: table components: @@ -7830,10 +5174,6 @@ entities: pos: 24.5,-5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 673 type: APC components: @@ -7841,10 +5181,6 @@ entities: pos: 20.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 674 type: Wire components: @@ -7852,9 +5188,6 @@ entities: pos: 16.5,1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 675 type: Wire components: @@ -7862,9 +5195,6 @@ entities: pos: 16.5,0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 676 type: Wire components: @@ -7872,9 +5202,6 @@ entities: pos: 16.5,-0.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 677 type: Wire components: @@ -7882,9 +5209,6 @@ entities: pos: 16.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 678 type: Wire components: @@ -7892,9 +5216,6 @@ entities: pos: 16.5,-2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 679 type: Wire components: @@ -7902,9 +5223,6 @@ entities: pos: 16.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 680 type: Wire components: @@ -7912,9 +5230,6 @@ entities: pos: 17.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 681 type: Wire components: @@ -7922,9 +5237,6 @@ entities: pos: 18.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 682 type: Wire components: @@ -7932,9 +5244,6 @@ entities: pos: 19.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 683 type: Wire components: @@ -7942,9 +5251,6 @@ entities: pos: 20.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 684 type: Wire components: @@ -7952,9 +5258,6 @@ entities: pos: 20.5,-4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 685 type: Wire components: @@ -7962,9 +5265,6 @@ entities: pos: 20.5,-5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 686 type: Wire components: @@ -7972,9 +5272,6 @@ entities: pos: 20.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 687 type: Wire components: @@ -7982,9 +5279,6 @@ entities: pos: 21.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 688 type: Wire components: @@ -7992,9 +5286,6 @@ entities: pos: 22.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 689 type: Wire components: @@ -8002,9 +5293,6 @@ entities: pos: 23.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 690 type: Wire components: @@ -8012,9 +5300,6 @@ entities: pos: 24.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 691 type: Wire components: @@ -8022,9 +5307,6 @@ entities: pos: 25.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 692 type: Wire components: @@ -8032,9 +5314,6 @@ entities: pos: 26.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 693 type: Wire components: @@ -8042,9 +5321,6 @@ entities: pos: 27.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 694 type: Wire components: @@ -8052,9 +5328,6 @@ entities: pos: 28.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 695 type: Wire components: @@ -8062,9 +5335,6 @@ entities: pos: 29.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 696 type: Wire components: @@ -8072,9 +5342,6 @@ entities: pos: 30.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 697 type: Wire components: @@ -8082,9 +5349,6 @@ entities: pos: 30.5,-4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 698 type: Wire components: @@ -8092,9 +5356,6 @@ entities: pos: 30.5,-5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 699 type: Wire components: @@ -8102,9 +5363,6 @@ entities: pos: 30.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 700 type: APC components: @@ -8112,10 +5370,6 @@ entities: pos: 30.5,-6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 701 type: poweredlight components: @@ -8123,9 +5377,6 @@ entities: pos: 31.5,-6 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -8141,12 +5392,6 @@ entities: components: - parent: 701 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 703 type: poweredlight components: @@ -8154,9 +5399,6 @@ entities: pos: 30,1.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -8172,12 +5414,6 @@ entities: components: - parent: 703 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 705 type: Wire components: @@ -8185,9 +5421,6 @@ entities: pos: 26.5,2.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 706 type: Wire components: @@ -8195,9 +5428,6 @@ entities: pos: 27.5,2.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 707 type: Wire components: @@ -8205,9 +5435,6 @@ entities: pos: 28.5,2.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 708 type: Wire components: @@ -8215,9 +5442,6 @@ entities: pos: 28.5,8.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 709 type: Wire components: @@ -8225,9 +5449,6 @@ entities: pos: 25.5,5.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 710 type: Wire components: @@ -8235,9 +5456,6 @@ entities: pos: 25.5,6.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 711 type: Wire components: @@ -8245,9 +5463,6 @@ entities: pos: 25.5,7.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 712 type: Wire components: @@ -8255,9 +5470,6 @@ entities: pos: 25.5,8.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 713 type: poweredlight components: @@ -8265,9 +5477,6 @@ entities: pos: 28,7.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -8283,12 +5492,6 @@ entities: components: - parent: 713 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 715 type: vending_machine_medical components: @@ -8298,11 +5501,6 @@ entities: type: Transform - sprite: Buildings/VendingMachines/medical.rsi type: Sprite - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 716 type: vending_machine_medical components: @@ -8312,11 +5510,6 @@ entities: type: Transform - sprite: Buildings/VendingMachines/medical.rsi type: Sprite - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 717 type: vending_machine_medical components: @@ -8326,11 +5519,6 @@ entities: type: Transform - sprite: Buildings/VendingMachines/medical.rsi type: Sprite - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 718 type: vending_machine_wallmed components: @@ -8340,11 +5528,6 @@ entities: type: Transform - sprite: Buildings/VendingMachines/wallmed.rsi type: Sprite - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 719 type: MedkitFilled components: @@ -8352,12 +5535,6 @@ entities: pos: 13.460339,0.6141751 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -8370,12 +5547,6 @@ entities: pos: 13.632214,1.5673001 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - containers: storagebase: entities: [] @@ -8388,11 +5559,6 @@ entities: pos: 22.5,-5.5 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - uid: 722 type: poweredlight components: @@ -8400,9 +5566,6 @@ entities: pos: 23.5,-6 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -8418,12 +5581,6 @@ entities: components: - parent: 722 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 724 type: Brutepack components: @@ -8431,12 +5588,6 @@ entities: pos: 18.476385,4.841032 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 725 type: Brutepack components: @@ -8444,12 +5595,6 @@ entities: pos: 18.601385,5.512907 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 726 type: Ointment components: @@ -8457,12 +5602,6 @@ entities: pos: 18.49201,6.059782 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 727 type: Ointment components: @@ -8470,12 +5609,6 @@ entities: pos: 18.77326,6.653532 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 728 type: spawn_point_latejoin components: @@ -8497,10 +5630,6 @@ entities: pos: 33.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 731 type: table components: @@ -8508,10 +5637,6 @@ entities: pos: 33.5,-2.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 732 type: table components: @@ -8519,10 +5644,6 @@ entities: pos: 33.5,-3.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 733 type: table components: @@ -8530,10 +5651,6 @@ entities: pos: 33.5,-4.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 734 type: table components: @@ -8541,10 +5658,6 @@ entities: pos: 33.5,-5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 735 type: LargeBeaker components: @@ -8552,12 +5665,6 @@ entities: pos: 33.18525,-5.681699 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 736 type: LargeBeaker components: @@ -8565,12 +5672,6 @@ entities: pos: 33.294624,-5.181699 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 737 type: LargeBeaker components: @@ -8578,12 +5679,6 @@ entities: pos: 33.544624,-5.572324 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 738 type: Beaker components: @@ -8591,12 +5686,6 @@ entities: pos: 33.357124,-4.837949 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 739 type: Beaker components: @@ -8604,12 +5693,6 @@ entities: pos: 33.357124,-4.166074 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 740 type: Beaker components: @@ -8617,12 +5700,6 @@ entities: pos: 33.388374,-4.431699 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 741 type: Beaker components: @@ -8630,12 +5707,6 @@ entities: pos: 33.62275,-4.228574 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 742 type: Beaker components: @@ -8643,12 +5714,6 @@ entities: pos: 33.62275,-4.634824 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 743 type: crate_medical components: @@ -8656,12 +5721,6 @@ entities: pos: 32.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.4,-0.4,0.4,0.4 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -8674,12 +5733,6 @@ entities: pos: 31.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.4,-0.4,0.4,0.4 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -8692,12 +5745,6 @@ entities: pos: 30.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -8710,12 +5757,6 @@ entities: pos: 29.5,-1.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -8728,12 +5769,6 @@ entities: pos: 27.5,5.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -8746,12 +5781,6 @@ entities: pos: 27.5,6.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -8764,10 +5793,6 @@ entities: pos: 4.5,24.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 750 type: solid_wall components: @@ -8775,10 +5800,6 @@ entities: pos: 4.5,23.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 751 type: solid_wall components: @@ -8786,10 +5807,6 @@ entities: pos: 4.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 752 type: solid_wall components: @@ -8797,10 +5814,6 @@ entities: pos: 4.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 753 type: solid_wall components: @@ -8808,10 +5821,6 @@ entities: pos: 4.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 754 type: solid_wall components: @@ -8819,10 +5828,6 @@ entities: pos: 4.5,19.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 755 type: solid_wall components: @@ -8830,10 +5835,6 @@ entities: pos: 4.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 756 type: solid_wall components: @@ -8841,10 +5842,6 @@ entities: pos: 4.5,17.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 757 type: solid_wall components: @@ -8852,10 +5849,6 @@ entities: pos: 4.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 758 type: solid_wall components: @@ -8863,10 +5856,6 @@ entities: pos: 4.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 759 type: solid_wall components: @@ -8874,10 +5863,6 @@ entities: pos: 7.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 760 type: solid_wall components: @@ -8885,10 +5870,6 @@ entities: pos: 7.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 761 type: solid_wall components: @@ -8896,10 +5877,6 @@ entities: pos: 7.5,17.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 762 type: solid_wall components: @@ -8907,10 +5884,6 @@ entities: pos: 7.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 763 type: solid_wall components: @@ -8918,10 +5891,6 @@ entities: pos: 7.5,19.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 764 type: solid_wall components: @@ -8929,10 +5898,6 @@ entities: pos: 8.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 765 type: solid_wall components: @@ -8940,10 +5905,6 @@ entities: pos: 10.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 766 type: solid_wall components: @@ -8951,10 +5912,6 @@ entities: pos: 11.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 767 type: solid_wall components: @@ -8962,10 +5919,6 @@ entities: pos: 12.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 768 type: solid_wall components: @@ -8973,10 +5926,6 @@ entities: pos: 13.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 769 type: solid_wall components: @@ -8984,10 +5933,6 @@ entities: pos: 14.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 770 type: solid_wall components: @@ -8995,10 +5940,6 @@ entities: pos: 15.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 771 type: solid_wall components: @@ -9006,10 +5947,6 @@ entities: pos: 14.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 772 type: solid_wall components: @@ -9017,10 +5954,6 @@ entities: pos: 14.5,17.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 773 type: solid_wall components: @@ -9028,10 +5961,6 @@ entities: pos: 14.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 774 type: solid_wall components: @@ -9039,10 +5968,6 @@ entities: pos: 14.5,19.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 775 type: solid_wall components: @@ -9050,10 +5975,6 @@ entities: pos: 15.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 776 type: solid_wall components: @@ -9061,10 +5982,6 @@ entities: pos: 17.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 777 type: solid_wall components: @@ -9072,10 +5989,6 @@ entities: pos: 17.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 778 type: solid_wall components: @@ -9083,10 +5996,6 @@ entities: pos: 18.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 779 type: solid_wall components: @@ -9094,10 +6003,6 @@ entities: pos: 18.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 780 type: solid_wall components: @@ -9105,10 +6010,6 @@ entities: pos: 18.5,17.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 781 type: solid_wall components: @@ -9116,10 +6017,6 @@ entities: pos: 18.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 782 type: solid_wall components: @@ -9127,10 +6024,6 @@ entities: pos: 18.5,19.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 783 type: solid_wall components: @@ -9138,10 +6031,6 @@ entities: pos: 18.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 784 type: solid_wall components: @@ -9149,10 +6038,6 @@ entities: pos: 18.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 785 type: solid_wall components: @@ -9160,10 +6045,6 @@ entities: pos: 18.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 786 type: solid_wall components: @@ -9171,10 +6052,6 @@ entities: pos: 19.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 787 type: solid_wall components: @@ -9182,10 +6059,6 @@ entities: pos: 20.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 788 type: solid_wall components: @@ -9193,10 +6066,6 @@ entities: pos: 21.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 789 type: solid_wall components: @@ -9204,10 +6073,6 @@ entities: pos: 22.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 790 type: solid_wall components: @@ -9215,10 +6080,6 @@ entities: pos: 23.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 791 type: solid_wall components: @@ -9226,10 +6087,6 @@ entities: pos: 24.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 792 type: solid_wall components: @@ -9237,10 +6094,6 @@ entities: pos: 25.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 793 type: solid_wall components: @@ -9248,10 +6101,6 @@ entities: pos: 26.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 794 type: solid_wall components: @@ -9259,10 +6108,6 @@ entities: pos: 27.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 795 type: solid_wall components: @@ -9270,10 +6115,6 @@ entities: pos: 28.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 796 type: solid_wall components: @@ -9281,10 +6122,6 @@ entities: pos: 6.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 797 type: solid_wall components: @@ -9292,10 +6129,6 @@ entities: pos: 7.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 798 type: solid_wall components: @@ -9303,10 +6136,6 @@ entities: pos: 14.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 799 type: solid_wall components: @@ -9314,10 +6143,6 @@ entities: pos: 14.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 800 type: solid_wall components: @@ -9325,10 +6150,6 @@ entities: pos: 8.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 801 type: solid_wall components: @@ -9336,10 +6157,6 @@ entities: pos: 9.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 802 type: solid_wall components: @@ -9347,10 +6164,6 @@ entities: pos: 10.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 803 type: solid_wall components: @@ -9358,10 +6171,6 @@ entities: pos: 11.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 804 type: solid_wall components: @@ -9369,10 +6178,6 @@ entities: pos: 12.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 805 type: solid_wall components: @@ -9380,10 +6185,6 @@ entities: pos: 13.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 806 type: solid_wall components: @@ -9391,10 +6192,6 @@ entities: pos: 14.5,23.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 807 type: solid_wall components: @@ -9402,10 +6199,6 @@ entities: pos: 14.5,25.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 808 type: solid_wall components: @@ -9413,10 +6206,6 @@ entities: pos: 14.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 809 type: solid_wall components: @@ -9424,10 +6213,6 @@ entities: pos: 14.5,27.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 810 type: solid_wall components: @@ -9435,10 +6220,6 @@ entities: pos: 14.5,28.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 811 type: solid_wall components: @@ -9446,10 +6227,6 @@ entities: pos: 18.5,23.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 812 type: solid_wall components: @@ -9457,10 +6234,6 @@ entities: pos: 18.5,24.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 813 type: solid_wall components: @@ -9468,10 +6241,6 @@ entities: pos: 18.5,25.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 814 type: solid_wall components: @@ -9479,10 +6248,6 @@ entities: pos: 18.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 815 type: solid_wall components: @@ -9490,10 +6255,6 @@ entities: pos: 18.5,27.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 816 type: solid_wall components: @@ -9501,10 +6262,6 @@ entities: pos: 18.5,28.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 817 type: solid_wall components: @@ -9512,10 +6269,6 @@ entities: pos: 13.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 818 type: solid_wall components: @@ -9523,10 +6276,6 @@ entities: pos: 12.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 819 type: solid_wall components: @@ -9534,10 +6283,6 @@ entities: pos: 11.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 820 type: solid_wall components: @@ -9545,10 +6290,6 @@ entities: pos: 10.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 821 type: solid_wall components: @@ -9556,10 +6297,6 @@ entities: pos: 9.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 822 type: solid_wall components: @@ -9567,10 +6304,6 @@ entities: pos: 8.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 823 type: solid_wall components: @@ -9578,10 +6311,6 @@ entities: pos: 4.5,28.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 824 type: solid_wall components: @@ -9589,10 +6318,6 @@ entities: pos: 10.5,25.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 825 type: solid_wall components: @@ -9600,10 +6325,6 @@ entities: pos: 10.5,23.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 826 type: solid_wall components: @@ -9611,10 +6332,6 @@ entities: pos: 10.5,24.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 827 type: solid_wall components: @@ -9622,10 +6339,6 @@ entities: pos: 4.5,25.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 828 type: solid_wall components: @@ -9633,10 +6346,6 @@ entities: pos: 4.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 829 type: solid_wall components: @@ -9644,10 +6353,6 @@ entities: pos: 4.5,27.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 830 type: solid_wall components: @@ -9655,10 +6360,6 @@ entities: pos: 7.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 831 type: solid_wall components: @@ -9666,10 +6367,6 @@ entities: pos: 7.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 832 type: solid_wall components: @@ -9677,10 +6374,6 @@ entities: pos: 7.5,27.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 833 type: solid_wall components: @@ -9688,10 +6381,6 @@ entities: pos: 7.5,28.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 834 type: catwalk components: @@ -9699,9 +6388,6 @@ entities: pos: 5.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 835 type: catwalk components: @@ -9709,9 +6395,6 @@ entities: pos: 6.5,24.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 836 type: catwalk components: @@ -9719,9 +6402,6 @@ entities: pos: 6.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 837 type: solid_wall components: @@ -9729,10 +6409,6 @@ entities: pos: 1.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 838 type: solid_wall components: @@ -9740,10 +6416,6 @@ entities: pos: 1.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 839 type: solid_wall components: @@ -9751,10 +6423,6 @@ entities: pos: 1.5,17.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 840 type: solid_wall components: @@ -9762,10 +6430,6 @@ entities: pos: 1.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 841 type: solid_wall components: @@ -9773,10 +6437,6 @@ entities: pos: 1.5,19.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 842 type: solid_wall components: @@ -9784,10 +6444,6 @@ entities: pos: 1.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 843 type: solid_wall components: @@ -9795,10 +6451,6 @@ entities: pos: 1.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 844 type: solid_wall components: @@ -9806,10 +6458,6 @@ entities: pos: 1.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 845 type: solid_wall components: @@ -9817,10 +6465,6 @@ entities: pos: 1.5,23.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - type: Collidable - uid: 846 type: Wire components: @@ -9828,9 +6472,6 @@ entities: pos: 2.5,11.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 847 type: Wire components: @@ -9838,9 +6479,6 @@ entities: pos: 2.5,12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 848 type: Wire components: @@ -9848,9 +6486,6 @@ entities: pos: 2.5,13.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 849 type: Wire components: @@ -9858,9 +6493,6 @@ entities: pos: 3.5,13.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 850 type: Wire components: @@ -9868,9 +6500,6 @@ entities: pos: 4.5,13.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 851 type: Wire components: @@ -9878,9 +6507,6 @@ entities: pos: 6.5,27.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 852 type: Wire components: @@ -9888,9 +6514,6 @@ entities: pos: 6.5,28.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 853 type: Wire components: @@ -9898,9 +6521,6 @@ entities: pos: 5.5,14.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 854 type: Wire components: @@ -9908,9 +6528,6 @@ entities: pos: 5.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 855 type: Wire components: @@ -9918,9 +6535,6 @@ entities: pos: 5.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 856 type: Wire components: @@ -9928,9 +6542,6 @@ entities: pos: 6.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 857 type: Wire components: @@ -9938,9 +6549,6 @@ entities: pos: 6.5,17.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 858 type: Wire components: @@ -9948,9 +6556,6 @@ entities: pos: 6.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 859 type: Wire components: @@ -9958,9 +6563,6 @@ entities: pos: 6.5,19.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 860 type: Wire components: @@ -9968,9 +6570,6 @@ entities: pos: 6.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 861 type: Wire components: @@ -9978,9 +6577,6 @@ entities: pos: 6.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 862 type: Wire components: @@ -9988,9 +6584,6 @@ entities: pos: 6.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 863 type: Wire components: @@ -9998,9 +6591,6 @@ entities: pos: 6.5,23.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 864 type: Wire components: @@ -10008,9 +6598,6 @@ entities: pos: 6.5,24.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 865 type: Wire components: @@ -10018,9 +6605,6 @@ entities: pos: 6.5,25.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 866 type: Wire components: @@ -10028,9 +6612,6 @@ entities: pos: 6.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 867 type: Wire components: @@ -10038,9 +6619,6 @@ entities: pos: 5.5,13.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 868 type: airlock_science_glass components: @@ -10048,12 +6626,6 @@ entities: pos: 14.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 869 type: airlock_science components: @@ -10061,12 +6633,6 @@ entities: pos: 14.5,24.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 870 type: airlock_science components: @@ -10074,12 +6640,6 @@ entities: pos: 16.5,18.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 871 type: airlock_science components: @@ -10087,12 +6647,6 @@ entities: pos: 16.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 872 type: airlock components: @@ -10100,12 +6654,6 @@ entities: pos: 5.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 873 type: airlock components: @@ -10113,12 +6661,6 @@ entities: pos: 7.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 4 - bounds: -0.49,-0.49,0.49,0.49 - type: Collidable - uid: 874 type: table components: @@ -10126,10 +6668,6 @@ entities: pos: 9.5,15.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 875 type: poweredlight components: @@ -10137,9 +6675,6 @@ entities: pos: 6.5,12 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10155,12 +6690,6 @@ entities: components: - parent: 875 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 877 type: poweredlight components: @@ -10168,9 +6697,6 @@ entities: pos: 12.5,12 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10186,23 +6712,11 @@ entities: components: - parent: 877 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 879 type: LightTube components: - parent: 880 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 880 type: poweredlight components: @@ -10210,9 +6724,6 @@ entities: pos: 14,18.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10230,9 +6741,6 @@ entities: pos: 3.5,-12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 882 type: Wire components: @@ -10240,9 +6748,6 @@ entities: pos: 2.5,-12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 883 type: poweredlight components: @@ -10250,9 +6755,6 @@ entities: pos: 18,22.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10268,12 +6770,6 @@ entities: components: - parent: 883 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 885 type: poweredlight components: @@ -10281,9 +6777,6 @@ entities: pos: 18,27.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10299,21 +6792,12 @@ entities: components: - parent: 885 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 887 type: poweredsmalllight components: - parent: 0 pos: 18,17.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10329,21 +6813,12 @@ entities: components: - parent: 887 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 889 type: poweredlight components: - parent: 0 pos: 2,17.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10359,32 +6834,17 @@ entities: components: - parent: 889 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 891 type: LightTube components: - parent: 892 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 892 type: poweredlight components: - parent: 0 pos: 2,23.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10402,9 +6862,6 @@ entities: pos: 11,24.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10420,12 +6877,6 @@ entities: components: - parent: 893 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 895 type: catwalk components: @@ -10433,9 +6884,6 @@ entities: pos: 13.5,24.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 896 type: poweredsmalllight components: @@ -10443,9 +6891,6 @@ entities: pos: 7.5,26 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10461,12 +6906,6 @@ entities: components: - parent: 896 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 898 type: researchAndDevelopmentServer components: @@ -10474,9 +6913,6 @@ entities: pos: 11.5,24.5 rot: 1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - points: 343000 type: ResearchServer - technologies: [] @@ -10487,11 +6923,6 @@ entities: - parent: 0 pos: 8.5,18.5 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - technologies: [] type: TechnologyDatabase - uid: 900 @@ -10500,20 +6931,12 @@ entities: - parent: 0 pos: 13.5,16.5 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - type: Collidable - uid: 901 type: protolathe components: - parent: 0 pos: 8.5,17.5 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - type: Collidable - recipes: [] protolatherecipes: - Brutepack @@ -10538,10 +6961,6 @@ entities: - parent: 0 pos: 13.5,18.5 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - type: Collidable - recipes: - Brutepack - Ointment @@ -10563,10 +6982,6 @@ entities: - parent: 0 pos: -4.5,-5.5 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 15 - type: Collidable - recipes: - Brutepack - Ointment @@ -10589,10 +7004,6 @@ entities: pos: 8.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 905 type: table components: @@ -10600,10 +7011,6 @@ entities: pos: 9.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 906 type: table components: @@ -10611,10 +7018,6 @@ entities: pos: 10.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 907 type: table components: @@ -10622,10 +7025,6 @@ entities: pos: 11.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 908 type: table components: @@ -10633,10 +7032,6 @@ entities: pos: 13.5,17.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 20 - type: Collidable - uid: 909 type: Wire components: @@ -10644,9 +7039,6 @@ entities: pos: 2.5,14.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 910 type: Wire components: @@ -10654,9 +7046,6 @@ entities: pos: 1.5,14.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 911 type: APC components: @@ -10664,10 +7053,6 @@ entities: pos: 1.5,14.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 912 type: APC components: @@ -10675,10 +7060,6 @@ entities: pos: 14.5,19.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 913 type: APC components: @@ -10686,10 +7067,6 @@ entities: pos: 18.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 914 type: Wire components: @@ -10697,9 +7074,6 @@ entities: pos: 7.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 915 type: Wire components: @@ -10707,9 +7081,6 @@ entities: pos: 8.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 916 type: Wire components: @@ -10717,9 +7088,6 @@ entities: pos: 9.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 917 type: Wire components: @@ -10727,9 +7095,6 @@ entities: pos: 10.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 918 type: Wire components: @@ -10737,9 +7102,6 @@ entities: pos: 11.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 919 type: Wire components: @@ -10747,9 +7109,6 @@ entities: pos: 12.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 920 type: Wire components: @@ -10757,9 +7116,6 @@ entities: pos: 13.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 921 type: Wire components: @@ -10767,9 +7123,6 @@ entities: pos: 14.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 922 type: Wire components: @@ -10777,9 +7130,6 @@ entities: pos: 14.5,19.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 923 type: Wire components: @@ -10787,9 +7137,6 @@ entities: pos: 15.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 924 type: Wire components: @@ -10797,9 +7144,6 @@ entities: pos: 16.5,20.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 925 type: Wire components: @@ -10807,9 +7151,6 @@ entities: pos: 16.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 926 type: Wire components: @@ -10817,9 +7158,6 @@ entities: pos: 16.5,22.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 927 type: Wire components: @@ -10827,9 +7165,6 @@ entities: pos: 16.5,23.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 928 type: Wire components: @@ -10837,9 +7172,6 @@ entities: pos: 16.5,24.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 929 type: Wire components: @@ -10847,9 +7179,6 @@ entities: pos: 16.5,25.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 930 type: Wire components: @@ -10857,9 +7186,6 @@ entities: pos: 16.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 931 type: Wire components: @@ -10867,9 +7193,6 @@ entities: pos: 16.5,27.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 932 type: Wire components: @@ -10877,9 +7200,6 @@ entities: pos: 17.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 933 type: Wire components: @@ -10887,9 +7207,6 @@ entities: pos: 18.5,26.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 934 type: Generator components: @@ -10897,11 +7214,6 @@ entities: pos: 3.5,-12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.5,0.3,0.5 - type: Collidable - uid: 935 type: Generator components: @@ -10909,11 +7221,6 @@ entities: pos: 2.5,-12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.5,0.3,0.5 - type: Collidable - uid: 936 type: Generator components: @@ -10921,11 +7228,6 @@ entities: pos: 1.5,-12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.5,0.3,0.5 - type: Collidable - uid: 937 type: Generator components: @@ -10933,11 +7235,6 @@ entities: pos: 0.5,-12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - bounds: -0.5,-0.5,0.3,0.5 - type: Collidable - uid: 938 type: Wire components: @@ -10945,18 +7242,12 @@ entities: pos: 0.5,-12.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 939 type: poweredlight components: - parent: 0 pos: 8,16.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - color: '#FFFFFFFF' type: PointLight - load: 40 @@ -10972,103 +7263,54 @@ entities: components: - parent: 939 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 941 type: APC components: - parent: 0 pos: 7.5,18.5 type: Transform - - shapes: - - !type:PhysShapeAabb - bounds: -0.25,-0.25,0.25,0.3 - type: Collidable - uid: 942 type: Wire components: - parent: 0 pos: 7.5,18.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 943 type: GlassStack components: - parent: 0 pos: 8.560405,21.456738 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 944 type: GlassStack components: - parent: 0 pos: 8.57603,21.566113 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 945 type: MetalStack components: - parent: 0 pos: 9.435405,21.503613 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 946 type: MetalStack components: - parent: 0 pos: 9.654155,21.628613 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 947 type: CableStack components: - parent: 0 pos: 10.561831,21.767809 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 948 type: CableStack components: - parent: 0 pos: 10.577456,21.424059 type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 32 - mask: 26 - bounds: -0.25,-0.25,0.25,0.25 - type: Collidable - uid: 949 type: chairOfficeLight components: @@ -11076,9 +7318,6 @@ entities: pos: 9.5,18.5 rot: 3.141592653589793 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 950 type: chairOfficeLight components: @@ -11086,18 +7325,12 @@ entities: pos: 9.5,16.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 951 type: chair components: - parent: 0 pos: 12.5,17.5 type: Transform - - shapes: - - !type:PhysShapeAabb {} - type: Collidable - uid: 952 type: locker_science components: @@ -11105,12 +7338,6 @@ entities: pos: 12.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] @@ -11123,12 +7350,6 @@ entities: pos: 13.5,21.5 rot: -1.5707963267948966 rad type: Transform - - shapes: - - !type:PhysShapeAabb - layer: 31 - mask: 30 - bounds: -0.5,-0.25,0.5,0.25 - type: Collidable - containers: EntityStorageComponent: entities: [] From 6e4b72f6cbfdb3a96054e503bc6984fb7f6776ff Mon Sep 17 00:00:00 2001 From: py01 <60152240+collinlunn@users.noreply.github.com> Date: Tue, 3 Mar 2020 07:40:57 -0600 Subject: [PATCH 12/16] Medical scanner eject collision fix (#767) * MedicalScanner ejection location * MedicalScanner bounding box change --- .../Components/Medical/MedicalScannerComponent.cs | 10 +++++++--- .../Prototypes/Entities/buildings/medical_scanner.yml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs index 6330d3b550..f27144bb0b 100644 --- a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs @@ -9,6 +9,7 @@ using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Maths; using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Medical @@ -20,6 +21,7 @@ namespace Content.Server.GameObjects.Components.Medical private AppearanceComponent _appearance; private BoundUserInterface _userInterface; private ContainerSlot _bodyContainer; + private readonly Vector2 _ejectOffset = new Vector2(-0.5f, 0f); public bool IsOccupied => _bodyContainer.ContainedEntity != null; public override void Initialize() @@ -61,7 +63,7 @@ namespace Content.Server.GameObjects.Components.Medical var dmgDict = new Dictionary(); - foreach (var dmgType in (DamageType[])Enum.GetValues(typeof(DamageType))) + foreach (var dmgType in (DamageType[]) Enum.GetValues(typeof(DamageType))) { if (damageable.CurrentDamage.TryGetValue(dmgType, out var amount)) { @@ -70,7 +72,7 @@ namespace Content.Server.GameObjects.Components.Medical } return new MedicalScannerBoundUserInterfaceState( - deathThresholdValue-currentHealth, + deathThresholdValue - currentHealth, deathThresholdValue, dmgDict); } @@ -160,7 +162,9 @@ namespace Content.Server.GameObjects.Components.Medical public void EjectBody() { - _bodyContainer.Remove(_bodyContainer.ContainedEntity); + var containedEntity = _bodyContainer.ContainedEntity; + _bodyContainer.Remove(containedEntity); + containedEntity.Transform.WorldPosition += _ejectOffset; UpdateUserInterface(); UpdateAppearance(); } diff --git a/Resources/Prototypes/Entities/buildings/medical_scanner.yml b/Resources/Prototypes/Entities/buildings/medical_scanner.yml index f71d7a4bc2..c583a1a12a 100644 --- a/Resources/Prototypes/Entities/buildings/medical_scanner.yml +++ b/Resources/Prototypes/Entities/buildings/medical_scanner.yml @@ -21,7 +21,7 @@ - type: Collidable shapes: - !type:PhysShapeAabb - bounds: "-0.5,-0.25,0.5,0.25" + bounds: "-0.5,0,0.5,1" layer: 15 IsScrapingFloor: true - type: Physics From 5e2cac78ac8c4169abd5bd2aa79bc7a0bd4734e1 Mon Sep 17 00:00:00 2001 From: py01 <60152240+collinlunn@users.noreply.github.com> Date: Tue, 3 Mar 2020 08:09:07 -0600 Subject: [PATCH 13/16] Fixes melee/hitscan raycast through airlocks (#777) --- .../GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs | 2 +- .../Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index 54249e39ba..bd199311ca 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -134,7 +134,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee for (var i = 0; i < increments; i++) { var castAngle = new Angle(baseAngle + increment * i); - var res = _physicsManager.IntersectRay(mapId, new CollisionRay(position, castAngle.ToVec(), 23), _range, ignore); + var res = _physicsManager.IntersectRay(mapId, new CollisionRay(position, castAngle.ToVec(), 23), _range, ignore, ignoreNonHardCollidables: true); if (res.HitEntity != null) { resSet.Add(res.HitEntity); diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs index 3ae6d069cd..3fd4dd5d1e 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs @@ -90,7 +90,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan var angle = new Angle(clickLocation.Position - userPosition); var ray = new CollisionRay(userPosition, angle.ToVec(), (int)(CollisionGroup.Impassable | CollisionGroup.MobImpassable)); - var rayCastResults = IoCManager.Resolve().IntersectRay(user.Transform.MapID, ray, MaxLength, user); + var rayCastResults = IoCManager.Resolve().IntersectRay(user.Transform.MapID, ray, MaxLength, user, ignoreNonHardCollidables: true); Hit(rayCastResults, energyModifier, user); AfterEffects(user, rayCastResults, angle, energyModifier); From d1ff84e95dc689d7028385d2576139b1d34fcde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Tue, 3 Mar 2020 15:10:09 +0100 Subject: [PATCH 14/16] Add CanAttack to IActionBlocker, prevent using guns when dead (#769) --- .../GameObjects/Components/Mobs/DamageStates.cs | 15 +++++++++++++++ .../Components/Mobs/SpeciesComponent.cs | 5 +++++ .../Components/Weapon/Ranged/RangedWeapon.cs | 3 ++- .../EntitySystems/ActionBlockerSystem.cs | 14 ++++++++++++++ .../EntitySystems/Click/InteractionSystem.cs | 2 +- 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs index ed17681720..515cf77e60 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs @@ -72,6 +72,11 @@ namespace Content.Server.GameObjects { return true; } + + bool IActionBlocker.CanAttack() + { + return true; + } } /// @@ -128,6 +133,11 @@ namespace Content.Server.GameObjects { return false; } + + bool IActionBlocker.CanAttack() + { + return false; + } } /// @@ -204,5 +214,10 @@ namespace Content.Server.GameObjects { return false; } + + bool IActionBlocker.CanAttack() + { + return false; + } } } diff --git a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs index 084af3a3e7..f3952cb92d 100644 --- a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs @@ -117,6 +117,11 @@ namespace Content.Server.GameObjects return CurrentDamageState.CanEmote(); } + bool IActionBlocker.CanAttack() + { + return CurrentDamageState.CanAttack(); + } + List IOnDamageBehavior.GetAllDamageThresholds() { var thresholdlist = DamageTemplate.DamageThresholds; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs index 6b0d17dfe6..0417729934 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs @@ -1,5 +1,6 @@ using System; using Content.Server.GameObjects.Components.Mobs; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; @@ -30,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged private bool UserCanFire(IEntity user) { - return UserCanFireHandler == null || UserCanFireHandler(user); + return (UserCanFireHandler == null || UserCanFireHandler(user)) && ActionBlockerSystem.CanAttack(user); } private void Fire(IEntity user, GridCoordinates clickLocation) diff --git a/Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs b/Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs index d653568e5a..ce3205bb01 100644 --- a/Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs @@ -20,6 +20,8 @@ namespace Content.Server.GameObjects.EntitySystems bool CanPickup(); bool CanEmote(); + + bool CanAttack(); } public class ActionBlockerSystem : EntitySystem @@ -105,5 +107,17 @@ namespace Content.Server.GameObjects.EntitySystems return canemote; } + + public static bool CanAttack(IEntity entity) + { + bool canattack = true; + + foreach (var actionblockercomponents in entity.GetAllComponents()) + { + canattack &= actionblockercomponents.CanAttack(); + } + + return canattack; + } } } diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 6ed819e814..e30d961669 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -853,7 +853,7 @@ namespace Content.Server.GameObjects.EntitySystems var item = hands.GetActiveHand?.Owner; // TODO: If item is null we need some kinda unarmed combat. - if (!ActionBlockerSystem.CanInteract(player) || item == null) + if (!ActionBlockerSystem.CanAttack(player) || item == null) { return; } From 0ec4cd4beab2df34355e5e35c72ea23d34b9f016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Tue, 3 Mar 2020 16:56:38 +0100 Subject: [PATCH 15/16] Fix crash when picking up black ak due case-sensitivity (#776) --- Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml index 74d6c945cd..56df89b763 100644 --- a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml @@ -81,7 +81,7 @@ steps: 1 - type: Item Size: 24 - sprite: Objects/Guns/Rifles/black-AK.rsi + sprite: Objects/Guns/Rifles/black-ak.rsi - type: entity name: Carbine From 6c6ef3911d8b1bef9739ded62789fdc0a961117a Mon Sep 17 00:00:00 2001 From: py01 <60152240+collinlunn@users.noreply.github.com> Date: Tue, 3 Mar 2020 10:03:58 -0600 Subject: [PATCH 16/16] =?UTF-8?q?InRangeUnobstructed=20check=20for=20const?= =?UTF-8?q?ruction=20start=20and=20step=20progre=E2=80=A6=20(#773)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Construction/ConstructionComponent.cs | 12 ++++++++++-- .../Components/Construction/ConstructorComponent.cs | 7 ++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs index 7e10507e50..4124a7a219 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs @@ -31,9 +31,10 @@ namespace Content.Server.GameObjects.Components.Construction SpriteComponent Sprite; ITransformComponent Transform; - #pragma warning disable 649 +#pragma warning disable 649 [Dependency] private IRobustRandom _random; - #pragma warning restore 649 + [Dependency] private readonly IEntitySystemManager _entitySystemManager; +#pragma warning restore 649 public override void Initialize() { @@ -46,6 +47,13 @@ namespace Content.Server.GameObjects.Components.Construction public bool AttackBy(AttackByEventArgs eventArgs) { + var playerEntity = eventArgs.User; + var interactionSystem = _entitySystemManager.GetEntitySystem(); + if (!interactionSystem.InRangeUnobstructed(playerEntity.Transform.MapPosition, Owner.Transform.WorldPosition, ignoredEnt: Owner, insideBlockerValid: true)) + { + return false; + } + var stage = Prototype.Stages[Stage]; if (TryProcessStep(stage.Forward, eventArgs.AttackWith)) diff --git a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs index 6dc83b2640..3ef1905fc6 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Construction; @@ -29,7 +29,6 @@ namespace Content.Server.GameObjects.Components.Construction public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null) { base.HandleMessage(message, netChannel, component); - switch (message) { case TryStartStructureConstructionMessage tryStart: @@ -43,7 +42,9 @@ namespace Content.Server.GameObjects.Components.Construction var prototype = _prototypeManager.Index(prototypeName); var transform = Owner.Transform; - if (!loc.InRange(_mapManager, transform.GridPosition, InteractionSystem.InteractionRange)) + + var interactionSystem = _entitySystemManager.GetEntitySystem(); + if (!interactionSystem.InRangeUnobstructed(loc.ToMap(_mapManager), Owner.Transform.WorldPosition, ignoredEnt: Owner, insideBlockerValid: true)) { return; }