Fixing old and new issues alike. (#12281)

code/__HELPERS/_cit_helpers.dm

@@ -1,9 +1,6 @@
 //THIS FILE CONTAINS CONSTANTS, PROCS, AND OTHER THINGS//
 /////////////////////////////////////////////////////////
 
-/mob/proc/setClickCooldown(var/timeout)
-	next_move = max(world.time + timeout, next_move)
-
 /proc/get_matrix_largest()
 	var/matrix/mtrx=new()
 	return mtrx.Scale(2)

code/game/objects/structures/tables_racks.dm

@@ -183,7 +183,7 @@
 
 /obj/structure/table/alt_attack_hand(mob/user)
 	if(user && Adjacent(user) && !user.incapacitated())
-		user.setClickCooldown(4)
+		user.changeNext_move(CLICK_CD_MELEE*0.5)
 		if(istype(user) && user.a_intent == INTENT_HARM)
 			user.visible_message("<span class='warning'>[user] slams [user.p_their()] palms down on [src].</span>", "<span class='warning'>You slam your palms down on [src].</span>")
 			playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)

code/modules/goonchat/browserassets/html/browserOutput.html

@@ -29,7 +29,7 @@
 			<span class="ms" id="pingMs">--ms</span>
 		</div>
 		<div id="darkmodething">
-			<a href="#" class="subCell toggle" id="changeColorPreset" title="Change color preset"><i class="fas fa-eye-open"></i></a>
+			<a href="#" class="subCell toggle" id="changeColorPreset" title="Change color preset"><i class="fas fa-eye"></i></a>
 		</div>
 		<div id="audio">
 			<a href="#" class="subCell toggle" id="toggleAudio" title="Audio"><i class="fas fa-volume-up"></i></a>

code/modules/mob/living/simple_animal/hostile/banana_spider.dm

@@ -20,7 +20,6 @@
 	mouse_opacity = 2
 	density = TRUE
 	ventcrawler = VENTCRAWLER_ALWAYS
-	gold_core_spawnable = FRIENDLY_SPAWN
 	verb_say = "chitters"
 	verb_ask = "chitters inquisitively"
 	verb_exclaim = "chitters loudly"

code/modules/vore/eating/belly_obj.dm

@@ -542,7 +542,7 @@
 	if (!(R in contents))
 		return  // User is not in this belly
 
-	R.setClickCooldown(50)
+	R.changeNext_move(CLICK_CD_BREAKOUT*0.5)
 
 	if(owner.stat) //If owner is stat (dead, KO) we can actually escape
 		to_chat(R,"<span class='warning'>You attempt to climb out of \the [lowertext(name)]. (This will take around [escapetime/10] seconds.)</span>")

code/modules/vore/eating/living.dm

@@ -358,6 +358,9 @@
 	if(incapacitated(ignore_restraints = TRUE))
 		to_chat(src, "<span class='warning'>You can't do that while incapacitated.</span>")
 		return
+	if(next_move > world.time)
+		to_chat(src, "<span class='warning'>You can't do that so fast, slow down.</span>")
+		return
 
 	var/list/choices
 	for(var/mob/living/L in view(1))
@@ -372,7 +375,7 @@
 	if(QDELETED(tasted) || (tasted.ckey && !(tasted.client?.prefs.vore_flags & LICKABLE)) || !Adjacent(tasted) || incapacitated(ignore_restraints = TRUE))
 		return
 
-	setClickCooldown(100)
+	changeNext_move(CLICK_CD_MELEE)
 
 	visible_message("<span class='warning'>[src] licks [tasted]!</span>","<span class='notice'>You lick [tasted]. They taste rather like [tasted.get_taste_message()].</span>","<b>Slurp!</b>")
 

tgui-next/packages/tgui/interfaces/Vending.js

@@ -50,14 +50,14 @@ export const Vending = props => {
             const free = (
               !data.onstation
               || product.price === 0
-              || (
-                data.cost_mult === 0
-                && !product.premium
-              )
             );
-            const suffix = (!product.premium
-              ? ' cr' + data.cost_text
-              : ' cr'
+            const to_pay = (!product.premium
+              ? Math.round(product.price * data.cost_mult)
+              : product.price
+            );
+            const pay_text = (!product.premium
+              ? to_pay + ' cr' + data.cost_text
+              : to_pay + ' cr'
             );
             return (
               <Table.Row key={product.name}>
@@ -105,13 +105,11 @@ export const Vending = props => {
                           !free
                           && (
                             !data.user
-                            || product.price > data.user.cash
+                            || to_pay > data.user.cash
                           )
                         )
                       )}
-                      content={!free
-                        ? Math.round(product.price * data.cost_mult) + suffix
-                        : 'FREE'}
+                      content={!free ? pay_text : 'FREE'}
                       onClick={() => act(ref, 'vend', {
                         'ref': product.ref,
                       })} />