mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 12:02:31 +01:00
Allows holsters to be worn on the belt slot (#18539)
* Update holster.dm adds slot_flags var to holster item * aaaa adds new sprites for machete holster * OOOOO makes it so holsters will not move to the pklayers empty hand when clicked and isntead will actually unholster the gun * i forgor the changelog changelog lmao * nani kore one day ill understand what im doing, but for now i will throw monkeys at typewriters and hope that they learn to end a sentence with. * how come this wasnt in alreayd AAAAAAAAAAAAAA
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
item_state = "holster"
|
||||
contained_sprite = TRUE
|
||||
slot = ACCESSORY_SLOT_UTILITY
|
||||
slot_flags = SLOT_BELT | SLOT_TIE
|
||||
var/obj/item/holstered = null
|
||||
var/sound_in = 'sound/weapons/holster/holsterin.ogg'
|
||||
var/sound_out = 'sound/weapons/holster/holsterout.ogg'
|
||||
@@ -82,12 +83,16 @@
|
||||
clear_holster()
|
||||
|
||||
/obj/item/clothing/accessory/holster/attack_hand(mob/user)
|
||||
if (has_suit) // If we are part of a suit.
|
||||
if (!ishuman(user))
|
||||
return ..()
|
||||
|
||||
var/mob/living/carbon/human/human = user
|
||||
if (has_suit || human.belt == src) // If we are part of a suit.
|
||||
if (holstered)
|
||||
unholster(user)
|
||||
unholster(human)
|
||||
return
|
||||
|
||||
..(user)
|
||||
return ..(human)
|
||||
|
||||
/obj/item/clothing/accessory/holster/attackby(obj/item/attacking_item, mob/user)
|
||||
holster(attacking_item, user)
|
||||
@@ -251,7 +256,7 @@
|
||||
name = "machete sheath"
|
||||
desc = "A handsome synthetic leather sheath with matching belt."
|
||||
icon_state = "holster_machete"
|
||||
item_state = "thigh_brown"
|
||||
item_state = "holster_machete"
|
||||
icon = 'icons/obj/item/clothing/accessory/holster.dmi'
|
||||
allowed_items = list(
|
||||
/obj/item/material/hatchet/machete,
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
|
||||
author: ClemTheDuck
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Added the ability to wear holsters on belt slots. Tweaked sprites on Machete Holsters as well."
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 14 KiB |
Reference in New Issue
Block a user