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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-04-26 23:07:57 +02:00
parent ccef4d1187 0fb164d041
commit 4423962a2a
146 changed files with 394 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+2 -2
View File
@@ -621,11 +621,11 @@
/obj/item/paper/evilfax/New()
..()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/paper/evilfax/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
if(mytarget && !used)
var/mob/living/carbon/target = mytarget
target.ForceContractDisease(new /datum/disease/transformation/corgi(0))