cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
ZomgPonies
2015-11-21 10:46:16 -05:00
parent d96741eb8c
commit 66202ff4b6
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flash.dm
+6 -5
View File
@@ -109,11 +109,12 @@
return 1
else if(issilicon(M))
var/mob/living/silicon/robot/R = M
if(R.activated(/obj/item/borg/combat/shield))
add_logs(M, user, "flashed", object="[src.name]")
user.visible_message("<span class='disarm'>[user] tries to overloads [M]'s sensors with the [src.name], but if blocked by [M]'s shield!</span>", "<span class='danger'>You try to overload [M]'s sensors with the [src.name], but are blocked by his shield!</span>")
return 1
if(isrobot(M))
var/mob/living/silicon/robot/R = M
if(R.activated(/obj/item/borg/combat/shield))
add_logs(M, user, "flashed", object="[src.name]")
user.visible_message("<span class='disarm'>[user] tries to overloads [M]'s sensors with the [src.name], but if blocked by [M]'s shield!</span>", "<span class='danger'>You try to overload [M]'s sensors with the [src.name], but are blocked by his shield!</span>")
return 1
else
M.Weaken(rand(5,10))
add_logs(M, user, "flashed", object="[src.name]")
code/modules/mob/living/life.dm
+4 -3
View File
@@ -305,6 +305,7 @@
/mob/living/proc/process_nations()
var/client/C = client
for(var/mob/living/carbon/human/H in view(world.view, src))
C.images += H.hud_list[NATIONS_HUD]
if(client)
var/client/C = client
for(var/mob/living/carbon/human/H in view(world.view, src))
C.images += H.hud_list[NATIONS_HUD]
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -3
View File
@@ -418,13 +418,12 @@
src.modules += new /obj/item/weapon/gun/energy/plasmacutter(src)
src.modules += new /obj/item/borg/combat/shield(src)
src.modules += new /obj/item/borg/combat/mobility(src)
src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
fix_modules()
/obj/item/weapon/robot_module/peacekeeper
name = "peacekeepert robot module"
name = "peacekeeper robot module"
/obj/item/weapon/robot_module/peacekeeper/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -433,7 +432,6 @@
src.modules += new /obj/item/weapon/gun/energy/plasmacutter(src)
src.modules += new /obj/item/borg/combat/shield(src)
src.modules += new /obj/item/borg/combat/mobility(src)
src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
fix_modules()