forked from Darkrp-community/OpenKeep
-
Notifications
You must be signed in to change notification settings - Fork 318
[BOUNTY & WIP] Porting Gronn stuff into Vanderlin #5250
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
Draft
Singul0
wants to merge
21
commits into
Monkestation:main
Choose a base branch
from
Singul0:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+869
−0
Draft
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
1e8f7e8
premilinary work
Singul0 28f00aa
done
Singul0 029abd4
Revert "done"
Singul0 a3e1b98
Revert "premilinary work"
Singul0 e2c3441
Merge remote-tracking branch 'upstream/main'
Singul0 5916071
Merge branch 'Monkestation:main' into main
Singul0 125632f
initial PR
Singul0 79747e9
initial PR
Singul0 7f1880b
Update vanderlin.dme
Singul0 e9e1a28
Update gronn.dm
Singul0 27f456e
second iteration, adds shaman
Singul0 5ec4371
third
Singul0 6ff85cc
re-order vars to fit standard
Singul0 85798ac
port font
Singul0 a57447e
moves stuffa round to more granural folders instead of centralized
Singul0 3183be7
Update vanderlin.dme
Singul0 2e4f0ae
done with code reviews (fina-fucking-ly)
Singul0 09c741d
Merge branch 'aaaa'
Singul0 53af117
misc
Singul0 eb461e3
blegh
Singul0 be94a14
last fix
Singul0 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| /datum/status_effect/debuff/lost_shaman_hood | ||
| id = "naledimask" | ||
| alert_type = /atom/movable/screen/alert/status_effect/debuff/shamanhood | ||
| effectedstats = list(STATKEY_LCK = -3) | ||
|
|
||
| /atom/movable/screen/alert/status_effect/debuff/shamanhood | ||
| name = "Lost Hood" | ||
| desc = "The sacred hood is lost. I feel frail and sapped without it." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,206 @@ | ||
| // Weapons | ||
| /obj/item/weapon/sword/short/gronn | ||
| name = "gronnic hinterblade" | ||
| desc = "Due to the shortage of forged steel in Gronn, their iron blades have become hardier and thicker than what one may see elsewhere. The favoured weapon of choice for any able-bodied northman of Gronn, the hinterblade is the heftier, unwieldy cousin of the arming sword." | ||
| possible_item_intents = list(/datum/intent/sword/cut/militia, /datum/intent/sword/chop/militia, /datum/intent/sword/thrust/short) | ||
| icon_state = "gronnsword" | ||
| gripped_intents = null | ||
| minstr = 10 //NO TWINKS!! | ||
| wdefense = 3 // Use it with a shield jackass | ||
| wlength = WLENGTH_SHORT | ||
| w_class = WEIGHT_CLASS_NORMAL | ||
|
|
||
| grid_width = 32 | ||
| grid_height = 96 | ||
|
|
||
| /datum/intent/sword/cut/militia | ||
| penfactor = 30 | ||
| damfactor = 1.2 | ||
| no_early_release = TRUE | ||
|
|
||
| /datum/intent/sword/chop/militia | ||
| penfactor = 50 | ||
| swingdelay = 0 | ||
| damfactor = 1.0 | ||
| no_early_release = TRUE | ||
|
|
||
| /obj/item/weapon/handclaw | ||
| name = "Iron Hound Claws" | ||
| desc = "A pair of heavily curved claws, styled after beasts of the wilds for rending bare flesh, \ | ||
| A show of the continual worship and veneration of beasts of strength in Gronn." | ||
| icon = 'icons/roguetown/weapons/32/fists_claws.dmi' | ||
| icon_state = "ironclaws" | ||
| parrysound = list('sound/combat/parry/bladed/bladedthin (1).ogg', 'sound/combat/parry/bladed/bladedthin (2).ogg', 'sound/combat/parry/bladed/bladedthin (3).ogg') | ||
| force = 30 | ||
| throwforce = 12 | ||
| thrown_bclass = BCLASS_CUT | ||
| wdefense = ULTMATE_PARRY | ||
| wlength = WLENGTH_NORMAL | ||
| possible_item_intents = list(/datum/intent/claw/cut/iron, /datum/intent/claw/lunge/iron, /datum/intent/claw/rend) | ||
| wbalance = DODGE_CHANCE_NORMAL | ||
| max_blade_int = 300 | ||
| max_integrity = INTEGRITY_STANDARD | ||
|
|
||
| w_class = WEIGHT_CLASS_NORMAL | ||
| slot_flags = ITEM_SLOT_HIP | ||
| swingsound = list('sound/combat/wooshes/bladed/wooshmed (1).ogg','sound/combat/wooshes/bladed/wooshmed (2).ogg','sound/combat/wooshes/bladed/wooshmed (3).ogg') | ||
| associated_skill = /datum/skill/combat/unarmed | ||
| pickup_sound = 'sound/foley/equip/swordsmall2.ogg' | ||
| anvilrepair = /datum/skill/craft/weaponsmithing | ||
| smeltresult = /obj/item/ingot/iron | ||
| grid_height = 96 | ||
| grid_width = 32 | ||
|
|
||
| /obj/item/weapon/handclaw/steel | ||
| name = "Steel Mantis Claws" | ||
| desc = "A pair of steel claws, An uncommon sight in Gronn as they do not forge their own steel, \ | ||
| Their longer blades offer a superior defence option but their added weight slows them down." | ||
| icon_state = "steelclaws" | ||
| wdefense = 6 | ||
| force = 35 | ||
| possible_item_intents = list(/datum/intent/claw/cut/steel, /datum/intent/claw/lunge/steel, /datum/intent/claw/rend/steel) | ||
| wbalance = EASY_TO_DODGE | ||
| max_blade_int = 180 | ||
| max_integrity = 200 | ||
| smeltresult = /obj/item/ingot/steel | ||
|
|
||
| /obj/item/weapon/handclaw/gronn | ||
| name = "Gronn Beast Claws" | ||
| desc = "A pair of uniquely reinforced iron claws forged with the addition of bone by the Iskarn shamans of the Northern Empty. \ | ||
| Their unique design aids them in slipping between the plates in armor and their light weight supports rapid aggressive slashes. \ | ||
| 'To see the claws of the four, Is to see the true danger of the north. Not man, Not land but beast. We are all prey in their eyes.'" | ||
| icon_state = "gronnclaws" | ||
| wdefense = 3 | ||
| force = 25 | ||
| possible_item_intents = list(/datum/intent/claw/cut/gronn, /datum/intent/claw/lunge/gronn, /datum/intent/claw/rend) | ||
| wbalance = HARD_TO_DODGE | ||
| max_blade_int = 200 | ||
| max_integrity = 200 | ||
|
|
||
|
|
||
| /obj/item/weapon/handclaw/getonmobprop(tag) | ||
| . = ..() | ||
| if(tag) | ||
| switch(tag) | ||
| if("gen") | ||
| return list("shrink" = 0.4,"sx" = -7,"sy" = -4,"nx" = 7,"ny" = -4,"wx" = -3,"wy" = -4,"ex" = 1,"ey" = -4,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 110,"sturn" = -110,"wturn" = -110,"eturn" = 110,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0) | ||
| if("onbelt") | ||
| return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0) | ||
|
|
||
| /datum/intent/claw/lunge | ||
| name = "lunge" | ||
| icon_state = "inimpale" | ||
| attack_verb = list("lunges") | ||
| animname = "stab" | ||
| blade_class = BCLASS_STAB | ||
| hitsound = list('sound/combat/hits/bladed/genstab (1).ogg', 'sound/combat/hits/bladed/genstab (2).ogg', 'sound/combat/hits/bladed/genstab (3).ogg') | ||
|
|
||
| /datum/intent/claw/lunge/iron | ||
| damfactor = 1.2 | ||
| swingdelay = 8 | ||
| clickcd = CLICK_CD_MELEE | ||
| penfactor = 35 | ||
|
|
||
| /datum/intent/claw/lunge/steel | ||
| damfactor = 1.2 | ||
| swingdelay = 12 | ||
| clickcd = CLICK_CD_RESIST | ||
| penfactor = 35 | ||
|
|
||
| /datum/intent/claw/lunge/gronn | ||
| damfactor = 1.1 | ||
| swingdelay = 5 | ||
| clickcd = 10 | ||
| penfactor = 45 | ||
|
|
||
| /datum/intent/claw/cut | ||
| name = "cut" | ||
| icon_state = "incut" | ||
| attack_verb = list("cuts", "slashes") | ||
| animname = "cut" | ||
| blade_class = BCLASS_CUT | ||
| hitsound = list('sound/combat/hits/bladed/smallslash (1).ogg', 'sound/combat/hits/bladed/smallslash (2).ogg', 'sound/combat/hits/bladed/smallslash (3).ogg') | ||
| item_damage_type = "slash" | ||
|
|
||
| /datum/intent/claw/cut/iron | ||
| penfactor = 20 | ||
| swingdelay = 8 | ||
| damfactor = 1.4 | ||
| clickcd = CLICK_CD_RESIST | ||
|
|
||
| /datum/intent/claw/cut/steel | ||
| penfactor = 10 | ||
| swingdelay = 4 | ||
| damfactor = 1.3 | ||
| clickcd = CLICK_CD_RESIST | ||
|
|
||
| /datum/intent/claw/cut/gronn | ||
| penfactor = 30 | ||
| swingdelay = 0 | ||
| damfactor = 1.1 | ||
| clickcd = CLICK_CD_MELEE | ||
|
|
||
| /datum/intent/claw/rend | ||
| name = "rend" | ||
| icon_state = "inrend" | ||
| attack_verb = list("rends") | ||
| animname = "cut" | ||
| blade_class = BCLASS_CHOP | ||
| reach = 1 | ||
| penfactor = AP_CLUB_SMASH | ||
| swingdelay = 20 | ||
| damfactor = 2.5 | ||
| clickcd = CLICK_CD_RESIST | ||
| no_early_release = TRUE | ||
| hitsound = list('sound/combat/hits/bladed/genslash (1).ogg', 'sound/combat/hits/bladed/genslash (2).ogg', 'sound/combat/hits/bladed/genslash (3).ogg') | ||
| item_damage_type = "slash" | ||
| misscost = 10 | ||
| damfactor = 0.05 | ||
|
|
||
| /datum/intent/claw/rend/steel | ||
| damfactor = 3 | ||
|
|
||
| //Mauls. Woe. Most characters will not be able to engage with this, beyond hobbling. | ||
| //Why? The unique strength lockout. The minimum strength is not a suggestion. | ||
| /obj/item/weapon/mace/goden/maul | ||
| force_wielded = DAMAGE_HEAVYCLUB_WIELD - 3 //-3 compared to grand mace(steel goden). Better intents. | ||
| possible_item_intents = list(/datum/intent/mace/strike) | ||
| gripped_intents = list(/datum/intent/mace/strike, /datum/intent/mace/smash, /datum/intent/effect/daze, /datum/intent/effect/hobble) | ||
| name = "maul" | ||
| desc = "Who would need something this large? It looks like it was made for tearing down walls, rather than men." | ||
| icon_state = "sledge" | ||
| wlength = WLENGTH_LONG | ||
| swingsound = BLUNTWOOSH_HUGE | ||
| slot_flags = null //No. | ||
| minstr = 14 | ||
| wdefense = 3 | ||
| dropshrink = 0.6 | ||
| bigboy = TRUE | ||
| gripsprite = TRUE | ||
|
|
||
| //Intents for the mauls. | ||
| /datum/intent/effect/hobble | ||
| name = "hobbling strike" | ||
| desc = "A heavy strike aimed at the legs to cripple movement." | ||
| icon_state = "incrack"//Temp. Just so it's easy to differentiate. | ||
| attack_verb = list("hobbles") | ||
| animname = "strike" | ||
| hitsound = list('sound/combat/hits/blunt/shovel_hit3.ogg') | ||
| swingdelay = 6 | ||
| damfactor = 0.8 | ||
| penfactor = AP_CLUB_STRIKE | ||
| clickcd = CLICK_CD_RESIST | ||
| item_damage_type = "blunt" | ||
| intent_effect = /datum/status_effect/debuff/hobbled | ||
| target_parts = list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //Intentionally leaving out feet. If you know, you know. | ||
|
|
||
| /datum/status_effect/debuff/hobbled | ||
| id = "hobbled" | ||
| alert_type = /atom/movable/screen/alert/status_effect/debuff/hobbled | ||
| effectedstats = list(STATKEY_SPD = -2) | ||
| duration = 8 SECONDS | ||
|
|
||
| /atom/movable/screen/alert/status_effect/debuff/hobbled | ||
| name = "Hobbled" | ||
| desc = "You've been struck in the leg! The force has left you staggered!" | ||
| icon_state = "dazed" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.