Adds the syndicate Booze-O-Mat (Bruise-O-Mat) to nukie planet (#32107)

diff --git a/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl b/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl
new file mode 100644 (file)
index 0000000..a8cb903
--- /dev/null
+++ b/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl
@@ -0,0 +1,43 @@
+advertisement-bruiseomat-1 = I VOTE WAROPS!!!
+advertisement-bruiseomat-2 = Who has TC?
+advertisement-bruiseomat-3 = Did anyone buy an EMAG?
+advertisement-bruiseomat-4 = I wanna go back to my home station...
+advertisement-bruiseomat-5 = Beware of the Mime and Clown. BEWARE!
+advertisement-bruiseomat-6 = A nuke a day keeps the deathsquad at bay!
+advertisement-bruiseomat-7 = You'll never be able to match MY mixing, Agent!
+advertisement-bruiseomat-8 = Thirsting for blood? I got you covered!
+advertisement-bruiseomat-9 = If they didn't want us to blow up the station, then why would they leave the disk so unsecured?
+advertisement-bruiseomat-10 = They say an eye for an eye makes the whole world blind. So try a nuke instead!
+advertisement-bruiseomat-11 = I hunger for blood!
+advertisement-bruiseomat-12 = Drink up before the mission!
+advertisement-bruiseomat-13 = Man, I didn't know I got moved back to Cadet City!
+advertisement-bruiseomat-14 = Sicker than your average Booze-O-Mat!
+advertisement-bruiseomat-15 = Nuke ops will continue until robustness improves.
+thankyou-bruiseomat-1 = Good luck, schmuck! You're gonna need it!
+thankyou-bruiseomat-2 = Show 'em the Gorlex Style!
+thankyou-bruiseomat-3 = Don't forget to stay hydrated!
+thankyou-bruiseomat-4 = You noted down the codes, right?
+thankyou-bruiseomat-5 = Don't forget the nuke!
+thankyou-bruiseomat-6 = I hope those are noslips.
+thankyou-bruiseomat-7 = Please let this be a normal team...
+thankyou-bruiseomat-8 = Seems like the station isn't the only thing getting hammered today.
+thankyou-bruiseomat-9 = What the hell did you buy?
+thankyou-bruiseomat-10 = Give it up for the flukeops professionals!
+thankyou-bruiseomat-11 = Death to NanoTrasen!!!
+thankyou-bruiseomat-12 = Really? That's your plan?
+thankyou-bruiseomat-13 = In my endless life, never have I ever seen that loadout.
+thankyou-bruiseomat-14 = Get that captain!
+thankyou-bruiseomat-15 = Don't run off by yourself, now!
+thankyou-bruiseomat-16 = Y'all are taking too long!
+thankyou-bruiseomat-17 = They won't see that coming!
+thankyou-bruiseomat-18 = Remember your pinpointer!
+thankyou-bruiseomat-19 = See you soon! Or maybe never again, that one's more likely!
+thankyou-bruiseomat-20 = Rescue another one of me! I need a friend!
+thankyou-bruiseomat-21 = You're going to sober up before the mission, right?
+thankyou-bruiseomat-22 = 5 telecrystal says you won't make it to the shuttle before you fall over.
+thankyou-bruiseomat-23 = The soda fountain's over there, lightweight.
+thankyou-bruiseomat-24 = Did you spend your TC on cat ears?
+thankyou-bruiseomat-25 = Really? That's what you wanted to drink?
+thankyou-bruiseomat-26 = Take a shot, give a shot!
+thankyou-bruiseomat-27 = How many drinks have you had now? I've lost count.
+thankyou-bruiseomat-28 = When the bosses say "die trying" they mean dying in BATTLE, not at the bar.

diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 2063451a0ee48bf4a0e1b173c277faa5c5af5bc9..665657f7ddaa02864ce3f3698c2f38462c5afd37 100644 (file)
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -13721,7 +13721,7 @@ entities:
     - type: Transform
       pos: 3.5882664,-8.344303
       parent: 104
-- proto: VendingMachineBooze
+- proto: VendingMachineBoozeSyndicate
   entities:
   - uid: 1380
     components:

diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
index 5f6806afbb1268a7a3e24de326ce5cb9296e736f..9314de979146129f794a8a476bc6edf6d1323543 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -22,6 +22,12 @@
     prefix: advertisement-boozeomat-
     count: 19
 
+- type: localizedDataset
+  id: BruiseOMatAds
+  values:
+    prefix: advertisement-bruiseomat-
+    count: 15
+
 - type: localizedDataset
   id: CargoDrobeAds
   values:

diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
index 5a3d91db1167c45220c32d63072fa60369a3ab51..fd4e53acaa7b857d3b17f46bcaf0051c5d1c167f 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
@@ -4,6 +4,12 @@
     prefix: thankyou-boozeomat-
     count: 3
 
+- type: localizedDataset
+  id: BruiseOMatGoodbyes
+  values:
+    prefix: thankyou-bruiseomat-
+    count: 28
+
 - type: localizedDataset
   id: ChangGoodbyes
   values:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 65f40ab3e49e925f02a9ee23555dd7dd03ac4e68..a6cf9ef0e308cf60a03bd46f03b7f304613f759c 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -199,6 +199,41 @@
     - Bartender
     - Drinks
 
+- type: entity
+  parent: VendingMachineBooze
+  id: VendingMachineBoozeSyndicate # syndie booze-o-mat for nukie outpost
+  name: Bruise-O-Mat
+  description: A refurbished Booze-O-Mat for boosting operative morale. An imprint of a blood-red hardsuit is visible on one side, and the paint seems ashed off on the other side.
+  components:
+  - type: VendingMachine
+    pack: BoozeOMatInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+    loopDeny: false
+  - type: Advertise
+    pack: BruiseOMatAds
+  - type: SpeakOnUIClosed
+    pack: BruiseOMatGoodbyes
+  - type: Speech
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/bruiseomat.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineCart

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png
new file mode 100644 (file)
index 0000000..1df6323
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png
new file mode 100644 (file)
index 0000000..52f43a5
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json
new file mode 100644 (file)
index 0000000..dcf3878
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json
@@ -0,0 +1,89 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept, further modification by ArtisticRoomba",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "broken"
+    },
+    {
+      "name": "deny-unshaded",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "normal-unshaded",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2,
+                 0.2
+        ]
+      ]
+    },
+    {
+      "name": "off"
+    },
+    {
+      "name": "panel"
+    }
+  ]
+}

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png
new file mode 100644 (file)
index 0000000..ff9ad34
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png
new file mode 100644 (file)
index 0000000..c3427b7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png
new file mode 100644 (file)
index 0000000..60dbf76
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png differ