From edef526a37b447a87d6454703e24d2da7def34d0 Mon Sep 17 00:00:00 2001 From: Lei Yunxing Date: Mon, 3 Apr 2023 14:20:15 +0800 Subject: [PATCH] Adds holobarrier projector to warden and HOS lockers (#15091) * adds holobarrier projector and adds it to warden&hos locker * a --- .../Catalog/Fills/Lockers/heads.yml | 1 + .../Catalog/Fills/Lockers/security.yml | 1 + .../Objects/Devices/holoprojectors.yml | 20 +++++++++ .../Structures/Holographic/projections.yml | 38 ++++++++++++++++++ .../Holoprojectors/security.rsi/icon.png | Bin 0 -> 745 bytes .../Holoprojectors/security.rsi/meta.json | 22 ++++++++++ .../Structures/Holo/security.rsi/icon.png | Bin 0 -> 704 bytes .../Structures/Holo/security.rsi/meta.json | 22 ++++++++++ 8 files changed, 104 insertions(+) create mode 100644 Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/icon.png create mode 100644 Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json create mode 100644 Resources/Textures/Structures/Holo/security.rsi/icon.png create mode 100644 Resources/Textures/Structures/Holo/security.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index e711f1b3a6..1c90a21593 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -209,3 +209,4 @@ - id: SecurityTechFabCircuitboard - id: JetpackSecurityFilled - id: BoxEncryptionKeySecurity + - id: HoloprojectorSecurity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 144f6119a7..65f2427cb7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -21,6 +21,7 @@ - id: RubberStampWarden - id: DoorRemoteArmory - id: ClothingOuterHardsuitWarden + - id: HoloprojectorSecurity - type: entity id: LockerSecurityFilled diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml index b1005afbc0..fa2b13638c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml @@ -44,3 +44,23 @@ - HolofanProjector - type: StaticPrice price: 80 + + +- type: entity + parent: Holoprojector + id: HoloprojectorSecurity + name: holobarrier projector + description: Creates a solid but fragile holographic barrier. + components: + - type: HolosignProjector + signProto: HolosignSecurity + chargeUse: 120 + - type: Sprite + sprite: Objects/Devices/Holoprojectors/security.rsi + state: icon + netsync: false + - type: Tag + tags: + - HolofanProjector + - type: StaticPrice + price: 80 diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml index b633484c19..2d07cac1b6 100644 --- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml +++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml @@ -36,3 +36,41 @@ lifetime: 180 - type: Airtight noAirWhenFullyAirBlocked: false + +- type: entity + id: HolosignSecurity + parent: HolosignWetFloor + name: holographic barrier + description: A barrier of hard light that blocks movenment, but pretty weak. + components: + - type: Physics + bodyType: Static + canCollide: true + - type: Sprite + sprite: Structures/Holo/security.rsi + state: icon + netsync: false + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + mask: + - TableMask + layer: + - TableLayer + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + - type: TimedDespawn + lifetime: 60 + - type: PointLight + enabled: true + radius: 3 + color: red + - type: Climbable diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/icon.png b/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..857d7799fda5c0dc60d981d5668c58404368fdea GIT binary patch literal 745 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1+ zPZ!6KiaBp*9n2PX6gjrPAy+4Y!*|7UA)A@mCJC9`w%kokjQqA(g@ge#=_ToO$=J@4maaLf`H( z6ss^8xHBPB>O~CxnX+qh}fyL#)Y^kZv3xT__LZF4c=Ip?u5B4GG#KrIW_i@9IzuVtmxc$oFD?8hVKNsawzAPi^U-_^xHJoImanQ}< z5Aa&P)Xw1*^AfuQYvb#<8!UwwW+*elsd~n`eatBvCDy9|(=LOjtDnm{r-UW|#Vk{c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json new file mode 100644 index 0000000000..c5d03f56bb --- /dev/null +++ b/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587", + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Holo/security.rsi/icon.png b/Resources/Textures/Structures/Holo/security.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6b45e90cd734d19f571175f79db37686f41a3086 GIT binary patch literal 704 zcmV;x0zdtUP);bbC^~{WL$5h@f$o!IuALzsAwcKw z462k$3MGsBS#k=P4{$9}mLB;+xsJmF>>Mlr>>Mlr>>MlrH6Q>cd79;MMCPjg05Fz1 zrufx7?Z+Lp{TP342F!Ai5A2+=3&b4?QiXYps0JCs!cvl^a4bG5j;PyL3jtN7K`tu0f68wvGa`_K> z!Y6old+`X$exeADE#$aA=B2lqKSKl}(O=1LvFf`(D8(rB*w-!ioh=}bp91m`rPu^z z7zum!I<5GtGQcBm{_MXcf3X0D9AirnTJskP5F&5k#54J`1)!8~;lwlfvjm`&58Z`( zh|rTiDL^XiD0?drdh;g*So3uj8lX2n7Qj3SF32h$V#a{&B9E8Sc@6m$CfuPi;38E& zLu2SqWlCID{SG0M-vPfCSAW!}E!8=}pYoTEd}{4eWPF7Fa5!uR3>%Q^ZFMHbw%}iI z@D_lbg9U({g9U({g9V@lh~EaeKEOB!TpvKA^&26x9@hsH&h^_NaD4zZ!1V!r!Sw-x z>jStxAm}s!t`ErJDB!o?`T*4C`hZGut`FE!1g;Ng%+K`!wdC5)^#PQf>jStxfa?Pm m5L_Sd|G@PDror_AJH;;`NYuzy`pBpN0000