cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

More bug fixes (#2305)

Browse Source 
Fixes #2296
Fixes #1904
Fixes #2303
Fixes #2285
Fixes #1753
Fixes #1649
Fixes #789
Fixes #1779
This commit is contained in:
Ron
2017-05-20 18:41:26 +03:00
committed by skull132
parent 9dfcdc5311
commit 5de06206e7
9 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/brain/MMI.dm
+3
View File
@@ -106,6 +106,9 @@
icon_state = "mmi_empty"
name = "Man-Machine Interface"
if(istype(src,/obj/item/device/mmi/digital/robot))
icon_state = "mainboard"
name = "robotic intelligence circuit"
proc
transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people.
code/modules/mob/living/carbon/human/stripping.dm
+5 -5
View File
@@ -13,22 +13,22 @@
// Handle things that are part of this interface but not removing/replacing a given item.
if("pockets")
visible_message("<span class='danger'>\The [user] is trying to empty \the [src]'s pockets!</span>")
if(do_after(user,HUMAN_STRIP_DELAY))
if(do_after(user,HUMAN_STRIP_DELAY, act_target = src))
empty_pockets(user)
return 1
if("splints")
visible_message("<span class='danger'>\The [user] is trying to remove \the [src]'s splints!</span>")
if(do_after(user,HUMAN_STRIP_DELAY))
if(do_after(user,HUMAN_STRIP_DELAY, act_target = src))
remove_splints(user)
return 1
if("sensors")
visible_message("<span class='danger'>\The [user] is trying to set \the [src]'s sensors!</span>")
if(do_after(user,HUMAN_STRIP_DELAY))
if(do_after(user,HUMAN_STRIP_DELAY, act_target = src))
toggle_sensors(user)
return 1
if("internals")
visible_message("<span class='danger'>\The [usr] is trying to set \the [src]'s internals!</span>")
if(do_after(user,HUMAN_STRIP_DELAY))
if(do_after(user,HUMAN_STRIP_DELAY, act_target = src))
toggle_internals(user)
return 1
if("tie")
@@ -40,7 +40,7 @@
return 0
visible_message("<span class='danger'>\The [usr] is trying to remove \the [src]'s [A.name]!</span>")
if(!do_after(user,HUMAN_STRIP_DELAY))
if(!do_after(user,HUMAN_STRIP_DELAY, act_target = src))
return 0
if(!A || suit.loc != src || !(A in suit.accessories))
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+1 -1
View File
@@ -74,7 +74,7 @@
var/mob/living/L = .
if(L.reagents)
L.reagents.add_reagent("toxin", poison_per_bite)
if(prob(poison_per_bite))
if(prob(poison_per_bite) && (!issilicon(L) && !isipc(L)))
to_chat(L, "<span class='warning'>You feel a tiny prick.</span>")
L.reagents.add_reagent(poison_type, 5)