Merge pull request #3735 from Mloc/fixeroos

Fixes.
2026-08-23 20:16:19 +01:00 · 2013-10-08 02:35:03 -07:00
parent 9eac5e295c 3d2f92f92c
commit 3c678d7990
9 changed files with 37 additions and 23 deletions
@@ -418,6 +418,7 @@ its easier to just keep the beam vertical.

 //returns 1 if made bloody, returns 0 otherwise
 /atom/proc/add_blood(mob/living/carbon/human/M as mob)
+	if(flags & NOBLOODY) return 0
 	.=1
 	if (!( istype(M, /mob/living/carbon/human) ))
 		return 0
@@ -27,6 +27,9 @@
 	set category = "Object"
 	set src in oview(1)

+	if(!istype(usr, /mob/living)) //ew ew ew usr, but it's the only way to check.
+		return
+
 	if( state != 4 )
 		usr << "The washing machine cannot run in this state."
 		return
@@ -16,6 +16,8 @@
 	var/spreadChance = 40
 	var/spreadIntoAdjacentChance = 60
 	var/evolveChance = 2
+	var/lastTick = 0
+	var/spreaded = 1

 /obj/effect/glowshroom/single
 	spreadChance = 0
@@ -40,15 +42,21 @@
 	else //if on the floor, glowshroom on-floor sprite
 		icon_state = "glowshroomf"

-	spawn(delay)
-		SetLuminosity(round(potency/10))
-		Spread()
+	processing_objects += src

-/obj/effect/glowshroom/proc/Spread()
-	set background = 1
-	var/spreaded = 1
+	SetLuminosity(round(potency/10))
+	lastTick = world.timeofday

-	while(spreaded)
+/obj/effect/glowshroom/Del()
+	processing_objects -= src
+	..()
+
+/obj/effect/glowshroom/process()
+	if(!spreaded)
+		return
+
+	if(((world.timeofday - lastTick) > delay) || ((world.timeofday - lastTick) < 0))
+		lastTick = world.timeofday
 		spreaded = 0

 		for(var/i=1,i<=yield,i++)
@@ -90,8 +98,6 @@
 		if(prob(evolveChance)) //very low chance to evolve on its own
 			potency += rand(4,6)

-		sleep(delay)
-
 /obj/effect/glowshroom/proc/CalcDir(turf/location = loc)
 	set background = 1
 	var/direction = 16
@@ -5,13 +5,18 @@
 	anchored = 1
 	w_class = 4.0
 	canhear_range = 2
+	flags = FPRINT | CONDUCT | TABLEPASS | NOBLOODY
 	var/number = 0
 	var/anyai = 1
 	var/mob/living/silicon/ai/ai = list()
+	var/last_tick //used to delay the powercheck

 /obj/item/device/radio/intercom/New()
-	spawn(5)
-		checkpower()
+	..()
+	processing_objects += src
+
+/obj/item/device/radio/intercom/Del()
+	processing_objects -= src
 	..()

 /obj/item/device/radio/intercom/attack_ai(mob/user as mob)
@@ -51,10 +56,9 @@
 		return
 	..()

-/obj/item/device/radio/intercom/proc/checkpower()
-
-	// Simple loop, checks for power. Strictly for intercoms
-	while(src)
+/obj/item/device/radio/intercom/process()
+	if(((world.timeofday - last_tick) > 30) || ((world.timeofday - last_tick) < 0))
+		last_tick = world.timeofday

 		if(!src.loc)
 			on = 0
@@ -69,5 +73,3 @@
 			icon_state = "intercom-p"
 		else
 			icon_state = "intercom"
-
-		sleep(30)
@@ -1,5 +1,6 @@
 /obj/item/weapon/melee/energy
 	var/active = 0
+	flags = FPRINT | TABLEPASS | NOBLOODY

 	suicide_act(mob/user)
 		viewers(user) << pick("\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>", \
@@ -15,7 +16,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3.0
-	flags = FPRINT | CONDUCT | NOSHIELD | TABLEPASS
+	flags = FPRINT | CONDUCT | NOSHIELD | TABLEPASS | NOBLOODY
 	origin_tech = "combat=3"
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")

@@ -33,7 +34,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | NOSHIELD
+	flags = FPRINT | TABLEPASS | NOSHIELD | NOBLOODY
 	origin_tech = "magnets=3;syndicate=4"
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")

@@ -51,6 +52,6 @@
 	throw_speed = 1
 	throw_range = 1
 	w_class = 4.0//So you can't hide it in your pocket or some such.
-	flags = FPRINT | TABLEPASS | NOSHIELD
+	flags = FPRINT | TABLEPASS | NOSHIELD | NOBLOODY
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/datum/effect/effect/system/spark_spread/spark_system
@@ -12,8 +12,8 @@
 <html>
 <head>
 <title>Permissions Panel</title>
-<script type='text/javascript' src='html/search.js'></script>
-<link rel='stylesheet' type='text/css' href='html/panels.css'>
+<script type='text/javascript' src='search.js'></script>
+<link rel='stylesheet' type='text/css' href='panels.css'>
 </head>
 <body onload='selectTextField();updateSearch();'>
 <div id='main'><table id='searchable' cellspacing='0'>
@@ -886,7 +886,7 @@
 	user.SetLuminosity(round(user.luminosity + (potency/10),1))

 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user)
-	user.SetLuminosity(round(user.luminosity + (potency/10),1))
+	user.SetLuminosity(round(user.luminosity - (potency/10),1))
 	SetLuminosity(round(potency/10,1))


@@ -189,6 +189,7 @@ var/MAX_EXPLOSION_RANGE = 14
 #define CONDUCT		64		// conducts electricity (metal etc.)
 #define FPRINT		256		// takes a fingerprint
 #define ON_BORDER	512		// item has priority to check when entering or leaving
+#define NOBLOODY	2048	// used to items if they don't want to get a blood overlay

 #define GLASSESCOVERSEYES	1024
 #define MASKCOVERSEYES		1024		// get rid of some of the other retardation in these flags