cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add new null rods for various religions. (#31393)

Browse Source 
* Update holy_weapons.dm

* Update holy_weapons.dm

* Add some new nullrods for various religions.

* Update inhands for gohei, whisk, goad.

* Tweak several nullrods.
- Modify weight classes for kirpan, vajra, ganta, gohei, and whisk
- Reduce force of vajra
- Nudge kirpan sheath sprite in belt slot
- More progress on getting vajra and ghanta to equip properly (should be one in each hand when equipped and none inhand if not) (still needs work)

* rod of null

* Update holy_weapons.dm

* Remove force from cleansing nullrods. Rename curved saber.

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Remove unknown proc 'is_in_inactive_hand'.

* Partially fix whisk knockback.

* Fix whisker knockback.

* Thanks, linters! part 2

* Change vajra to weapon and ghanta to tile blessing.

* Thanks, linters. part 3

* Call ghanta's activate_self() parent more wisely.

* Tweak visible and audible messages.

* Thanks, linters!

* Fix some of the wackiness with Vajra pickup.

* Prevent ghanta from being placed somewhere all alone.

* Handle some cases where vajra equipped to wrong hand.

* Tweak nullrod documentation.

* Update icon on sheaths when initializing.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: Fordoxia <Thrash97@googlemail.com>
This commit is contained in:
Alan
2026-02-27 20:07:25 +00:00
committed by GitHub
co-authored by Fordoxia
parent 5f6fe54945
commit aed493d9a1
11 changed files with 408 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/displaycase.dm
+15 -3
View File
@@ -77,10 +77,22 @@
. += SPAN_WARNING("The ID lock has been shorted out.")
/obj/structure/displaycase/proc/dump(mob/user)
if(showpiece)
if(!user || !user.put_in_hands(showpiece))
showpiece.forceMove(loc)
if(!showpiece)
return
if(!user)
showpiece.forceMove(loc)
showpiece = null
return
if(!istype(user, /mob/living/carbon/human) && !user.put_in_hands(showpiece))
showpiece.forceMove(loc)
showpiece = null
return
var/mob/living/carbon/human/human_user = user
if(!human_user.equip_to_slot_if_possible(showpiece, (human_user.hand ? ITEM_SLOT_LEFT_HAND : ITEM_SLOT_RIGHT_HAND), disable_warning = TRUE))
if(!human_user.equip_to_slot_if_possible(showpiece, (human_user.hand ? ITEM_SLOT_RIGHT_HAND : ITEM_SLOT_LEFT_HAND), disable_warning = TRUE))
showpiece.forceMove(loc)
showpiece = null
/obj/structure/displaycase/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
code/game/objects/structures/safe.dm
+6 -1
View File
@@ -334,7 +334,12 @@ GLOBAL_LIST_EMPTY(safes)
return
var/obj/item/I = contents[index]
if(I && in_range(src, usr))
usr.put_in_hands(I)
var/mob/living/carbon/human/human_user = usr
if(!istype(usr, /mob/living/carbon/human) && !usr.put_in_hands(I))
I.forceMove(loc)
else if(!human_user.equip_to_slot_if_possible(I, (human_user.hand ? ITEM_SLOT_LEFT_HAND : ITEM_SLOT_RIGHT_HAND), disable_warning = TRUE))
if(!human_user.equip_to_slot_if_possible(I, (human_user.hand ? ITEM_SLOT_RIGHT_HAND : ITEM_SLOT_LEFT_HAND), disable_warning = TRUE))
I.forceMove(loc)
space -= I.w_class
else
return FALSE