cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13985 from bgobandit/bugfixesandshit

Browse Source 
Fixes some minor bugs and adds minor feedback.
This commit is contained in:
tkdrg
2015-12-25 18:24:25 -03:00
parent cfe2a19952 789e3457cb
commit 0a4b99e2ec
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/machinery/doors/airlock.dm
View File

@@ -923,7 +923,10 @@ About the new airlock wires panel:
else if(istype(C, /obj/item/weapon/airlock_painter)) else if(istype(C, /obj/item/weapon/airlock_painter))
change_paintjob(C, user) change_paintjob(C, user)
else if(istype(C, /obj/item/device/doorCharge) && p_open) else if(istype(C, /obj/item/device/doorCharge))
if(!p_open)
user << "<span class='warning'>The maintenance panel must be open to apply [C]!</span>"
return
if(emagged) if(emagged)
return return
if(charge && !detonated) if(charge && !detonated)

6
code/game/objects/items/weapons/implants/implanter.dm
View File

@@ -32,8 +32,10 @@
if(T && (M == user || do_after(user, 50))) if(T && (M == user || do_after(user, 50)))
if(user && M && (get_turf(M) == T) && src && imp) if(user && M && (get_turf(M) == T) && src && imp)
if(imp.implant(M, user)) if(imp.implant(M, user))
user << "<span class='notice'>You implant the implant into [M].</span>" if (M == user)
M.visible_message("[user] has implanted [M].", "<span class='notice'>[user] implants you with the implant.</span>") user << "<span class='notice'>You implant yourself.</span>"
else
M.visible_message("[user] has implanted [M].", "<span class='notice'>[user] implants you.</span>")
imp = null imp = null
update_icon() update_icon()

4
code/modules/mob/living/simple_animal/friendly/dog.dm
View File

@@ -183,7 +183,7 @@
) )
if( ! ( item_to_add.type in allowed_types ) ) if( ! ( item_to_add.type in allowed_types ) )
usr << "<span class='warning'>You set [item_to_add] on [src]'s back, but \he shakes it off!</span>" usr << "<span class='warning'>You set [item_to_add] on [src]'s back, but it falls off!</span>"
if(!usr.drop_item()) if(!usr.drop_item())
usr << "<span class='warning'>\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!</span>" usr << "<span class='warning'>\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!</span>"
return return
@@ -260,7 +260,7 @@
if(user && !user.drop_item()) if(user && !user.drop_item())
user << "<span class='warning'>\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!</span>" user << "<span class='warning'>\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!</span>"
return 0 return 0
user << "<span class='warning'>You set [item_to_add] on [src]'s head, but \he shakes it off!</span>" user << "<span class='warning'>You set [item_to_add] on [src]'s head, but it falls off!</span>"
item_to_add.loc = loc item_to_add.loc = loc
if(prob(25)) if(prob(25))
step_rand(item_to_add) step_rand(item_to_add)