Skip to content

Commit

Permalink
More! borg buffing/qol and gifts for prospecting. (#4833)
Browse files Browse the repository at this point in the history
* More QOL for borgis.

Disks for paperwork grippers!
GuN for service borgs (like all the rest)

* Bonus stuff!

3% drop chance of reaver assualt armor on all reavers

* Update Map_Nadezhda.dm

wOooops classic

* service gripper

allows the service borg to hold Hex Cooking related items. Might work? Might explode who knows.

* sonar

Gives mining borgs ore sonar thingy

* Update gripper.dm

Disables grippers holding hex cooking containers again for now. They need work sadly more then I know how to do.
  • Loading branch information
benj8560 authored Nov 10, 2023
1 parent 820e422 commit 06255a3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
9 changes: 9 additions & 0 deletions code/game/objects/random/cloth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -506,3 +506,12 @@
/obj/item/clothing/head/helmet/space/os = 8,
/obj/item/clothing/suit/space/os = 8,
/obj/item/clothing/suit/space/void/greyson = 1))

/obj/random/cloth/assault/reaver
name = "low chance Reaver Assault Armor"
desc = "Low chance reaver assault armor spawn. Intended for use on Reavers."
icon_state = "armor-grey-low"
spawn_nothing_percentage = 97 //about a 1/3 chance on a normal round of obtaining this

/obj/random/cloth/assault/reaver/item_to_spawn()
return pickweight(list(/obj/item/clothing/suit/space/void/assault/void_wolf))
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
rapid = TRUE
rapid_fire_shooting_amount = 3
ranged_cooldown = 3
drop_items = list(/obj/item/gun/energy/firestorm/reaver_modded)
drop_items = list(/obj/item/gun/energy/firestorm/reaver_modded,/obj/random/cloth/assault/reaver)
limited_ammo = TRUE
mag_drop = TRUE
rounds_left = 20
Expand All @@ -228,7 +228,7 @@

/mob/living/carbon/superior_animal/human/voidwolf/elite/laserak
projectiletype = /obj/item/projectile/beam/weak/ap/reaver
drop_items = list(/obj/item/gun/energy/firestorm/reaver_modded)
drop_items = list(/obj/item/gun/energy/firestorm/reaver_modded,/obj/random/cloth/assault/reaver)

mag_type = /obj/item/cell/medium/high/depleted
mags_left = 3
Expand Down Expand Up @@ -279,7 +279,7 @@
icon_state = "reaver_gyro"
projectilesound = 'sound/weapons/guns/fire/ubgl.ogg'
projectiletype = /obj/item/projectile/bullet/gyro
drop_items = list(/obj/item/gun/projectile/gyropistol)
drop_items = list(/obj/item/gun/projectile/gyropistol,/obj/random/cloth/assault/reaver)
rapid = FALSE
rounds_left = 4
mag_type = /obj/item/ammo_magazine/a75/empty
Expand All @@ -303,7 +303,7 @@
ranged = FALSE
rapid = FALSE
limited_ammo = FALSE
drop_items = list(/obj/item/tool/sword/saber/cutlass, /obj/item/shield/buckler/energy/reaver/damaged)
drop_items = list(/obj/item/tool/sword/saber/cutlass, /obj/item/shield/buckler/energy/reaver/damaged,/obj/random/cloth/assault/reaver)

var/block_chance = 65

Expand Down
5 changes: 3 additions & 2 deletions code/modules/mob/living/silicon/robot/gripper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@
/obj/item/photo,
/obj/item/spacecash,
/obj/item/coin,
/obj/item/device/toner
/obj/item/device/toner,
/obj/item/computer_hardware/hard_drive/portable/design
)

/obj/item/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc
Expand Down Expand Up @@ -311,7 +312,7 @@
/obj/item/am_containment,
/obj/item/am_shielding_container,
/obj/item/clothing/mask/smokable/cigarette,
///obj/item/reagent_containers/cooking_container //PArt of cooking overhaul, not yet ported
///obj/item/reagent_containers/cooking_with_jane/cooking_container //currently not working with cooking with jane. Primary issue being grippers trying to put themselfs into cooking containers rather then picking them up.
)

/obj/item/gripper/ammo //Used to boxes, ammo and shells
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/silicon/robot/robot_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/gripper/upgrade(src)
src.modules += new /obj/item/device/gps(src)
src.modules += new /obj/item/device/synthesized_instrument/synthesizer(src)
src.modules += new /obj/item/gun/energy/borg/pistol(src)
src.emag += new /obj/item/stamp/chameleon(src)
src.emag += new /obj/item/pen/chameleon(src)
..(R)
Expand Down Expand Up @@ -1109,6 +1110,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/pen/robopen(src)
src.modules += new /obj/item/form_printer(src)
src.modules += new /obj/item/gripper/paperwork(src)
src.modules += new /obj/item/device/ore_sonar(src)
src.emag += new /obj/item/tool/pickaxe/onestar/cyborg(src)

//Seller so quite and knowing the deal!
Expand Down

0 comments on commit 06255a3

Please sign in to comment.