mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-15 02:03:48 +01:00
[MIRROR] Adds Gooborgs & Toggleable Stomach Glowing for Borgs (#10418)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
4a4293a9e4
commit
2cd485cbba
@@ -5,20 +5,6 @@
|
||||
***********************************************************************/
|
||||
//Might want to move this into several files later but for now it works here
|
||||
|
||||
/obj/item/melee/baton/robot/arm
|
||||
name = "electrified arm"
|
||||
icon = 'icons/obj/decals.dmi'
|
||||
icon_state = "shock"
|
||||
|
||||
hitcost = 750
|
||||
agonyforce = 70
|
||||
|
||||
/obj/item/melee/baton/robot/arm/update_icon()
|
||||
if(status)
|
||||
set_light(1.5, 1, lightcolor)
|
||||
else
|
||||
set_light(0)
|
||||
|
||||
/obj/item/borg/overdrive
|
||||
name = "overdrive"
|
||||
icon = 'icons/obj/decals.dmi'
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
var/status = 0 //whether the thing is on or not
|
||||
var/obj/item/cell/bcell = null
|
||||
var/hitcost = 240
|
||||
var/use_external_power = FALSE //only used to determine if it's a cyborg baton
|
||||
var/grip_safety = TRUE
|
||||
var/taped_safety = FALSE
|
||||
|
||||
@@ -118,8 +117,6 @@
|
||||
. += span_warning("The baton does not have a power source installed.")
|
||||
|
||||
/obj/item/melee/baton/attackby(obj/item/W, mob/user)
|
||||
if(use_external_power)
|
||||
return
|
||||
if(istype(W, /obj/item/cell))
|
||||
if(istype(W, /obj/item/cell/device))
|
||||
if(!bcell)
|
||||
@@ -159,11 +156,6 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/melee/baton/attack_self(mob/user)
|
||||
if(use_external_power)
|
||||
//try to find our power cell
|
||||
var/mob/living/silicon/robot/R = loc
|
||||
if (istype(R))
|
||||
bcell = R.cell
|
||||
if(bcell && bcell.charge >= hitcost)
|
||||
status = !status
|
||||
to_chat(user, span_notice("[src] is now [status ? "on" : "off"]."))
|
||||
@@ -229,11 +221,6 @@
|
||||
bcell.emp_act(severity) //let's not duplicate code everywhere if we don't have to please.
|
||||
..()
|
||||
|
||||
//secborg stun baton module
|
||||
/obj/item/melee/baton/robot
|
||||
hitcost = 500
|
||||
use_external_power = TRUE
|
||||
|
||||
//Makeshift stun baton. Replacement for stun gloves.
|
||||
/obj/item/melee/baton/cattleprod
|
||||
name = "stunprod"
|
||||
@@ -291,7 +278,3 @@
|
||||
..(target, user, hit_zone)
|
||||
if(status && target.has_AI())
|
||||
target.taunt(user)
|
||||
|
||||
// Borg version, for the lost module.
|
||||
/obj/item/melee/baton/shocker/robot
|
||||
use_external_power = TRUE
|
||||
|
||||
Reference in New Issue
Block a user