Merge pull request #109 from Jackofashepard/master

Clapped prommies and added them to inf
Alanii · Oct 21, 2020 · 4a9f687 · 4a9f687
2 parents b8fc523 + 398a2c1
commit 4a9f687
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/code/game/objects/auras/regenerating_aura.dm b/code/game/objects/auras/regenerating_aura.dm
@@ -226,7 +226,7 @@
 		if(H.should_have_organ(BP_SLIMECORE))
 			var/obj/item/organ/internal/brain/slime/sponge = H.internal_organs_by_name[BP_SLIMECORE]
 			if(sponge)
-				sponge.take_internal_damage(1)
+				sponge.take_internal_damage(20)
 
 	if(last_damage < H.getBruteLoss() + H.getFireLoss() && world.time < toggle_organ_blocked_until)
 		ignore_tag = null

diff --git a/code/modules/species/station/prometheans.dm b/code/modules/species/station/prometheans.dm
@@ -35,7 +35,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 	min_age =             18
 	max_age =             125
 	brute_mod =           0.8
-	burn_mod =            1.2
+	burn_mod =            1.1
 	toxins_mod =          0.1
 	oxy_mod =             0
 	total_health =        400

diff --git a/maps/torch/torch_ranks_boh.dm b/maps/torch/torch_ranks_boh.dm
@@ -127,7 +127,7 @@
 		/datum/species/custom		= list(UNRESTRICTED, SEMIRESTRICTED, /datum/mil_branch/solgov),
 		/datum/species/humanathi	= list(UNRESTRICTED, SEMIRESTRICTED, /datum/mil_branch/solgov),
 		/datum/species/tajaran		= list(UNRESTRICTED, SEMIRESTRICTED, /datum/mil_branch/solgov),
- 		/datum/species/shapeshifter/promethean	= list(UNRESTRICTED, /datum/mil_branch/solgov, /datum/mil_branch/private_security),
+ 		/datum/species/shapeshifter/promethean	= list(UNRESTRICTED, SEMIRESTRICTED, /datum/mil_branch/private_security),
 		/datum/species/plasmasans	= list(/datum/mil_branch/civilian, /datum/mil_branch/solgov),
 		/datum/species/vox			= list(/datum/mil_branch/alien),
 		/datum/species/vox/armalis	= list(/datum/mil_branch/alien)
@@ -823,7 +823,7 @@
 	name = "Captain"
 	name_short = "CPT"
 	sort_order = 8
-	pow_cat = 3	
+	pow_cat = 3
 
 /datum/mil_rank/soviet/o3
 	name = "Major"
@@ -896,7 +896,7 @@
 	name = "Lieutenant"
 	name_short = "LFT"
 	sort_order = 8
-	pow_cat = 3	
+	pow_cat = 3
 
 /datum/mil_rank/soviet/o3_gnf
 	name = "Captain Lieutenant"
@@ -932,7 +932,7 @@
 	name = "High Admiral"
 	name_short = "HAM"
 	sort_order = 14
-	pow_cat = 3	
+	pow_cat = 3
 //
 //
 // Ends of defines