Updates more instances of blocked<2 or /=(blocked+1)

Removes facehugger source code file
2025-12-29 03:21:42 +00:00 · 2016-04-22 04:49:53 -04:00
parent 03761c5eed
commit 3ae1f9ed78
7 changed files with 8 additions and 240 deletions
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -28,7 +28,7 @@
 	user.apply_damage(rand(force/2, force), BRUTE, zone, 0, sharp=1, edge=1)
 	user.Weaken(5)

-	user.drop_from_inventory(src)
+	user.removeItem(src, src.loc)
 	throw_at(get_edge_target_turf(src, pick(alldirs)), rand(1,3), throw_speed)

 	var/spooky = pick('sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg', 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/wail.ogg')
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -250,7 +250,7 @@
 		if(prob(35))
 			if(user)
 				user << "<span class='danger'>\The [src] has fallen to bits.</span>"
-				user.drop_from_inventory(src)
+				user.removeItem(src)
 			qdel(src)

 /obj/item/weapon/reagent_containers/food/snacks/grown/attack_self(mob/user as mob)
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -6,7 +6,7 @@
 	..()

 /mob/living/carbon/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/hit_zone)
-	if(!effective_force || blocked >= 2) 
+	if(!effective_force || blocked >= 100) 
 		return 0

 	//Hulk modifier
@@ -26,7 +26,7 @@
 	if (I && I.damtype == BRUTE && !I.anchored && !is_robot_module(I))
 		var/damage = effective_force
 		if (blocked)
-			damage /= blocked+1
+			damage *= (100 - blocked)/100

 		//blunt objects should really not be embedding in things unless a huge amount of force is involved
 		var/embed_chance = weapon_sharp? damage/I.w_class : damage/(I.w_class*3)
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -243,9 +243,9 @@ emp_act
 	return 1

 /mob/living/carbon/human/proc/attack_joint(var/obj/item/organ/external/organ, var/obj/item/W, var/blocked)
-	if(!organ || (organ.dislocated == 2) || (organ.dislocated == -1) || blocked >= 2)
+	if(!organ || (organ.dislocated == 2) || (organ.dislocated == -1) || blocked >= 100)
 		return 0
-	if(prob(W.force / (blocked+1)))
+	if(prob(W.force * (100 - blocked)/100))
 		visible_message("<span class='danger'>[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!</span>")
 		organ.dislocate(1)
 		return 1
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
@@ -1,232 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-//TODO: Make these simple_animals
-
-var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
-var/const/MAX_IMPREGNATION_TIME = 150
-
-var/const/MIN_ACTIVE_TIME = 200 //time between being dropped and going idle
-var/const/MAX_ACTIVE_TIME = 400
-
-/obj/item/clothing/mask/facehugger
-	name = "alien"
-	desc = "It has some sort of a tube at the end of its tail."
-	icon = 'icons/mob/alien.dmi'
-	icon_state = "facehugger"
-	item_state = "facehugger"
-	w_class = 3 //note: can be picked up by aliens unlike most other items of w_class below 4
-	flags = PROXMOVE
-	body_parts_covered = FACE|EYES
-	throw_range = 5
-
-	var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
-	var/sterile = 0
-	var/strength = 5
-	var/attached = 0
-
-/obj/item/clothing/mask/facehugger/attack_hand(user as mob)
-
-	if((stat == CONSCIOUS && !sterile))
-		if(Attach(user))
-			return
-
-	..()
-
-/obj/item/clothing/mask/facehugger/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
-	. = ..()
-	user.drop_from_inventory(src)
-	if(hit_zone == "head")
-		Attach(target)
-
-/obj/item/clothing/mask/facehugger/New()
-	if(config.aliens_allowed)
-		..()
-	else
-		qdel(src)
-
-/obj/item/clothing/mask/facehugger/examine(mob/user)
-	..(user)
-	switch(stat)
-		if(DEAD,UNCONSCIOUS)
-			user << "\red \b [src] is not moving."
-		if(CONSCIOUS)
-			user << "\red \b [src] seems to be active."
-	if (sterile)
-		user << "\red \b It looks like the proboscis has been removed."
-	return
-
-/obj/item/clothing/mask/facehugger/attackby(obj/item/I, mob/user)
-	if(I.force)
-		user.do_attack_animation(src)
-		Die()
-	return
-
-/obj/item/clothing/mask/facehugger/bullet_act()
-	Die()
-	return
-
-/obj/item/clothing/mask/facehugger/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > T0C+80)
-		Die()
-	return
-
-/obj/item/clothing/mask/facehugger/equipped(mob/M)
-	Attach(M)
-
-/obj/item/clothing/mask/facehugger/Crossed(atom/target)
-	HasProximity(target)
-	return
-
-/obj/item/clothing/mask/facehugger/on_found(mob/finder as mob)
-	if(stat == CONSCIOUS)
-		HasProximity(finder)
-		return 1
-	return
-
-/obj/item/clothing/mask/facehugger/HasProximity(atom/movable/AM as mob|obj)
-	if(CanHug(AM))
-		Attach(AM)
-
-/obj/item/clothing/mask/facehugger/throw_at(atom/target, range, speed)
-	..()
-	if(stat == CONSCIOUS)
-		icon_state = "[initial(icon_state)]_thrown"
-		spawn(15)
-			if(icon_state == "[initial(icon_state)]_thrown")
-				icon_state = "[initial(icon_state)]"
-
-/obj/item/clothing/mask/facehugger/throw_impact(atom/hit_atom)
-	..()
-	if(stat == CONSCIOUS)
-		icon_state = "[initial(icon_state)]"
-		throwing = 0
-	GoIdle(30,100) //stunned for a few seconds - allows throwing them to be useful for positioning but not as an offensive action (unless you're setting up a trap)
-
-/obj/item/clothing/mask/facehugger/proc/Attach(M as mob)
-
-	if((!iscorgi(M) && !iscarbon(M)))
-		return
-
-	if(attached)
-		return
-
-	var/mob/living/carbon/C = M
-	if(istype(C) && locate(/obj/item/organ/xenos/hivenode) in C.internal_organs)
-		return
-
-
-	attached++
-	spawn(MAX_IMPREGNATION_TIME)
-		attached = 0
-
-	var/mob/living/L = M //just so I don't need to use :
-
-	if(loc == L) return
-	if(stat != CONSCIOUS)	return
-	if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
-
-	L.visible_message("\red \b [src] leaps at [L]'s face!")
-
-	if(iscarbon(M))
-		var/mob/living/carbon/target = L
-
-		if(target.wear_mask)
-			if(prob(20))	return
-			var/obj/item/clothing/W = target.wear_mask
-			if(!W.canremove)	return
-			target.drop_from_inventory(W)
-
-			target.visible_message("\red \b [src] tears [W] off of [target]'s face!")
-
-		target.equip_to_slot(src, slot_wear_mask)
-		target.contents += src // Monkey sanity check - Snapshot
-
-		if(!sterile) L.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
-	else if (iscorgi(M))
-		var/mob/living/simple_animal/corgi/corgi = M
-		src.loc = corgi
-		corgi.facehugger = src
-		corgi.wear_mask = src
-		//C.regenerate_icons()
-
-	GoIdle() //so it doesn't jump the people that tear it off
-
-	spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
-		Impregnate(L)
-
-	return
-
-/obj/item/clothing/mask/facehugger/proc/Impregnate(mob/living/target as mob)
-	if(!target || target.wear_mask != src || target.stat == DEAD) //was taken off or something
-		return
-
-	if(!sterile)
-		//target.contract_disease(new /datum/disease/alien_embryo(0)) //so infection chance is same as virus infection chance
-		new /obj/item/alien_embryo(target)
-		target.status_flags |= XENO_HOST
-
-		target.visible_message("\red \b [src] falls limp after violating [target]'s face!")
-
-		Die()
-		icon_state = "[initial(icon_state)]_impregnated"
-
-		if(iscorgi(target))
-			var/mob/living/simple_animal/corgi/C = target
-			src.loc = get_turf(C)
-			C.facehugger = null
-	else
-		target.visible_message("\red \b [src] violates [target]'s face!")
-	return
-
-/obj/item/clothing/mask/facehugger/proc/GoActive()
-	if(stat == DEAD || stat == CONSCIOUS)
-		return
-
-	stat = CONSCIOUS
-	icon_state = "[initial(icon_state)]"
-
-	return
-
-/obj/item/clothing/mask/facehugger/proc/GoIdle(var/min_time=MIN_ACTIVE_TIME, var/max_time=MAX_ACTIVE_TIME)
-	if(stat == DEAD || stat == UNCONSCIOUS)
-		return
-
-/*		RemoveActiveIndicators()	*/
-
-	stat = UNCONSCIOUS
-	icon_state = "[initial(icon_state)]_inactive"
-
-	spawn(rand(min_time,max_time))
-		GoActive()
-	return
-
-/obj/item/clothing/mask/facehugger/proc/Die()
-	if(stat == DEAD)
-		return
-
-/*		RemoveActiveIndicators()	*/
-
-	icon_state = "[initial(icon_state)]_dead"
-	stat = DEAD
-
-	src.visible_message("\red \b[src] curls up into a ball!")
-
-	return
-
-/proc/CanHug(var/mob/M)
-
-	if(iscorgi(M))
-		return 1
-
-	if(!iscarbon(M))
-		return 0
-
-	var/mob/living/carbon/C = M
-	if(istype(C) && locate(/obj/item/organ/xenos/hivenode) in C.internal_organs)
-		return 0
-
-	if(ishuman(C))
-		var/mob/living/carbon/human/H = C
-		if(H.head && (H.head.body_parts_covered & FACE) && !(H.head.item_flags & FLEXIBLEMATERIAL))
-			return 0
-	return 1
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -162,7 +162,7 @@

 //returns 0 if the effects failed to apply for some reason, 1 otherwise.
 /mob/living/proc/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/hit_zone)
-	if(!effective_force || blocked >= 2) 
+	if(!effective_force || blocked >= 100) 
 		return 0

 	//Hulk modifier
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -146,7 +146,7 @@
 	
 	// You are going to knock someone out for longer if they are not wearing a helmet.
 	var/weaken_duration = 0
-	if(blocked < 2)
+	if(blocked < 100)
 		weaken_duration = smash_duration + min(0, force - target.getarmor(hit_zone, "melee") + 10)
 	
 	if(hit_zone == "head" && istype(target, /mob/living/carbon/))