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

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

Browse Source 
# Conflicts:
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-04-21 23:27:23 +02:00
parent eed189b175 467bda7c4d
commit 7fef96e38d
42 changed files with 1002 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/loot/colossus_loot.dm
+1 -1
View File
@@ -165,7 +165,7 @@
var/mob/living/carbon/human/H = user
for(var/obj/item/W in H)
H.unEquip(W)
var/datum/job/clown/C = job_master.GetJob("Clown")
var/datum/job/clown/C = SSjobs.GetJob("Clown")
C.equip(H)
affected_targets.Add(H)