Skip to content

Commit

Permalink
Some ss220 edit edits
Browse files Browse the repository at this point in the history
  • Loading branch information
Furrior committed Sep 27, 2023
1 parent ad06faf commit 568ef00
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
7 changes: 3 additions & 4 deletions code/__HELPERS/name_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,9 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
)

var/safety[] = list(1,2,3)//Tells the proc which options to remove later on.
// var/nouns[] = list("love","hate","anger","peace","pride","sympathy","bravery","loyalty","honesty","integrity","compassion","charity","success","courage","deceit","skill","beauty","brilliance","pain","misery","beliefs","dreams","justice","truth","faith","liberty","knowledge","thought","information","culture","trust","dedication","progress","education","hospitality","leisure","trouble","friendships", "relaxation")
// var/drinks[] = list("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequila sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine")
// var/locations[] = length(SSmapping.teleportlocs) ? SSmapping.teleportlocs : drinks//if null, defaults to drinks instead.
// SS220 DELETION
var/nouns[] = list("love","hate","anger","peace","pride","sympathy","bravery","loyalty","honesty","integrity","compassion","charity","success","courage","deceit","skill","beauty","brilliance","pain","misery","beliefs","dreams","justice","truth","faith","liberty","knowledge","thought","information","culture","trust","dedication","progress","education","hospitality","leisure","trouble","friendships", "relaxation")
var/drinks[] = list("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequila sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine")
var/locations[] = length(SSmapping.teleportlocs) ? SSmapping.teleportlocs : drinks//if null, defaults to drinks instead.
var/names[] = list()
for(var/datum/data/record/t in GLOB.data_core.general)//Picks from crew manifest.
names += t.fields["name"]
Expand Down
3 changes: 2 additions & 1 deletion code/datums/datumvars.dm
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,9 @@

var/html = {"
<html>
<meta charset="UTF-8"> <!-- SS220 ADDITION-->
<head>
<meta charset="UTF-8"><title>[title]</title> <!-- SS220 ADDITION - <meta charset="UTF-8"> -->
<title>[title]</title>
<style>
body {
font-family: Verdana, sans-serif;
Expand Down
4 changes: 2 additions & 2 deletions code/datums/mind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
/datum/mind/proc/show_memory(mob/recipient, window = 1)
if(!recipient)
recipient = current
var/output = {"<meta charset="UTF-8"><B>[current.real_name]'s Memories:</B><HR>"} // SS220 EDIT - ORIGINAL: "<B>[current.real_name]'s Memories:</B><HR>"
var/output = "<meta charset='UTF-8'><B>[current.real_name]'s Memories:</B><HR>" // SS220 EDIT - ORIGINAL: "<B>[current.real_name]'s Memories:</B><HR>"
output += memory

var/antag_datum_objectives = FALSE
Expand Down Expand Up @@ -468,7 +468,7 @@
alert("Not before round-start!", "Alert")
return

var/out = {"<meta charset="UTF-8"><B>[name]</B>[(current && (current.real_name != name))?" (as [current.real_name])" : ""]<br>"} // SS220 EDIT - ORIGINAL: "<B>[name]</B>[(current && (current.real_name != name))?" (as [current.real_name])" : ""]<br>"
var/out = "<meta charset='UTF-8'><B>[name]</B>[(current && (current.real_name != name))?" (as [current.real_name])" : ""]<br>" // SS220 EDIT - ORIGINAL: "<B>[name]</B>[(current && (current.real_name != name))?" (as [current.real_name])" : ""]<br>"
out += "Mind currently owned by key: [key] [active ? "(synced)" : "(not synced)"]<br>"
out += "Assigned role: [assigned_role]. <a href='?src=[UID()];role_edit=1'>Edit</a><br>"
out += "Factions and special roles:<br>"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/misc_admin_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
if(!check_rights(R_ADMIN|R_MOD))
return

var/body = {"<html><meta charset="UTF-8"><head><title>Options for [M.key]</title></head>"} // SS220 EDIT - ORIGINAL: "<html><head><title>Options for [M.key]</title></head>"
var/body = "<html><meta charset='UTF-8'><head><title>Options for [M.key]</title></head>" // SS220 EDIT - ORIGINAL: "<html><head><title>Options for [M.key]</title></head>"
body += "<body>Options panel for <b>[M]</b>"
if(M.client)
body += " played by <b>[M.client]</b> "
Expand Down

0 comments on commit 568ef00

Please sign in to comment.