mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 04:57:12 +01:00
BRUTAL Part 1 - No proc var/ in procs
This commit is contained in:
@@ -63,7 +63,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
|
||||
T = clamp(T, 1, 4)
|
||||
efficiency_coeff = 1 / (2 ** (T - 1))
|
||||
|
||||
/obj/machinery/r_n_d/circuit_imprinter/check_mat(datum/design/being_built, var/M)
|
||||
/obj/machinery/r_n_d/circuit_imprinter/check_mat(datum/design/being_built, M)
|
||||
var/list/all_materials = being_built.reagents_list + being_built.materials
|
||||
|
||||
var/A = materials.amount(M)
|
||||
@@ -72,7 +72,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
|
||||
|
||||
return round(A / max(1, (all_materials[M] * efficiency_coeff)))
|
||||
|
||||
/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
|
||||
/obj/machinery/r_n_d/circuit_imprinter/attackby(obj/item/O as obj, mob/user as mob, params)
|
||||
if(shocked)
|
||||
if(shock(user,50))
|
||||
return TRUE
|
||||
|
||||
@@ -36,14 +36,14 @@ Note: Must be placed within 3 tiles of the R&D Console
|
||||
decon_mod = T
|
||||
|
||||
|
||||
/obj/machinery/r_n_d/destructive_analyzer/proc/ConvertReqString2List(var/list/source_list)
|
||||
/obj/machinery/r_n_d/destructive_analyzer/proc/ConvertReqString2List(list/source_list)
|
||||
var/list/temp_list = params2list(source_list)
|
||||
for(var/O in temp_list)
|
||||
temp_list[O] = text2num(temp_list[O])
|
||||
return temp_list
|
||||
|
||||
|
||||
/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
|
||||
/obj/machinery/r_n_d/destructive_analyzer/attackby(obj/item/O as obj, mob/user as mob, params)
|
||||
if(shocked)
|
||||
if(shock(user,50))
|
||||
return TRUE
|
||||
|
||||
@@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(message_servers)
|
||||
var/sender = "Unspecified" //name of the sender
|
||||
var/message = "Blank" //transferred message
|
||||
|
||||
/datum/data_pda_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "")
|
||||
/datum/data_pda_msg/New(param_rec = "", param_sender = "", param_message = "")
|
||||
|
||||
if(param_rec)
|
||||
recipient = param_rec
|
||||
@@ -22,7 +22,7 @@ GLOBAL_LIST_EMPTY(message_servers)
|
||||
var/id_auth = "Unauthenticated"
|
||||
var/priority = "Normal"
|
||||
|
||||
/datum/data_rc_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "",var/param_stamp = "",var/param_id_auth = "",var/param_priority)
|
||||
/datum/data_rc_msg/New(param_rec = "", param_sender = "", param_message = "", param_stamp = "", param_id_auth = "", param_priority)
|
||||
if(param_rec)
|
||||
rec_dpt = param_rec
|
||||
if(param_sender)
|
||||
@@ -81,10 +81,10 @@ GLOBAL_LIST_EMPTY(message_servers)
|
||||
update_icon()
|
||||
return
|
||||
|
||||
/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
|
||||
/obj/machinery/message_server/proc/send_pda_message(recipient = "", sender = "", message = "")
|
||||
pda_msgs += new/datum/data_pda_msg(recipient,sender,message)
|
||||
|
||||
/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
|
||||
/obj/machinery/message_server/proc/send_rc_message(recipient = "", sender = "", message = "", stamp = "", id_auth = "", priority = 1)
|
||||
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
|
||||
var/authmsg = "[message]"
|
||||
if(id_auth)
|
||||
|
||||
@@ -68,7 +68,7 @@ Note: Must be placed west/left of and R&D console to function.
|
||||
T -= M.rating/10
|
||||
efficiency_coeff = min(max(0, T), 1)
|
||||
|
||||
/obj/machinery/r_n_d/protolathe/check_mat(datum/design/being_built, var/M) // now returns how many times the item can be built with the material
|
||||
/obj/machinery/r_n_d/protolathe/check_mat(datum/design/being_built, M) // now returns how many times the item can be built with the material
|
||||
var/A = materials.amount(M)
|
||||
if(!A)
|
||||
A = reagents.get_reagent_amount(M)
|
||||
@@ -77,7 +77,7 @@ Note: Must be placed west/left of and R&D console to function.
|
||||
A = A / max(1, (being_built.materials[M]))
|
||||
return A
|
||||
|
||||
/obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
|
||||
/obj/machinery/r_n_d/protolathe/attackby(obj/item/O as obj, mob/user as mob, params)
|
||||
if(shocked)
|
||||
if(shock(user,50))
|
||||
return TRUE
|
||||
|
||||
@@ -186,7 +186,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
|
||||
griefProtection()
|
||||
*/
|
||||
|
||||
/obj/machinery/computer/rdconsole/attackby(var/obj/item/D as obj, var/mob/user as mob, params)
|
||||
/obj/machinery/computer/rdconsole/attackby(obj/item/D as obj, mob/user as mob, params)
|
||||
|
||||
//Loading a disk into it.
|
||||
if(istype(D, /obj/item/disk))
|
||||
|
||||
@@ -132,5 +132,5 @@
|
||||
sleep(10)
|
||||
overlays -= "[initial(name)]_[stack_name]"
|
||||
|
||||
/obj/machinery/r_n_d/proc/check_mat(datum/design/being_built, var/M)
|
||||
/obj/machinery/r_n_d/proc/check_mat(datum/design/being_built, M)
|
||||
return 0 // number of copies of design beign_built you can make with material M
|
||||
|
||||
@@ -70,7 +70,7 @@ research holder datum.
|
||||
|
||||
//Checks to see if tech has all the required pre-reqs.
|
||||
//Input: datum/tech; Output: 0/1 (false/true)
|
||||
/datum/research/proc/TechHasReqs(var/datum/tech/T)
|
||||
/datum/research/proc/TechHasReqs(datum/tech/T)
|
||||
if(T.req_tech.len == 0)
|
||||
return TRUE
|
||||
for(var/req in T.req_tech)
|
||||
@@ -81,7 +81,7 @@ research holder datum.
|
||||
|
||||
//Checks to see if design has all the required pre-reqs.
|
||||
//Input: datum/design; Output: 0/1 (false/true)
|
||||
/datum/research/proc/DesignHasReqs(var/datum/design/D)
|
||||
/datum/research/proc/DesignHasReqs(datum/design/D)
|
||||
if(D.req_tech.len == 0)
|
||||
return TRUE
|
||||
for(var/req in D.req_tech)
|
||||
@@ -92,7 +92,7 @@ research holder datum.
|
||||
|
||||
//Adds a tech to known_tech list. Checks to make sure there aren't duplicates and updates existing tech's levels if needed.
|
||||
//Input: datum/tech; Output: Null
|
||||
/datum/research/proc/AddTech2Known(var/datum/tech/T)
|
||||
/datum/research/proc/AddTech2Known(datum/tech/T)
|
||||
if(T.id in known_tech)
|
||||
var/datum/tech/known = known_tech[T.id]
|
||||
if(T.level > known.level)
|
||||
@@ -100,12 +100,12 @@ research holder datum.
|
||||
return
|
||||
known_tech[T.id] = T
|
||||
|
||||
/datum/research/proc/CanAddDesign2Known(var/datum/design/D)
|
||||
/datum/research/proc/CanAddDesign2Known(datum/design/D)
|
||||
if (D.id in known_designs)
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
/datum/research/proc/AddDesign2Known(var/datum/design/D)
|
||||
/datum/research/proc/AddDesign2Known(datum/design/D)
|
||||
if(!CanAddDesign2Known(D))
|
||||
return
|
||||
// Global datums make me nervous
|
||||
@@ -126,7 +126,7 @@ research holder datum.
|
||||
|
||||
//Refreshes the levels of a given tech.
|
||||
//Input: Tech's ID and Level; Output: null
|
||||
/datum/research/proc/UpdateTech(var/ID, var/level)
|
||||
/datum/research/proc/UpdateTech(ID, level)
|
||||
var/datum/tech/KT = known_tech[ID]
|
||||
if(KT)
|
||||
if(KT.level <= level)
|
||||
@@ -146,7 +146,7 @@ research holder datum.
|
||||
else
|
||||
return FALSE
|
||||
|
||||
/datum/research/proc/FindDesignByID(var/id)
|
||||
/datum/research/proc/FindDesignByID(id)
|
||||
return known_designs[id]
|
||||
|
||||
// A common task is for one research datum to copy over its techs and designs
|
||||
@@ -166,10 +166,10 @@ research holder datum.
|
||||
//Autolathe files
|
||||
/datum/research/autolathe
|
||||
|
||||
/datum/research/autolathe/DesignHasReqs(var/datum/design/D)
|
||||
/datum/research/autolathe/DesignHasReqs(datum/design/D)
|
||||
return D && (D.build_type & AUTOLATHE) && ("initial" in D.category)
|
||||
|
||||
/datum/research/autolathe/CanAddDesign2Known(var/datum/design/design)
|
||||
/datum/research/autolathe/CanAddDesign2Known(datum/design/design)
|
||||
// Specifically excludes circuit imprinter and mechfab
|
||||
if(design.locked || !(design.build_type & (AUTOLATHE|PROTOLATHE|CRAFTLATHE)))
|
||||
return FALSE
|
||||
@@ -331,7 +331,7 @@ datum/tech/robotics
|
||||
req_tech = list("materials" = 3, "programming" = 3)
|
||||
*/
|
||||
|
||||
/datum/tech/proc/getCost(var/current_level = null)
|
||||
/datum/tech/proc/getCost(current_level = null)
|
||||
// Calculates tech disk's supply points sell cost
|
||||
if(!current_level)
|
||||
current_level = initial(level)
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
env.merge(removed)
|
||||
air_update_turf()
|
||||
|
||||
/obj/machinery/r_n_d/server/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
|
||||
/obj/machinery/r_n_d/server/attackby(obj/item/O as obj, mob/user as mob, params)
|
||||
if(disabled)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user