diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 912e8416813..bc63db21645 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -185,18 +185,21 @@ for reference: return else if (istype(W, /obj/item/weapon/wrench)) if (src.health < src.maxhealth) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) src.health = src.maxhealth src.emagged = 0 src.req_access = list(access_security) visible_message("[user] repairs \the [src]!") return else if (src.emagged > 0) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) src.emagged = 0 src.req_access = list(access_security) visible_message("[user] repairs \the [src]!") return return else + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) switch(W.damtype) if("fire") src.health -= W.force * 0.75 diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index b09f708f2b1..6a94f878718 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -256,7 +256,7 @@ /obj/item/device/radio/headset/ert/ccia name = "central command internal affairs radio headset" - ks2type = /obj/item/device/encryptionkey/ert + ks2type = /obj/item/device/encryptionkey/ccia /obj/item/device/encryptionkey/ccia name = "\improper CCIA radio encryption key" diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 4764dcd5479..0a5cf895545 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -153,11 +153,8 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca if((istype(O, /obj/item) || istype(O, /obj/structure)) && !is_type_in_list(O, protected_objects)) - O.loc = src - name = O.name - desc = O.desc - icon = O.icon - icon_state = O.icon_state + O.forceMove(src) + appearance = O icon_living = icon_state if(istype(O, /obj/structure)) @@ -192,4 +189,4 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca if(istype(L)) if(prob(15)) L.Weaken(1) - L.visible_message("\the [src] knocks down \the [L]!") \ No newline at end of file + L.visible_message("\the [src] knocks down \the [L]!") diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index b276837823c..f251bd38374 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -51,12 +51,12 @@ if(usr.incapacitated()) return if(kickstand) - src.visible_message("You put up \the [src]'s kickstand.") + src.visible_message("\The [usr] puts up \the [src]'s kickstand.", "You put up \the [src]'s kickstand.", "You hear a thunk.") else if(istype(src.loc,/turf/space)) usr << " You don't think kickstands work in space..." return - src.visible_message("You put down \the [src]'s kickstand.") + src.visible_message("\The [usr] puts down \the [src]'s kickstand.", "You put down \the [src]'s kickstand.", "You hear a thunk.") if(pulledby) pulledby.stop_pulling() diff --git a/html/changelog.html b/html/changelog.html index ffdefd98168..65ebcf6e9be 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

10 February 2017

+

Alberyk updated:

+ +

07 February 2017

Lohikar updated: