diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 4adcc9109fc..c72f04f4ff3 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -53,16 +53,16 @@
playsound(src.loc, 'sound/machines/buzz-two.ogg', 20, 0)
return 0
- pai.ID.access.Cut()
- pai.ID.access = card.access.Copy()
- pai.ID.registered_name = card.registered_name
+ pai.idcard.access.Cut()
+ pai.idcard.access = card.access.Copy()
+ pai.idcard.registered_name = card.registered_name
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
- user << "ID Registration for [pai.ID.registered_name] is a success. PAI access updated!"
+ user << "ID Registration for [pai.idcard.registered_name] is a success. PAI access updated!"
return 1
/obj/item/device/paicard/proc/ID_readout()
- if (pai.ID.registered_name)
- return "Identity of owner: [pai.ID.registered_name] registered."
+ if (pai.idcard.registered_name)
+ return "Identity of owner: [pai.idcard.registered_name] registered."
else
return "No ID card registered! Please scan your ID to share access."
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index c9f66a6815f..d7e82798d66 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -580,7 +580,7 @@ All custom items with worn sprites must follow the contained sprite system: http
if(isnull(F))
return
- F.damage += 5
+ F.take_damage(5)
src << "You feel a stabbing pain in your chest!"
playsound(user, 'sound/effects/Heart Beat.ogg', 20, 1)
@@ -1037,7 +1037,7 @@ All custom items with worn sprites must follow the contained sprite system: http
item_state = "azaroz_staff"
contained_sprite = 1
slot_flags = SLOT_BACK
- w_class = 4
+ w_class = 3
/obj/item/clothing/suit/fluff/eul_robe //Well Made Robe - Uelak Eul - lordraven001
@@ -1057,3 +1057,24 @@ All custom items with worn sprites must follow the contained sprite system: http
icon_state = "eul_glasses"
item_state = "eul_glasses"
contained_sprite = 1
+
+
+/obj/item/clothing/suit/poncho/fluff/flaming_poncho //Stitched Heart White Poncho - Flaming Hearts Love Stars - sleepywolf
+ name = "stitched heart white poncho"
+ desc = "A white poncho stitched together shoddily, with a pink heart made of flame patterned on the front. The fabric is rough, like chainmail."
+ icon = 'icons/obj/custom_items/flaming_poncho.dmi'
+ icon_state = "flaming_poncho"
+ item_state = "flaming_poncho"
+ contained_sprite = 1
+
+
+/obj/item/clothing/accessory/badge/fluff/jane_badge //Tarnished Badge - Jane Pyre - somethingvile
+ name = "tarnished badge"
+ desc = "A worn, tarnished brass badge with ash and soot set deep in the grooves of its surface. The word, though faded and barely discernible, \"Pyre\" can be traced out lining its bottom edge."
+ icon = 'icons/obj/custom_items/jane_badge.dmi'
+ icon_state = "jane_badge"
+ item_state = "jane_badge"
+ slot_flags = SLOT_BELT | SLOT_TIE
+ contained_sprite = 1
+ stored_name = "Francis Pyre"
+ badge_string = "CPD"
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 5a3cdb8c4ec..5a7f885f020 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -45,7 +45,7 @@
)
var/obj/item/weapon/pai_cable/cable // The cable we produce and use when door or camera jacking
- var/obj/item/weapon/card/id/ID = null //Internal ID used to store copied owner access, and to check access for airlocks
+ idcard_type = /obj/item/weapon/card/id //Internal ID used to store copied owner access, and to check access for airlocks
var/master // Name of the one who commands us
var/master_dna // DNA string for owner verification
@@ -138,8 +138,6 @@
//PDA
pda = new(src)
- ID = new(src)
- ID.registered_name = ""
addtimer(CALLBACK(src, .proc/set_pda), 5)
. = ..()
@@ -149,6 +147,11 @@
pda.name = "[pda.owner] ([pda.ownjob])"
pda.toff = TRUE
+/mob/living/silicon/pai/init_id()
+ . = ..()
+ idcard.registered_name = ""
+
+
/mob/living/silicon/pai/Login()
greet()
..()
diff --git a/html/changelog.html b/html/changelog.html
index 2a489dc4544..4bff36a7c4f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
-->
+
13 June 2017
+
Nanako updated:
+
+ - Fixed personal AI's having all-access to the station. They are now back to only having the access of their master.
+
+
16 May 2017
Printer16 updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0b95b11be41..d9065c36b08 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4168,3 +4168,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: Smoking pipes have been made small items.
- bugfix: IPC's can now wear refitted voidsuits. (Only if refitted to human/skrell)
- bugfix: 'The holodeck thunderdome ready button no longer requires power. '
+2017-06-13:
+ Nanako:
+ - bugfix: Fixed personal AI's having all-access to the station. They are now back
+ to only having the access of their master.
diff --git a/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi
index acb2b0cb966..ac4bbdb31ab 100644
Binary files a/icons/mob/custom_synthetic.dmi and b/icons/mob/custom_synthetic.dmi differ
diff --git a/icons/obj/custom_items/flaming_poncho.dmi b/icons/obj/custom_items/flaming_poncho.dmi
new file mode 100644
index 00000000000..7328dfbcafa
Binary files /dev/null and b/icons/obj/custom_items/flaming_poncho.dmi differ
diff --git a/icons/obj/custom_items/jane_badge.dmi b/icons/obj/custom_items/jane_badge.dmi
new file mode 100644
index 00000000000..2f0a5f3321b
Binary files /dev/null and b/icons/obj/custom_items/jane_badge.dmi differ