Small Changes (#1836)

devices and tools.dm ~Advanced pinpointer added
implant.dm ~loyalty implants melt when EMP'd
nuclear_bomb.dm ~ code goes to delta when activated
microwave.dm ~ Fixes #1668
lockbox.dm ~ medal box added
exodus-1.dmm ~ medal box added
storage.dmi ~ medal box icon added
advanced pin pointer was 25 but after talking to some people they said 15 is better, I don't know though
This commit is contained in:
printer16
2017-02-25 22:13:02 +02:00
committed by skull132
parent dceacd805b
commit d97afa0bee
8 changed files with 79 additions and 5 deletions
@@ -346,6 +346,26 @@ the implant may become unstable and either pre-maturely inject the subject or si
H << "<span class='notice'>You feel a surge of loyalty towards [company_name].</span>"
return 1
emp_act(severity)
if (malfunction)
return
malfunction = MALFUNCTION_TEMPORARY
activate("emp")
if(severity == 1)
if(prob(50))
meltdown()
else if (prob(50))
malfunction = MALFUNCTION_PERMANENT
processing_objects.Remove(src)
return
spawn(20)
malfunction--
implanted(mob/source as mob)
//mobname = source.real_name
processing_objects.Add(src)
return 1
/obj/item/weapon/implant/adrenalin
name = "adrenalin"
@@ -99,3 +99,36 @@
New()
..()
new /obj/item/weapon/gun/energy/lawgiver(src)
/obj/item/weapon/storage/lockbox/medal
name = "medal box"
desc = "A locked box used to store medals."
icon_state = "medalbox+l"
item_state = "syringe_kit"
w_class = 3
max_w_class = 2
req_access = list(access_captain)
icon_locked = "medalbox+l"
icon_closed = "medalbox"
icon_broken = "medalbox+b"
/obj/item/weapon/storage/lockbox/medal/New()
..()
new /obj/item/clothing/accessory/medal
new /obj/item/clothing/accessory/medal
new /obj/item/clothing/accessory/medal/conduct
new /obj/item/clothing/accessory/medal/conduct
new /obj/item/clothing/accessory/medal/conduct
new /obj/item/clothing/accessory/medal/conduct
new /obj/item/clothing/accessory/medal/bronze_heart
new /obj/item/clothing/accessory/medal/bronze_heart
new /obj/item/clothing/accessory/medal/nobel_science
new /obj/item/clothing/accessory/medal/nobel_science
new /obj/item/clothing/accessory/medal/silver
new /obj/item/clothing/accessory/medal/iron/merit
new /obj/item/clothing/accessory/medal/silver/valor
new /obj/item/clothing/accessory/medal/silver/security
new /obj/item/clothing/accessory/medal/silver/security
new /obj/item/clothing/accessory/medal/gold