[entity] jonk bot

* jonkbot

* copyright

* fix

* fix

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 9b698ef25f49352b48165f2b7d3d55a424a6bddc..6ff998396eb5060a19c3eb3abf830c36b78da63d 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -82,6 +82,11 @@
     excess: 120
   - type: Destructible
     thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:TriggerBehavior
     - trigger:
         !type:DamageTrigger
         damage: 120
@@ -143,6 +148,42 @@
     interactSuccessSound:
       path: /Audio/Items/bikehorn.ogg
 
+- type: entity
+  parent: MobHonkBot
+  id: MobJonkBot
+  name: jonkbot
+  description: Horrifying.
+  components:
+  - type: SpamEmitSound
+    sound:
+      collection: CluwneHorn
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Silicon/Bots/honkbot.rsi
+    state: jonkbot
+  - type: Slippery
+    launchForwardsMultiplier: 7.0
+  - type: Construction
+    graph: JonkBot
+    node: bot
+  - type: GhostRole
+    makeSentient: true
+    name: jonkbot
+    description: An artificial being of pure evil.
+  - type: InteractionPopup
+    interactSuccessSound:
+      path: /Audio/Items/brokenbikehorn.ogg
+  - type: Vocal
+    sounds:
+      Unsexed: Cluwne
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 20
+    totalIntensity: 10
+    intensitySlope: 5
+    canCreateVacuum: false
+
 - type: entity
   parent: MobSiliconBase
   id: MobCleanBot

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index cd69d01bbc5803e15eeb712a7dc54d3d701bdbea..baa7c64658f07b1e2aa24fee461c5091ddc2def9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -380,10 +380,10 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/Storage/happyhonk/clown.rsi
+    sprite: Objects/Storage/Happyhonk/clown.rsi
     state: box
   - type: Item
-    sprite: Objects/Storage/happyhonk/clown.rsi
+    sprite: Objects/Storage/Happyhonk/clown.rsi
     heldPrefix: box
   - type: Appearance
     visuals:
@@ -394,6 +394,7 @@
   - type: Tag
     tags:
     - Trash
+    - HappyHonk
   - type: StorageFill
     contents:
       - id: ToyMouse
@@ -465,10 +466,10 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/Storage/happyhonk/mime.rsi
+    sprite: Objects/Storage/Happyhonk/mime.rsi
     state: box
   - type: Item
-    sprite: Objects/Storage/happyhonk/mime.rsi
+    sprite: Objects/Storage/Happyhonk/mime.rsi
     heldPrefix: box
 
 - type: entity
@@ -480,10 +481,10 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/Storage/happyhonk/nukie.rsi
+    sprite: Objects/Storage/Happyhonk/nukie.rsi
     state: box
   - type: Item
-    sprite: Objects/Storage/happyhonk/nukie.rsi
+    sprite: Objects/Storage/Happyhonk/nukie.rsi
     heldPrefix: box
   - type: StorageFill
     contents:
@@ -512,10 +513,10 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/Storage/happyhonk/cluwne.rsi
+    sprite: Objects/Storage/Happyhonk/cluwne.rsi
     state: box
   - type: Item
-    sprite: Objects/Storage/happyhonk/cluwne.rsi
+    sprite: Objects/Storage/Happyhonk/cluwne.rsi
     heldPrefix: box
   - type: StorageFill
     contents:

diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index 317691b63ded3749a3d060d2dc1c61e4163bb434..480fc1905f31e34cd0766304596b99f7455eb12c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -41,11 +41,12 @@
         Blunt: 0
 
 - type: entity
-  parent: BikeHorn
+  parent: BaseItem
   id: CluwneHorn
   name: broken bike horn
   description: A broken horn off of a bicycle.
   components:
+  - type: ItemCooldown
   - type: Sprite
     sprite: Objects/Fun/cluwnehorn.rsi
     state: icon
@@ -56,11 +57,29 @@
     sprite: Objects/Fun/cluwnehorn.rsi
     slots: [Belt]
     quickEquip: false
+  - type: Tag
+    tags:
+    - Payload # yes, you can make re-usable prank grenades
+    - CluwneHorn
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: CluwneHorn
+      params:
+        variation: 0.125
   - type: EmitSoundOnUse
     sound:
       collection: CluwneHorn
       params:
         variation: 0.246
+  - type: MeleeWeapon
+    soundHit:
+      collection: CluwneHorn
+      params:
+        variation: 0.125
+    damage:
+      types:
+        Blunt: 5
+
 
 - type: entity
   parent: BikeHorn

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
index c804364b0128a35438ba2d2bba231583e01d67a5..25a9104d595fc5aaac438594b81f2f41fda611f3 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
@@ -36,3 +36,42 @@
         doAfter: 2
   - node: bot
     entity: MobHonkBot
+
+- type: constructionGraph
+  id: JonkBot
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bot
+      steps:
+      - tag: HappyHonk
+        icon:
+          sprite: Objects/Storage/Happyhonk/clown.rsi
+          state: box
+        name: happy honk meal
+      - tag: ClownRubberStamp
+        icon:
+          sprite: Objects/Misc/bureaucracy.rsi
+          state: stamp-clown
+        name: clown's rubber stamp
+        doAfter: 2
+      - tag: CluwneHorn
+        icon:
+            sprite: Objects/Fun/cluwnehorn.rsi
+            state: icon
+        name: broken bike horn
+        doAfter: 2
+      - tag: ProximitySensor
+        icon:
+          sprite: Objects/Misc/proximity_sensor.rsi
+          state: icon
+        name: proximity sensor
+      - tag: BorgArm
+        icon:
+          sprite: Mobs/Silicon/drone.rsi
+          state: l_hand
+        name: borg arm
+        doAfter: 2
+  - node: bot
+    entity: MobJonkBot

diff --git a/Resources/Prototypes/Recipes/Crafting/bots.yml b/Resources/Prototypes/Recipes/Crafting/bots.yml
index ff3858eaf13c9047fff8ccffbe279c235d7cc400..2f76f14ec671b3bad761287068b2bba28d1b6a1d 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/bots.yml
+++ b/Resources/Prototypes/Recipes/Crafting/bots.yml
@@ -24,6 +24,19 @@
     sprite: Mobs/Silicon/Bots/honkbot.rsi
     state: honkbot
 
+- type: construction
+  name: jonkbot
+  id: jonkbot
+  graph: JonkBot
+  startNode: start
+  targetNode: bot
+  category: construction-category-utilities
+  objectType: Item
+  description: This cursed bot honks, laughs and slips people.
+  icon:
+    sprite: Mobs/Silicon/Bots/honkbot.rsi
+    state: jonkbot
+
 - type: construction
   name: medibot
   id: medibot

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index f549352e3d464af548cc4cb7992b0a6fe7e58b20..ae37ea4f3f08423d74027f0c24ddd184db9fb02e 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -140,6 +140,9 @@
 - type: Tag
   id: ClownRubberStamp
 
+- type: Tag
+  id: CluwneHorn
+
 - type: Tag
   id: Crayon
 
@@ -305,6 +308,10 @@
 - type: Tag
   id: Handcuffs
 
+- type: Tag
+  id: HappyHonk
+
+
 - type: Tag
   id: Hardsuit # Prevent melee injectors that can't penetrate hardsuits from injecting the wearer (nettles)
 

diff --git a/Resources/Textures/Mobs/Silicon/Bots/honkbot.rsi/jonkbot.png b/Resources/Textures/Mobs/Silicon/Bots/honkbot.rsi/jonkbot.png
new file mode 100644 (file)
index 0000000..cf0d266
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/Bots/honkbot.rsi/jonkbot.png differ

diff --git a/Resources/Textures/Mobs/Silicon/Bots/honkbot.rsi/meta.json b/Resources/Textures/Mobs/Silicon/Bots/honkbot.rsi/meta.json
index fcb184f863eaf8f8c7508de7d8dd5007ef09ca16..de06949608279b03aaed316cf734f4ee1e40f0cd 100644 (file)
--- a/Resources/Textures/Mobs/Silicon/Bots/honkbot.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/Bots/honkbot.rsi/meta.json
@@ -1,5 +1,5 @@
 {
-   "copyright" : "Taken from https://github.com/tgstation/tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+   "copyright" : "Taken from https://github.com/tgstation/tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, jonkbot made by Alekshhh (github) for ss14",
    "license" : "CC-BY-SA-3.0",
    "size" : {
       "x" : 32,
@@ -9,6 +9,10 @@
       {
          "directions" : 1,
          "name" : "honkbot"
+      },
+      {
+         "directions" : 1,
+         "name" : "jonkbot"
       }
    ],
    "version" : 1

diff --git a/Resources/Textures/Objects/Storage/happyhonk/clown.rsi/box-inhand-left.png b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/clown.rsi/box-inhand-left.png
rename to Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-inhand-left.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/clown.rsi/box-inhand-right.png b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/clown.rsi/box-inhand-right.png
rename to Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-inhand-right.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/clown.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/clown.rsi/box-open.png
rename to Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box-open.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/clown.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/clown.rsi/box.png
rename to Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/box.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/clown.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/clown.rsi/meta.json
rename to Resources/Textures/Objects/Storage/Happyhonk/clown.rsi/meta.json

diff --git a/Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/box-inhand-left.png b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/box-inhand-left.png
rename to Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-inhand-left.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/box-inhand-right.png b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/box-inhand-right.png
rename to Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-inhand-right.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/box-open.png
rename to Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box-open.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/box.png
rename to Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/box.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/cluwne.rsi/meta.json
rename to Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi/meta.json

diff --git a/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-inhand-left.png b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-inhand-left.png
rename to Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-inhand-left.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-inhand-right.png b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-inhand-right.png
rename to Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-inhand-right.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-open.png
rename to Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box-open.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box.png
rename to Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/box.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/mime.rsi/meta.json
rename to Resources/Textures/Objects/Storage/Happyhonk/mime.rsi/meta.json

diff --git a/Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/box-inhand-left.png b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/box-inhand-left.png
rename to Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-inhand-left.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/box-inhand-right.png b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/box-inhand-right.png
rename to Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-inhand-right.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/box-open.png b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/box-open.png
rename to Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box-open.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/box.png b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/box.png
rename to Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/box.png

diff --git a/Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/meta.json b/Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Storage/happyhonk/nukie.rsi/meta.json
rename to Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi/meta.json