Skip to content

[ADD] CQC adjustements and North Stars minor buff #2779

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.

Sign up for GitHub

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

Open
Chituka wants to merge 5 commits into
base: beta-dev
Choose a base branch
from
Open

[ADD] CQC adjustements and North Stars minor buff #2779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16b0732
CQC update
Chituka Mar 3, 2026
5aa0f20
Gloves of the Nord Star update
Chituka Mar 3, 2026
8d994a1
New consecutive combo fix
Chituka Mar 5, 2026
9735653
The final
Chituka Mar 30, 2026
9c97bfa
Merge branch 'CeladonSS13:beta-dev' into CQC-stuff
Chituka Mar 30, 2026
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
12 changes: 8 additions & 4 deletions _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_teardrop.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2963,6 +2963,10 @@
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plasteel/dark,
/area/ship/engineering)
"EM" = (
/obj/mecha/combat/tanklp,
/turf/template_noop,
/area/template_noop)
"EU" = (
/obj/effect/turf_decal/trimline/opaque/solgovgold/filled/warning{
dir = 8;
Expand Down Expand Up @@ -4271,9 +4275,6 @@
/turf/open/floor/plasteel/heavymetal/var4,
/area/ship/hallway/central)
"UC" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/machinery/light_switch{
pixel_y = 23;
Expand All @@ -4286,6 +4287,9 @@
dir = 10
},
/obj/effect/turf_decal/corner/opaque/black/diagonal,
/obj/structure/cable{
icon_state = "0-2"
},
/turf/open/floor/plasteel/heavymetal/var4,
/area/ship/hallway/central)
"UH" = (
Expand Down Expand Up @@ -5469,7 +5473,7 @@ fa
"}
(30,1,1) = {"
fa
fa
EM
fa
fa
LN
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/punchcooldown.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

///Called on COMSIG_HUMAN_MELEE_UNARMED_ATTACK. Yells the warcry and and reduces punch cooldown.
/datum/component/wearertargeting/punchcooldown/proc/reducecooldown(mob/living/carbon/M, atom/target)
if(M.a_intent == INTENT_HARM && isliving(target))
if(M.a_intent != INTENT_HELP && isliving(target)) //[CELADON-EDIT] M.a_intent == INTENT_HARM -> M.a_intent != INTENT_HELP
M.changeNext_move(CLICK_CD_RAPID)
if(warcry)
M.say(warcry, ignore_spam = TRUE, forced = "north star warcry")
Expand Down
43 changes: 38 additions & 5 deletions code/datums/martial/cqc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
span_userdanger("Your neck is punched by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A)
to_chat(A, span_danger("You punch [D]'s neck!"))
D.adjustStaminaLoss(60)
//[CELADON-ADD] Adds a 100% disarm change to Pressure
var/obj/item/I = D.get_active_held_item()
if(I && D.temporarilyRemoveItemFromInventory(I))
A.put_in_inactive_hand(I)
//[/CELADON-ADD]
playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
return TRUE

Expand Down Expand Up @@ -113,13 +118,41 @@
span_userdanger("Your abdomen, neck and back are struck consecutively by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A)
to_chat(A, span_danger("You strike [D]'s abdomen, neck and back consecutively!"))
playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1)
var/obj/item/I = D.get_active_held_item()
if(I && D.temporarilyRemoveItemFromInventory(I))
A.put_in_hands(I)
//[CELADON-REMOVE] - Moves 100% disarm chance from consecutive to presusre
//var/obj/item/I = D.get_active_held_item()
// if(I && D.temporarilyRemoveItemFromInventory(I))
// A.put_in_hands(I)
//[/CELADON-REMOVE]
D.adjustStaminaLoss(50)
D.apply_damage(25, A.dna.species.attack_type)
//[CELADON-ADD] - reworks consecutive combo
if(A != D)
mini_slam(A,D)
//[/CELADON-ADD]
return TRUE

//[CELADON-ADD] - reworks consecutive combo
/datum/martial_art/cqc/proc/mini_slam(mob/living/carbon/human/A, mob/living/carbon/human/D, list/attacked_mobs = list())
if(!can_use(A))
return FALSE
D.visible_message(span_danger("[A] dashes to [D] and slams them into the ground!"), \
span_userdanger("You're slammed into the ground by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, A)
to_chat(A, span_danger("You dash and slam [D] into the ground!"))
playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
D.apply_damage(10, BRUTE)
D.Paralyze(40)
log_combat(A, D, "mini slammed (CQC)")
var/slowdown_mod = A.equipped_speed_mods()*3
for(var/mob/living/carbon/M in oviewers(5,A))
if(istype(M,/mob/living/carbon/human) && (M != D) && (!attacked_mobs.Find(M)) && (get_dist(A,M) <= 5) && (!M.stat) && (!M.IsParalyzed()) && (M.mind))
walk_to(A,M,1,slowdown_mod)
sleep(5*slowdown_mod)
mini_slam(A,M,attacked_mobs)
attacked_mobs.Add(M)
break
return TRUE
//[/CELADON-ADD]

/datum/martial_art/cqc/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(A.a_intent == INTENT_GRAB && A!=D && can_use(A)) // A!=D prevents grabbing yourself
add_to_streak("G",D)
Expand Down Expand Up @@ -185,7 +218,7 @@
to_chat(A, span_danger("You strike [D]'s jaw, leaving [D.p_them()] disoriented!"))
playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
if(I && D.temporarilyRemoveItemFromInventory(I))
A.put_in_hands(I)
A.put_in_inactive_hand(I) //[CELADON-EDIT] - A.put_in_hands(I) -> A.put_in_inactive_hand(I)
D.set_timed_status_effect(4 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
D.apply_damage(5, A.dna.species.attack_type)
else
Expand Down Expand Up @@ -218,7 +251,7 @@
to_chat(usr, "[span_notice("CQC Kick")]: Harm Harm. Knocks opponent away. Knocks out stunned or knocked down opponents.")
to_chat(usr, "[span_notice("Restrain")]: Grab Grab. Locks opponents into a restraining position, disarm to knock them out with a chokehold.")
to_chat(usr, "[span_notice("Pressure")]: Disarm Grab. Decent stamina damage.")
to_chat(usr, "[span_notice("Consecutive CQC")]: Disarm Disarm Harm. Mainly offensive move, huge damage and decent stamina damage.")
to_chat(usr, "[span_notice("Consecutive CQC")]: Disarm Disarm Harm. Crowd control move. Allows to dash from target to target, knocking each one down.") //[CELADON-EDIT] - Desc update

to_chat(usr, "<b><i>In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to block and sometimes even counter attacks done to you.</i></b>")

Expand Down
9 changes: 5 additions & 4 deletions code/game/objects/items/stacks/sheets/glass.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* Glass sheets
*/
GLOBAL_LIST_INIT(glass_recipes, list ( \
new/datum/stack_recipe("directional window", /obj/structure/window/unanchored, time = 0.5 SECONDS, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile window", /obj/structure/window/fulltile/unanchored, 2, time = 1 SECONDS, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("directional window", /obj/structure/window/unanchored, time = 1.5 SECONDS, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile window", /obj/structure/window/fulltile/unanchored, 2, time = 2 SECONDS, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("glass floor tile", /obj/item/stack/tile/glass, 1, 4, 20), \
new/datum/stack_recipe("glass shard", /obj/item/shard, 1) \
)) // [CELADON-EDIT] - NO-MOMENTAL-CRAFT
Expand Down Expand Up @@ -82,10 +82,11 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \


GLOBAL_LIST_INIT(pglass_recipes, list ( \
new/datum/stack_recipe("directional window", /obj/structure/window/plasma/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile window", /obj/structure/window/plasma/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("directional window", /obj/structure/window/plasma/unanchored, time = 1.5 SECONDS, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile window", /obj/structure/window/plasma/fulltile/unanchored, 2, time = 2.5 SECONDS, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, 1) \
))
// [CELADON-EDIT] - NO-MOMENTAL-CRAFT

/obj/item/stack/sheet/plasmaglass
name = "plasma glass"
Expand Down
5 changes: 3 additions & 2 deletions code/game/objects/items/stacks/sheets/mineral.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,14 +443,15 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \
material_type = /datum/material/snow

GLOBAL_LIST_INIT(snow_recipes, list ( \
new/datum/stack_recipe("Snow wall", /turf/closed/wall/mineral/snow, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Snow wall", /turf/closed/wall/mineral/snow, time = 2 SECONDS, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Snowman", /obj/structure/statue/snow/snowman, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Snowball", /obj/item/toy/snowball, 1), \
new/datum/stack_recipe("Snow tile", /obj/item/stack/tile/mineral/snow, 1, 4, 20), \
// [CELADON-ADD] - CELADON_STRUCTURES - Барикады
new/datum/stack_recipe("snow barricade", /obj/structure/deployable_barricade/snow, 3, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("snow barricade", /obj/structure/deployable_barricade/snow, time = 3 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
// [/CELADON-ADD]
))
// [CELADON-EDIT] - NO-MOMENTAL-CRAFT

/obj/item/stack/sheet/mineral/snow/get_main_recipes()
. = ..()
Expand Down
Loading