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

Merge pull request #2678 from Fox-McCloud/mob-faction-fixes

Browse Source 
Simple Animal Faction Fixes
This commit is contained in:
TheDZD
2015-11-29 15:34:58 -05:00
parent a2f6204a8b 36d5b7636f
commit 6a558196ca
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/metroid/metroid.dm
+1 -1
View File
@@ -824,7 +824,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
C = pick(consenting_candidates)
M.key = C.key
M.universal_speak = 1
M.faction -= "neutral"
M.faction |= "sentient"
M << "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>"
M << "<span class='userdanger'>You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.</span>"
user << "<span class='notice'>[M] accepts the potion and suddenly becomes attentive and aware. It worked!</span>"
code/modules/mob/living/simple_animal/hostile/hivebot.dm
+6 -3
View File
@@ -94,11 +94,14 @@
bot_amt--
switch(bot_type)
if("norm")
new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
var/mob/living/simple_animal/hostile/hivebot/H = new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
H.faction = faction
if("range")
new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
var/mob/living/simple_animal/hostile/hivebot/range/R = new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
R.faction = faction
if("rapid")
new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
var/mob/living/simple_animal/hostile/hivebot/rapid/F = new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
F.faction = faction
spawn(100)
qdel(src)
return