Merge pull request #8387 from JTGSZ/gangs

Ports gang mode
2019-06-05 01:55:19 -07:00
parent 962afa97bc 93813613aa
commit 980c48180c
22 changed files with 1949 additions and 25 deletions
@@ -1683,8 +1683,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)

 					if(H.stat == CONSCIOUS && H != user && prob(I.force + ((100 - H.health) * 0.5))) // rev deconversion through blunt trauma.
 						var/datum/antagonist/rev/rev = H.mind.has_antag_datum(/datum/antagonist/rev)
+						var/datum/antagonist/gang/gang = H.mind.has_antag_datum(/datum/antagonist/gang/)
 						if(rev)
 							rev.remove_revolutionary(FALSE, user)
+						if(gang)
+							H.mind.remove_antag_datum(/datum/antagonist/gang)

 				if(bloody)	//Apply blood
 					if(H.wear_mask)