mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
BRUTAL Part 1 - No proc var/ in procs
This commit is contained in:
@@ -111,56 +111,56 @@
|
||||
/obj/item/paper/contract/infernal/update_text()
|
||||
info = "This shouldn't be seen. Error DEVIL:6"
|
||||
|
||||
/obj/item/paper/contract/infernal/power/update_text(var/signature = "____________", blood = 0)
|
||||
/obj/item/paper/contract/infernal/power/update_text(signature = "____________", blood = 0)
|
||||
info = "<center><B>Contract for infernal power</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for power and physical strength. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
|
||||
if(blood)
|
||||
info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
|
||||
else
|
||||
info += "<i>[signature]</i>"
|
||||
|
||||
/obj/item/paper/contract/infernal/wealth/update_text(var/signature = "____________", blood = 0)
|
||||
/obj/item/paper/contract/infernal/wealth/update_text(signature = "____________", blood = 0)
|
||||
info = "<center><B>Contract for unlimited wealth</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for a pocket that never runs out of valuable resources. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
|
||||
if(blood)
|
||||
info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
|
||||
else
|
||||
info += "<i>[signature]</i>"
|
||||
|
||||
/obj/item/paper/contract/infernal/prestige/update_text(var/signature = "____________", blood = 0)
|
||||
/obj/item/paper/contract/infernal/prestige/update_text(signature = "____________", blood = 0)
|
||||
info = "<center><B>Contract for prestige</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for prestige and esteem among my peers. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
|
||||
if(blood)
|
||||
info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
|
||||
else
|
||||
info += "<i>[signature]</i>"
|
||||
|
||||
/obj/item/paper/contract/infernal/magic/update_text(var/signature = "____________", blood = 0)
|
||||
/obj/item/paper/contract/infernal/magic/update_text(signature = "____________", blood = 0)
|
||||
info = "<center><B>Contract for magic</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for arcane abilities beyond normal human ability. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
|
||||
if(blood)
|
||||
info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
|
||||
else
|
||||
info += "<i>[signature]</i>"
|
||||
|
||||
/obj/item/paper/contract/infernal/revive/update_text(var/signature = "____________", blood = 0)
|
||||
/obj/item/paper/contract/infernal/revive/update_text(signature = "____________", blood = 0)
|
||||
info = "<center><B>Contract for resurrection</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for resurrection and curing of all injuries. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
|
||||
if(blood)
|
||||
info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
|
||||
else
|
||||
info += "<i>[signature]</i>"
|
||||
|
||||
/obj/item/paper/contract/infernal/knowledge/update_text(var/signature = "____________", blood = 0)
|
||||
/obj/item/paper/contract/infernal/knowledge/update_text(signature = "____________", blood = 0)
|
||||
info = "<center><B>Contract for knowledge</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for boundless knowledge. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
|
||||
if(blood)
|
||||
info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
|
||||
else
|
||||
info += "<i>[signature]</i>"
|
||||
|
||||
/obj/item/paper/contract/infernal/friendship/update_text(var/signature = "____________", blood = 0)
|
||||
/obj/item/paper/contract/infernal/friendship/update_text(signature = "____________", blood = 0)
|
||||
info = "<center><B>Contract for friendship</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for true unconditional friendship. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
|
||||
if(blood)
|
||||
info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
|
||||
else
|
||||
info += "<i>[signature]</i>"
|
||||
|
||||
/obj/item/paper/contract/infernal/unwilling/update_text(var/signature = "____________", blood = 0)
|
||||
/obj/item/paper/contract/infernal/unwilling/update_text(signature = "____________", blood = 0)
|
||||
info = "<center><B>Contract for slave</B></center><BR><BR><BR>I, [target], hereby offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename]. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
|
||||
if(blood)
|
||||
info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
|
||||
|
||||
@@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(adminfaxes)
|
||||
SSblackbox.record_feedback("tally", "admin_verb", 1, "Fax Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
return
|
||||
|
||||
/datum/admins/proc/fax_panel(var/mob/living/user)
|
||||
/datum/admins/proc/fax_panel(mob/living/user)
|
||||
var/html = "<A align='right' href='?src=[UID()];refreshfaxpanel=1'>Refresh</A>"
|
||||
html += "<A align='right' href='?src=[UID()];AdminFaxCreate=1;faxtype=Administrator'>Create Fax</A>"
|
||||
|
||||
|
||||
@@ -226,7 +226,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
|
||||
if(.)
|
||||
add_fingerprint(usr)
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/proc/scan(var/obj/item/card/id/card = null)
|
||||
/obj/machinery/photocopier/faxmachine/proc/scan(obj/item/card/id/card = null)
|
||||
if(scan) // Card is in machine
|
||||
if(ishuman(usr))
|
||||
scan.forceMove(get_turf(src))
|
||||
@@ -266,7 +266,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
|
||||
else
|
||||
to_chat(usr, "There is nothing to remove from [src].")
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/proc/sendfax(var/destination,var/mob/sender)
|
||||
/obj/machinery/photocopier/faxmachine/proc/sendfax(destination, mob/sender)
|
||||
use_power(active_power_usage)
|
||||
var/success = 0
|
||||
for(var/obj/machinery/photocopier/faxmachine/F in GLOB.allfaxes)
|
||||
@@ -286,7 +286,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
|
||||
else
|
||||
visible_message("[src] beeps, \"Error transmitting message.\"")
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/proc/receivefax(var/obj/item/incoming)
|
||||
/obj/machinery/photocopier/faxmachine/proc/receivefax(obj/item/incoming)
|
||||
if(stat & (BROKEN|NOPOWER))
|
||||
return FALSE
|
||||
|
||||
@@ -312,7 +312,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
|
||||
use_power(active_power_usage)
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/proc/send_admin_fax(var/mob/sender, var/destination)
|
||||
/obj/machinery/photocopier/faxmachine/proc/send_admin_fax(mob/sender, destination)
|
||||
use_power(active_power_usage)
|
||||
|
||||
if(!(istype(copyitem, /obj/item/paper) || istype(copyitem, /obj/item/paper_bundle) || istype(copyitem, /obj/item/photo)))
|
||||
@@ -344,7 +344,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
|
||||
return 0
|
||||
return round((sendcooldown - world.time) / 10)
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/faxtype, var/obj/item/sent, font_colour="#9A04D1")
|
||||
/obj/machinery/photocopier/faxmachine/proc/message_admins(mob/sender, faxname, faxtype, obj/item/sent, font_colour="#9A04D1")
|
||||
var/msg = "<span class='boldnotice'><font color='[font_colour]'>[faxname]: </font> [key_name_admin(sender)] | REPLY: (<A HREF='?_src_=holder;[faxname == "SYNDICATE FAX" ? "SyndicateReply" : "CentcommReply"]=[sender.UID()]'>RADIO</A>) (<a href='?_src_=holder;AdminFaxCreate=\ref[sender];originfax=\ref[src];faxtype=[faxtype];replyto=\ref[sent]'>FAX</a>) ([ADMIN_SM(sender,"SM")]) | REJECT: (<A HREF='?_src_=holder;FaxReplyTemplate=[sender.UID()];originfax=\ref[src]'>TEMPLATE</A>) ([ADMIN_BSA(sender,"BSA")]) (<A HREF='?_src_=holder;EvilFax=[sender.UID()];originfax=\ref[src]'>EVILFAX</A>) </span>: Receiving '[sent.name]' via secure connection... <a href='?_src_=holder;AdminFaxView=\ref[sent]'>view message</a>"
|
||||
for(var/client/C in GLOB.admins)
|
||||
if(check_rights(R_EVENT, 0, C.mob))
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
|
||||
playsound(PF.loc, usesound, 100, 1)
|
||||
|
||||
/obj/item/picture_frame/examine(mob/user, var/infix = "", var/suffix = "")
|
||||
/obj/item/picture_frame/examine(mob/user, infix = "", suffix = "")
|
||||
. = ..()
|
||||
if(displayed)
|
||||
. += displayed.examine(user, infix, suffix)
|
||||
@@ -245,7 +245,7 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/structure/sign/picture_frame/examine(mob/user, var/infix = "", var/suffix = "")
|
||||
/obj/structure/sign/picture_frame/examine(mob/user, infix = "", suffix = "")
|
||||
if(frame)
|
||||
. += frame.examine(user, infix, suffix)
|
||||
else
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
else
|
||||
. += "<span class='notice'>You don't know how to read.</span>"
|
||||
|
||||
/obj/item/paper/proc/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1)
|
||||
/obj/item/paper/proc/show_content(mob/user, forceshow = 0, forcestars = 0, infolinks = 0, view = 1)
|
||||
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
|
||||
assets.send(user)
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
spam_flag = 0
|
||||
return
|
||||
|
||||
/obj/item/paper/attack_ai(var/mob/living/silicon/ai/user as mob)
|
||||
/obj/item/paper/attack_ai(mob/living/silicon/ai/user as mob)
|
||||
var/dist
|
||||
if(istype(user) && user.current) //is AI
|
||||
dist = get_dist(src, user.current)
|
||||
@@ -161,7 +161,7 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/paper/proc/addtofield(var/id, var/text, var/links = 0)
|
||||
/obj/item/paper/proc/addtofield(id, text, links = 0)
|
||||
if(id > MAX_PAPER_FIELDS)
|
||||
return
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
update_icon()
|
||||
|
||||
|
||||
/obj/item/paper/proc/parsepencode(var/t, var/obj/item/pen/P, mob/user as mob)
|
||||
/obj/item/paper/proc/parsepencode(t, obj/item/pen/P, mob/user as mob)
|
||||
t = pencode_to_html(html_encode(t), usr, P, TRUE, TRUE, TRUE, deffont, signfont, crayonfont)
|
||||
return t
|
||||
|
||||
@@ -412,7 +412,7 @@
|
||||
if(!(resistance_flags & FIRE_PROOF))
|
||||
info = "<i>Heat-curled corners and sooty words offer little insight. Whatever was once written on this page has been rendered illegible through fire.</i>"
|
||||
|
||||
/obj/item/paper/proc/stamp(var/obj/item/stamp/S)
|
||||
/obj/item/paper/proc/stamp(obj/item/stamp/S)
|
||||
stamps += (!stamps || stamps == "" ? "<HR>" : "") + "<img src=large_[S.icon_state].png>"
|
||||
|
||||
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
|
||||
@@ -626,7 +626,7 @@
|
||||
var/activate_on_timeout = 0
|
||||
var/faxmachineid = null
|
||||
|
||||
/obj/item/paper/evilfax/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1)
|
||||
/obj/item/paper/evilfax/show_content(mob/user, forceshow = 0, forcestars = 0, infolinks = 0, view = 1)
|
||||
if(user == mytarget)
|
||||
if(istype(user, /mob/living/carbon))
|
||||
var/mob/living/carbon/C = user
|
||||
@@ -669,7 +669,7 @@
|
||||
else
|
||||
countdown--
|
||||
|
||||
/obj/item/paper/evilfax/proc/evilpaper_specialaction(var/mob/living/carbon/target)
|
||||
/obj/item/paper/evilfax/proc/evilpaper_specialaction(mob/living/carbon/target)
|
||||
spawn(30)
|
||||
if(istype(target, /mob/living/carbon))
|
||||
var/obj/machinery/photocopier/faxmachine/fax = locateUID(faxmachineid)
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
. = TRUE
|
||||
default_unfasten_wrench(user, I)
|
||||
|
||||
/obj/machinery/photocopier/proc/copy(var/obj/item/paper/copy)
|
||||
/obj/machinery/photocopier/proc/copy(obj/item/paper/copy)
|
||||
var/obj/item/paper/c = new /obj/item/paper (loc)
|
||||
c.header = copy.header
|
||||
c.info = copy.info
|
||||
@@ -218,7 +218,7 @@
|
||||
return c
|
||||
|
||||
|
||||
/obj/machinery/photocopier/proc/photocopy(var/obj/item/photo/photocopy)
|
||||
/obj/machinery/photocopier/proc/photocopy(obj/item/photo/photocopy)
|
||||
var/obj/item/photo/p = new /obj/item/photo (loc)
|
||||
p.name = photocopy.name
|
||||
p.icon = photocopy.icon
|
||||
@@ -281,7 +281,7 @@
|
||||
return p
|
||||
|
||||
//If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner
|
||||
/obj/machinery/photocopier/proc/bundlecopy(var/obj/item/paper_bundle/bundle, var/need_toner=1)
|
||||
/obj/machinery/photocopier/proc/bundlecopy(obj/item/paper_bundle/bundle, need_toner=1)
|
||||
var/obj/item/paper_bundle/P = new /obj/item/paper_bundle (src, default_papers = FALSE)
|
||||
for(var/obj/item/W in bundle)
|
||||
if(toner <= 0 && need_toner)
|
||||
|
||||
@@ -400,7 +400,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
|
||||
|
||||
return P
|
||||
|
||||
/obj/item/camera/proc/printpicture(mob/user, var/datum/picture/P)
|
||||
/obj/item/camera/proc/printpicture(mob/user, datum/picture/P)
|
||||
var/obj/item/photo/Photo = new/obj/item/photo()
|
||||
Photo.loc = user.loc
|
||||
if(!user.get_inactive_hand())
|
||||
@@ -411,7 +411,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
|
||||
blueprints = 0
|
||||
Photo.construct(P)
|
||||
|
||||
/obj/item/photo/proc/construct(var/datum/picture/P)
|
||||
/obj/item/photo/proc/construct(datum/picture/P)
|
||||
name = P.fields["name"]
|
||||
icon = P.fields["icon"]
|
||||
tiny = P.fields["tiny"]
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
/obj/item/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used
|
||||
name = "Drone photo camera"
|
||||
|
||||
/obj/item/camera/siliconcam/proc/injectaialbum(var/datum/picture/P, var/sufix = "") //stores image information to a list similar to that of the datacore
|
||||
/obj/item/camera/siliconcam/proc/injectaialbum(datum/picture/P, sufix = "") //stores image information to a list similar to that of the datacore
|
||||
photos_taken++
|
||||
P.fields["name"] = "Image [photos_taken][sufix]"
|
||||
aipictures += P
|
||||
|
||||
/obj/item/camera/siliconcam/proc/injectmasteralbum(var/datum/picture/P) //stores image information to a list similar to that of the datacore
|
||||
/obj/item/camera/siliconcam/proc/injectmasteralbum(datum/picture/P) //stores image information to a list similar to that of the datacore
|
||||
var/mob/living/silicon/robot/C = src.loc
|
||||
if(C.connected_ai)
|
||||
var/mob/A = P.fields["author"]
|
||||
|
||||
Reference in New Issue
Block a user