cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Whitelists diona nymphs. Forces them not to have universal_speak.

Browse Source
This commit is contained in:
Zuhayr
2014-06-19 08:48:58 +09:30
parent 8fa57539a5
commit ce69599a3a
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/podmen.dm
View File

@@ -92,7 +92,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
/obj/item/seeds/replicapod/proc/request_player() /obj/item/seeds/replicapod/proc/request_player()
for(var/mob/dead/observer/O in player_list) for(var/mob/dead/observer/O in player_list)
if(jobban_isbanned(O, "Dionaea")) if(jobban_isbanned(O, "Dionaea") || (!is_alien_whitelisted(src, "Diona") && config.usealienwhitelist))
continue continue
if(O.client) if(O.client)
if(O.client.prefs.be_special & BE_PLANT) if(O.client.prefs.be_special & BE_PLANT)
@@ -101,7 +101,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
/obj/item/seeds/replicapod/proc/question(var/client/C) /obj/item/seeds/replicapod/proc/question(var/client/C)
spawn(0) spawn(0)
if(!C) return if(!C) return
var/response = alert(C, "Someone is harvesting a replica pod. Would you like to play as a Dionaea?", "Replica pod harvest", "Yes", "No", "Never for this round.") var/response = alert(C, "Someone is harvesting a diona pod. Would you like to play as a diona?", "Dionaea harvest", "Yes", "No", "Never for this round.")
if(!C || ckey) if(!C || ckey)
return return
if(response == "Yes") if(response == "Yes")

7
code/modules/mob/living/carbon/monkey/diona.dm
View File

@@ -10,6 +10,8 @@
icon_state = "nymph1" icon_state = "nymph1"
var/list/donors = list() var/list/donors = list()
var/ready_evolve = 0 var/ready_evolve = 0
universal_understand = 0 // Dionaea do not need to speak to people
universal_speak = 0 // before becoming an adult. Use *chirp.
/mob/living/carbon/monkey/diona/attack_hand(mob/living/carbon/human/M as mob) /mob/living/carbon/monkey/diona/attack_hand(mob/living/carbon/human/M as mob)
@@ -245,14 +247,11 @@
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if(stat == 2) if(stat == 2)
return say_dead(message) return say_dead(message)
var/datum/language/speaking = null var/datum/language/speaking = null
if(length(message) >= 2) if(length(message) >= 2)
var/channel_prefix = copytext(message, 1 ,3) var/channel_prefix = copytext(message, 1 ,3)
if(languages.len) if(languages.len)
@@ -270,6 +269,4 @@
if(!message || stat) if(!message || stat)
return return
..(message, speaking, verb, null, null, message_range, null) ..(message, speaking, verb, null, null, message_range, null)