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

Jump to bottom

doggy dog word #200

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

doggy dog word #200

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
351 changes: 276 additions & 75 deletions _maps/map_files/Pahrump-AB/Pahrump-AB.dmm
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions code/datums/components/crafting/recipes/recipes_assemblies.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,30 @@
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC

/datum/crafting_recipe/boseyebot
name = "Brotherhood Eyebot"
result = /mob/living/simple_animal/hostile/eyebot/virtual
reqs = list(/obj/item/stack/crafting/electronicparts = 25,
/obj/item/stack/crafting/metalparts = 20,
/obj/item/stack/crafting/goodparts = 15)
tools = list(TOOL_WORKBENCH)
time = 60
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
always_available = FALSE

/datum/crafting_recipe/bosfloat
name = "Brotherhood Floating Eyebot"
result = /mob/living/simple_animal/hostile/eyebot/virtual/floatingeye
reqs = list(/obj/item/stack/crafting/electronicparts = 30,
/obj/item/stack/crafting/metalparts = 25,
/obj/item/stack/crafting/goodparts = 20)
tools = list(TOOL_WORKBENCH)
time = 70
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
always_available = FALSE

/datum/crafting_recipe/trading_machine
name = "Vending machine"
result = /obj/machinery/trading_machine
Expand Down
16 changes: 13 additions & 3 deletions code/datums/traits/good.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,9 +1126,9 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(

/datum/quirk/crittermaster
name = "Beast Master - Small Critters"
desc = "Whenever by psychic means or not, you gained ability to control roaches, most geckos and molerats (last ones will be initially hostile and needs to be tamed).\
<br>Taming will make them passive toward other players and tamed fauna. Young and adult nightstalkers can be also tamed, but not controlled."
value = 4
desc = "Whenever by psychic means or not, you gained ability to control roaches, Bloatflies, Feral dogs, Geckos and molerats\
<br>You will need to use your Cattle Prod to make them passive toward other players and tamed fauna, Young and adult nightstalkers can be also tamed, But adults not controlled, You can also use this to control Faction-Aligned Beasts, But only if you share said alignment"
value = 5
mob_trait = TRAIT_BEASTMASTER_SMALLCRITTER
gain_text = span_notice("You tapped to potentials of the critter horde!")
lose_text = span_danger("Small critters refuse to obey your commands now.")
Expand All @@ -1137,6 +1137,16 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(
var/obj/effect/proc_holder/mob_common/summon_backup/beastmaster/small_critter/gather
var/obj/effect/proc_holder/mob_common/direct_mobs/beastmaster/small_critter/moveto

/datum/quirk/crittermaster/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/melee/onehanded/dogwhip/dogwhip = new(get_turf(H))
H.put_in_hands(dogwhip)
H.equip_to_slot_if_possible(dogwhip, SLOT_IN_BACKPACK)
var/obj/item/melee/onehanded/dogprod/dogprod = new(get_turf(H))
H.put_in_hands(dogprod)
H.equip_to_slot_if_possible(dogprod, SLOT_IN_BACKPACK)
H.regenerate_icons()

/datum/quirk/crittermaster/add()
var/mob/living/carbon/human/H = quirk_holder
H.faction |= list("critter-friend")
Expand Down
22 changes: 22 additions & 0 deletions code/game/objects/items/melee/f13onehanded.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,28 @@ obj/item/melee/onehanded/knife/switchblade
return
M.apply_damage(20, STAMINA, null, 0)

/obj/item/melee/onehanded/dogwhip
name = "Dog whip"
desc = "Used to get beasts into action."
icon_state = "whip"
item_state = "chain"
force = 1
attack_verb = list("riled", "encouraged")
hitsound = 'sound/weapons/whip.ogg'

/obj/item/melee/onehanded/dogprod
name = "Cattle prod"
desc = "Used to get beasts in line, Will make them hesitant until you encourage them again, Doesn't really work on people."
icon = 'icons/fallout/objects/melee/melee.dmi'
icon_state = "stunprod"
item_state = "stunprod"
force = 1
attack_verb = list("shocked", "zapped", "prodded")
hitsound = 'sound/weapons/egloves.ogg'
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'


///////////////////
// GLOVE WEAPONS //
/////////////////// -faster attack speed
Expand Down
4 changes: 4 additions & 0 deletions code/modules/jobs/job_types/bos.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,8 @@ Senior Scribe
if(visualsOnly)
return
H.mind.teach_crafting_recipe(GLOB.chemwhiz_recipes)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/boseyebot)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/bosfloat)
ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src)
ADD_TRAIT(H, TRAIT_CYBERNETICIST, src)
Expand Down Expand Up @@ -640,6 +642,8 @@ Scribe
if(visualsOnly)
return
H.mind.teach_crafting_recipe(GLOB.chemwhiz_recipes)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/boseyebot)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/bosfloat)
ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src)
ADD_TRAIT(H, TRAIT_CYBERNETICIST, src)
Expand Down
Loading
Loading