cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Buffs Nuclear Operative Cyborgs (#22444)

Browse Source 
* Pinpointer + grenade launcher

* NANOPASTE FOR THE PEASANTS

* Adds pinpointers lmao

* Removes the Nuke

* Henri review

* Update code/game/gamemodes/nuclear/pinpointer.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Henri review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2023-09-25 19:05:15 -04:00
committed by GitHub
co-authored by Henri215
parent 59c70f983b
commit ed11dad321
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules.dm
+6 -4
View File
@@ -620,7 +620,8 @@
/obj/item/gun/projectile/revolver/grenadelauncher/multi/cyborg,
/obj/item/card/emag,
/obj/item/crowbar/cyborg,
/obj/item/pinpointer/operative
/obj/item/pinpointer/operative/nad,
/obj/item/stack/nanopaste/cyborg/syndicate
)
// Sydicate medical cyborg module.
@@ -646,7 +647,7 @@
/obj/item/FixOVein,
/obj/item/card/emag,
/obj/item/crowbar/cyborg,
/obj/item/pinpointer/operative,
/obj/item/pinpointer/operative/nad,
/obj/item/stack/medical/bruise_pack/advanced/cyborg/syndicate,
/obj/item/stack/medical/ointment/advanced/cyborg/syndicate,
/obj/item/stack/medical/splint/cyborg/syndicate,
@@ -678,13 +679,14 @@
/obj/item/melee/energy/sword/cyborg,
/obj/item/card/emag,
/obj/item/borg_chameleon,
/obj/item/pinpointer/operative,
/obj/item/pinpointer/operative/nad,
/obj/item/stack/sheet/metal/cyborg,
/obj/item/stack/rods/cyborg,
/obj/item/stack/tile/plasteel/cyborg,
/obj/item/stack/cable_coil/cyborg,
/obj/item/stack/sheet/glass/cyborg,
/obj/item/stack/sheet/rglass/cyborg
/obj/item/stack/sheet/rglass/cyborg,
/obj/item/stack/nanopaste/cyborg/syndicate
)
special_rechargables = list(/obj/item/extinguisher, /obj/item/weldingtool/largetank/cyborg)
code/modules/mob/living/silicon/robot/syndicate_robot.dm
+1 -1
View File
@@ -23,7 +23,7 @@
/mob/living/silicon/robot/syndicate/New(loc)
..()
cell = new /obj/item/stock_parts/cell/hyper(src)
cell = new /obj/item/stock_parts/cell/bluespace(src)
/mob/living/silicon/robot/syndicate/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null)
laws = new /datum/ai_laws/syndicate_override
code/modules/projectiles/ammunition/magazines.dm
+4
View File
@@ -147,6 +147,10 @@
ammo_type = /obj/item/ammo_casing/a40mm
max_ammo = 6
/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi/fifteen
ammo_type = /obj/item/ammo_casing/a40mm
max_ammo = 15
/obj/item/ammo_box/magazine/internal/speargun
name = "speargun internal magazine"
ammo_type = /obj/item/ammo_casing/caseless/magspear
code/modules/projectiles/guns/projectile/launchers.dm
+2 -1
View File
@@ -24,9 +24,10 @@
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi
/obj/item/gun/projectile/revolver/grenadelauncher/multi/cyborg
desc = "A 6-shot grenade launcher."
desc = "A 15-shot grenade launcher."
icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_grenadelnchr"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi/fifteen
/obj/item/gun/projectile/revolver/grenadelauncher/multi/cyborg/attack_self()
return