Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yautja Change Holder #4063

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3a4b5d4
scythe bleed
realforest2001 Jul 29, 2023
374968a
unique_action suuuuuucks
realforest2001 Aug 1, 2023
c19b842
scythe ability
realforest2001 Aug 2, 2023
5b30467
combi block probability
realforest2001 Aug 2, 2023
ea2022c
icon removal
realforest2001 Aug 2, 2023
63c7f2e
fixed
realforest2001 Aug 2, 2023
68003de
check fix
realforest2001 Aug 2, 2023
6cb0eb8
mirroring fix
johndoe2013 Aug 2, 2023
2c55996
Merge branch 'master' into forest/pred/scythe
Zonespace27 Aug 8, 2023
613d9a3
Rebalances power and rifle
realforest2001 Aug 10, 2023
824ab48
fixes unique action popup
realforest2001 Aug 10, 2023
94b362c
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/we…
realforest2001 Aug 10, 2023
051a21c
fixes mask chance going over intended max
realforest2001 Aug 10, 2023
c55440a
atomise
realforest2001 Aug 21, 2023
558f40d
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/po…
realforest2001 Aug 21, 2023
3b8246b
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/we…
realforest2001 Aug 21, 2023
4d1dc5b
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/po…
realforest2001 Aug 22, 2023
0a25cb2
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/we…
realforest2001 Aug 22, 2023
2be4bc3
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/po…
realforest2001 Sep 11, 2023
56eb993
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/we…
realforest2001 Sep 11, 2023
d3d813c
changes
realforest2001 Sep 11, 2023
cf061b2
EXPERIMENTAL: DAMAGE CHANGES
realforest2001 Sep 13, 2023
b67b978
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/po…
realforest2001 Sep 13, 2023
a8b0be2
fic
realforest2001 Sep 13, 2023
43a7a65
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/we…
realforest2001 Sep 30, 2023
eae16e7
Merge branch 'forest/pred/powerbalance' into forest/pred/holder3
realforest2001 Sep 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/_onclick/hud/screen_objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
return 1

if("Use unique action")
var/obj/item/weapon/gun/held_item = user.get_held_item()
var/obj/item/weapon/held_item = user.get_held_item()
if(istype(held_item))
held_item.use_unique_action()
return 1
Expand Down
4 changes: 2 additions & 2 deletions code/datums/keybinding/human_combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
if(!.)
return
var/mob/user_mob = user.mob
return isgun(user_mob.get_held_item())
return isweapon(user_mob.get_held_item())

/datum/keybinding/human/combat/field_strip_weapon
hotkey_keys = list("Unbound")
Expand Down Expand Up @@ -102,7 +102,7 @@
if(.)
return
var/mob/living/carbon/human/human = user.mob
var/obj/item/weapon/gun/held_item = human.get_held_item()
var/obj/item/weapon/held_item = human.get_held_item()
held_item.use_unique_action()
return TRUE

Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/weapons/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
name = "weapon"
icon = 'icons/obj/items/weapons/weapons.dmi'
hitsound = "swing_hit"
var/has_unique_action = FALSE

/obj/item/weapon/Initialize(mapload, ...)
. = ..()
if(!has_unique_action)
verbs -= /obj/item/weapon/verb/use_unique_action

/obj/item/get_examine_text(mob/user)
. = ..()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cm_preds/smartdisc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
unacidable = TRUE
embeddable = FALSE

force = 15
throwforce = 25
force = MELEE_FORCE_WEAK
throwforce = MELEE_FORCE_NORMAL

/obj/item/explosive/grenade/spawnergrenade/smartdisc/launch_towards(datum/launch_metadata/LM)
..()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cm_preds/yaut_bracers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@
to_chat(caller, SPAN_WARNING("You recently activated the stabilising crystal. Be patient."))
return FALSE

if(!drain_power(caller, 1000))
if(!drain_power(caller, 400))
return FALSE

inject_timer = TRUE
Expand Down Expand Up @@ -877,7 +877,7 @@
to_chat(usr, SPAN_WARNING("Your bracer is still generating a new healing capsule!"))
return FALSE

if(!drain_power(caller, 800))
if(!drain_power(caller, 600))
return FALSE

healing_capsule_timer = TRUE
Expand Down
Loading