-
-
Notifications
You must be signed in to change notification settings - Fork 165
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
I love Gambling Sets up J-corp framework Moves Mariachi weapons into J-corp file Added Ting Tang Weaponry Made gambling feature (roll between max and 10%, at max sanity roll between 50% and max) added inhands added crate and refinery input more sprites yippie added mariachi stuff new maracas sprites, old ones retired added to J-corp crate added armors No more misinformation
- Loading branch information
1 parent
ef0bd15
commit 7f2215e
Showing
15 changed files
with
270 additions
and
53 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains 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 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 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 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
146 changes: 146 additions & 0 deletions
146
code/game/objects/items/ego_weapons/non_abnormality/jcorp.dm
This file contains 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,146 @@ | ||
| //Ting-Tang, weapons are quite gimmicky, and leaves up to chance. Thus does a bit more damage than their tier allows. | ||
| //All weapons, but leader are grade 7, they are all quite the jobber anyways. | ||
| /obj/item/ego_weapon/city/ting_tang | ||
| name = "ting tang shank" | ||
| desc = "A twisted piece of metal. The shape makes very open wounds." | ||
| special = "This deals a random damage amount between 10% of max damage and max damage. Chances scale with sanity with a max of 50% instead of 10%." | ||
| icon_state = "tingtang_shank" | ||
| inhand_icon_state = "tingtang_shank" | ||
| force = 27 | ||
| attack_speed = 1 | ||
| damtype = WHITE_DAMAGE //Almost everyone and their mother in this god forsaken district does something with sanity. | ||
| armortype = WHITE_DAMAGE | ||
| attack_verb_continuous = list("slices", "gashes", "stabs") | ||
| attack_verb_simple = list("slice", "gash", "stab") | ||
| hitsound = 'sound/weapons/fixer/generic/knife3.ogg' | ||
| var/sp_mod | ||
|
|
||
| /obj/item/ego_weapon/city/ting_tang/attack(mob/living/target, mob/living/user) //mostly stolen from dice code | ||
| sp_mod = user.sanityhealth / user.maxSanity * 0.5 //hits .5 at max sanity. | ||
| sp_mod = max(0.10, sp_mod) | ||
| force = rand(force*sp_mod, force) | ||
| ..() | ||
| force = initial(force) | ||
|
|
||
| /obj/item/ego_weapon/city/ting_tang/cleaver | ||
| name = "ting tang cleaver" | ||
| desc = "It's quite heavy, clearly made for throwing your weight around." | ||
| icon_state = "tingtang_cleaver" | ||
| inhand_icon_state = "tingtang_cleaver" | ||
| force = 40 | ||
| attack_speed = 1.5 | ||
| hitsound = 'sound/weapons/fixer/generic/blade5.ogg' | ||
|
|
||
| /obj/item/ego_weapon/city/ting_tang/pipe | ||
| name = "ting tang pipe" | ||
| desc = "A heavy pipe that you're pretty sure used to belong in a car." | ||
| icon_state = "tingtang_pipe" | ||
| inhand_icon_state = "tingtang_pipe" | ||
| force = 54 | ||
| attack_speed = 2 | ||
| attack_verb_continuous = list("smacks", "bludgeons", "beats") | ||
| attack_verb_simple = list("smack", "bludgeon", "beat") | ||
| hitsound = 'sound/weapons/fixer/generic/baton1.ogg' | ||
|
|
||
| /obj/item/ego_weapon/city/ting_tang/knife //Leader, Grade 6 | ||
| name = "ting tang knife" | ||
| desc = "The finger hook at the end lets you pull off some sick tricks. If you had the skill." | ||
| icon_state = "tingtang_knife" | ||
| inhand_icon_state = "tingtang_knife" | ||
| force = 37 | ||
| attack_speed = 1 | ||
| hitsound = 'sound/weapons/fixer/generic/knife1.ogg' | ||
| attribute_requirements = list( | ||
| FORTITUDE_ATTRIBUTE = 40, | ||
| PRUDENCE_ATTRIBUTE = 60, | ||
| TEMPERANCE_ATTRIBUTE = 40, | ||
| JUSTICE_ATTRIBUTE = 40 | ||
| ) | ||
|
|
||
| //Los Mariachis - Grade 7 with poise crits, white version of Kurokumo. | ||
| /obj/item/ego_weapon/city/mariachi | ||
| name = "maraca" | ||
| desc = "A single maraca used by Los Mariachis." | ||
| special = "This weapon gains 1 poise for every attack. 1 poise gives you a 2% chance to crit at 3x damage, stacking linearly. Critical hits reduce poise to 0." | ||
| icon_state = "maracas" | ||
| inhand_icon_state = "maracas" | ||
| force = 22 | ||
| damtype = WHITE_DAMAGE | ||
| armortype = WHITE_DAMAGE | ||
| attack_verb_continuous = list("bashes", "clubs") | ||
| attack_verb_simple = list("bashes", "clubs") | ||
| hitsound = 'sound/weapons/fixer/generic/club1.ogg' | ||
| var/poise = 0 | ||
|
|
||
| /obj/item/ego_weapon/city/mariachi/examine(mob/user) | ||
| . = ..() | ||
| . += "Current Poise: [poise]/20." | ||
|
|
||
| /obj/item/ego_weapon/city/mariachi/attack(mob/living/target, mob/living/carbon/human/user) | ||
| if(!CanUseEgo(user)) | ||
| return | ||
| poise+=1 | ||
| if(poise>= 20) | ||
| poise = 20 | ||
|
|
||
| //Crit itself. | ||
| if(prob(poise*2)) | ||
| force*=3 | ||
| to_chat(user, "<span class='userdanger'>Critical!</span>") | ||
| poise = 0 | ||
| ..() | ||
| force = initial(force) | ||
|
|
||
| //Sp healing for jobbers | ||
| /obj/item/ego_weapon/city/mariachi_blades | ||
| name = "dual machetes" | ||
| desc = "A pair of machetes used by the Los Mariachis." | ||
| special = "On kill, heal 15 sanity." | ||
| icon_state = "mariachi_blades" | ||
| inhand_icon_state = "mariachi_blades" | ||
| force = 22 | ||
| damtype = WHITE_DAMAGE | ||
| armortype = WHITE_DAMAGE | ||
| attack_verb_continuous = list("slashes", "slices") | ||
| attack_verb_simple = list("slash", "slice") | ||
| hitsound = 'sound/weapons/fixer/generic/blade1.ogg' | ||
|
|
||
| /obj/item/ego_weapon/city/mariachi_blades/attack(mob/living/target, mob/living/carbon/human/user) | ||
| var/living = FALSE | ||
| if(!CanUseEgo(user)) | ||
| return | ||
| if(target.stat != DEAD) | ||
| living = TRUE | ||
| ..() | ||
| if(target.stat == DEAD && living) | ||
| user.adjustSanityLoss(-15) | ||
| living = FALSE | ||
|
|
||
| //Leader, Grade 6 (She's pretty weak) | ||
| /obj/item/ego_weapon/city/mariachi/dual | ||
| name = "maracas" | ||
| desc = "A pair of maracas used by the leader of Los Mariachis." | ||
| icon_state = "dualmaracas" | ||
| inhand_icon_state = "dualmaracas" | ||
| force = 19 //Double the maracas twice the attack speed. | ||
| attack_speed = 0.5 | ||
| attribute_requirements = list( | ||
| FORTITUDE_ATTRIBUTE = 60, | ||
| PRUDENCE_ATTRIBUTE = 40, | ||
| TEMPERANCE_ATTRIBUTE = 40, | ||
| JUSTICE_ATTRIBUTE = 40 | ||
| ) | ||
|
|
||
| //Pre-nerf Aida, the real prize of J-corp. Grade 5 | ||
| /obj/item/ego_weapon/city/mariachi/dual/boss | ||
| name = "glowing maracas" | ||
| desc = "A pair of glowing maracas used by the leader of Los Mariachis. Only seen by the now dead." | ||
| icon_state = "dualmaracas_boss" | ||
| inhand_icon_state = "dualmaracas_boss" | ||
| force = 25 | ||
| attribute_requirements = list( | ||
| FORTITUDE_ATTRIBUTE = 80, | ||
| PRUDENCE_ATTRIBUTE = 60, | ||
| TEMPERANCE_ATTRIBUTE = 60, | ||
| JUSTICE_ATTRIBUTE = 60 | ||
| ) |
47 changes: 0 additions & 47 deletions
47
code/game/objects/items/ego_weapons/non_abnormality/mariachi.dm
This file was deleted.
Oops, something went wrong.
77 changes: 77 additions & 0 deletions
77
code/modules/clothing/suits/ego_gear/non_abnormality/jcorp.dm
This file contains 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,77 @@ | ||
| //Ting Tang, stuffs kinda jobber, no reqs anyways so big day for clerks. White resist to pair up with weapons. | ||
| /obj/item/clothing/suit/armor/ego_gear/city/ting_tang | ||
| flags_inv = HIDEJUMPSUIT|HIDEGLOVES | ||
| name = "red ting tang shirt" | ||
| desc = "A hawaiin shirt that comes with tattos, somehow. They supposedly bring good luck." | ||
| icon_state = "tingtang_bean" | ||
| armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = 30, BLACK_DAMAGE = -10, PALE_DAMAGE = -10) | ||
|
|
||
| /obj/item/clothing/suit/armor/ego_gear/city/ting_tang/puffer | ||
| name = "blue ting tang shirt" | ||
| icon_state = "tingtang_bean" | ||
|
|
||
| /obj/item/clothing/suit/armor/ego_gear/city/ting_tang/rustic | ||
| name = "yellow ting tang shirt" | ||
| icon_state = "tingtang_bean" | ||
|
|
||
| /obj/item/clothing/suit/armor/ego_gear/city/ting_tang/boss | ||
| name = "green ting tang shirt" | ||
| desc = "A hawaiin shirt worn by the boss of the Ting Tang Gang. The tattos on this one feel luckier." | ||
| icon_state = "tingtang_boss" | ||
| armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 10) | ||
| attribute_requirements = list( | ||
| FORTITUDE_ATTRIBUTE = 60, | ||
| PRUDENCE_ATTRIBUTE = 60, | ||
| TEMPERANCE_ATTRIBUTE = 60, | ||
| JUSTICE_ATTRIBUTE = 60 | ||
| ) | ||
|
|
||
| //Mariachis, balanced red and white resists. two non-req armors, 2 moderately strong ones. | ||
| /obj/item/clothing/suit/armor/ego_gear/city/mariachi | ||
| name = "los mariachis poncho" | ||
| desc = "A poncho worn by members of the Los Mariachis. This one's blue." | ||
| icon_state = "mariachis_alegre" | ||
| armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 20, BLACK_DAMAGE = -10, PALE_DAMAGE = -10) | ||
|
|
||
| /obj/item/clothing/suit/armor/ego_gear/city/mariachi/vivaz | ||
| desc = "A poncho worn by members of the Los Mariachis. This one's brown." | ||
| icon_state = "mariachis_vivaz" | ||
|
|
||
| /obj/item/clothing/suit/armor/ego_gear/city/mariachi/aida | ||
| name = "los mariachis armor" | ||
| desc = "The outfit of the Los Mariachis leader. Its well woven for sure." | ||
| icon_state = "aida" | ||
| armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 30, BLACK_DAMAGE = 10, PALE_DAMAGE = 20) | ||
| hat = /obj/item/clothing/head/ego_hat/aida_hat | ||
| attribute_requirements = list( | ||
| FORTITUDE_ATTRIBUTE = 60, | ||
| PRUDENCE_ATTRIBUTE = 60, | ||
| TEMPERANCE_ATTRIBUTE = 60, | ||
| JUSTICE_ATTRIBUTE = 60 | ||
| ) | ||
|
|
||
| /obj/item/clothing/head/ego_hat/aida_hat | ||
| name = "los mariachis sombrero" | ||
| desc = "A sombrero worn by the Los Mariachis leader. It makes you want to dance." | ||
| icon_state = "aida" | ||
|
|
||
| /obj/item/clothing/suit/armor/ego_gear/city/mariachi/aida_boss | ||
| name = "los mariachis armor" | ||
| desc = "The outfit of the Los Mariachis leader. No one has seen this form and live." | ||
| icon_state = "aida_boss" | ||
| armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 30) | ||
| hat = /obj/item/clothing/head/ego_hat/aida_hat_boss | ||
| attribute_requirements = list( | ||
| FORTITUDE_ATTRIBUTE = 80, | ||
| PRUDENCE_ATTRIBUTE = 80, | ||
| TEMPERANCE_ATTRIBUTE = 80, | ||
| JUSTICE_ATTRIBUTE = 80 | ||
| ) | ||
|
|
||
| /obj/item/clothing/head/ego_hat/aida_hat_boss | ||
| name = "los mariachis sombrero" | ||
| desc = "A sombrero worn by the Los Mariachis leader. This one has a glowing mask of a skull." | ||
| icon_state = "aida_boss" | ||
| flags_inv = HIDEMASK|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR | ||
| dynamic_hair_suffix = "" | ||
| dynamic_fhair_suffix = "" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains 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