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

Merge remote-tracking branch 'upstream/master' into to_chat

Browse Source 
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
This commit is contained in:
Tigercat2000
2016-04-05 15:54:48 -07:00
parent 78f53553f8 3d4e85f3e6
commit c72cc9606e
48 changed files with 196 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm
+5
View File
@@ -17,6 +17,7 @@
speak = list("Hruuugh!","Hrunnph")
emote_see = list("paws the ground","shakes its mane","stomps")
emote_hear = list("snuffles")
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/diyaab
name = "diyaab"
@@ -37,6 +38,7 @@
speak = list("Awrr?","Aowrl!","Worrl")
emote_see = list("sniffs the air cautiously","looks around")
emote_hear = list("snuffles")
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/shantak
name = "shantak"
@@ -56,6 +58,7 @@
speak_chance = 5
speak = list("Shuhn","Shrunnph?","Shunpf")
emote_see = list("scratches the ground","shakes out it's mane","tinkles gently")
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/yithian
name = "yithian"
@@ -63,6 +66,7 @@
icon_state = "yithian"
icon_living = "yithian"
icon_dead = "yithian_dead"
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/tindalos
name = "tindalos"
@@ -70,3 +74,4 @@
icon_state = "tindalos"
icon_living = "tindalos"
icon_dead = "tindalos_dead"
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
code/modules/research/xenobiology/xenobiology.dm
+15 -11
View File
@@ -200,6 +200,7 @@
var/list/not_interested = list()
var/being_used = 0
w_class = 1
var/sentience_type = SENTIENCE_ORGANIC
/obj/item/weapon/sentience_potion/afterattack(mob/living/M, mob/user)
@@ -210,27 +211,30 @@
return ..()
if(M.stat)
to_chat(user, "<span class='warning'>[M] is dead!</span>")
return..()
return ..()
var/mob/living/simple_animal/SM = M
if(SM.sentience_type != sentience_type)
to_chat(user, "<span class='warning'>The potion won't work on [SM].</span>")
return ..()
to_chat(user, "<span class='notice'>You offer the sentience potion to [M]...</span>")
to_chat(user, "<span class='notice'>You offer the sentience potion to [SM]...</span>")
being_used = 1
var/list/candidates = pollCandidates("Do you want to play as [M.name]?", ROLE_SENTIENT, 0, 100)
var/list/candidates = pollCandidates("Do you want to play as [SM.name]?", ROLE_SENTIENT, 0, 100)
if(!src)
return
if(candidates.len)
var/mob/C = pick(candidates)
M.key = C.key
M.universal_speak = 1
M.faction |= "sentient"
to_chat(M, "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>")
to_chat(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>")
SM.key = C.key
SM.universal_speak = 1
SM.faction = user.faction
SM.master_commander = user
SM.sentience_act()
to_chat(SM, "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>")
to_chat(SM, "<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>")
to_chat(user, "<span class='notice'>[M] accepts the potion and suddenly becomes attentive and aware. It worked!</span>")
if(isanimal(M))
var/mob/living/simple_animal/S = M
S.master_commander = user
qdel(src)
else
to_chat(user, "<span class='notice'>[M] looks interested for a moment, but then looks back down. Maybe you should try again later.</span>")