Merge branch 'Civ13:master' into master

KanohaShinobi · Jan 11, 2024 · 098e09b · 098e09b
2 parents 1d71cd8 + 42ac20d
commit 098e09b
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 17 deletions.
diff --git a/code/game/mob/living/carbon/human/human_life.dm b/code/game/mob/living/carbon/human/human_life.dm
@@ -1340,7 +1340,6 @@
 					Weaken(15)
 
 /mob/living/human/proc/handle_shock()
-	..()
 	if(status_flags & GODMODE)	return FALSE	//godmode
 	if(!can_feel_pain())
 		shock_stage = 0

diff --git a/code/game/mob/living/simple_animal/simple_animal.dm b/code/game/mob/living/simple_animal/simple_animal.dm
@@ -1158,6 +1158,5 @@
 /mob/living/simple_animal/proc/mutate()
 	if(mutation_variants == null)
 		return
-	..()
 
 #undef GRAIN
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -268,7 +268,6 @@
 
 // apparently called whenever an item is removed from a slot, container, or anything else.
 /obj/item/proc/dropped(mob/user as mob)
-	..()
 	plane = GAME_PLANE
 	spawn (1)
 		if (dropsound)

diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
@@ -208,8 +208,6 @@ obj/item/stack/Crossed(var/obj/item/stack/S)
 		spawn(0)
 			if (src && usr.using_object == src)
 				interact(usr)
-	else
-		..()
 	return
 
 /obj/item/stack/examine(mob/user)

diff --git a/code/game/objects/items/weapons/grenades/explosive.dm b/code/game/objects/items/weapons/grenades/explosive.dm
@@ -52,8 +52,7 @@
 
 /obj/proc/fragmentate(var/turf/T, var/fragment_number = 30, var/spreading_range = 5, var/list/fragtypes=list(/obj/item/projectile/bullet/pellet/fragment/short_range = 1))
 	set waitfor = 0
-	..()
-
+
 	if(!T) return
 
 	var/list/target_turfs = getcircle(T, spreading_range)

diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
@@ -100,7 +100,6 @@
 	var/suicide = FALSE // for the hari kiri action
 
 /obj/item/weapon/material/kitchen/utensil/knife/proc/handle_suicide(mob/living/user)
-	..()
 	if (!ishuman(user))
 		return
 	var/mob/living/human/M = user

diff --git a/code/game/objects/items/weapons/sledgehammer.dm b/code/game/objects/items/weapons/sledgehammer.dm
@@ -18,7 +18,6 @@
 	if (!(user.has_empty_hand(both = FALSE)))
 		user << "<span class='warning'>You need both hands to swing the [src]!</span>"
 		return FALSE
-	..()
 
 /obj/item/weapon/sledgehammer/stone/sledgehammer
 	name = "Stone Sledgehammer"

diff --git a/code/game/objects/structures/wild.dm b/code/game/objects/structures/wild.dm
@@ -312,7 +312,6 @@ var/list/seed_list_jungle
 		icon = current_icon
 
 /obj/structure/wild/tree/live_tree/proc/change_season()
-	..()
 	if (radiation >= 15)
 		icon = deadicon
 		icon_state = deadicon_state

diff --git a/code/game/turfs/initialization/init.dm b/code/game/turfs/initialization/init.dm
@@ -5,7 +5,6 @@
 	var/datum/turf_initializer/turf_initializer = null
 
 /area/proc/initialize()
-	..()
 	for (var/turf/T in src)
 		T.initialize()
 		if (turf_initializer)

diff --git a/code/modules/1713/tools.dm b/code/modules/1713/tools.dm
@@ -314,7 +314,6 @@
 	if (!(user.has_empty_hand(both = FALSE)))
 		user << "<span class='warning'>You need both hands to use the [src]!</span>"
 		return FALSE
-	..()
 
 /obj/item/weapon/wirecutters/boltcutters
 	name = "boltcutters"

diff --git a/code/modules/1713/weapons/guns/mg/_stationary.dm b/code/modules/1713/weapons/guns/mg/_stationary.dm
@@ -130,8 +130,6 @@
 		layer = FLY_LAYER
 
 /obj/item/weapon/gun/projectile/automatic/stationary/proc/started_using(mob/living/human/user)
-	..()
-
 	user.forceMove(loc)
 	user.dir = dir
 	user.pixel_x = pixel_x
@@ -156,7 +154,6 @@
 			break
 
 /obj/item/weapon/gun/projectile/automatic/stationary/proc/stopped_using(mob/user as mob)
-	..()
 	user.pixel_x = 0
 	user.pixel_y = 0
 	for (var/datum/action/A in actions)

diff --git a/code/modules/organs/brain.dm b/code/modules/organs/brain.dm
@@ -55,7 +55,6 @@
 
 /obj/item/organ/brain/proc/take_internal_damage(var/damage, var/silent)
 	set waitfor = 0
-	..()
 	if(damage >= 10) //This probably won't be triggered by oxyloss or mercury. Probably.
 		var/damage_secondary = damage * 0.20
 		owner.eye_blurry += damage_secondary

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
@@ -454,7 +454,6 @@
 	if (istype(target_mob, /mob/living/simple_animal/hostile/human) && target_mob.stat != DEAD && prob(33))
 		var/list/screamlist = list('sound/voice/screams/scream1.ogg','sound/voice/screams/scream2.ogg','sound/voice/screams/scream3.ogg','sound/voice/screams/scream4.ogg','sound/voice/screams/scream5.ogg','sound/voice/screams/scream6.ogg',)
 		playsound(loc, pick(screamlist), 100, extrarange = 50)
-	..()
 	//admin logs
 	if (!no_attack_log)
 		if (istype(firer, /mob))