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

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into sweden

Browse Source 
# Conflicts:
#	code/game/dna/genes/goon_disabilities.dm
This commit is contained in:
pinatacolada
2016-08-04 18:56:06 +01:00
parent 7d7c9aa647 5a82177cdc
commit fc54696914
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/dna/genes/goon_disabilities.dm
-9
View File
@@ -129,7 +129,6 @@
..()
block=SWEDEBLOCK
<<<<<<< HEAD
OnSay(var/mob/M, var/message)
// svedish
message = replacetextEx(message,"W","V")
@@ -147,14 +146,6 @@
if(prob(30))
message += " Bork[pick("",", bork",", bork, bork")]!"
return message
=======
/datum/dna/gene/disability/speech/swedish/OnSay(var/mob/M, var/message)
// svedish
message = replacetext(message,"w","v")
if(prob(30))
message += " Bork[pick("",", bork",", bork, bork")]!"
return message
>>>>>>> refs/remotes/ParadiseSS13/master
// WAS: /datum/bioEffect/unintelligable
/datum/dna/gene/disability/unintelligable