Fixes proc arguments

This commit is contained in:
Firecage
2015-07-15 23:52:35 +02:00
parent 6a0faa4ff6
commit 4688c2c969
832 changed files with 3721 additions and 3664 deletions
+5 -5
View File
@@ -1,7 +1,7 @@
#define MAX_ADMIN_BANS_PER_ADMIN 1
//Either pass the mob you wish to ban in the 'banned_mob' attribute, or the banckey, banip and bancid variables. If both are passed, the mob takes priority! If a mob is not passed, banckey is the minimum that needs to be passed! banip and bancid are optional.
/datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null, var/banip = null, var/bancid = null)
/datum/admins/proc/DB_ban_record(bantype, mob/banned_mob, duration = -1, reason, job = "", rounds = 0, banckey = null, banip = null, bancid = null)
if(!check_rights(R_BAN)) return
@@ -138,7 +138,7 @@
del(banned_mob.client)
/datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
/datum/admins/proc/DB_ban_unban(ckey, bantype, job = "")
if(!check_rights(R_BAN)) return
@@ -211,7 +211,7 @@
DB_ban_unban_by_id(ban_id)
/datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
/datum/admins/proc/DB_ban_edit(banid = null, param = null)
if(!check_rights(R_BAN)) return
@@ -271,7 +271,7 @@
usr << "Cancelled"
return
/datum/admins/proc/DB_ban_unban_by_id(var/id)
/datum/admins/proc/DB_ban_unban_by_id(id)
if(!check_rights(R_BAN)) return
@@ -323,7 +323,7 @@
holder.DB_ban_panel()
/datum/admins/proc/DB_ban_panel(var/playerckey = null, var/adminckey = null)
/datum/admins/proc/DB_ban_panel(playerckey = null, adminckey = null)
if(!usr.client)
return
+1 -1
View File
@@ -2,7 +2,7 @@ var/CMinutes = null
var/savefile/Banlist
/proc/CheckBan(var/ckey, var/id, var/address)
/proc/CheckBan(ckey, id, address)
if(!Banlist) // if Banlist cannot be located for some reason
LoadBans() // try to load the bans
if(!Banlist) // uh oh, can't find bans!
+7 -7
View File
@@ -4,14 +4,14 @@ var/global/floorIsLava = 0
////////////////////////////////
/proc/message_admins(var/msg)
/proc/message_admins(msg)
msg = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[msg]</span></span>"
admins << msg
///////////////////////////////////////////////////////////////////////////////////////////////Panels
/datum/admins/proc/show_player_panel(var/mob/M in mob_list)
/datum/admins/proc/show_player_panel(mob/M in mob_list)
set category = "Admin"
set name = "Show Player Panel"
set desc="Edit player (respawn, ban, heal, etc)"
@@ -558,7 +558,7 @@ var/global/floorIsLava = 0
log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.")
feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/unprison(var/mob/M in mob_list)
/datum/admins/proc/unprison(mob/M in mob_list)
set category = "Admin"
set name = "Unprison"
if (M.z == ZLEVEL_CENTCOM)
@@ -589,7 +589,7 @@ var/global/floorIsLava = 0
else
return "Error: Invalid sabotage target: [target]"
*/
/datum/admins/proc/spawn_atom(var/object as text)
/datum/admins/proc/spawn_atom(object as text)
set category = "Debug"
set desc = "(atom path) Spawn an atom"
set name = "Spawn"
@@ -622,7 +622,7 @@ var/global/floorIsLava = 0
feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/show_traitor_panel(var/mob/M in mob_list)
/datum/admins/proc/show_traitor_panel(mob/M in mob_list)
set category = "Admin"
set desc = "Edit mobs's memory and role"
set name = "Show Traitor Panel"
@@ -746,7 +746,7 @@ var/global/floorIsLava = 0
//Kicks all the clients currently in the lobby. The second parameter (kick_only_afk) determins if an is_afk() check is ran, or if all clients are kicked
//defaults to kicking everyone (afk + non afk clients in the lobby)
//returns a list of ckeys of the kicked clients
/proc/kick_clients_in_lobby(var/message, var/kick_only_afk = 0)
/proc/kick_clients_in_lobby(message, kick_only_afk = 0)
var/list/kicked_client_names = list()
for(var/client/C in clients)
if(istype(C.mob, /mob/new_player))
@@ -760,7 +760,7 @@ var/global/floorIsLava = 0
//returns 1 to let the dragdrop code know we are trapping this event
//returns 0 if we don't plan to trap the event
/datum/admins/proc/cmd_ghost_drag(var/mob/dead/observer/frommob, var/mob/living/tomob)
/datum/admins/proc/cmd_ghost_drag(mob/dead/observer/frommob, mob/living/tomob)
//this is the exact two check rights checks required to edit a ckey with vv.
if (!check_rights(R_VAREDIT,0) || !check_rights(R_SPAWN|R_DEBUG,0))
+2 -2
View File
@@ -8,14 +8,14 @@
#define INVESTIGATE_DIR "data/investigate/"
//SYSTEM
/proc/investigate_subject2file(var/subject)
/proc/investigate_subject2file(subject)
return file("[INVESTIGATE_DIR][subject].html")
/proc/investigate_reset()
if(fdel(INVESTIGATE_DIR)) return 1
return 0
/atom/proc/investigate_log(var/message, var/subject)
/atom/proc/investigate_log(message, subject)
if(!message) return
var/F = investigate_subject2file(subject)
if(!F) return
+4 -4
View File
@@ -462,7 +462,7 @@ var/list/admin_verbs_hideable = list(
message_admins("<span class='adminnotice'>[ckey] creating an admin explosion at [epicenter.loc].</span>")
feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/give_spell(mob/T as mob in mob_list)
/client/proc/give_spell(mob/T in mob_list)
set category = "Fun"
set name = "Give Spell"
set desc = "Gives a spell to a mob."
@@ -485,7 +485,7 @@ var/list/admin_verbs_hideable = list(
message_admins("<span class='danger'>Spells given to mindless mobs will not be transferred in mindswap or cloning!</span>")
/client/proc/give_disease(mob/T as mob in mob_list)
/client/proc/give_disease(mob/T in mob_list)
set category = "Fun"
set name = "Give Disease"
set desc = "Gives a Disease to a mob."
@@ -496,7 +496,7 @@ var/list/admin_verbs_hideable = list(
log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] gave [key_name(T)] the disease [D].</span>")
/client/proc/object_say(var/obj/O in world)
/client/proc/object_say(obj/O in world)
set category = "Special Verbs"
set name = "OSay"
set desc = "Makes an object say something."
@@ -599,7 +599,7 @@ var/list/admin_verbs_hideable = list(
deadmins -= ckey
return
/client/proc/populate_world(var/amount = 50 as num)
/client/proc/populate_world(amount = 50 as num)
set name = "Populate World"
set category = "Debug"
set desc = "(\"Amount of mobs to create\") Populate the world with test mobs."
+1 -1
View File
@@ -1,5 +1,5 @@
/var/create_mob_html = null
/datum/admins/proc/create_mob(var/mob/user)
/datum/admins/proc/create_mob(mob/user)
if (!create_mob_html)
var/mobjs = null
mobjs = list2text(typesof(/mob), ";")
+2 -2
View File
@@ -1,6 +1,6 @@
/var/create_object_html = null
/datum/admins/proc/create_object(var/mob/user)
/datum/admins/proc/create_object(mob/user)
if (!create_object_html)
var/objectjs = null
objectjs = list2text(typesof(/obj), ";")
@@ -10,7 +10,7 @@
user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475")
/datum/admins/proc/quick_create_object(var/mob/user)
/datum/admins/proc/quick_create_object(mob/user)
var/quick_create_object_html = null
var/pathtext = null
+1 -1
View File
@@ -1,5 +1,5 @@
/var/create_turf_html = null
/datum/admins/proc/create_turf(var/mob/user)
/datum/admins/proc/create_turf(mob/user)
if (!create_turf_html)
var/turfjs = null
turfjs = list2text(typesof(/turf), ";")
+1 -1
View File
@@ -1,7 +1,7 @@
var/savefile/Banlistjob
/proc/_jobban_isbanned(var/client/clientvar, var/rank)
/proc/_jobban_isbanned(client/clientvar, rank)
if(!clientvar) return 1
ClearTempbansjob()
var/id = clientvar.computer_id
@@ -47,7 +47,7 @@
usr << browse(output,"window=editrights;size=900x650")
/datum/admins/proc/log_admin_rank_modification(var/adm_ckey, var/new_rank)
/datum/admins/proc/log_admin_rank_modification(adm_ckey, new_rank)
if(config.admin_legacy_system) return
if(!usr.client)
@@ -97,7 +97,7 @@
usr << "<span class='adminnnotice'>Admin rank changed.</span>"
/datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission)
/datum/admins/proc/log_admin_permission_modification(adm_ckey, new_permission)
if(config.admin_legacy_system) return
if(!usr.client) return
if(check_rights(R_PERMISSIONS)) return
+4 -4
View File
@@ -26,11 +26,11 @@
popup.open()
/datum/admins/proc/notes_show(var/ckey)
/datum/admins/proc/notes_show(ckey)
usr << browse("<head><title>Player Notes</title></head><body>[notes_gethtml(ckey)]</body>","window=player_notes;size=700x400")
/datum/admins/proc/notes_gethtml(var/ckey)
/datum/admins/proc/notes_gethtml(ckey)
var/savefile/notesfile = new(NOTESFILE)
if(!notesfile) return "<span class='warning'>Error: Cannot access [NOTESFILE]</span>"
if(ckey)
@@ -53,7 +53,7 @@
//handles adding notes to the end of a ckey's buffer
//originally had seperate entries such as var/by to record who left the note and when
//but the current bansystem is a heap of dung.
/proc/notes_add(var/ckey, var/note, var/lognote = 0)
/proc/notes_add(ckey, note, lognote = 0)
if(!ckey)
ckey = ckey(input(usr,"Who would you like to add notes for?","Enter a ckey",null) as text|null)
if(!ckey) return
@@ -75,7 +75,7 @@
return
//handles removing entries from the buffer, or removing the entire directory if no start_index is given
/proc/notes_remove(var/ckey, var/start_index, var/end_index)
/proc/notes_remove(ckey, start_index, end_index)
var/savefile/notesfile = new(NOTESFILE)
var/admin_msg
if(!notesfile) return
+1 -1
View File
@@ -81,7 +81,7 @@
/datum/admins/proc/Secrets_topic(var/item,var/href_list)
/datum/admins/proc/Secrets_topic(item,href_list)
var/datum/round_event/E
var/ok = 0
switch(item)
+1 -1
View File
@@ -1,4 +1,4 @@
/proc/keywords_lookup(var/msg)
/proc/keywords_lookup(msg)
//This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i")
+6 -6
View File
@@ -25,7 +25,7 @@
message_admins("[key_name_admin(usr)] jumped to [A]")
feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/jumptoturf(var/turf/T in world)
/client/proc/jumptoturf(turf/T in world)
set name = "Jump to Turf"
set category = "Admin"
if(!src.holder)
@@ -38,7 +38,7 @@
feedback_add_details("admin_verb","JT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
/client/proc/jumptomob(var/mob/M in mob_list)
/client/proc/jumptomob(mob/M in mob_list)
set category = "Admin"
set name = "Jump to Mob"
@@ -96,7 +96,7 @@
feedback_add_details("admin_verb","JK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/Getmob(var/mob/M in mob_list)
/client/proc/Getmob(mob/M in mob_list)
set category = "Admin"
set name = "Get Mob"
set desc = "Mob to teleport"
@@ -135,7 +135,7 @@
usr.loc = M.loc
feedback_add_details("admin_verb","GK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/sendmob(var/mob/M in sortmobs())
/client/proc/sendmob(mob/M in sortmobs())
set category = "Admin"
set name = "Send Mob"
if(!src.holder)
@@ -148,11 +148,11 @@
log_admin("[key_name(usr)] teleported [key_name(M)] to [A]")
message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]")
/proc/admin_forcemove(var/mob/mover, var/atom/newloc)
/proc/admin_forcemove(mob/mover, atom/newloc)
mover.loc = newloc
mover.on_forcemove(newloc)
/mob/proc/on_forcemove(var/atom/newloc)
/mob/proc/on_forcemove(atom/newloc)
return
+1 -1
View File
@@ -1,5 +1,5 @@
//allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm
/client/proc/cmd_admin_pm_context(mob/M as mob in mob_list)
/client/proc/cmd_admin_pm_context(mob/M in mob_list)
set category = null
set name = "Admin PM Mob"
if(!holder)
+1 -1
View File
@@ -1,4 +1,4 @@
/client/proc/bluespace_artillery(var/mob/M in mob_list)
/client/proc/bluespace_artillery(mob/M in mob_list)
set name = "Bluespace Artillery"
set category = "Fun"
+2 -2
View File
@@ -5,7 +5,7 @@
#define AREA_BUILDMODE 5
#define NUM_BUILDMODES 5
/proc/togglebuildmode(mob/M as mob in player_list)
/proc/togglebuildmode(mob/M in player_list)
set name = "Toggle Build Mode"
set category = "Special Verbs"
if(M.client)
@@ -197,7 +197,7 @@
return 1
/proc/build_click(var/mob/user, buildmode, params, var/obj/object)
/proc/build_click(mob/user, buildmode, params, obj/object)
var/obj/effect/bmode/buildholder/holder = null
for(var/obj/effect/bmode/buildholder/H)
if(H.cl == user.client)
+1 -1
View File
@@ -1,4 +1,4 @@
/client/proc/cinematic(var/cinematic as anything in list("explosion",null))
/client/proc/cinematic(cinematic as anything in list("explosion",null))
set name = "cinematic"
set category = "Fun"
set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
+14 -14
View File
@@ -83,7 +83,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
usr << "<font color='blue'>[procname] returned: [returnval ? returnval : "null"]</font>"
feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/callproc_datum(var/A as null|area|mob|obj|turf)
/client/proc/callproc_datum(A as null|area|mob|obj|turf)
set category = "Debug"
set name = "Atom ProcCall"
@@ -182,7 +182,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
usr.show_message(t, 1)
feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_robotize(var/mob/M in mob_list)
/client/proc/cmd_admin_robotize(mob/M in mob_list)
set category = "Fun"
set name = "Make Robot"
@@ -198,7 +198,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
else
alert("Invalid mob")
/client/proc/cmd_admin_blobize(var/mob/M in mob_list)
/client/proc/cmd_admin_blobize(mob/M in mob_list)
set category = "Fun"
set name = "Make Blob"
@@ -215,7 +215,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
alert("Invalid mob")
/client/proc/cmd_admin_animalize(var/mob/M in mob_list)
/client/proc/cmd_admin_animalize(mob/M in mob_list)
set category = "Fun"
set name = "Make Simple Animal"
@@ -236,7 +236,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M.Animalize()
/client/proc/makepAI(var/turf/T in mob_list)
/client/proc/makepAI(turf/T in mob_list)
set category = "Fun"
set name = "Make pAI"
set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI"
@@ -263,7 +263,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
SSpai.candidates.Remove(candidate)
feedback_add_details("admin_verb","MPAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_alienize(var/mob/M in mob_list)
/client/proc/cmd_admin_alienize(mob/M in mob_list)
set category = "Fun"
set name = "Make Alien"
@@ -280,7 +280,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
else
alert("Invalid mob")
/client/proc/cmd_admin_slimeize(var/mob/M in mob_list)
/client/proc/cmd_admin_slimeize(mob/M in mob_list)
set category = "Fun"
set name = "Make slime"
@@ -425,7 +425,7 @@ var/global/list/g_fancy_list_of_types = null
return matches
//TODO: merge the vievars version into this or something maybe mayhaps
/client/proc/cmd_debug_del_all(var/object as text)
/client/proc/cmd_debug_del_all(object as text)
set category = "Debug"
set name = "Del-All"
@@ -456,7 +456,7 @@ var/global/list/g_fancy_list_of_types = null
message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_grantfullaccess(var/mob/M in mob_list)
/client/proc/cmd_admin_grantfullaccess(mob/M in mob_list)
set category = "Admin"
set name = "Grant Full Access"
@@ -496,7 +496,7 @@ var/global/list/g_fancy_list_of_types = null
log_admin("[key_name(src)] has granted [M.key] full access.")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] has granted [M.key] full access.</span>")
/client/proc/cmd_assume_direct_control(var/mob/M in mob_list)
/client/proc/cmd_assume_direct_control(mob/M in mob_list)
set category = "Admin"
set name = "Assume direct control"
set desc = "Direct intervention"
@@ -603,7 +603,7 @@ var/global/list/g_fancy_list_of_types = null
for(var/areatype in areas_without_camera)
world << "* [areatype]"
/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list)
/client/proc/cmd_admin_dress(mob/living/carbon/human/M in mob_list)
set category = "Fun"
set name = "Select equipment"
if(!ishuman(M))
@@ -1091,7 +1091,7 @@ var/global/list/g_fancy_list_of_types = null
//Deathsquad
/proc/equip_deathsquad(var/mob/living/carbon/human/M, var/officer)
/proc/equip_deathsquad(mob/living/carbon/human/M, officer)
var/obj/item/device/radio/R = new /obj/item/device/radio/headset/headset_cent/alt(M)
R.set_frequency(CENTCOM_FREQ)
R.freqlock = 1
@@ -1142,7 +1142,7 @@ var/global/list/g_fancy_list_of_types = null
M.equip_to_slot_or_del(W, slot_wear_id)
//Emergency Response Team
/proc/equip_emergencyresponsesquad(var/mob/living/carbon/human/M, var/ertrole, var/alert)
/proc/equip_emergencyresponsesquad(mob/living/carbon/human/M, ertrole, alert)
var/obj/item/weapon/card/id/W = null
var/obj/item/device/radio/R = new /obj/item/device/radio/headset/headset_cent/alt(M)
R.set_frequency(CENTCOM_FREQ)
@@ -1260,7 +1260,7 @@ var/global/list/g_fancy_list_of_types = null
W.update_label(W.registered_name, W.assignment)
/proc/equip_centcomofficial(var/mob/living/carbon/human/M)
/proc/equip_centcomofficial(mob/living/carbon/human/M)
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
+1 -1
View File
@@ -1,4 +1,4 @@
/client/proc/air_status(turf/target as turf)
/client/proc/air_status(turf/target)
set category = "Debug"
set name = "Display Air Status"
+1 -1
View File
@@ -1,4 +1,4 @@
/proc/machine_upgrade(obj/machinery/M as obj in world)
/proc/machine_upgrade(obj/machinery/M in world)
set name = "Tweak Component Ratings"
set category = "Debug"
var/new_rating = input("Enter new rating:","Num") as num
+2 -2
View File
@@ -1,4 +1,4 @@
/client/proc/cmd_mass_modify_object_variables(atom/A, var/var_name)
/client/proc/cmd_mass_modify_object_variables(atom/A, var_name)
set category = "Debug"
set name = "Mass Edit Variables"
set desc="(target) Edit all instances of a target item's variables"
@@ -23,7 +23,7 @@
feedback_add_details("admin_verb","MEV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/massmodify_variables(var/atom/O, var/var_name = "", var/method = 0)
/client/proc/massmodify_variables(atom/O, var_name = "", method = 0)
if(!check_rights(R_VAREDIT)) return
for(var/p in forbidden_varedit_object_types)
+4 -4
View File
@@ -77,7 +77,7 @@ var/list/VVckey_edit = list("key", "ckey")
return var_value
/client/proc/mod_list_add(var/list/L, atom/O, original_name, objectvar)
/client/proc/mod_list_add(list/L, atom/O, original_name, objectvar)
var/class = "text"
if(src.holder && src.holder.marked_datum)
@@ -133,7 +133,7 @@ var/list/VVckey_edit = list("key", "ckey")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]")
message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]")
/client/proc/mod_list(var/list/L, atom/O, original_name, objectvar)
/client/proc/mod_list(list/L, atom/O, original_name, objectvar)
if(!check_rights(R_VAREDIT)) return
if(!istype(L,/list)) src << "Not a List."
@@ -263,7 +263,7 @@ var/list/VVckey_edit = list("key", "ckey")
original_var = L[assoc_key]
else
original_var = L[L.Find(variable)]
var/new_var
switch(class) //Spits a runtime error if you try to modify an entry in the contents list. Dunno how to fix it, yet.
@@ -347,7 +347,7 @@ var/list/VVckey_edit = list("key", "ckey")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]")
message_admins("[key_name_admin(src)] modified [original_name]'s varlist [objectvar]: [original_var]=[new_var]")
/client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
/client/proc/modify_variables(atom/O, param_var_name = null, autodetect_class = 0)
if(!check_rights(R_VAREDIT)) return
for(var/p in forbidden_varedit_object_types)
+1 -1
View File
@@ -684,7 +684,7 @@
return candidates
/datum/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
/datum/admins/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
if(!G_found || !G_found.key) return
//First we spawn a dude.
+3 -3
View File
@@ -1,4 +1,4 @@
/proc/possess(obj/O as obj in world)
/proc/possess(obj/O in world)
set name = "Possess Obj"
set category = "Object"
@@ -26,7 +26,7 @@
usr.control_object = O
feedback_add_details("admin_verb","PO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/proc/release(obj/O as obj in world)
/proc/release(obj/O in world)
set name = "Release Obj"
set category = "Object"
//usr.loc = get_turf(usr)
@@ -44,7 +44,7 @@
usr.control_object = null
feedback_add_details("admin_verb","RO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/proc/givetestverbs(mob/M as mob in mob_list)
/proc/givetestverbs(mob/M in mob_list)
set desc = "Give this guy possess/release verbs"
set category = "Debug"
set name = "Give Possessing Verbs"
+3 -3
View File
@@ -37,17 +37,17 @@
feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
//log_admin("HELP: [key_name(src)]: [msg]")
/proc/Centcomm_announce(var/text , var/mob/Sender)
/proc/Centcomm_announce(text , mob/Sender)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "<span class='adminnotice'><b><font color=orange>CENTCOM:</font>[key_name_admin(Sender)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[Sender]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[Sender]'>FLW</A>) (<A HREF='?_src_=holder;traitor=\ref[Sender]'>TP</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]</span>"
admins << msg
/proc/Syndicate_announce(var/text , var/mob/Sender)
/proc/Syndicate_announce(text , mob/Sender)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "<span class='adminnotice'><b><font color=crimson>SYNDICATE:</font>[key_name_admin(Sender)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[Sender]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[Sender]'>FLW</A>) (<A HREF='?_src_=holder;traitor=\ref[Sender]'>TP</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]</span>"
admins << msg
/proc/Nuke_request(var/text , var/mob/Sender)
/proc/Nuke_request(text , mob/Sender)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "<span class='adminnotice'><b><font color=orange>NUKE CODE REQUEST:</font>[key_name_admin(Sender)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[Sender]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[Sender]'>FLW</A>) (<A HREF='?_src_=holder;traitor=\ref[Sender]'>TP</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]</span>"
admins << msg
+9 -9
View File
@@ -1,4 +1,4 @@
/client/proc/cmd_admin_drop_everything(mob/M as mob in mob_list)
/client/proc/cmd_admin_drop_everything(mob/M in mob_list)
set category = null
set name = "Drop Everything"
if(!holder)
@@ -19,7 +19,7 @@
feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_subtle_message(mob/M as mob in mob_list)
/client/proc/cmd_admin_subtle_message(mob/M in mob_list)
set category = "Special Verbs"
set name = "Subtle Message"
@@ -58,7 +58,7 @@
message_admins("<span class='adminnotice'><b> GlobalNarrate: [key_name_admin(usr)] :</b> [msg]<BR></span>")
feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_direct_narrate(var/mob/M)
/client/proc/cmd_admin_direct_narrate(mob/M)
set category = "Special Verbs"
set name = "Direct Narrate"
@@ -82,7 +82,7 @@
message_admins("<span class='adminnotice'><b> DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]):</b> [msg]<BR></span>")
feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_local_narrate(var/atom/A)
/client/proc/cmd_admin_local_narrate(atom/A)
set category = "Special Verbs"
set name = "Local Narrate"
@@ -104,7 +104,7 @@
message_admins("<span class='adminnotice'><b> LocalNarrate: [key_name_admin(usr)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[A.x];Y=[A.y];Z=[A.z]'>[get_area(A)]</a>):</b> [msg]<BR></span>")
feedback_add_details("admin_verb","LN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_godmode(mob/M as mob in mob_list)
/client/proc/cmd_admin_godmode(mob/M in mob_list)
set category = "Special Verbs"
set name = "Godmode"
if(!holder)
@@ -417,7 +417,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list)
/client/proc/cmd_admin_rejuvenate(mob/living/M in mob_list)
set category = "Special Verbs"
set name = "Rejuvenate"
if(!holder)
@@ -536,7 +536,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
else
return
/client/proc/cmd_admin_gib(mob/M as mob in mob_list)
/client/proc/cmd_admin_gib(mob/M in mob_list)
set category = "Special Verbs"
set name = "Gib"
@@ -574,7 +574,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
message_admins("<span class='adminnotice'>[key_name_admin(usr)] used gibself.</span>")
feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_check_contents(mob/living/M as mob in mob_list)
/client/proc/cmd_admin_check_contents(mob/living/M in mob_list)
set category = "Special Verbs"
set name = "Check Contents"
@@ -635,7 +635,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
/client/proc/cmd_admin_attack_log(mob/M as mob in mob_list)
/client/proc/cmd_admin_attack_log(mob/M in mob_list)
set category = "Special Verbs"
set name = "Attack Log"
+5 -5
View File
@@ -50,7 +50,7 @@
//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
/obj/item/device/assembly/proc/pulsed(var/radio = 0)
/obj/item/device/assembly/proc/pulsed(radio = 0)
if(holder && (wires & WIRE_RECEIVE))
activate()
if(radio && (wires & WIRE_RADIO_RECEIVE))
@@ -59,7 +59,7 @@
//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
/obj/item/device/assembly/proc/pulse(var/radio = 0)
/obj/item/device/assembly/proc/pulse(radio = 0)
if(src.connected && src.wires)
connected.Pulse(src)
return 1
@@ -86,7 +86,7 @@
return secured
/obj/item/device/assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/device/assembly/attackby(obj/item/weapon/W, mob/user, params)
if(isassembly(W))
var/obj/item/device/assembly/A = W
if((!A.secured) && (!secured))
@@ -119,7 +119,7 @@
user << "\The [src] can be attached to other things."
/obj/item/device/assembly/attack_self(mob/user as mob)
/obj/item/device/assembly/attack_self(mob/user)
if(!user)
return 0
user.set_machine(src)
@@ -127,6 +127,6 @@
return 1
/obj/item/device/assembly/interact(mob/user as mob)
/obj/item/device/assembly/interact(mob/user)
return //HTML MENU FOR WIRES GOES HERE
+3 -3
View File
@@ -23,7 +23,7 @@
overlays += bombassembly.overlays
overlays += "bomb_assembly"
/obj/item/device/onetankbomb/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/device/onetankbomb/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/device/analyzer))
bombtank.attackby(W, user)
return
@@ -54,7 +54,7 @@
add_fingerprint(user)
..()
/obj/item/device/onetankbomb/attack_self(mob/user as mob) //pressing the bomb accesses its assembly
/obj/item/device/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly
bombassembly.attack_self(user, 1)
add_fingerprint(user)
return
@@ -77,7 +77,7 @@
if(bombassembly)
bombassembly.Crossed(AM)
/obj/item/device/onetankbomb/on_found(mob/finder as mob) //for mousetraps
/obj/item/device/onetankbomb/on_found(mob/finder) //for mousetraps
if(bombassembly)
bombassembly.on_found(finder)
+6 -6
View File
@@ -16,14 +16,14 @@
return 1
/obj/item/device/assembly_holder/proc/assemble(var/obj/item/device/assembly/A, var/obj/item/device/assembly/A2, var/mob/user)
/obj/item/device/assembly_holder/proc/assemble(obj/item/device/assembly/A, obj/item/device/assembly/A2, mob/user)
attach(A,user)
attach(A2,user)
name = "[A.name]-[A2.name] assembly"
update_icon()
feedback_add_details("assembly_made","[name]")
/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/assembly/A, var/mob/user)
/obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user)
if(!A.remove_item_from_storage(src))
if(user)
user.remove_from_mob(A)
@@ -61,7 +61,7 @@
if(a_right)
a_right.Crossed(AM)
/obj/item/device/assembly_holder/on_found(mob/finder as mob)
/obj/item/device/assembly_holder/on_found(mob/finder)
if(a_left)
a_left.on_found(finder)
if(a_right)
@@ -81,7 +81,7 @@
..()
return
/obj/item/device/assembly_holder/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/device/assembly_holder/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/screwdriver))
var/turf/T = get_turf(src)
if(!T)
@@ -96,7 +96,7 @@
else
..()
/obj/item/device/assembly_holder/attack_self(mob/user as mob)
/obj/item/device/assembly_holder/attack_self(mob/user)
src.add_fingerprint(user)
if(!a_left || !a_right)
user << "<span class='danger'>Assembly part missing!</span>"
@@ -111,7 +111,7 @@
a_right.attack_self(user)
/obj/item/device/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1, var/special = 1)
/obj/item/device/assembly_holder/proc/process_activation(obj/D, normal = 1, special = 1)
if(!D)
return 0
if((normal) && (a_right) && (a_left))
+1 -1
View File
@@ -21,7 +21,7 @@
return 1
/obj/item/device/assembly/igniter/attack_self(mob/user as mob)
/obj/item/device/assembly/igniter/attack_self(mob/user)
activate()
add_fingerprint(user)
return
+1 -1
View File
@@ -93,7 +93,7 @@
process_cooldown()
return
/obj/item/device/assembly/infra/interact(mob/user as mob)//TODO: change this this to the wire control panel
/obj/item/device/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel
if(is_secured(user))
user.set_machine(src)
var/dat = text("<TT><B>Infrared Laser</B>\n<B>Status</B>: []<BR>\n<B>Visibility</B>: []<BR>\n</TT>", (on ? text("<A href='?src=\ref[];state=0'>On</A>", src) : text("<A href='?src=\ref[];state=1'>Off</A>", src)), (src.visible ? text("<A href='?src=\ref[];visible=0'>Visible</A>", src) : text("<A href='?src=\ref[];visible=1'>Invisible</A>", src)))
+5 -5
View File
@@ -36,7 +36,7 @@
if(holder)
holder.update_icon()
/obj/item/device/assembly/mousetrap/proc/triggered(mob/target as mob, var/type = "feet")
/obj/item/device/assembly/mousetrap/proc/triggered(mob/target, type = "feet")
if(!armed)
return
var/obj/item/organ/limb/affecting = null
@@ -71,7 +71,7 @@
pulse(0)
/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user as mob)
/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user)
if(!armed)
user << "<span class='notice'>You arm [src].</span>"
else
@@ -89,7 +89,7 @@
playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user as mob)
/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user)
if(armed)
if(((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY) && prob(50))
var/which_hand = "l_hand"
@@ -102,7 +102,7 @@
..()
/obj/item/device/assembly/mousetrap/Crossed(var/atom/movable/AM as mob|obj)
/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj)
if(armed)
if(ishuman(AM))
var/mob/living/carbon/H = AM
@@ -119,7 +119,7 @@
..()
/obj/item/device/assembly/mousetrap/on_found(mob/finder as mob)
/obj/item/device/assembly/mousetrap/on_found(mob/finder)
if(armed)
finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking their fingers.</span>", \
"<span class='warning'>You accidentally trigger [src]!</span>")
+1 -1
View File
@@ -98,7 +98,7 @@
return
/obj/item/device/assembly/prox_sensor/interact(mob/user as mob)//TODO: Change this to the wires thingy
/obj/item/device/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy
if(is_secured(user))
var/second = time % 60
var/minute = (time - second) / 60
+2 -2
View File
@@ -14,7 +14,7 @@
..()
return
/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
var/turf/T = loc
if(ismob(T))
@@ -30,7 +30,7 @@
add_fingerprint(user)
return
/obj/item/assembly/shock_kit/attack_self(mob/user as mob)
/obj/item/assembly/shock_kit/attack_self(mob/user)
part1.attack_self(user)
part2.attack_self(user)
add_fingerprint(user)
+1 -1
View File
@@ -38,7 +38,7 @@
holder.update_icon()
return
/obj/item/device/assembly/signaler/interact(mob/user as mob, flag1)
/obj/item/device/assembly/signaler/interact(mob/user, flag1)
if(is_secured(user))
var/t1 = "-------"
// if ((src.b_stat && !( flag1 )))
+1 -1
View File
@@ -66,7 +66,7 @@
return
/obj/item/device/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires
/obj/item/device/assembly/timer/interact(mob/user)//TODO: Have this use the wires
if(is_secured(user))
var/second = time % 60
var/minute = (time - second) / 60
@@ -20,7 +20,7 @@
/obj/structure/artilleryplaceholder/decorative
density = 0
/obj/machinery/artillerycontrol/attack_hand(mob/user as mob)
/obj/machinery/artillerycontrol/attack_hand(mob/user)
user.set_machine(src)
var/dat = "<B>Bluespace Artillery Control:</B><BR>"
dat += "Locked on<BR>"
+6 -6
View File
@@ -78,7 +78,7 @@
ready = 1
/obj/machinery/gateway/centerstation/proc/toggleon(mob/user as mob)
/obj/machinery/gateway/centerstation/proc/toggleon(mob/user)
if(!ready) return
if(linked.len != 8) return
if(!powered()) return
@@ -104,7 +104,7 @@
update_icon()
/obj/machinery/gateway/centerstation/attack_hand(mob/user as mob)
/obj/machinery/gateway/centerstation/attack_hand(mob/user)
if(!ready)
detect()
return
@@ -133,7 +133,7 @@
return
/obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob, params)
/obj/machinery/gateway/centerstation/attackby(obj/item/device/W, mob/user, params)
if(istype(W,/obj/item/device/multitool))
user << "\black The gate is already calibrated, there is no work for you to do here."
return
@@ -183,7 +183,7 @@
ready = 1
/obj/machinery/gateway/centeraway/proc/toggleon(mob/user as mob)
/obj/machinery/gateway/centeraway/proc/toggleon(mob/user)
if(!ready) return
if(linked.len != 8) return
if(!stationgate)
@@ -205,7 +205,7 @@
update_icon()
/obj/machinery/gateway/centeraway/attack_hand(mob/user as mob)
/obj/machinery/gateway/centeraway/attack_hand(mob/user)
if(!ready)
detect()
return
@@ -227,7 +227,7 @@
M.dir = SOUTH
/obj/machinery/gateway/centeraway/attackby(obj/item/device/W as obj, mob/user as mob, params)
/obj/machinery/gateway/centeraway/attackby(obj/item/device/W, mob/user, params)
if(istype(W,/obj/item/device/multitool))
if(calibrated)
user << "\black The gate is already calibrated, there is no work for you to do here."
@@ -16,7 +16,7 @@ var/global/dmm_suite/preloader/_preloader = null
* 2) Read the map line by line, parsing the result (using parse_grid)
*
*/
/dmm_suite/load_map(var/dmm_file as file, var/z_offset as num)
/dmm_suite/load_map(dmm_file as file, z_offset as num)
if(!z_offset)//what z_level we are creating the map on
z_offset = world.maxz+1
@@ -110,7 +110,7 @@ var/global/dmm_suite/preloader/_preloader = null
* 4) Instanciates the atom with its variables
*
*/
/dmm_suite/proc/parse_grid(var/model as text,var/xcrd as num,var/ycrd as num,var/zcrd as num)
/dmm_suite/proc/parse_grid(model as text,xcrd as num,ycrd as num,zcrd as num)
/*Method parse_grid()
- Accepts a text string containing a comma separated list of type paths of the
same construction as those contained in a .dmm file, and instantiates them.
@@ -203,7 +203,7 @@ var/global/dmm_suite/preloader/_preloader = null
////////////////
//Instance an atom at (x,y,z) and gives it the variables in attributes
/dmm_suite/proc/instance_atom(var/path,var/list/attributes, var/x, var/y, var/z)
/dmm_suite/proc/instance_atom(path,list/attributes, x, y, z)
var/atom/instance
_preloader = new(attributes, path)
@@ -216,7 +216,7 @@ var/global/dmm_suite/preloader/_preloader = null
//text trimming (both directions) helper proc
//optionally removes quotes before and after the text (for variable name)
/dmm_suite/proc/trim_text(var/what as text,var/trim_quotes=0)
/dmm_suite/proc/trim_text(what as text,trim_quotes=0)
while(length(what) && (findtext(what," ",1,2)))
what=copytext(what,2,0)
while(length(what) && (findtext(what," ",length(what),0)))
@@ -230,7 +230,7 @@ var/global/dmm_suite/preloader/_preloader = null
//find the position of the next delimiter,skipping whatever is comprised between opening_escape and closing_escape
//returns 0 if reached the last delimiter
/dmm_suite/proc/find_next_delimiter_position(var/text as text,var/initial_position as num, var/delimiter=",",var/opening_escape=quote,var/closing_escape=quote)
/dmm_suite/proc/find_next_delimiter_position(text as text,initial_position as num, delimiter=",",opening_escape=quote,closing_escape=quote)
var/position = initial_position
var/next_delimiter = findtext(text,delimiter,position,0)
var/next_opening = findtext(text,opening_escape,position,0)
@@ -245,7 +245,7 @@ var/global/dmm_suite/preloader/_preloader = null
//build a list from variables in text form (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7))
//return the filled list
/dmm_suite/proc/text2list(var/text as text,var/delimiter=",")
/dmm_suite/proc/text2list(text as text,delimiter=",")
var/list/to_return = list()
@@ -295,7 +295,7 @@ var/global/dmm_suite/preloader/_preloader = null
return to_return
//simulates the DM multiple turfs on one tile underlaying
/dmm_suite/proc/add_underlying_turf(var/turf/placed,var/turf/underturf, var/list/turfs_underlays)
/dmm_suite/proc/add_underlying_turf(turf/placed,turf/underturf, list/turfs_underlays)
if(underturf.density)
placed.density = 1
if(underturf.opacity)
@@ -318,7 +318,7 @@ var/global/dmm_suite/preloader/_preloader = null
var/list/attributes
var/target_path
/dmm_suite/preloader/New(var/list/the_attributes, var/path)
/dmm_suite/preloader/New(list/the_attributes, path)
.=..()
if(!the_attributes.len)
Del()
@@ -173,7 +173,7 @@ var/sc_safecode5 = "[rand(0,9)]"
if(prob(25))
mezzer()
/obj/singularity/narsie/sc_Narsie/consume(var/atom/A)
/obj/singularity/narsie/sc_Narsie/consume(atom/A)
if(is_type_in_list(A, uneatable))
return 0
if (istype(A,/mob/living))
@@ -51,7 +51,7 @@
var/chargesa = 1
var/insistinga = 0
/obj/machinery/wish_granter_dark/attack_hand(var/mob/living/carbon/human/user as mob)
/obj/machinery/wish_granter_dark/attack_hand(mob/living/carbon/human/user)
usr.set_machine(src)
if(chargesa <= 0)
+2 -2
View File
@@ -5,10 +5,10 @@
anchored = 1
density = 1
/obj/structure/signpost/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/signpost/attackby(obj/item/weapon/W, mob/user, params)
return attack_hand(user)
/obj/structure/signpost/attack_hand(mob/user as mob)
/obj/structure/signpost/attack_hand(mob/user)
switch(alert("Travel back to ss13?",,"Yes","No"))
if("Yes")
if(user.z != src.z) return
+1 -1
View File
@@ -49,7 +49,7 @@
return 0
return 1
/client/proc/handle_spam_prevention(var/message, var/mute_type)
/client/proc/handle_spam_prevention(message, mute_type)
if(config.automute_on && !holder && src.last_message == message)
src.last_message_count++
if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE)
+2 -2
View File
@@ -516,7 +516,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
popup.open(0)
return
proc/SetJobPreferenceLevel(var/datum/job/job, var/level)
proc/SetJobPreferenceLevel(datum/job/job, level)
if (!job)
return 0
@@ -618,7 +618,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
job_engsec_low = 0
proc/GetJobDepartment(var/datum/job/job, var/level)
proc/GetJobDepartment(datum/job/job, level)
if(!job || !level) return 0
switch(job.department_flag)
if(CIVILIAN)
+3 -3
View File
@@ -77,7 +77,7 @@ BLIND // can't see anything
put_on_delay = 40
// Called just before an attack_hand(), in mob/UnarmedAttack()
/obj/item/clothing/gloves/proc/Touch(var/atom/A, var/proximity)
/obj/item/clothing/gloves/proc/Touch(atom/A, proximity)
return 0 // return 1 to cancel attack_hand()
//Head
@@ -106,7 +106,7 @@ BLIND // can't see anything
return message
//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
/obj/item/clothing/mask/proc/adjustmask(var/mob/user)
/obj/item/clothing/mask/proc/adjustmask(mob/user)
if(!ignore_maskadjust)
if(user.incapacitated())
return
@@ -326,7 +326,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type)
..()
/obj/item/clothing/under/AltClick(var/mob/user)
/obj/item/clothing/under/AltClick(mob/user)
..()
if(!user.canUseTopic(user))
user << "<span class='warning'>You can't do that right now!</span>"
+2 -2
View File
@@ -180,7 +180,7 @@
toggle_helmlight()
..()
/obj/item/clothing/head/helmet/attackby(var/obj/item/A as obj, mob/user as mob, params)
/obj/item/clothing/head/helmet/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/device/flashlight/seclite))
var/obj/item/device/flashlight/seclite/S = A
if(can_flashlight)
@@ -231,7 +231,7 @@
update_helmlight(user)
return
/obj/item/clothing/head/helmet/proc/update_helmlight(var/mob/user = null)
/obj/item/clothing/head/helmet/proc/update_helmlight(mob/user = null)
if(F)
action_button_name = "Toggle Helmetlight"
if(F.on)
+2 -2
View File
@@ -66,7 +66,7 @@
if (istype(location, /turf))
location.hotspot_expose(700, 1)
/obj/item/clothing/head/cakehat/attack_self(mob/user as mob)
/obj/item/clothing/head/cakehat/attack_self(mob/user)
if(status > 1) return
src.onfire = !( src.onfire )
if (src.onfire)
@@ -94,7 +94,7 @@
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
/obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
/obj/item/clothing/head/ushanka/attack_self(mob/user)
if(earflaps)
src.icon_state = "ushankaup"
src.item_state = "ushankaup"
+2 -2
View File
@@ -18,7 +18,7 @@
flip(usr)
/obj/item/clothing/head/soft/AltClick(var/mob/user)
/obj/item/clothing/head/soft/AltClick(mob/user)
..()
if(!user.canUseTopic(user))
user << "<span class='warning'>You can't do that right now!</span>"
@@ -29,7 +29,7 @@
flip(user)
/obj/item/clothing/head/soft/proc/flip(var/mob/user)
/obj/item/clothing/head/soft/proc/flip(mob/user)
if(user.canmove && !user.stat && !user.restrained())
src.flipped = !src.flipped
if(src.flipped)
+1 -1
View File
@@ -10,7 +10,7 @@
action_button_name = "Adjust Balaclava"
ignore_maskadjust = 0
/obj/item/clothing/mask/balaclava/attack_self(var/mob/user)
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
adjustmask(user)
/obj/item/clothing/mask/luchador
+2 -2
View File
@@ -14,10 +14,10 @@
flags_cover = MASKCOVERSMOUTH
burn_state = -1 //Won't burn in fires
/obj/item/clothing/mask/breath/attack_self(var/mob/user)
/obj/item/clothing/mask/breath/attack_self(mob/user)
adjustmask(user)
/obj/item/clothing/mask/breath/AltClick(var/mob/user)
/obj/item/clothing/mask/breath/AltClick(mob/user)
..()
if(!user.canUseTopic(user))
user << "<span class='warning'>You can't do that right now!</span>"
+1 -1
View File
@@ -74,7 +74,7 @@
..()
verbs -= /obj/item/clothing/mask/gas/sechailer/verb/adjust
/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/screwdriver))
switch(aggressiveness)
if(1)
+2 -2
View File
@@ -31,7 +31,7 @@
action_button_name = "Adjust Sterile Mask"
ignore_maskadjust = 0
/obj/item/clothing/mask/surgical/attack_self(var/mob/user)
/obj/item/clothing/mask/surgical/attack_self(mob/user)
adjustmask(user)
/obj/item/clothing/mask/fakemoustache
@@ -118,7 +118,7 @@
adjusted_flags = SLOT_HEAD
icon_state = "bandbotany"
/obj/item/clothing/mask/bandana/attack_self(var/mob/user)
/obj/item/clothing/mask/bandana/attack_self(mob/user)
adjustmask(user)
/obj/item/clothing/mask/bandana/red
+2 -2
View File
@@ -81,7 +81,7 @@
icon_state = "orange"
item_color = "orange"
/obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user as mob)
/obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user)
if (src.chained)
src.chained = null
src.slowdown = SHOES_SLOWDOWN
@@ -89,7 +89,7 @@
src.icon_state = "orange"
return
/obj/item/clothing/shoes/sneakers/orange/attackby(H as obj, loc, params)
/obj/item/clothing/shoes/sneakers/orange/attackby(obj/H, loc, params)
..()
if ((istype(H, /obj/item/weapon/restraints/handcuffs) && !( src.chained )))
//H = null
@@ -34,7 +34,7 @@
var/teleporting = 0
/obj/item/clothing/suit/space/chronos/proc/new_camera(var/mob/user)
/obj/item/clothing/suit/space/chronos/proc/new_camera(mob/user)
if(camera)
qdel(camera)
camera = new /obj/effect/chronos_cam(get_turf(user))
@@ -65,7 +65,7 @@
user << "<span class='userdanger'>Elecrtromagnetic pulse detected, shutting down systems to preserve integrity...</span>"
deactivate()
/obj/item/clothing/suit/space/chronos/proc/chronowalk(var/mob/living/carbon/human/user)
/obj/item/clothing/suit/space/chronos/proc/chronowalk(mob/living/carbon/human/user)
if(!teleporting && user && (user.stat == CONSCIOUS))
teleporting = 1
var/turf/from_turf = get_turf(user)
@@ -17,7 +17,7 @@
user << "<span class='notice'>There are [extinguishes_left] extinguisher canisters left in this suit.</span>"
/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(var/mob/living/carbon/human/H)
/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(mob/living/carbon/human/H)
if(!istype(H))
return
+2 -2
View File
@@ -103,7 +103,7 @@
armor = list(melee = 10, bullet = 10, laser = 60, energy = 50, bomb = 0, bio = 0, rad = 0)
var/hit_reflect_chance = 40
/obj/item/clothing/suit/armor/laserproof/IsReflect(var/def_zone)
/obj/item/clothing/suit/armor/laserproof/IsReflect(def_zone)
if(!(def_zone in list("chest", "groin"))) //If not shot where ablative is covering you, you don't get the reflection bonus!
hit_reflect_chance = 0
if (prob(hit_reflect_chance))
@@ -135,7 +135,7 @@
return 1
return 0
/obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob)
/obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
src.active = !( src.active )
if (src.active)
user << "<span class='notice'>[src] is now active.</span>"
+1 -1
View File
@@ -57,7 +57,7 @@
//Toggle exosuits for different aesthetic styles (hoodies, suit jacket buttons, etc)
/obj/item/clothing/suit/toggle/AltClick(var/mob/user)
/obj/item/clothing/suit/toggle/AltClick(mob/user)
..()
if(!user.canUseTopic(user))
user << "<span class='warning'>You can't do that right now!</span>"
+1 -1
View File
@@ -25,7 +25,7 @@
return
/obj/item/clothing/under/chameleon/attackby(obj/item/clothing/under/U as obj, mob/user as mob, params)
/obj/item/clothing/under/chameleon/attackby(obj/item/clothing/under/U, mob/user, params)
..()
if(istype(U, /obj/item/clothing/under/chameleon))
user << "\<span class='notice'>Nothing happens.</span>"
+1 -1
View File
@@ -286,6 +286,6 @@
item_color = "petcollar"
var/tagname = null
/obj/item/clothing/tie/petcollar/attack_self(mob/user as mob)
/obj/item/clothing/tie/petcollar/attack_self(mob/user)
tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN)
name = "[initial(name)] - [tagname]"
+4 -4
View File
@@ -18,7 +18,7 @@
// CRAFTING //
/obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/item/weaponcrafting/reciever/attackby(obj/item/W, mob/user, params)
if(istype(W,/obj/item/pipe))
user << "<span class='notice'>You attach the shotgun barrel to the receiver. The pins seem loose.</span>"
var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction
@@ -36,7 +36,7 @@
icon = 'icons/obj/improvised.dmi'
icon_state = "ishotgunstep1"
/obj/item/weaponcrafting/ishotgunconstruction/attackby(var/obj/item/I, mob/user as mob, params)
/obj/item/weaponcrafting/ishotgunconstruction/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/weapon/screwdriver))
var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2
@@ -51,7 +51,7 @@
icon = 'icons/obj/improvised.dmi'
icon_state = "ishotgunstep1"
/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W, mob/user, params)
if(istype(W,/obj/item/weaponcrafting/stock))
user << "<span class='notice'>You attach the stock to the receiver-barrel assembly.</span>"
var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3
@@ -67,7 +67,7 @@
icon = 'icons/obj/improvised.dmi'
icon_state = "ishotgunstep2"
/obj/item/weaponcrafting/ishotgunconstruction3/attackby(var/obj/item/I, mob/user as mob, params)
/obj/item/weaponcrafting/ishotgunconstruction3/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/stack/packageWrap))
var/obj/item/stack/packageWrap/C = I
+1 -1
View File
@@ -252,7 +252,7 @@
if(. <= 0)
. = categories.len
/obj/structure/table/proc/build_recipe_text(var/datum/table_recipe/R)
/obj/structure/table/proc/build_recipe_text(datum/table_recipe/R)
. = ""
var/name_text = ""
var/req_text = ""
+3 -3
View File
@@ -47,7 +47,7 @@
//world.log << "Added fibertext: [fibertext]"
suit_fibers += "Material from a pair of [M.gloves.name]."
/atom/proc/add_hiddenprint(mob/living/M as mob)
/atom/proc/add_hiddenprint(mob/living/M)
if(isnull(M)) return
if(isnull(M.key)) return
if(ishuman(M))
@@ -71,7 +71,7 @@
return
//Set ignoregloves to add prints irrespective of the mob having gloves on.
/atom/proc/add_fingerprint(mob/living/M as mob, ignoregloves = 0)
/atom/proc/add_fingerprint(mob/living/M, ignoregloves = 0)
if(isnull(M)) return
if(isnull(M.key)) return
if(ishuman(M))
@@ -127,7 +127,7 @@
return
/atom/proc/transfer_fingerprints_to(var/atom/A)
/atom/proc/transfer_fingerprints_to(atom/A)
// Make sure everything are lists.
if(!islist(A.fingerprints))
+1 -1
View File
@@ -65,7 +65,7 @@
w_class = I.w_class
return 1
/obj/item/weapon/evidencebag/attack_self(mob/user as mob)
/obj/item/weapon/evidencebag/attack_self(mob/user)
if(contents.len)
var/obj/item/I = contents[1]
user.visible_message("[user] takes [I] out of [src].", "<span class='notice'>You take [I] out of [src].</span>",\
@@ -18,7 +18,7 @@
possible_transfer_amounts = list(5)
volume = 5
/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity)
/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
if(!proximity)
return
if(ismob(A) && A.reagents && reagents.total_volume)
+5 -5
View File
@@ -13,7 +13,7 @@
var/scanning = 0
var/list/log = list()
/obj/item/device/detective_scanner/attack_self(var/mob/user)
/obj/item/device/detective_scanner/attack_self(mob/user)
if(log.len && !scanning)
scanning = 1
user << "<span class='notice'>Printing report, please wait...</span>"
@@ -39,14 +39,14 @@
else
user << "<span class='notice'>The scanner has no logs or is in use.</span>"
/obj/item/device/detective_scanner/attack(mob/living/M as mob, mob/user as mob)
/obj/item/device/detective_scanner/attack(mob/living/M, mob/user)
return
/obj/item/device/detective_scanner/afterattack(atom/A, mob/user as mob, proximity)
/obj/item/device/detective_scanner/afterattack(atom/A, mob/user, proximity)
scan(A, user)
/obj/item/device/detective_scanner/proc/scan(var/atom/A, var/mob/user)
/obj/item/device/detective_scanner/proc/scan(atom/A, mob/user)
if(!scanning)
// Can remotely scan objects and mobs.
@@ -160,7 +160,7 @@
scanning = 0
return
/obj/item/device/detective_scanner/proc/add_log(var/msg, var/broadcast = 1)
/obj/item/device/detective_scanner/proc/add_log(msg, broadcast = 1)
if(scanning)
if(broadcast && ismob(loc))
var/mob/M = loc
+1 -1
View File
@@ -184,7 +184,7 @@
var/spawn_type = pick_n_take(shuttle_spawns)
new spawn_type(T)
/datum/round_event/shuttle_loan/proc/add_crates(var/list/crate_types, var/list/turfs)
/datum/round_event/shuttle_loan/proc/add_crates(list/crate_types, list/turfs)
for(var/crate_type in crate_types)
var/turf/T = pick_n_take(turfs)
var/datum/supply_packs/sp_obj = new crate_type()
+4 -4
View File
@@ -343,7 +343,7 @@
eater.say("Nom")
qdel(src)
/obj/effect/spacevine/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/effect/spacevine/attackby(obj/item/weapon/W, mob/user, params)
if (!W || !user || !W.type)
return
user.changeNext_move(CLICK_CD_MELEE)
@@ -381,13 +381,13 @@
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_cross(src, crosser)
/obj/effect/spacevine/attack_hand(mob/user as mob)
/obj/effect/spacevine/attack_hand(mob/user)
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_hit(src, user)
user_unbuckle_mob(user, user)
/obj/effect/spacevine/attack_paw(mob/living/user as mob)
/obj/effect/spacevine/attack_paw(mob/living/user)
user.do_attack_animation(src)
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_hit(src, user)
@@ -426,7 +426,7 @@
SSobj.processing.Remove(src)
..()
/obj/effect/spacevine_controller/proc/spawn_spacevine_piece(var/turf/location, obj/effect/spacevine/parent, list/muts)
/obj/effect/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/effect/spacevine/parent, list/muts)
var/obj/effect/spacevine/SV = new(location)
growth_queue += SV
vines += SV
+9 -9
View File
@@ -22,14 +22,14 @@ Gunshots/explosions/opening doors/less rare audio (done)
/mob/living/carbon/proc/handle_hallucinations()
if(handling_hal)
return
//Least obvious
var/list/minor = list("sounds"=20,"bolts_minor"=10,"whispers"=15,"message"=5)
//Something's wrong here
var/list/medium = list("hudscrew"=15,"items"=15,"dangerflash"=15,"bolts"=10,"flood"=10,"husks"=10,"battle"=10)
//AAAAH
var/list/major = list("fake"=10,"death"=5,"xeno"=10,"singulo"=10,"delusion"=10)
var/grade = 0
var/current = list()
var/trip_length = 0
@@ -83,14 +83,14 @@ Gunshots/explosions/opening doors/less rare audio (done)
I.color = col_mod
return I
/obj/effect/hallucination/simple/proc/Show(var/update=1)
/obj/effect/hallucination/simple/proc/Show(update=1)
if(active)
if(target.client) target.client.images.Remove(current_image)
if(update)
current_image = GetImage()
if(target.client) target.client.images |= current_image
/obj/effect/hallucination/simple/update_icon(var/new_state,var/new_icon,var/new_px=0,var/new_py=0)
/obj/effect/hallucination/simple/update_icon(new_state,new_icon,new_px=0,new_py=0)
image_state = new_state
if(new_icon)
image_icon = new_icon
@@ -209,7 +209,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
src.throwing = 0
src.throw_impact(get_turf(src))
return 1
/obj/effect/hallucination/simple/xeno/throw_impact(A)
@@ -407,7 +407,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
var/health = 100
/obj/effect/fake_attacker/attackby(var/obj/item/weapon/P as obj, mob/living/user as mob, params)
/obj/effect/fake_attacker/attackby(obj/item/weapon/P, mob/living/user, params)
step_away(src,my_target,2)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
@@ -418,7 +418,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
src.health -= P.force
return
/obj/effect/fake_attacker/Crossed(var/mob/M, somenumber)
/obj/effect/fake_attacker/Crossed(mob/M, somenumber)
if(M == my_target)
step_away(src,my_target,2)
if(prob(30))
@@ -489,7 +489,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
collapse = 1
updateimage()
/obj/effect/fake_attacker/proc/fake_blood(var/mob/target)
/obj/effect/fake_attacker/proc/fake_blood(mob/target)
var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc)
O.name = "blood"
var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1)
@@ -581,7 +581,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
target << chosen
qdel(src)
/mob/living/carbon/proc/hallucinate(var/hal_type) // Todo -> proc / defines
/mob/living/carbon/proc/hallucinate(hal_type) // Todo -> proc / defines
switch(hal_type)
if("xeno")
new /obj/effect/hallucination/xeno_attack(src.loc,src)
+3 -3
View File
@@ -21,10 +21,10 @@
if (gulp_size < 5) gulp_size = 5
else gulp_size = max(round(reagents.total_volume / 5), 5)
/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user as mob)
/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user)
return
/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone)
/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
user << "<span class='warning'>[src] is empty!</span>"
@@ -85,7 +85,7 @@
return
/obj/item/weapon/reagent_containers/food/drinks/attackby(var/obj/item/I, mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
return
if(is_hot(I))
@@ -11,7 +11,7 @@
var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets)
var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
/obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target as mob, mob/living/user as mob)
/obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user)
//Creates a shattering noise and replaces the bottle with a broken_bottle
user.drop_item()
@@ -32,7 +32,7 @@
qdel(src)
/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target as mob, mob/living/user as mob)
/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user)
if(!target)
return
@@ -593,7 +593,7 @@
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola
list_reagents = list("cola" = 50)
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attackby(var/obj/item/I, mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/egg)) //breaking eggs
var/obj/item/weapon/reagent_containers/food/snacks/egg/E = I
if(reagents)
+2 -2
View File
@@ -26,10 +26,10 @@
"sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"))
/obj/item/weapon/reagent_containers/food/condiment/attack_self(mob/user as mob)
/obj/item/weapon/reagent_containers/food/condiment/attack_self(mob/user)
return
/obj/item/weapon/reagent_containers/food/condiment/attack(mob/M as mob, mob/user as mob, def_zone)
/obj/item/weapon/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
user << "<span class='warning'>None of [src] left, oh no!</span>"
+1 -1
View File
@@ -162,7 +162,7 @@
var/amount = bonus_reagents[r_id]
reagents.add_reagent(r_id, amount)
/obj/item/weapon/reagent_containers/food/snacks/proc/slice(var/accuracy, obj/item/weapon/W, mob/user)
/obj/item/weapon/reagent_containers/food/snacks/proc/slice(accuracy, obj/item/weapon/W, mob/user)
if((slices_num <= 0 || !slices_num) || !slice_path) //is the food sliceable?
return 0
+1 -1
View File
@@ -23,7 +23,7 @@
reagents.reaction(hit_atom, TOUCH)
del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes.
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W, mob/user, params)
if(istype( W, /obj/item/toy/crayon ))
var/obj/item/toy/crayon/C = W
var/clr = C.colourName
@@ -24,11 +24,11 @@
mixer = new /obj/item/weapon/reagent_containers(src, MIXER_CAPACITY)
mixer.name = "Mixer"
/obj/machinery/food_cart/attack_hand(mob/user as mob)
/obj/machinery/food_cart/attack_hand(mob/user)
user.set_machine(src)
interact(user)
/obj/machinery/food_cart/interact(mob/user as mob)
/obj/machinery/food_cart/interact(mob/user)
var/dat
dat += "<br><b>STORED INGREDIENTS AND DRINKS</b><br><div class='statusDisplay'>"
dat += "Remaining glasses: [glasses]<br>"
@@ -59,7 +59,7 @@
/obj/machinery/food_cart/proc/isFull()
return food_stored >= STORAGE_CAPACITY
/obj/machinery/food_cart/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/food_cart/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass))
var/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/DG = O
if(!DG.reagents.total_volume) //glass is empty
@@ -35,7 +35,7 @@
diary << "a [src] didn't find an input plate."
return
/obj/machinery/gibber/autogibber/Bumped(var/atom/A)
/obj/machinery/gibber/autogibber/Bumped(atom/A)
if(!input_plate) return
if(ismob(A))
@@ -78,14 +78,14 @@
else
src.overlays += image('icons/obj/kitchen.dmi', "gridle")
/obj/machinery/gibber/attack_paw(mob/user as mob)
/obj/machinery/gibber/attack_paw(mob/user)
return src.attack_hand(user)
/obj/machinery/gibber/container_resist()
src.go_out()
return
/obj/machinery/gibber/attack_hand(mob/user as mob)
/obj/machinery/gibber/attack_hand(mob/user)
if(stat & (NOPOWER|BROKEN))
return
if(operating)
@@ -94,7 +94,7 @@
else
src.startgibbing(user)
/obj/machinery/gibber/attackby(obj/item/P as obj, mob/user as mob, params)
/obj/machinery/gibber/attackby(obj/item/P, mob/user, params)
if (istype(P, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = P
if(!istype(G.affecting, /mob/living/carbon/))
@@ -148,7 +148,7 @@
dropContents()
update_icon()
/obj/machinery/gibber/proc/startgibbing(mob/user as mob)
/obj/machinery/gibber/proc/startgibbing(mob/user)
if(src.operating)
return
if(!src.occupant)
@@ -19,7 +19,7 @@
flags = OPENCONTAINER | NOREACT
reagents = new()
/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type)
/obj/machinery/icecream_vat/proc/get_ingredient_list(type)
switch(type)
if(ICECREAM_CHOCOLATE)
return list("milk", "ice", "cocoa")
@@ -35,7 +35,7 @@
return list("milk", "ice")
/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type)
/obj/machinery/icecream_vat/proc/get_flavour_name(flavour_type)
switch(flavour_type)
if(ICECREAM_CHOCOLATE)
return "chocolate"
@@ -61,11 +61,11 @@
reagents.add_reagent("sugar", 5)
reagents.add_reagent("ice", 5)
/obj/machinery/icecream_vat/attack_hand(mob/user as mob)
/obj/machinery/icecream_vat/attack_hand(mob/user)
user.set_machine(src)
interact(user)
/obj/machinery/icecream_vat/interact(mob/user as mob)
/obj/machinery/icecream_vat/interact(mob/user)
var/dat
dat += "<b>ICECREAM</b><br><div class='statusDisplay'>"
dat += "<b>Dispensing: [flavour_name] icecream </b> <br><br>"
@@ -87,7 +87,7 @@
popup.set_content(dat)
popup.open()
/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/icecream_vat/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/icecream))
var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O
if(!I.ice_creamed)
@@ -110,7 +110,7 @@
else
..()
/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type, var/amount)
/obj/machinery/icecream_vat/proc/make(mob/user, make_type, amount)
for(var/R in get_ingredient_list(make_type))
if(reagents.has_reagent(R, amount))
continue
@@ -35,7 +35,7 @@
return
/obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/juicer/attackby(obj/item/O, mob/user, params)
if(default_unfasten_wrench(user, O))
return
if (istype(O,/obj/item/weapon/reagent_containers/glass) || \
@@ -62,17 +62,17 @@
src.updateUsrDialog()
return 0
/obj/machinery/juicer/attack_paw(mob/user as mob)
/obj/machinery/juicer/attack_paw(mob/user)
return src.attack_hand(user)
/obj/machinery/juicer/attack_ai(mob/user as mob)
/obj/machinery/juicer/attack_ai(mob/user)
return 0
/obj/machinery/juicer/attack_hand(mob/user as mob)
/obj/machinery/juicer/attack_hand(mob/user)
user.set_machine(src)
interact(user)
/obj/machinery/juicer/interact(mob/user as mob) // The microwave Menu
/obj/machinery/juicer/interact(mob/user) // The microwave Menu
var/is_chamber_empty = 0
var/is_beaker_ready = 0
var/processing_chamber = ""
@@ -138,12 +138,12 @@
beaker = null
update_icon()
/obj/machinery/juicer/proc/get_juice_id(var/obj/item/weapon/reagent_containers/food/snacks/grown/O)
/obj/machinery/juicer/proc/get_juice_id(obj/item/weapon/reagent_containers/food/snacks/grown/O)
for (var/i in allowed_items)
if (istype(O, i))
return allowed_items[i]
/obj/machinery/juicer/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O)
/obj/machinery/juicer/proc/get_juice_amount(obj/item/weapon/reagent_containers/food/snacks/grown/O)
if (!istype(O))
return 5
else if (O.potency == -1)
@@ -47,7 +47,7 @@
* Item Adding
********************/
/obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/microwave/attackby(obj/item/O, mob/user, params)
if(operating)
return
if(!broken && dirty<100)
@@ -162,13 +162,13 @@
..()
updateUsrDialog()
/obj/machinery/microwave/attack_paw(mob/user as mob)
/obj/machinery/microwave/attack_paw(mob/user)
return src.attack_hand(user)
/obj/machinery/microwave/attack_ai(mob/user as mob)
/obj/machinery/microwave/attack_ai(mob/user)
return 0
/obj/machinery/microwave/attack_hand(mob/user as mob)
/obj/machinery/microwave/attack_hand(mob/user)
if(..())
return
user.set_machine(src)
@@ -178,7 +178,7 @@
* Microwave Menu
********************/
/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu
/obj/machinery/microwave/interact(mob/user) // The microwave Menu
if(panel_open || !anchored)
return
var/dat = "<div class='statusDisplay'>"
@@ -260,7 +260,7 @@
return
/obj/machinery/microwave/proc/microwaving(var/seconds as num)
/obj/machinery/microwave/proc/microwaving(seconds as num)
for (var/i=1 to seconds)
if (stat & (NOPOWER|BROKEN))
return 0
@@ -32,7 +32,7 @@
cube_production = cubes_made
required_grind = req_grind
/obj/machinery/monkey_recycler/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params)
if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O))
return
@@ -77,7 +77,7 @@
user << "<span class='danger'>The machine only accepts monkeys!</span>"
return
/obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob)
/obj/machinery/monkey_recycler/attack_hand(mob/user)
if (src.stat != 0) //NOPOWER etc
return
if(grinded >= required_grind)
@@ -33,7 +33,7 @@
var/input
var/output
var/time = 40
/datum/food_processor_process/proc/process_food(loc, what, var/obj/machinery/processor/processor)
/datum/food_processor_process/proc/process_food(loc, what, obj/machinery/processor/processor)
if (src.output && loc && processor)
for(var/i = 0, i < processor.rating_amount, i++)
new src.output(loc)
@@ -79,7 +79,7 @@
..()
/datum/food_processor_process/mob/slime/process_food(loc, what, var/obj/machinery/processor/processor)
/datum/food_processor_process/mob/slime/process_food(loc, what, obj/machinery/processor/processor)
var/mob/living/simple_animal/slime/S = what
var/C = S.cores
if(S.stat != DEAD)
@@ -126,7 +126,7 @@
/datum/food_processor_process/mob/monkey/input = /mob/living/carbon/monkey
/datum/food_processor_process/mob/monkey/output = null
/obj/machinery/processor/proc/select_recipe(var/X)
/obj/machinery/processor/proc/select_recipe(X)
for (var/Type in typesof(/datum/food_processor_process) - /datum/food_processor_process - /datum/food_processor_process/mob)
var/datum/food_processor_process/P = new Type()
if (!istype(X, P.input))
@@ -134,7 +134,7 @@
return P
return 0
/obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/processor/attackby(obj/item/O, mob/user, params)
if(src.processing)
user << "<span class='warning'>The processor is in the process of processing!</span>"
return 1
@@ -169,7 +169,7 @@
what:loc = src
return
/obj/machinery/processor/attack_hand(var/mob/user as mob)
/obj/machinery/processor/attack_hand(mob/user)
if (src.stat != 0) //NOPOWER etc
return
if(src.processing)
@@ -54,7 +54,7 @@
* Item Adding
********************/
/obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/smartfridge/attackby(obj/item/O, mob/user, params)
if(default_deconstruction_screwdriver(user, "smartfridge_open", "smartfridge", O))
return
@@ -118,12 +118,12 @@
/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj)
/obj/machinery/smartfridge/proc/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/))
return 1
return 0
/obj/machinery/smartfridge/proc/load(var/obj/item/O as obj)
/obj/machinery/smartfridge/proc/load(obj/item/O)
if(istype(O.loc,/mob))
var/mob/M = O.loc
if(!M.unEquip(O))
@@ -142,13 +142,13 @@
item_quants[n] = 1
sortList(item_quants)
/obj/machinery/smartfridge/attack_paw(mob/user as mob)
/obj/machinery/smartfridge/attack_paw(mob/user)
return src.attack_hand(user)
/obj/machinery/smartfridge/attack_ai(mob/user as mob)
/obj/machinery/smartfridge/attack_ai(mob/user)
return 0
/obj/machinery/smartfridge/attack_hand(mob/user as mob)
/obj/machinery/smartfridge/attack_hand(mob/user)
user.set_machine(src)
interact(user)
@@ -156,7 +156,7 @@
* SmartFridge Menu
********************/
/obj/machinery/smartfridge/interact(mob/user as mob)
/obj/machinery/smartfridge/interact(mob/user)
if(stat)
return 0
@@ -227,7 +227,7 @@
icon_off = "drying_rack"
var/drying = 0
/obj/machinery/smartfridge/drying_rack/interact(mob/user as mob)
/obj/machinery/smartfridge/drying_rack/interact(mob/user)
var/dat = ..()
if(dat)
dat += "<br>"
@@ -235,7 +235,7 @@
user << browse("<HEAD><TITLE>[src] supplies</TITLE></HEAD><TT>[dat]</TT>", "window=smartfridge")
onclose(user, "smartfridge")
/obj/machinery/smartfridge/drying_rack/Topic(var/href, var/list/href_list)
/obj/machinery/smartfridge/drying_rack/Topic(href, list/href_list)
..()
if(href_list["dry"])
toggle_drying()
@@ -267,14 +267,14 @@
if(rack_dry())//no need to update unless something got dried
update_icon()
/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj)
/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/))
var/obj/item/weapon/reagent_containers/food/snacks/S = O
if(S.dried_type)
return 1
return 0
/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(var/forceoff = 0)
/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff = 0)
if(drying || forceoff)
drying = 0
use_power = 1
@@ -308,7 +308,7 @@
name = "drink showcase"
desc = "A refrigerated storage unit for tasty tasty alcohol."
/obj/machinery/smartfridge/drinks/accept_check(var/obj/item/O as obj)
/obj/machinery/smartfridge/drinks/accept_check(obj/item/O)
if(!istype(O,/obj/item/weapon/reagent_containers) || !O.reagents || !O.reagents.reagent_list.len)
return 0
if(istype(O,/obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks) || istype(O,/obj/item/weapon/reagent_containers/food/condiment))
@@ -322,7 +322,7 @@
name = "smart slime extract storage"
desc = "A refrigerated storage unit for slime extracts."
/obj/machinery/smartfridge/extract/accept_check(var/obj/item/O as obj)
/obj/machinery/smartfridge/extract/accept_check(obj/item/O)
if(istype(O,/obj/item/slime_extract))
return 1
if(istype(O,/obj/item/device/slime_scanner))
@@ -355,7 +355,7 @@
load(I)
amount--
/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj)
/obj/machinery/smartfridge/chemistry/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/storage/pill_bottle))
if(O.contents.len)
for(var/obj/item/I in O)
@@ -10,7 +10,7 @@
result_amount = 1
mob_react=1
/datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/tofu(location)
@@ -23,7 +23,7 @@
required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
result_amount = 1
/datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
/datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
@@ -37,7 +37,7 @@
required_reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2)
result_amount = 1
mob_react = 1
/datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
@@ -87,7 +87,7 @@
required_catalysts = list("enzyme" = 5)
result_amount = 1
/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
/datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/store/cheesewheel(location)
return
@@ -100,7 +100,7 @@
result_amount = 1
mob_react = 1
/datum/chemical_reaction/synthmeat/on_reaction(var/datum/reagents/holder, var/created_volume)
/datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat(location)
return
@@ -129,7 +129,7 @@
required_container = /obj/item/weapon/reagent_containers/food/snacks/tofu
mix_message = "The mixture becomes similar to carp meat."
/datum/chemical_reaction/imitationcarpmeat/on_reaction(var/datum/reagents/holder)
/datum/chemical_reaction/imitationcarpmeat/on_reaction(datum/reagents/holder)
var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
S.loc = get_turf(holder.my_atom)
if(holder && holder.my_atom)
@@ -143,7 +143,7 @@
result_amount = 1
mix_message = "The ingredients form a dough."
/datum/chemical_reaction/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/dough(location)
@@ -156,7 +156,7 @@
result_amount = 1
mix_message = "The ingredients form a cake batter."
/datum/chemical_reaction/cakebatter/on_reaction(var/datum/reagents/holder, var/created_volume)
/datum/chemical_reaction/cakebatter/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/cakebatter(location)
@@ -174,7 +174,7 @@
required_container = /obj/item/weapon/reagent_containers/glass/bowl
mix_message = "The rice absorbs the water."
/datum/chemical_reaction/ricebowl/on_reaction(var/datum/reagents/holder)
/datum/chemical_reaction/ricebowl/on_reaction(datum/reagents/holder)
var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl
S.loc = get_turf(holder.my_atom)
if(holder && holder.my_atom)
+5 -5
View File
@@ -52,7 +52,7 @@
src.cards.Add(card)
/obj/item/weapon/deck/attackby(obj/O as obj, mob/user as mob)
/obj/item/weapon/deck/attackby(obj/O, mob/user)
if (istype(O,/obj/item/weapon/hand))
var/obj/item/weapon/hand/H = O
@@ -63,7 +63,7 @@
user.show_message("You place your cards on the bottom of the deck.")
else return ..()
/obj/item/weapon/deck/attack_self(var/mob/user as mob)
/obj/item/weapon/deck/attack_self(mob/user)
var/list/newcards = list()
var/datum/playingcard/card
@@ -82,7 +82,7 @@
if (istype(A, /mob/living)) src.dealTo(A, user)
else return ..()
/obj/item/weapon/deck/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
/obj/item/weapon/deck/attack(mob/living/M, mob/living/user, def_zone)
if (istype(M)) src.dealTo(M, user)
else return ..()
@@ -130,7 +130,7 @@
return ..()
/obj/item/weapon/hand/attackby(obj/O as obj, mob/user as mob)
/obj/item/weapon/hand/attackby(obj/O, mob/user)
if(istype(O,/obj/item/weapon/hand))
var/obj/item/weapon/hand/H = O
@@ -178,7 +178,7 @@
src.update_icon()
/obj/item/weapon/hand/attack_self(var/mob/user as mob)
/obj/item/weapon/hand/attack_self(mob/user)
src.hi.show(user)
/obj/item/weapon/hand/examine()
+2 -2
View File
@@ -116,7 +116,7 @@
icon_state = "egg-[color]"
item_color = "[color]"
/obj/item/weapon/reagent_containers/food/snacks/egg/proc/dispensePrize(var/turf/where)
/obj/item/weapon/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where)
var/won = pick(/obj/item/clothing/head/bunnyhead,
/obj/item/clothing/suit/bunnysuit,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
@@ -133,7 +133,7 @@
new won(where)
new/obj/item/weapon/reagent_containers/food/snacks/chocolateegg(where)
/obj/item/weapon/reagent_containers/food/snacks/egg/attack_self(mob/user as mob)
/obj/item/weapon/reagent_containers/food/snacks/egg/attack_self(mob/user)
..()
if(containsPrize)
user << "<span class='notice'>You unwrap the [src] and find a prize inside!</span>"
+1 -1
View File
@@ -276,7 +276,7 @@
if(prob(5))
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)
/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(var/obj/item/O as obj, var/mob/user as mob)
/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(obj/item/O, mob/user)
if(istype(O,/obj/item/weapon/nullrod))
if(prob(5))
visible_message("[src] finally found the peace it deserves. <i>You hear honks echoing off into the distance.</i>")
+6 -6
View File
@@ -53,7 +53,7 @@
icon_state = "biogen-work"
return
/obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/biogenerator/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/weapon/reagent_containers/glass) && !panel_open)
if(beaker)
user << "<span class='warning'>A container is already loaded into the machine.</span>"
@@ -113,7 +113,7 @@
update_icon()
return
/obj/machinery/biogenerator/interact(mob/user as mob)
/obj/machinery/biogenerator/interact(mob/user)
if(stat & BROKEN || panel_open)
return
user.set_machine(src)
@@ -179,7 +179,7 @@
popup.open()
return
/obj/machinery/biogenerator/attack_hand(mob/user as mob)
/obj/machinery/biogenerator/attack_hand(mob/user)
interact(user)
/obj/machinery/biogenerator/proc/activate()
@@ -210,7 +210,7 @@
menustat = "void"
return
/obj/machinery/biogenerator/proc/check_cost(var/cost)
/obj/machinery/biogenerator/proc/check_cost(cost)
if (cost > points)
menustat = "nopoints"
return 1
@@ -221,12 +221,12 @@
updateUsrDialog()
return 0
/obj/machinery/biogenerator/proc/check_container_volume(var/reagent_amount)
/obj/machinery/biogenerator/proc/check_container_volume(reagent_amount)
if(beaker.reagents.total_volume + reagent_amount > beaker.reagents.maximum_volume)
menustat = "nobeakerspace"
return 1
/obj/machinery/biogenerator/proc/create_product(var/create)
/obj/machinery/biogenerator/proc/create_product(create)
switch(create)
if("milk")
if(check_container_volume(10)) return 0
+20 -20
View File
@@ -49,7 +49,7 @@
return 1
return 0
/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params)
..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
var/msg
@@ -73,7 +73,7 @@
return
return
/obj/item/weapon/grown/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/grown/attackby(obj/item/O, mob/user, params)
..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
var/msg
@@ -193,7 +193,7 @@
reagents.add_reagent("vitamin", 1 + round((potency / 25), 1))
bitesize = reagents.total_volume
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W, mob/user, params)
..()
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
@@ -646,7 +646,7 @@
reagents.add_reagent("vitamin", 1 + round((potency / 25), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(obj/item/O, mob/user, params)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "<span class='info'>- Capsaicin: <i>[reagents.get_reagent_amount("capsaicin")]%</i></span>"
@@ -666,7 +666,7 @@
reagents.add_reagent("frostoil", 3+round(potency / 5, 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(obj/item/O, mob/user, params)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "<span class='info'>- Frost Oil: <i>[reagents.get_reagent_amount("frostoil")]%</i></span>"
@@ -687,12 +687,12 @@
reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1))
bitesize = 1 + round(reagents.total_volume / 4, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(obj/item/O, mob/user, params)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "<span class='info'>- Capsaicin: <i>[reagents.get_reagent_amount("capsaicin")]%</i></span>"
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user as mob)
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
..()
if( istype(src.loc, /mob) )
held_mob = src.loc
@@ -832,7 +832,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
return
..()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user as mob)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user)
if(awakening || istype(user.loc,/turf/space))
return
user << "<span class='notice'>You begin to awaken the Killer Tomato...</span>"
@@ -861,7 +861,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
splat = /obj/effect/gibspawner/generic
filling_color = "#FF0000"
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood/add_juice(var/loc, var/potency = 10)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood/add_juice(loc, potency = 10)
..()
reagents.add_reagent("blood", 1 + round((potency / 5), 1))
@@ -896,7 +896,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
..()
reagents.add_reagent("singulo", 1 + round((potency / 5), 1))
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(var/mob/user)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(mob/user)
squish(user)
user.unEquip(src)
src.visible_message("[user] squashes the [src.name].","<span class='italics'>You hear a smack.</span>")
@@ -961,7 +961,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
reagents.add_reagent("nutriment", 1 + round((potency / 50), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user as mob)
/obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user)
user << "<span class='notice'>You prepare the astroturf.</span>"
var/grassAmt = 1 + round(potency / 50) // The grass we're holding
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/grass/G in user.loc) // The grass on the floor
@@ -986,7 +986,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
desc = "The textile industry's dark secret."
icon_state = "carpetclump"
/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user as mob)
/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user)
user << "<span class='notice'>You roll out the red carpet.</span>"
var/carpetAmt = 1 + round(potency / 50) // The carpet we're holding
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/C in user.loc) // The carpet on the floor
@@ -1051,7 +1051,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
reagents.add_reagent("morphine", 3+round(potency / 3, 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(obj/item/O, mob/user, params)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "<span class='info'>- Anti-Toxin: <i>[reagents.get_reagent_amount("charcoal")]%</i></span>"
@@ -1071,7 +1071,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
reagents.add_reagent("mushroomhallucinogen", 1 + round(potency / 25, 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(obj/item/O, mob/user, params)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "<span class='info'>- Amatoxins: <i>[reagents.get_reagent_amount("amatoxin")]%</i></span>"
@@ -1091,7 +1091,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
reagents.add_reagent("mushroomhallucinogen", 1 + round(potency / 25, 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(obj/item/O, mob/user, params)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "<span class='info'>- Amatoxins: <i>[reagents.get_reagent_amount("amatoxin")]%</i></span>"
@@ -1104,13 +1104,13 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
icon_state = "libertycap"
filling_color = "#DAA520"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/add_juice(var/loc, var/potency = 15)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/add_juice(loc, potency = 15)
..()
reagents.add_reagent("nutriment", 1 + round((potency / 50), 1))
reagents.add_reagent("mushroomhallucinogen", 3+round(potency / 5, 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(obj/item/O, mob/user, params)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "<span class='info'>- Mushroom Hallucinogen: <i>[reagents.get_reagent_amount("mushroomhallucinogen")]%</i></span>"
@@ -1141,7 +1141,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
reagents.add_reagent("nutriment", 2+round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user as mob)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
if(istype(user.loc,/turf/space))
return
var/mob/living/simple_animal/hostile/mushroom/M = new /mob/living/simple_animal/hostile/mushroom(user.loc)
@@ -1194,7 +1194,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
reagents.add_reagent("radium", 1 + round((potency / 20), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user as mob)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(istype(user.loc,/turf/space))
return
var/obj/effect/glowshroom/planted = new /obj/effect/glowshroom(user.loc)
@@ -1290,7 +1290,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
desc = "Dry them out to make coffee."
icon_state = "coffee_robusta"
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta/add_juice(var/loc, var/potency = 20)
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta/add_juice(loc, potency = 20)
..()
reagents.add_reagent("morphine", 1 + round((potency / 20), 1))
+11 -11
View File
@@ -66,7 +66,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat)
/obj/item/weapon/grown/log/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/weapon/grown/log/attackby(obj/item/weapon/W, mob/user, params)
..()
if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || (istype(W, /obj/item/weapon/twohanded/fireaxe) && W:wielded) || istype(W, /obj/item/weapon/melee/energy))
user.show_message("<span class='notice'>You make [plank_name] out of \the [src]!</span>", 1)
@@ -114,7 +114,7 @@
throw_speed = 1
throw_range = 3
/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob)
/obj/item/weapon/grown/sunflower/attack(mob/M, mob/user)
M << "<font color='green'><b> [user] smacks you with a sunflower!</font><font color='yellow'><b>FLOWER POWER<b></font>"
user << "<font color='green'>Your sunflower's </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'>strikes [M]</font>"
@@ -141,14 +141,14 @@
reagents.add_reagent("condensedcapsaicin", round((potency / 4), 1))
force = round((5 + potency / 5), 1)
/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob)
/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M, mob/user)
if(!..()) return
if(istype(M, /mob/living))
M << "<span class='danger'>You are lit on fire from the intense heat of the [name]!</span>"
M.adjust_fire_stacks(potency / 20)
M.IgniteMob()
/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user as mob,proximity)
/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity)
if(!proximity) return
if(endurance > 0)
endurance -= rand(1, (endurance / 3) + 1)
@@ -157,7 +157,7 @@
usr.unEquip(src)
qdel(src)
/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob)
/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user)
if(!user.gloves)
user << "<span class='danger'>The [name] burns your bare hand!</span>"
user.adjustFireLoss(rand(1, 5))
@@ -183,7 +183,7 @@
user.visible_message("<span class='suicide'>[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.</span>")
return (BRUTELOSS|TOXLOSS)
/obj/item/weapon/grown/nettle/pickup(mob/living/user as mob)
/obj/item/weapon/grown/nettle/pickup(mob/living/user)
if(!iscarbon(user))
return 0
var/mob/living/carbon/C = user
@@ -200,7 +200,7 @@
C << "<span class='userdanger'>The nettle burns your bare hand!</span>"
return 1
/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user as mob,proximity)
/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
if(!proximity) return
if(force > 0)
force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off
@@ -233,13 +233,13 @@
reagents.add_reagent("facid", round((potency / 2), 1))
force = round((5 + potency / 2.5), 1)
/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user as mob)
/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user)
if(..())
if(prob(50))
user.Paralyse(5)
user << "<span class='userdanger'>You are stunned by the Deathnettle when you try picking it up!</span>"
/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M as mob, mob/user as mob)
/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
if(!..()) return
if(istype(M, /mob/living))
M << "<span class='danger'>You are stunned by the powerful acid of the Deathnettle!</span>"
@@ -300,7 +300,7 @@
throw_speed = 3
throw_range = 7
/obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W as obj, mob/user as mob, params)
/obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W, mob/user, params)
..()
if(is_sharp(W))
user << "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>"
@@ -324,7 +324,7 @@
..()
snap_pops = max(round(potency/8), 1)
/obj/item/weapon/grown/snapcorn/attack_self(mob/user as mob)
/obj/item/weapon/grown/snapcorn/attack_self(mob/user)
..()
user << "<span class='notice'>You pick up a snap pops from the cob.</span>"
var/obj/item/toy/snappop/S = new /obj/item/toy/snappop(user.loc)
+1 -1
View File
@@ -7,7 +7,7 @@
item_state = "analyzer"
origin_tech = "magnets=1;biotech=1"
/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob)
/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user)
return 0
// *************************************
+17 -17
View File
@@ -94,7 +94,7 @@
return connected
/obj/machinery/hydroponics/bullet_act(var/obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables.
/obj/machinery/hydroponics/bullet_act(obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables.
if(!planted)
..()
return
@@ -335,7 +335,7 @@
visible_message("<span class='info'>[oldPlantName] overtaken by [myseed.plantname].</span>")
/obj/machinery/hydroponics/proc/mutate(var/lifemut = 2, var/endmut = 5, var/productmut = 1, var/yieldmut = 2, var/potmut = 25) // Mutates the current seed
/obj/machinery/hydroponics/proc/mutate(lifemut = 2, endmut = 5, productmut = 1, yieldmut = 2, potmut = 25) // Mutates the current seed
if(!planted)
return
adjustSLife(rand(-lifemut,lifemut))
@@ -416,7 +416,7 @@
else
usr << "The pests seem to behave oddly, but quickly settle down..."
/obj/machinery/hydroponics/proc/applyChemicals(var/datum/reagents/S)
/obj/machinery/hydroponics/proc/applyChemicals(datum/reagents/S)
if(myseed)
myseed.on_chem_reaction(S) //In case seeds have some special interactions with special chems, currently only used by vines
@@ -590,7 +590,7 @@
if(1 to 32) mutatepest()
else usr << "Nothing happens..."
/obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/hydroponics/attackby(obj/item/O, mob/user, params)
//Called when mob user "attacks" it with object O
if(istype(O, /obj/item/weapon/reagent_containers) ) // Syringe stuff (and other reagent containers now too)
@@ -765,7 +765,7 @@
return
/obj/machinery/hydroponics/attack_hand(mob/user as mob)
/obj/machinery/hydroponics/attack_hand(mob/user)
if(istype(user, /mob/living/silicon)) //How does AI know what plant is?
return
if(harvest)
@@ -899,41 +899,41 @@
update_icon()
/// Tray Setters - The following procs adjust the tray or plants variables, and make sure that the stat doesn't go out of bounds.///
/obj/machinery/hydroponics/proc/adjustNutri(var/adjustamt)
/obj/machinery/hydroponics/proc/adjustNutri(adjustamt)
nutrilevel += adjustamt
nutrilevel = max(nutrilevel, 0)
nutrilevel = min(nutrilevel, maxnutri)
/obj/machinery/hydroponics/proc/adjustWater(var/adjustamt)
/obj/machinery/hydroponics/proc/adjustWater(adjustamt)
waterlevel += adjustamt
waterlevel = max(waterlevel, 0)
waterlevel = min(waterlevel, maxwater)
if(adjustamt>0)
adjustToxic(-round(adjustamt/4))//Toxicity dilutation code. The more water you put in, the lesser the toxin concentration.
/obj/machinery/hydroponics/proc/adjustHealth(var/adjustamt)
/obj/machinery/hydroponics/proc/adjustHealth(adjustamt)
if(planted && !dead)
health += adjustamt
health = max(health, 0)
health = min(health, myseed.endurance)
/obj/machinery/hydroponics/proc/adjustToxic(var/adjustamt)
/obj/machinery/hydroponics/proc/adjustToxic(adjustamt)
toxic += adjustamt
toxic = max(toxic, 0)
toxic = min(toxic, 100)
/obj/machinery/hydroponics/proc/adjustPests(var/adjustamt)
/obj/machinery/hydroponics/proc/adjustPests(adjustamt)
pestlevel += adjustamt
pestlevel = max(pestlevel, 0)
pestlevel = min(pestlevel, 10)
/obj/machinery/hydroponics/proc/adjustWeeds(var/adjustamt)
/obj/machinery/hydroponics/proc/adjustWeeds(adjustamt)
weedlevel += adjustamt
weedlevel = max(weedlevel, 0)
weedlevel = min(weedlevel, 10)
/// Seed Setters ///
/obj/machinery/hydroponics/proc/adjustSYield(var/adjustamt)//0,10
/obj/machinery/hydroponics/proc/adjustSYield(adjustamt)//0,10
if(myseed && myseed.yield != -1) // Unharvestable shouldn't suddenly turn harvestable
myseed.yield += adjustamt
myseed.yield = max(myseed.yield, 0)
@@ -941,25 +941,25 @@
if(myseed.yield <= 0 && myseed.plant_type == 2)
myseed.yield = 1 // Mushrooms always have a minimum yield of 1.
/obj/machinery/hydroponics/proc/adjustSLife(var/adjustamt)//10,100
/obj/machinery/hydroponics/proc/adjustSLife(adjustamt)//10,100
if(myseed)
myseed.lifespan += adjustamt
myseed.lifespan = max(myseed.lifespan, 10)
myseed.lifespan = min(myseed.lifespan, 100)
/obj/machinery/hydroponics/proc/adjustSEnd(var/adjustamt)//10,100
/obj/machinery/hydroponics/proc/adjustSEnd(adjustamt)//10,100
if(myseed)
myseed.endurance += adjustamt
myseed.endurance = max(myseed.endurance, 10)
myseed.endurance = min(myseed.endurance, 100)
/obj/machinery/hydroponics/proc/adjustSProduct(var/adjustamt)//2,10
/obj/machinery/hydroponics/proc/adjustSProduct(adjustamt)//2,10
if(myseed)
myseed.production += adjustamt
myseed.production = max(myseed.production, 2)
myseed.production = min(myseed.production, 10)
/obj/machinery/hydroponics/proc/adjustSPot(var/adjustamt)//0,100
/obj/machinery/hydroponics/proc/adjustSPot(adjustamt)//0,100
if(myseed && myseed.potency != -1) //Not all plants have a potency
myseed.potency += adjustamt
myseed.potency = max(myseed.potency, 0)
@@ -1000,7 +1000,7 @@
SetLuminosity(0)
return
/obj/machinery/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/hydroponics/soil/attackby(obj/item/O, mob/user, params)
..()
if(istype(O, /obj/item/weapon/shovel))
user << "<span class='notice'>You clear up [src]!</span>"
+5 -5
View File
@@ -1,4 +1,4 @@
/proc/seedify(var/obj/item/O as obj, var/t_max, var/obj/machinery/seed_extractor/extractor)
/proc/seedify(obj/item/O, t_max, obj/machinery/seed_extractor/extractor)
var/t_amount = 0
if(t_max == -1)
if(extractor)
@@ -71,7 +71,7 @@
for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
seed_multiplier = M.rating
/obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/machinery/seed_extractor/attackby(obj/item/O, mob/user, params)
if(default_deconstruction_screwdriver(user, "sextractor_open", "sextractor", O))
return
@@ -142,11 +142,11 @@
src.potency = poten
src.amount = am
/obj/machinery/seed_extractor/attack_hand(mob/user as mob)
/obj/machinery/seed_extractor/attack_hand(mob/user)
user.set_machine(src)
interact(user)
/obj/machinery/seed_extractor/interact(mob/user as mob)
/obj/machinery/seed_extractor/interact(mob/user)
if (stat)
return 0
@@ -197,7 +197,7 @@
src.updateUsrDialog()
return
/obj/machinery/seed_extractor/proc/add(var/obj/item/seeds/O as obj)
/obj/machinery/seed_extractor/proc/add(obj/item/seeds/O)
if(contents.len >= 999)
usr << "<span class='notice'>\The [src] is full.</span>"
return 0
+5 -5
View File
@@ -31,10 +31,10 @@
/obj/item/seeds/proc/get_analyzer_text() //in case seeds have something special to tell to the analyzer
return
/obj/item/seeds/proc/on_chem_reaction(var/datum/reagents/S) //in case seeds have some special interaction with special chems
/obj/item/seeds/proc/on_chem_reaction(datum/reagents/S) //in case seeds have some special interaction with special chems
return
/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
/obj/item/seeds/attackby(obj/item/O, mob/user, params)
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "*** <B>[plantname]</B> ***"
user << "-Plant Endurance: <span class='notice'>[endurance]</span>"
@@ -95,7 +95,7 @@
var/factions = null
var/contains_sample = 0
/obj/item/seeds/replicapod/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/item/seeds/replicapod/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/weapon/reagent_containers/syringe))
if(!contains_sample)
for(var/datum/reagent/blood/bloodSample in W.reagents.reagent_list)
@@ -1344,7 +1344,7 @@
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod)
K.mutations = mutations
/obj/item/seeds/kudzuseed/attack_self(mob/user as mob)
/obj/item/seeds/kudzuseed/attack_self(mob/user)
if(istype(user.loc,/turf/space))
return
var/turf/T = get_turf(src)
@@ -1362,7 +1362,7 @@
mut_text += "-Plant Mutations: [(text_string == "") ? "None" : text_string]"
return mut_text
/obj/item/seeds/kudzuseed/on_chem_reaction(var/datum/reagents/S)
/obj/item/seeds/kudzuseed/on_chem_reaction(datum/reagents/S)
var/list/temp_mut_list = list()
+6 -6
View File
@@ -26,7 +26,7 @@
var/author
var/SQLquery
/obj/machinery/computer/libraryconsole/attack_hand(var/mob/user as mob)
/obj/machinery/computer/libraryconsole/attack_hand(mob/user)
if(..())
return
interact(user)
@@ -290,7 +290,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.open()
/obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/barcodescanner))
var/obj/item/weapon/barcodescanner/scanner = W
scanner.computer = src
@@ -299,7 +299,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
else
..()
/obj/machinery/computer/libraryconsole/bookmanagement/emag_act(mob/user as mob)
/obj/machinery/computer/libraryconsole/bookmanagement/emag_act(mob/user)
if(density && !emagged)
emagged = 1
@@ -445,13 +445,13 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
density = 1
var/obj/item/weapon/book/cache // Last scanned book
/obj/machinery/libraryscanner/attackby(var/obj/O as obj, var/mob/user as mob, params)
/obj/machinery/libraryscanner/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/weapon/book))
if(!user.drop_item())
return
O.loc = src
/obj/machinery/libraryscanner/attack_hand(var/mob/user as mob)
/obj/machinery/libraryscanner/attack_hand(mob/user)
usr.set_machine(src)
var/dat = "" // <META HTTP-EQUIV='Refresh' CONTENT='10'>
if(cache)
@@ -501,7 +501,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
density = 1
var/busy = 0
/obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob, params)
/obj/machinery/bookbinder/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/weapon/paper))
if(busy)
user << "<span class='warning'>The book binder is busy. Please wait for completion of previous operation.</span>"
+2 -2
View File
@@ -235,7 +235,7 @@
var/atom/movable/light/lighting_object //Will be null for space turfs and anything in a static lighting area
var/list/affecting_lights //not initialised until used (even empty lists reserve a fair bit of memory)
/turf/ChangeTurf(var/path)
/turf/ChangeTurf(path)
if(!path || path == type) //Sucks this is here but it would cause problems otherwise.
return ..()
@@ -295,7 +295,7 @@
if(config.starlight)
update_starlight()
/turf/proc/redraw_lighting(var/instantly = 0)
/turf/proc/redraw_lighting(instantly = 0)
if(lighting_object)
var/newalpha
if(lighting_lumcount <= 0)
+2 -2
View File
@@ -154,7 +154,7 @@
if(100)
new /obj/item/clothing/head/bearpelt(src)
/obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob)
/obj/structure/closet/crate/secure/loot/attack_hand(mob/user)
if(locked)
user << "<span class='notice'>The crate is locked with a Deca-code lock.</span>"
var/input = input(usr, "Enter [codelen] digits.", "Deca-Code Lock", "") as text
@@ -179,7 +179,7 @@
else
return ..()
/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W, mob/user)
if(locked)
if (istype(W, /obj/item/weapon/card/emag))
user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
+10 -10
View File
@@ -85,7 +85,7 @@
else
break
/obj/machinery/mineral/ore_redemption/attackby(var/obj/item/weapon/W, var/mob/user, params)
/obj/machinery/mineral/ore_redemption/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/weapon/card/id))
var/obj/item/weapon/card/id/I = usr.get_active_hand()
if(istype(I) && !istype(inserted_id))
@@ -113,7 +113,7 @@
return 1
..()
/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(var/obj/item/weapon/ore/O)
/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(obj/item/weapon/ore/O)
if(O.refined_type)
var/obj/item/stack/sheet/M = O.refined_type
points += O.points * point_upgrade
@@ -121,7 +121,7 @@
qdel(O)//No refined type? Purge it.
return
/obj/machinery/mineral/ore_redemption/attack_hand(user as mob)
/obj/machinery/mineral/ore_redemption/attack_hand(mob/user)
if(..())
return
interact(user)
@@ -300,7 +300,7 @@
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
RefreshParts()
/obj/machinery/mineral/equipment_vendor/attack_hand(user as mob)
/obj/machinery/mineral/equipment_vendor/attack_hand(mob/user)
if(..())
return
interact(user)
@@ -352,7 +352,7 @@
updateUsrDialog()
return
/obj/machinery/mineral/equipment_vendor/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/machinery/mineral/equipment_vendor/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/mining_voucher))
RedeemVoucher(I, user)
return
@@ -416,7 +416,7 @@
icon_state = "data"
var/points = 500
/obj/item/weapon/card/mining_point_card/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/item/weapon/card/mining_point_card/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/card/id))
if(points)
var/obj/item/weapon/card/id/C = I
@@ -445,7 +445,7 @@
throw_range = 5
origin_tech = "bluespace=2"
/obj/item/device/wormhole_jaunter/attack_self(mob/user as mob)
/obj/item/device/wormhole_jaunter/attack_self(mob/user)
var/turf/device_turf = get_turf(user)
if(!device_turf||device_turf.z==2||device_turf.z>=7)
user << "<span class='notice'>You're having difficulties getting the [src.name] to work.</span>"
@@ -508,7 +508,7 @@
var/burst_time = 50
var/fieldlimit = 3
/obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator)
/obj/item/weapon/resonator/proc/CreateResonance(target, creator)
var/turf/T = get_turf(target)
if(locate(/obj/effect/resonance) in T)
return
@@ -519,7 +519,7 @@
spawn(burst_time)
fieldsactive--
/obj/item/weapon/resonator/attack_self(mob/user as mob)
/obj/item/weapon/resonator/attack_self(mob/user)
if(burst_time == 50)
burst_time = 30
user << "<span class='info'>You set the resonator's fields to detonate after 3 seconds.</span>"
@@ -619,7 +619,7 @@
/obj/item/weapon/ore/plasma, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/iron,
/obj/item/weapon/ore/bananium)
/mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I as obj, mob/user as mob, params)
/mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(W.welding && !stat)
@@ -36,7 +36,7 @@
return (istype(inserted_id) && inserted_id.points >= inserted_id.goal) //Otherwise, only let them out if the prisoner's reached his quota.
/obj/machinery/mineral/labor_claim_console/attack_hand(user as mob)
/obj/machinery/mineral/labor_claim_console/attack_hand(mob/user)
var/dat
dat += text("<b>Point Claim Console</b><br><br>")
if(emagged) //Shit's broken
@@ -58,12 +58,12 @@
user << browse("[dat]", "window=console_stacking_machine")
/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/card/id))
return attack_hand(user)
..()
/obj/machinery/mineral/labor_claim_console/emag_act(mob/user as mob)
/obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
if(!emagged)
emagged = 1
user << "<span class='warning'>PZZTTPFFFT</span>"
@@ -159,7 +159,7 @@
/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
user.examinate(src)
/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I as obj, mob/user as mob, params)
/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/card/id))
if(istype(I, /obj/item/weapon/card/id/prisoner))
var/obj/item/weapon/card/id/prisoner/prisoner_id = I
@@ -22,7 +22,7 @@
var/input_dir = NORTH
var/output_dir = SOUTH
/obj/machinery/mineral/proc/unload_mineral(var/atom/movable/S)
/obj/machinery/mineral/proc/unload_mineral(atom/movable/S)
S.loc = loc
var/turf/T = get_step(src,output_dir)
if(T)

Some files were not shown because too many files have changed in this diff Show More