Revert "Merge branch 'master' into Yeehaw"

This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
This commit is contained in:
BlackMajor
2020-01-02 22:06:31 +13:00
parent 30e3edaac1
commit aabb39a364
309 changed files with 1577 additions and 3108 deletions
+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 && HAS_TRAIT(H.mind, TRAIT_CLOWN_MENTALITY)) //Ensures only clowns can drive the car. (Including more at once)
if(H.mind && H.mind.assigned_role == "Clown") //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)