shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10095 from Ghommie/Ghommie-cit443

Browse Source 
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
This commit is contained in:
kevinz000
2019-12-30 00:03:21 -08:00
committed by GitHub
parent 640419eed5 19b9cbbb69
commit 310d343242
12 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/cars/clowncar.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.mind && H.mind.assigned_role == "Clown") //Ensures only clowns can drive the car. (Including more at once)
if(H.mind && HAS_TRAIT(H.mind, TRAIT_CLOWN_MENTALITY)) //Ensures only clowns can drive the car. (Including more at once)
add_control_flags(M, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_PERMISSION)
return
add_control_flags(M, VEHICLE_CONTROL_KIDNAPPED)