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

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

Browse Source 
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm
This commit is contained in:
Fox-McCloud
2017-08-05 19:03:52 -04:00
parent 87e429b18e d18c20cb9f
commit 9d14e6c9da
368 changed files with 4818 additions and 14392 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/flufftext/TextFilters.dm
-2
View File
@@ -1,5 +1,3 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
proc/Intoxicated(phrase)
phrase = html_decode(phrase)
var/leng=lentext(phrase)