cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 21:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix for user created areas not correctly powering machinery.

Browse Source 
- Fix for retaliating hostile mobs to not attack itself.
- Grammar fix for goats and cows.
- Fix for malfunction and continuous rounds; which doesn't stop the count down timer when the AI dies.
- Spiderlings won't grow inside vents and spiderlings are much easier to kill, can be shot with a projectile and display a message after dying.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5548 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2013-01-14 17:46:33 +00:00
parent 96d300ceeb
commit f6078aba78
5 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@
/mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass))
user.visible_message("<span class='notice'>[user] milks [src] using the [O].</span>")
user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
var/obj/item/weapon/reagent_containers/glass/G = O
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
@@ -106,7 +106,7 @@
/mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass))
user.visible_message("<span class='notice'>[user] milks [src] using the [O].</span>")
user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
var/obj/item/weapon/reagent_containers/glass/G = O
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)

6
code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
View File

@@ -17,11 +17,13 @@
var/list/mobs_around = viewers(src, 7)
for(var/mob/living/M in mobs_around)
if(!attack_same && istype(M, type))
if(M == src)
continue
if(!attack_same && M.faction != faction)
enemies += M
for(var/mob/living/simple_animal/hostile/retaliate/H in mobs_around)
if(istype(H, src.type))
if(!attack_same && !H.attack_same && H.faction == faction)
H.enemies += enemies
return 0