fix docs, change timing

This commit is contained in:
Kyep
2018-06-17 21:39:17 -07:00
parent 835a2dcdda
commit 9660aac6d2
5 changed files with 22 additions and 20 deletions
+1 -1
View File
@@ -742,7 +742,7 @@
"on" = (/turf/simulated/floor/mineral/silver,/area/syndicate_depot)
"oo" = (/turf/simulated/floor/mineral/plasma,/area/syndicate_depot)
"op" = (/obj/structure/table,/obj/item/wrench,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
"oq" = (/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
"oq" = (/obj/structure/table,/obj/item/folder/syndicate/yellow,/obj/item/pen,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
"or" = (/obj/structure/cable,/obj/machinery/power/terminal,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
"os" = (/obj/effect/spawner/random_spawners/syndicate/layout/door/vault,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
"ot" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/wall/r_wall,/area/syndicate_depot)
@@ -182,12 +182,13 @@
)
/obj/effect/spawner/random_spawners/syndicate/trap/documents
name = "50pc traped documents"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "folder_syellow"
icon_state = "docs_yellow"
spawn_nothing_percentage = 0
result = list(
/obj/item/folder/syndicate/yellow = 1,
/obj/item/folder/syndicate/yellow_trapped = 1
/obj/item/documents/syndicate/yellow = 1,
/obj/item/documents/syndicate/yellow/trapped = 1
)
+14 -1
View File
@@ -31,4 +31,17 @@
/obj/item/documents/syndicate/yellow
name = "'Yellow' secret documents"
desc = "\"Top Secret\" documents printed on special copy-protected paper. It details sensitive Syndicate operational intelligence. These documents are marked \"Yellow\"."
icon_state = "docs_yellow"
icon_state = "docs_yellow"
var/poison_type = "amanitin"
var/poison_dose = 20
var/poison_total = 60
/obj/item/documents/syndicate/yellow/trapped/pickup(user)
if(ishuman(user) && poison_total > 0)
var/mob/living/carbon/human/H = user
var/obj/item/clothing/gloves/G = H.gloves
if(!istype(G) || G.transfer_prints)
H.reagents.add_reagent(poison_type, poison_dose)
poison_total -= poison_dose
add_attack_logs(src, user, "Picked up [src], the trapped syndicate documents")
..()
+2 -2
View File
@@ -46,7 +46,7 @@
if(containment_failure)
playsound(loc, 'sound/machines/Alarm.ogg', 100, 0, 0)
O.deliberate = TRUE
O.max_cycles = 7
O.max_cycles = 6
qdel(src)
/obj/effect/overload
@@ -58,7 +58,7 @@
var/cycles = 0
var/beepsound = 'sound/items/timer.ogg'
var/deliberate = FALSE
var/max_cycles = 15
var/max_cycles = 10
var/max_fire_range = 6
var/area/syndicate_depot/depotarea
+1 -13
View File
@@ -125,20 +125,8 @@
/obj/item/folder/syndicate/yellow
icon_state = "folder_syellow"
/obj/item/folder/syndicate/yellow/New()
/obj/item/folder/syndicate/yellow/full/New()
..()
new /obj/item/documents/syndicate/yellow(src)
update_icon()
/obj/item/folder/syndicate/yellow_trapped
icon_state = "folder_syellow"
/obj/item/folder/syndicate/yellow_trapped/New()
..()
var/obj/item/paper/P = new /obj/item/paper(src)
P.name = "'Yellow' secret documents"
P.info = "Death to NanoTrasen!"
P.contact_poison = "amanitin"
P.contact_poison_volume = 20
P.contact_poison_poisoner = "syndicate_depot"
P.update_icon()