lol

ss14Starlight · Feb 4, 2025 · 6a7816c · 6a7816c
1 parent a0c333e
commit 6a7816c
Show file tree

Hide file tree

Showing 30 changed files with 57 additions and 115 deletions.
diff --git a/Resources/Audio/_Starlight/Weapons/attributions.yml b/Resources/Audio/_Starlight/Weapons/attributions.yml
@@ -0,0 +1,8 @@
+- files: ["marriage_hum.org"]
+  license: "CC-BY-NC-4.0"
+  copyright: "10835 big fire loop.wav by Robinhood76 , freesound.org"
+  source: "https://freesound.org/s/612277/"
+
+- files: ["marriage_swing.org"]
+  license: "CC-BY-SA-3.0"
+  copyright: "by github.com/fqqf"
diff --git a/Resources/Audio/_Starlight/Weapons/marriage_hum.ogg b/Resources/Audio/_Starlight/Weapons/marriage_hum.ogg
diff --git a/Resources/Audio/_Starlight/Weapons/marriage_swing.ogg b/Resources/Audio/_Starlight/Weapons/marriage_swing.ogg
diff --git a/Resources/Locale/en-US/_Starlight/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Starlight/store/uplink-catalog.ftl
@@ -1,5 +1,7 @@
 uplink-contortionist-jumpsuit-name = Contortionist's Jumpsuit
+uplink-marriage-axe-name = Marriage axe
 uplink-contortionist-jumpsuit-desc = It looks like an atmos jumpsuit, but it really is. This jumpsuit allows the agent to slip through the vents.
+uplink-marriage-axe-desc = A charming subtle instrument of chaos—perfect for when diplomacy fails. Screams like a banshee, cuts like a demon, and turns people into regrettable memories. Handle with enthusiasm.
 uplink-mini-energy-crossbow-name = mini energy crossbow
 uplink-mini-energy-crossbow-desc = Fires low-damage kinetic bolts at a short range.
 uplink-minotaur-name = Minotaur bundle

diff --git a/Resources/Prototypes/_StarLight/Catalog/uplink_catalog.yml b/Resources/Prototypes/_StarLight/Catalog/uplink_catalog.yml
@@ -36,7 +36,21 @@
       blacklist:
         tags:
           - NukeOpsUplink
-
+
+- type: listing
+  id: UplinkMarriage
+  name: uplink-marriage-axe-name
+  description: uplink-marriage-axe-desc
+  icon: { sprite: /Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi, state: icon }
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 20
+  productEntity: MarriageAxe
+  cost:
+    Telecrystal: 24
+  categories:
+  - UplinkWeaponry
+
 - type: listing
   id: uplinkWeaponShotgunMinotaur
   name: uplink-minotaur-name

diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/e_melee.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/e_melee.yml
@@ -2,33 +2,48 @@
   name: marriage axe 
   parent: [BaseMeleeWeaponEnergy, BaseSyndicateContraband]
   id: MarriageAxe
-  description: A charmingl subtle instrument of chaos—perfect for when diplomacy fails. Screams like a banshee, cuts like a demon, and turns people into regrettable memories. Handle with enthusiasm.
+  description: A charming subtle instrument of chaos—perfect for when diplomacy fails. Screams like a banshee, cuts like a demon, and turns people into regrettable memories. Handle with enthusiasm.
   components:
   - type: Sprite
     sprite: _Starlight/Objects/Weapons/Melee/marriage_axe.rsi
     layers:
-    - state: e_sword
-    - state: e_sword_blade
+    - state: marriage
+    - state: marriage_blade
       color: "#FFFFFF"
       visible: false
       shader: unshaded
       map: [ "blade" ]
+  - type: ItemToggleActiveSound
+    activeSound:
+      path: /Audio/_Starlight/Weapons/marriage_hum.ogg
+  - type: ItemToggleMeleeWeapon
+    activatedSoundOnHit:
+      path: /Audio/_Starlight/Weapons/marriage_swing.ogg
+      params:
+        variation: 0.250
+    activatedSoundOnHitNoDamage:
+      path: /Audio/_Starlight/Weapons/marriage_swing.ogg
+      params:
+        variation: 0.250
+        volume: -10
+    activatedSoundOnSwing:
+      path: /Audio/_Starlight/Weapons/marriage_swing.ogg
+      params:
+        variation: 0.125
+    activatedDamage:
+      types:
+        Slash: 25
+        Heat: 25
+        Structural: 30
   - type: Item
     sprite: _Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi
   - type: MultiHandedItem
-  - type: Scalpel
-  - type: SurgeryTool
-    successRate: 0.6
-    startSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
   - type: Tool
     qualities:
       - Prying
+    useSound:
+      path: /Audio/Items/crowbar.ogg
   - type: ToolTileCompatible
   - type: Prying
   - type: UseDelay
-    delay: 1
-
-# Todo pry doors
+    delay: 1
diff --git a/...tarlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png b/...tarlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png
diff --git a/...res/_Starlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png b/...res/_Starlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png
diff --git a/...arlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png b/...arlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png
diff --git a/...es/_Starlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png b/...es/_Starlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json
diff --git a/...rlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png b/...rlight/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png
diff --git a/...light/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png b/...light/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png
diff --git a/...Textures/_Starlight/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png b/...Textures/_Starlight/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png
diff --git a/...es/_Starlight/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png b/...es/_Starlight/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/e_sword_double.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Weapons/Melee/e_sword_double.rsi/icon.png
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/e_sword_double.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Weapons/Melee/e_sword_double.rsi/meta.json
diff --git a/..._Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-left-blade.png b/..._Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-left-blade.png
diff --git a/...tures/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-left.png b/...tures/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-left.png
diff --git a/...res/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-right-blade.aseprite b/...res/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-right-blade.aseprite
diff --git a/...Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-right-blade.png b/...Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-right-blade.png
diff --git a/.../Textures/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-right.aseprite b/.../Textures/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-right.aseprite
diff --git a/...ures/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-right.png b/...ures/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/inhand-right.png
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe-inhands.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Inhands by RiceMar1244.",
+    "copyright": "github.com/fqqf",
     "size": {
         "x": 64,
         "y": 64

diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/e_sword.png b/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/e_sword.png
diff --git a/...es/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/e_sword_blade.png b/...es/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/e_sword_blade.png
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/icon.png
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/marriage.png b/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/marriage.png
diff --git a/...s/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/marriage_blade.png b/...s/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/marriage_blade.png
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Weapons/Melee/marriage_axe.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation",
+  "copyright": "github.com/fqqf",
   "size": {
     "x": 32,
     "y": 32
@@ -11,10 +11,10 @@
       "name": "icon"
     },
     {
-      "name": "e_sword"
+      "name": "marriage"
     },
 	{
-      "name": "e_sword_blade",
+      "name": "marriage_blade",
       "delays": [
         [
           0.1,