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.

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

Artificer unrework Test Merge #105

Closed
wants to merge 1 commit into from
Closed

Artificer unrework Test Merge #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions code/game/objects/items/rogueweapons/ranged/gunpowder/runelock.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
if(!cocked)
to_chat(user, span_info("I ready the runelock to be fired..."))
if(user.mind)
var/skill = user.mind.get_skill_level(/datum/skill/craft/engineering)
var/skill = user.mind.get_skill_level(/datum/skill/combat/firearms)
if(skill)
reload_time = reload_time / skill
if(move_after(user, reload_time SECONDS, target = user))
Expand All @@ -72,7 +72,7 @@

/obj/item/gun/ballistic/revolver/grenadelauncher/runelock/process_fire/(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(user.mind)
var/skill = user.mind.get_skill_level(/datum/skill/craft/engineering)
var/skill = user.mind.get_skill_level(/datum/skill/combat/firearms)
if(skill)
misfire_chance = max(0, misfire_chance - (skill * 2))
spread = max(3, spread / skill)
Expand Down
5 changes: 2 additions & 3 deletions code/modules/jobs/job_types/roguetown/yeomen/artificer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
..()
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/firearms, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/axes, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
Expand All @@ -35,7 +35,6 @@
H.mind.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)


head = /obj/item/clothing/head/roguetown/hatfur
if(prob(50))
Expand All @@ -51,7 +50,7 @@
mask = /obj/item/clothing/mask/rogue/spectacles/golden
backl = /obj/item/storage/backpack/rogue/backpack
backpack_contents = list(/obj/item/rogueweapon/hammer/claw = 1)
H.change_stat("perception", 1)
H.change_stat("strength", 1)
H.change_stat("intelligence", 2)
H.change_stat("endurance", 1)
H.change_stat("constitution", 1)
13 changes: 0 additions & 13 deletions code/modules/roguetown/roguecrafting/alchemy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,19 +200,6 @@

/datum/crafting_recipe/roguetown/alchemy/powderflask
name = "Powder Flask"
req_table = FALSE
verbage_simple = "mix"
result = list(/obj/item/powderflask)
reqs = list(/obj/item/ash = 2, /obj/item/rogueore/coal = 2, /obj/item/natural/hide = 1)
skillcraft = /datum/skill/misc/alchemy
craftdiff = 2


/datum/crafting_recipe/roguetown/alchemy/powderflaskEngineering
name = "Powder Flask"
req_table = FALSE
verbage_simple = "mix"
result = list(/obj/item/powderflask)
reqs = list(/obj/item/ash = 2, /obj/item/rogueore/coal = 2, /obj/item/natural/hide = 1)
skillcraft = /datum/skill/craft/engineering
craftdiff = 2
13 changes: 13 additions & 0 deletions code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,4 +422,17 @@
created_item = /obj/item/rogueweapon/sword/long/blackflamb
craftdiff = 5

//GUN AMMO

/datum/anvil_recipe/weapons/iron/leadball
name = "Iron Balls (3x)"
req_bar = /obj/item/ingot/iron
created_item = /obj/item/ammo_casing/caseless/lead
createditem_num = 3
i_type = "Ammo"

/datum/anvil_recipe/weapons/iron/runeball
name = "Runic Ball"
req_bar = /obj/item/ingot/iron
created_item = /obj/item/ammo_casing/caseless/runelock
i_type = "Ammo"
19 changes: 0 additions & 19 deletions modular_causticcove/code/modules/roguetown/roguejobs/Engineer/anvil_recipes/mechanical.dm
View file
Open in desktop

This file was deleted.

19 changes: 12 additions & 7 deletions roguetown.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3626,18 +3626,11 @@
#include "modular_azurepeak\statpacks\wildcard.dm"
#include "modular_causticcove\code\__DEFINES\status_effects.dm"
#include "modular_causticcove\code\datums\status_effects\rogue\causticbuff.dm"
#include "modular_causticcove\code\datums\status_effects\rogue\causticdebuff.dm"
#include "modular_causticcove\code\game\area\areas.dm"
#include "modular_causticcove\code\game\area\objects\items\rogueitems\natural\animals.dm"
#include "modular_causticcove\code\modules\clothing\rogueclothes\armor.dm"
#include "modular_causticcove\code\modules\mob\living\simple_animal\rogue\eldritch\beast_mother.dm"
#include "modular_causticcove\code\modules\mob\living\simple_animal\rogue\monster\brain_gusher_beast.dm"
#include "modular_causticcove\code\modules\mob\living\simple_animal\rogue\monster\wendigo_beast.dm"
#include "modular_causticcove\code\modules\roguetown\roguecrafting\alchemy.dm"
#include "modular_causticcove\code\modules\roguetown\roguecrafting\weaving.dm"
#include "modular_causticcove\code\modules\roguetown\roguejobs\alchemist\containers.dm"
#include "modular_causticcove\code\modules\roguetown\roguejobs\alchemist\reagent.dm"
#include "modular_causticcove\code\modules\roguetown\roguejobs\Engineer\anvil_recipes\mechanical.dm"
#include "modular_causticcove\code\modules\spells\wizard.dm"
#include "modular_causticcove\code\modules\spells\pantheon\Divine\noc.dm"
#include "modular_causticcove\code\modules\vore\persistence.dm"
Expand All @@ -3663,6 +3656,18 @@
#include "modular_hearthstone\code\modules\mob\living\simple_animal\rogue\rogue_corpse.dm"
#include "modular_hearthstone\code\modules\reagents\reagent_containers\lux.dm"
#include "modular_hearthstone\code\modules\spells\roguetown\wizard.dm"
#include "modular_causticcove\code\__DEFINES\status_effects.dm"
#include "modular_causticcove\code\datums\status_effects\rogue\causticbuff.dm"
#include "modular_causticcove\code\modules\roguetown\roguejobs\alchemist\reagent.dm"
#include "modular_causticcove\code\modules\roguetown\roguecrafting\alchemy.dm"
#include "modular_causticcove\code\modules\roguetown\roguecrafting\weaving.dm"
#include "modular_causticcove\code\modules\roguetown\roguejobs\alchemist\containers.dm"
#include "modular_causticcove\code\game\area\objects\items\rogueitems\natural\animals.dm"
#include "modular_causticcove\code\modules\mob\living\simple_animal\rogue\eldritch\beast_mother.dm"
#include "modular_causticcove\code\modules\mob\living\simple_animal\rogue\monster\wendigo_beast.dm"
#include "modular_causticcove\code\modules\mob\living\simple_animal\rogue\monster\brain_gusher_beast.dm"
#include "modular_causticcove\code\datums\status_effects\rogue\causticdebuff.dm"
#include "modular_hearthstone\code\modules\spells\roguetown\spells5e\cantrips5e.dm"
#include "modular_hearthstone\code\modules\spells\roguetown\spells5e\spellscrolls.dm"
#include "modular_causticcove\code\modules\clothing\rogueclothes\armor.dm"
// END_INCLUDE
Loading