cleanup, syndipod

This commit is contained in:
Kyep
2018-01-05 03:46:55 -08:00
parent 20e2fc2db1
commit 623da07147
7 changed files with 15 additions and 30 deletions
@@ -204,7 +204,8 @@
icon = 'icons/goonstation/48x48/pods.dmi'
icon_state = "pod_synd"
result = list(
/obj/spacepod/civilian = 1
/obj/spacepod/syndi = 1,
/obj/spacepod/syndi/unlocked = 1
)
/obj/effect/spawner/random_spawners/syndicate/loot/radiokey
@@ -164,4 +164,4 @@ effective or pretty fucking useless.
if(active)
active_jammers |= src
else
active_jammers -= src
active_jammers -= src
@@ -129,19 +129,4 @@
for(var/i in 1 to 2)
for(var/res in resources)
var/obj/item/stack/R = new res(src)
R.amount = R.max_amount
/obj/structure/closet/syndicate/depot
name = "supply depot closet"
desc = ""
icon_state = "syndicate"
icon_closed = "syndicate"
icon_opened = "syndicateopen"
anchored = 1
/obj/structure/closet/syndicate/depot/open()
..()
/obj/structure/closet/syndicate/depot/Destroy()
..()
R.amount = R.max_amount
@@ -66,8 +66,4 @@
slowdown = -0.3
/turf/simulated/floor/noslip/MakeSlippery()
return
/turf/simulated/floor/syndicate
icon = 'icons/turf/shuttle.dmi'
icon_state = "floor4"
return
@@ -2,11 +2,8 @@
/mob/living/simple_animal/bot/ed209/syndicate
name = "ED-411 Security Robot"
desc = "A syndicate security bot."
//icon_state = "red2091"
icon = 'icons/mecha/mecha.dmi'
icon_state = "darkgygax"
radio_channel = "Syndicate"
health = 300
maxHealth = 300
@@ -56,6 +53,9 @@
target = H
mode = BOT_HUNT
/mob/living/simple_animal/bot/ed209/syndicate(mob/M)
return
/mob/living/simple_animal/bot/ed209/syndicate/emag_act(mob/user)
to_chat(user, "<span class='warning'>[src] has no card reader slot!</span>")
return
@@ -112,7 +112,6 @@
continue
target = M
oldtarget_name = M.name
visible_message("<b>[src]</b> points at [M.name]!")
mode = BOT_HUNT
spawn(0)
handle_automated_action()
@@ -126,13 +125,12 @@
s.set_up(3, 1, src)
s.start()
new /obj/effect/decal/cleanable/blood/oil(loc)
new /obj/effect/decal/mecha_wreckage/gygax/dark(loc)
qdel(src)
/mob/living/simple_animal/bot/ed209/syndicate/set_weapon()
projectile = /obj/item/projectile/bullet/a40mm
///obj/item/projectile/bullet/incendiary/shell/dragonsbreath
///obj/item/projectile/bullet/sniper/penetrator
/mob/living/simple_animal/bot/ed209/syndicate/emp_act(severity)
return
@@ -91,10 +91,12 @@
..()
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depotboss/proc/raise_alert()
if(depotarea)
if(depotarea && !raised_alert)
say("Intruder!")
raised_alert = TRUE
depotarea.increase_alert()
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depotboss/death()
raise_alert()
return ..()
+3
View File
@@ -552,6 +552,9 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
health = 400
unlocked = FALSE
/obj/spacepod/syndi/unlocked
unlocked = TRUE
/obj/spacepod/sec/New()
..()
var/obj/item/device/spacepod_equipment/weaponry/burst_taser/T = new /obj/item/device/spacepod_equipment/weaponry/taser