Skip to content

Fixes typo, cleans up sabre code, lowers cargo sabres stats, higher sledge demo #5111

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

Merged
merged 10 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions code/game/objects/items/melee/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
flags_1 = CONDUCT_1
obj_flags = UNIQUE_RENAME
force = 15
force = 20 // MONKESTATION EDIT ORG 15
throwforce = 10
demolition_mod = 0.75 //but not metal
w_class = WEIGHT_CLASS_BULKY
Expand All @@ -82,8 +82,8 @@
block_sound = 'sound/weapons/parry.ogg'
hitsound = 'sound/weapons/rapierhit.ogg'
custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
wound_bonus = 10
bare_wound_bonus = 25
wound_bonus = 5 // MONKESTATION EDIT ORG 10
bare_wound_bonus = 20 // MONKESTATION EDIT ORG 25

/obj/item/melee/sabre/Initialize(mapload)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/service.dm
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@

/// Box of 7 grey IDs.
/datum/supply_pack/service/greyidbox
name = "Grey ID Card Multipack Cate"
name = "Grey ID Card Multipack Crate"
desc = "A convenient crate containing a box of seven cheap ID cards in a handy wallet-sized form factor. \
Cards come in every colour you can imagne, as long as it's grey."
cost = CARGO_CRATE_VALUE * 3
Expand Down
9 changes: 9 additions & 0 deletions monkestation/code/game/machinery/bomb_actualizer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,15 @@
TIMER_COOLDOWN_START(src, COOLDOWN_BOMB_BUTTON, 3 SECONDS)
return

else if(istype(get_area(src), /area/space))
say("ERROR: Does not work in space!")
TIMER_COOLDOWN_START(src, COOLDOWN_BOMB_BUTTON, 3 SECONDS)
return

else if(src.anchored == FALSE)
say("ERROR: Needs to be anchored!")
TIMER_COOLDOWN_START(src, COOLDOWN_BOMB_BUTTON, 3 SECONDS)
return

else if(!on_reebe(src))
say("Beginning detonation sequence. Countdown starting.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
force = 5 /// The weapon requires two hands
throwforce = 12
throw_range = 3 /// Doesn't throw very far
demolition_mod = 3 // BREAK THINGS
demolition_mod = 6 // BREAK THINGS
armour_penetration = -20
hitsound = 'sound/weapons/smash.ogg' /// Hitsound when thrown at someone
attack_verb_continuous = list("slams", "crushes", "smashes", "flattens", "pounds")
Expand Down
12 changes: 4 additions & 8 deletions monkestation/code/modules/blueshift/items/melee.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,15 @@
new /obj/item/melee/sabre/cargo(src)
update_appearance()

/obj/item/melee/sabre
force = 20 // Original: 15
wound_bonus = 5 // Original: 10
bare_wound_bonus = 20 // Original: 25 Both down slightly, to make up for the damage buff, since it'd get a bit wacky ontop of the armor pen.

/obj/item/melee/sabre/cargo
name = "authentic shamshir sabre"
desc = "An expertly crafted historical human sword once used by the Persians which has recently gained traction due to Venusian historal recreation sports. One small flaw, the Taj-based company who produces these has mistaken them for British cavalry sabres akin to those used by high ranking Nanotrasen officials. Atleast it cuts the same way!"
icon = 'monkestation/code/modules/blueshift/icons/obj/melee.dmi'
//lefthand_file = 'monkestation/code/modules/blueshift/icons/mob/inhands/weapons/swords_lefthand.dmi'
//righthand_file = 'monkestation/code/modules/blueshift/icons/mob/inhands/weapons/swords_righthand.dmi'
force = 15
block_chance = 20
armour_penetration = 25
armour_penetration = 10
wound_bonus = 0
bare_wound_bonus = 15


// This is here so that people can't buy the Sabres and craft them into powercrepes
Expand Down
Loading