cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert math (#33059)

Browse Source 
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
This commit is contained in:
Emmett Gaines
2017-11-23 20:59:52 -05:00
committed by ShizCalev
parent 4f1f265d72
commit 7c69cdcb8a
178 changed files with 627 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/integrated_electronics/subtypes/converters.dm
+2 -2
View File
@@ -263,7 +263,7 @@
pull_data()
var/incoming = get_pin_data(IC_INPUT, 1)
if(!isnull(incoming))
result = TODEGREES(incoming)
result = ToDegrees(incoming)
set_pin_data(IC_OUTPUT, 1, result)
push_data()
@@ -281,7 +281,7 @@
pull_data()
var/incoming = get_pin_data(IC_INPUT, 1)
if(!isnull(incoming))
result = TORADIANS(incoming)
result = ToRadians(incoming)
set_pin_data(IC_OUTPUT, 1, result)
push_data()
code/modules/integrated_electronics/subtypes/data_transfer.dm
+1 -1
View File
@@ -125,7 +125,7 @@
/obj/item/integrated_circuit/transfer/pulsedemultiplexer/do_work()
var/output_index = get_pin_data(IC_INPUT, 1)
if(output_index == CLAMP(output_index, 1, number_of_outputs))
if(output_index == Clamp(output_index, 1, number_of_outputs))
activate_pin(round(output_index + 1 ,1))
/obj/item/integrated_circuit/transfer/pulsedemultiplexer/medium
code/modules/integrated_electronics/subtypes/input.dm
+2 -2
View File
@@ -365,7 +365,7 @@
var/rad = get_pin_data(IC_INPUT, 2)
if(isnum(rad))
rad = CLAMP(rad, 0, 8)
rad = Clamp(rad, 0, 8)
radius = rad
/obj/item/integrated_circuit/input/advanced_locator_list/do_work()
@@ -418,7 +418,7 @@
/obj/item/integrated_circuit/input/advanced_locator/on_data_written()
var/rad = get_pin_data(IC_INPUT, 2)
if(isnum(rad))
rad = CLAMP(rad, 0, 8)
rad = Clamp(rad, 0, 8)
radius = rad
/obj/item/integrated_circuit/input/advanced_locator/do_work()
code/modules/integrated_electronics/subtypes/manipulation.dm
+6 -6
View File
@@ -93,8 +93,8 @@
yo.data = round(yo.data, 1)
var/turf/T = get_turf(assembly)
var/target_x = CLAMP(T.x + xo.data, 0, world.maxx)
var/target_y = CLAMP(T.y + yo.data, 0, world.maxy)
var/target_x = Clamp(T.x + xo.data, 0, world.maxx)
var/target_y = Clamp(T.y + yo.data, 0, world.maxy)
shootAt(locate(target_x, target_y, T.z))
@@ -210,7 +210,7 @@
var/datum/integrated_io/detonation_time = inputs[1]
var/dt
if(isnum(detonation_time.data) && detonation_time.data > 0)
dt = CLAMP(detonation_time.data, 1, 12)*10
dt = Clamp(detonation_time.data, 1, 12)*10
else
dt = 15
addtimer(CALLBACK(attached_grenade, /obj/item/grenade.proc/prime), dt)
@@ -380,8 +380,8 @@
target_x.data = round(target_x.data, 1)
if(isnum(target_y.data))
target_y.data = round(target_y.data, 1)
var/_x = CLAMP(T.x + target_x.data, 0, world.maxx)
var/_y = CLAMP(T.y + target_y.data, 0, world.maxy)
var/_x = Clamp(T.x + target_x.data, 0, world.maxx)
var/_y = Clamp(T.y + target_y.data, 0, world.maxy)
A.forceMove(drop_location())
A.throw_at(locate(_x, _y, T.z), round(CLAMP(sqrt(target_x.data*target_x.data+target_y.data*target_y.data),0,8),1), 3)
A.throw_at(locate(_x, _y, T.z), round(Clamp(sqrt(target_x.data*target_x.data+target_y.data*target_y.data),0,8),1), 3)
code/modules/integrated_electronics/subtypes/output.dm
+2 -2
View File
@@ -84,7 +84,7 @@
var/brightness = get_pin_data(IC_INPUT, 2)
if(new_color && isnum(brightness))
brightness = CLAMP(brightness, 0, 6)
brightness = Clamp(brightness, 0, 6)
light_rgb = new_color
light_brightness = brightness
@@ -160,7 +160,7 @@
var/selected_sound = sounds[ID]
if(!selected_sound)
return
vol = CLAMP(vol ,0 , 100)
vol = Clamp(vol ,0 , 100)
playsound(get_turf(src), selected_sound, vol, freq, -1)
/obj/item/integrated_circuit/output/sound/on_data_written()
code/modules/integrated_electronics/subtypes/reagents.dm
+4 -4
View File
@@ -93,7 +93,7 @@
else
direction_mode = SYRINGE_INJECT
if(isnum(new_amount))
new_amount = CLAMP(new_amount, 0, volume)
new_amount = Clamp(new_amount, 0, volume)
transfer_amount = new_amount
/obj/item/integrated_circuit/reagent/proc/inject_tray(var/obj/machinery/hydroponics/H,var/atom/movable/SO,var/A)
@@ -159,7 +159,7 @@
if(reagents.total_volume >= reagents.maximum_volume) // Full
activate_pin(3)
return
var/tramount = CLAMP(min(transfer_amount, reagents.maximum_volume - reagents.total_volume), 0, reagents.maximum_volume)
var/tramount = Clamp(min(transfer_amount, reagents.maximum_volume - reagents.total_volume), 0, reagents.maximum_volume)
if(isliving(AM))
var/mob/living/L = AM
L.visible_message("<span class='danger'>[src] is trying to take a blood sample from [L]!</span>", \
@@ -209,7 +209,7 @@
else
direction_mode = SYRINGE_INJECT
if(isnum(new_amount))
new_amount = CLAMP(new_amount, 0, 50)
new_amount = Clamp(new_amount, 0, 50)
transfer_amount = new_amount
/obj/item/integrated_circuit/reagent/pump/do_work()
@@ -332,7 +332,7 @@
else
direction_mode = SYRINGE_INJECT
if(isnum(new_amount))
new_amount = CLAMP(new_amount, 0, 50)
new_amount = Clamp(new_amount, 0, 50)
transfer_amount = new_amount
/obj/item/integrated_circuit/reagent/filter/do_work()
code/modules/integrated_electronics/subtypes/time.dm
+1 -1
View File
@@ -62,7 +62,7 @@
/obj/item/integrated_circuit/time/delay/custom/do_work()
var/delay_input = get_pin_data(IC_INPUT, 1)
if(delay_input && isnum(delay_input) )
var/new_delay = CLAMP(delay_input ,1 ,36000) //An hour.
var/new_delay = Clamp(delay_input ,1 ,36000) //An hour.
delay = new_delay
..()
code/modules/integrated_electronics/subtypes/trig.dm
+4 -4
View File
@@ -71,7 +71,7 @@
var/result = null
var/A = get_pin_data(IC_INPUT, 1)
if(!isnull(A))
result = TAN(A)
result = Tan(A)
set_pin_data(IC_OUTPUT, 1, result)
push_data()
@@ -91,7 +91,7 @@
var/result = null
var/A = get_pin_data(IC_INPUT, 1)
if(!isnull(A))
result = CSC(A)
result = Csc(A)
set_pin_data(IC_OUTPUT, 1, result)
push_data()
@@ -111,7 +111,7 @@
var/result = null
var/A = get_pin_data(IC_INPUT, 1)
if(!isnull(A))
result = SEC(A)
result = Sec(A)
set_pin_data(IC_OUTPUT, 1, result)
push_data()
@@ -131,7 +131,7 @@
var/result = null
var/A = get_pin_data(IC_INPUT, 1)
if(!isnull(A))
result = COT(A)
result = Cot(A)
set_pin_data(IC_OUTPUT, 1, result)
push_data()