Skip to content

Commit

Permalink
this was a pain
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bomberman66Dev
Bomberman66Dev committed Jun 12, 2024
1 parent 951a187 commit c4ee86d
Show file tree
Hide file tree
Showing 1,593 changed files with 14,669 additions and 14,463 deletions.
156 changes: 156 additions & 0 deletions code/__DEFINES/spans.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
#define span_abductor(str) ("<span class='abductor'>" + str + "</span>")
#define span_admin(str) ("<span class='admin'>" + str + "</span>")
#define span_adminhelp(str) ("<span class='adminhelp'>" + str + "</span>")
#define span_adminnotice(str) ("<span class='adminnotice'>" + str + "</span>")
#define span_adminobserverooc(str) ("<span class='adminobserverooc'>" + str + "</span>")
#define span_adminooc(str) ("<span class='adminooc'>" + str + "</span>")
#define span_adminprefix(str) ("<span class='adminprefix'>" + str + "</span>")
#define span_adminsay(str) ("<span class='adminsay'>" + str + "</span>")
#define span_aiprivradio(str) ("<span class='aiprivradio'>" + str + "</span>")
#define span_alert(str) ("<span class='alert'>" + str + "</span>")
#define span_alertalien(str) ("<span class='alertalien'>" + str + "</span>")
#define span_alertsyndie(str) ("<span class='alertsyndie'>" + str + "</span>")
#define span_alertwarning(str) ("<span class='alertwarning'>" + str + "</span>")
#define span_alien(str) ("<span class='alien'>" + str + "</span>")
#define span_announce(str) ("<span class='announce'>" + str + "</span>")
#define span_artery(str) ("<span class='artery'>" + str + "</span>")
#define span_average(str) ("<span class='average'>" + str + "</span>")
#define span_bad(str) ("<span class='bad'>" + str + "</span>")
#define span_big(str) ("<span class='big'>" + str + "</span>")
#define span_bigbold(str) ("<span class='bigbold'>" + str + "</span>")
#define span_bigicon(str) ("<span class='bigicon'>" + str + "</span>")
#define span_biginfo(str) ("<span class='biginfo'>" + str + "</span>")
#define span_bignotice(str) ("<span class='bignotice'>" + str + "</span>")
#define span_binarysay(str) ("<span class='binarysay'>" + str + "</span>")
#define span_blue(str) ("<span class='blue'>" + str + "</span>")
#define span_blueteamradio(str) ("<span class='blueteamradio'>" + str + "</span>")
#define span_bloody(str) ("<span class='bloody '>" + str + "</span>")
#define span_bold(str) ("<span class='bold'>" + str + "</span>")
#define span_boldannounce(str) ("<span class='boldannounce'>" + str + "</span>")
#define span_boldnotice(str) ("<span class='boldnotice'>" + str + "</span>")
#define span_boldwarning(str) ("<span class='boldwarning'>" + str + "</span>")
#define span_bone(str) ("<span class='bone'>" + str + "</span>")
#define span_centcomradio(str) ("<span class='centcomradio'>" + str + "</span>")
#define span_changeling(str) ("<span class='changeling'>" + str + "</span>")
#define span_changelingbold(str) ("<span class='changelingbold'>" + str + "</span>")
#define span_clown(str) ("<span class='clown'>" + str + "</span>")
#define span_colossus(str) ("<span class='colossus'>" + str + "</span>")
#define span_command_headset(str) ("<span class='command_headset'>" + str + "</span>")
#define span_comradio(str) ("<span class='comradio'>" + str + "</span>")
#define span_crit(str) ("<span class='crit'>" + str + "</span>")
#define span_cult(str) ("<span class='cult'>" + str + "</span>")
#define span_cultbigbold(str) ("<span class='cultbigbold'>" + str + "</span>")
#define span_cultbold(str) ("<span class='cultbold'>" + str + "</span>")
#define span_cultboldtalic(str) ("<span class='cultboldtalic'>" + str + "</span>")
#define span_cultitalic(str) ("<span class='cultitalic'>" + str + "</span>")
#define span_cultlarge(str) ("<span class='cultlarge'>" + str + "</span>")
#define span_cultsmall(str) ("<span class='cultsmall'>" + str + "</span>")
#define span_danger(str) ("<span class='danger'>" + str + "</span>")
#define span_dead(str) ("<span class='dead'>" + str + "</span>")
#define span_deadsay(str) ("<span class='deadsay'>" + str + "</span>")
#define span_deadsayitalicsbold(str) ("<span class='deadsayitalicsbold'>" + str + "</span>")
#define span_deconversion_message(str) ("<span class='deconversion_message'>" + str + "</span>")
#define span_drone(str) ("<span class='drone'>" + str + "</span>")
#define span_emote(str) ("<span class='emote'>" + str + "</span>")
#define span_engradio(str) ("<span class='engradio'>" + str + "</span>")
#define span_extremelybig(str) ("<span class='extremelybig'>" + str + "</span>")
#define span_gamedeadsay(str) ("<span class='gamedeadsay'>" + str + "</span>")
#define span_ghostalert(str) ("<span class='ghostalert'>" + str + "</span>")
#define span_good(str) ("<span class='good'>" + str + "</span>")
#define span_green(str) ("<span class='green'>" + str + "</span>")
#define span_greenannounce(str) ("<span class='greenannounce'>" + str + "</span>")
#define span_greenteamradio(str) ("<span class='greenteamradio'>" + str + "</span>")
#define span_greentext(str) ("<span class='greentext'>" + str + "</span>")
#define span_greentextbig(str) ("<span class='greentextbig'>" + str + "</span>")
#define span_hear(str) ("<span class='hear'>" + str + "</span>")
#define span_header(str) ("<span class='header'>" + str + "</span>")
#define span_heavy_brass(str) ("<span class='heavy_brass'>" + str + "</span>")
#define span_hidden(str) ("<span class='hidden'>" + str + "</span>")
#define span_hierophant(str) ("<span class='hierophant'>" + str + "</span>")
#define span_hierophant_warning(str) ("<span class='hierophant_warning'>" + str + "</span>")
#define span_highlight(str) ("<span class='highlight'>" + str + "</span>")
#define span_his_grace(str) ("<span class='his_grace'>" + str + "</span>")
#define span_holoparasite(str) ("<span class='holoparasite'>" + str + "</span>")
#define span_holoparasitebold(str) ("<span class='holoparasitebold'>" + str + "</span>")
#define span_hypnophrase(str) ("<span class='hypnophrase'>" + str + "</span>")
#define span_icon(str) ("<span class='icon'>" + str + "</span>")
#define span_infection(str) ("<span class='infection'>" + str + "</span>")
#define span_info(str) ("<span class='info'>" + str + "</span>")
#define span_interface(str) ("<span class='interface'>" + str + "</span>")
#define span_italics(str) ("<span class='italics'>" + str + "</span>")
#define span_linkoff(str) ("<span class='linkOff'>" + str + "</span>")
#define span_linkoffbad(str) ("<span class='linkoffbad'>" + str + "</span>")
#define span_linkon(str) ("<span class='linkon'>" + str + "</span>")
#define span_looc(str) ("<span class='looc'>" + str + "</span>")
#define span_love(str) ("<span class='love'>" + str + "</span>")
#define span_marooned(str) ("<span class='marooned'>" + str + "</span>")
#define span_medal(str) ("<span class='medal'>" + str + "</span>")
#define span_medradio(str) ("<span class='medradio'>" + str + "</span>")
#define span_memo(str) ("<span class='memo'>" + str + "</span>")
#define span_memoedit(str) ("<span class='memoedit'>" + str + "</span>")
#define span_mind_control(str) ("<span class='mind_control'>" + str + "</span>")
#define span_minorannounce(str) ("<span class='minorannounce'>" + str + "</span>")
#define span_monkey(str) ("<span class='monkey'>" + str + "</span>")
#define span_monkeyhive(str) ("<span class='monkeyhive'>" + str + "</span>")
#define span_monkeylead(str) ("<span class='monkeylead'>" + str + "</span>")
#define span_name(str) ("<span class='name'>" + str + "</span>")
#define span_narsie(str) ("<span class='narsie'>" + str + "</span>")
#define span_narsiesmall(str) ("<span class='narsiesmall'>" + str + "</span>")
#define span_necrosis(str) ("<span class='necrosis'>" + str + "</span>")
#define span_neutraltext(str) ("<span class='neutraltext'>" + str + "</span>")
#define span_neutraltextbig(str) ("<span class='neutraltextbig'>" + str + "</span>")
#define span_nicegreen(str) ("<span class='nicegreen'>" + str + "</span>")
#define span_notice(str) ("<span class='notice'>" + str + "</span>")
#define span_noticealien(str) ("<span class='noticealien'>" + str + "</span>")
#define span_ooc(str) ("<span class='ooc'>" + str + "</span>")
#define span_papyrus(str) ("<span class='papyrus'>" + str + "</span>")
#define span_phobia(str) ("<span class='phobia'>" + str + "</span>")
#define span_prefix(str) ("<span class='prefix'>" + str + "</span>")
#define span_purple(str) ("<span class='purple'>" + str + "</span>")
#define span_radio(str) ("<span class='radio'>" + str + "</span>")
#define span_reallybig(str) ("<span class='reallybig'>" + str + "</span>")
#define span_reallybigboldnotice(str) ("<span class='reallybigboldnotice'>" + str + "</span>")
#define span_reallybighypnophrase(str) ("<span class='reallybighypnophrase'>" + str + "</span>")
#define span_reallybigredtext(str) ("<span class='reallybigredtext'>" + str + "</span>")
#define span_red(str) ("<span class='red'>" + str + "</span>")
#define span_redteamradio(str) ("<span class='redteamradio'>" + str + "</span>")
#define span_redtext(str) ("<span class='redtext'>" + str + "</span>")
#define span_redtextbig(str) ("<span class='redtextbig'>" + str + "</span>")
#define span_resonate(str) ("<span class='resonate'>" + str + "</span>")
#define span_revenbignotice(str) ("<span class='revenbignotice'>" + str + "</span>")
#define span_revenboldnotice(str) ("<span class='revenboldnotice'>" + str + "</span>")
#define span_revendanger(str) ("<span class='revendanger'>" + str + "</span>")
#define span_revenminor(str) ("<span class='revenminor'>" + str + "</span>")
#define span_revennotice(str) ("<span class='revennotice'>" + str + "</span>")
#define span_revenwarning(str) ("<span class='revenwarning'>" + str + "</span>")
#define span_robot(str) ("<span class='robot'>" + str + "</span>")
#define span_robotdanger(str) ("<span class='robotdanger'>" + str + "</span>")
#define span_robotnotice(str) ("<span class='robotnotice'>" + str + "</span>")
#define span_rose(str) ("<span class='rose'>" + str + "</span>")
#define span_sans(str) ("<span class='sans'>" + str + "</span>")
#define span_say(str) ("<span class='say'>" + str + "</span>")
#define span_sciradio(str) ("<span class='sciradio'>" + str + "</span>")
#define span_secradio(str) ("<span class='secradio'>" + str + "</span>")
#define span_servradio(str) ("<span class='servradio'>" + str + "</span>")
#define span_singing(str) ("<span class='singing'>" + str + "</span>")
#define span_slime(str) ("<span class='slime'>" + str + "</span>")
#define span_small(str) ("<span class='small'>" + str + "</span>")
#define span_smallboldannounce(str) ("<span class='smallboldannounce'>" + str + "</span>")
#define span_smallnotice(str) ("<span class='smallnotice'>" + str + "</span>")
#define span_smallnoticeital(str) ("<span class='smallnoticeital'>" + str + "</span>")
#define span_spider(str) ("<span class='spider'>" + str + "</span>")
#define span_suicide(str) ("<span class='suicide'>" + str + "</span>")
#define span_suppradio(str) ("<span class='suppradio'>" + str + "</span>")
#define span_swarmer(str) ("<span class='swarmer'>" + str + "</span>")
#define span_syndradio(str) ("<span class='syndradio'>" + str + "</span>")
#define span_tape_recorder(str) ("<span class='tape_recorder'>" + str + "</span>")
#define span_tinynotice(str) ("<span class='tinynotice'>" + str + "</span>")
#define span_tinynoticeital(str) ("<span class='tinynoticeital'>" + str + "</span>")
#define span_tooltip_container(str) ("<span class='tooltip_container'>" + str + "</span>")
#define span_unconscious(str) ("<span class='unconscious'>" + str + "</span>")
#define span_userdanger(str) ("<span class='userdanger'>" + str + "</span>")
#define span_warn(str) ("<span class='warn'>" + str + "</span>")
#define span_warning(str) ("<span class='warning'>" + str + "</span>")
#define span_warningbig(str) ("<span class='warningbig'>" + str + "</span>")
#define span_yell(str) ("<span class='yell'>" + str + "</span>")
#define span_yellowteamradio(str) ("<span class='yellowteamradio'>" + str + "</span>")
34 changes: 17 additions & 17 deletions code/__DEFINES/traits.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,43 +56,43 @@

GLOBAL_LIST_INIT(roguetraits, list(
TRAIT_WEBWALK = "I can move freely between webs.",
TRAIT_NOSTINK = "<span class='dead'>My nose is numb to the smell of decay.</span>",
TRAIT_NOSTINK = span_dead("My nose is numb to the smell of decay."),
TRAIT_ZJUMP = "Time to reach a new high.",
TRAIT_LEAPER = "I can leap like a frog.",
TRAIT_NOSEGRAB = "I love to grab idiots by their noses!",
TRAIT_NUTCRACKER = "I love kicking idiots on the nuts!",
TRAIT_SEEPRICES = "I can tell the prices of things down to the zenny.",
TRAIT_SEEPRICES_SHITTY = "I can tell the prices of things... <i>Kind of</i>.",
TRAIT_STRONGBITE = "Stronger bites, critical bite attacks.",
TRAIT_NOBLE = "<span class='blue'>I'm of noble blood.</span>",
TRAIT_NOBLE = span_blue("I'm of noble blood."),
TRAIT_EMPATH = "I can notice when people are in pain.",
TRAIT_BREADY = "Defensive stance does not passively fatigue me.",
TRAIT_MEDIUMARMOR = "I can move freely in medium armor.",
TRAIT_HEAVYARMOR = "I can move freely in heavy armor.",
TRAIT_DODGEEXPERT = "I can dodge easily while only wearing light armor.",
TRAIT_DECEIVING_MEEKNESS = "People look at me and think I am a weakling. They are mistaken.",
TRAIT_CRITICAL_RESISTANCE = "I am resistant to wounds that would be life threatening to others.",
TRAIT_CRITICAL_WEAKNESS = "<span class='danger'>I am weak to wounds that others could survive.</span>",
TRAIT_MANIAC_AWOKEN = "<span class='danger'>I am <b>WAKING UP</b> and the sheeple know this. They will resist.</span>",
TRAIT_CRITICAL_WEAKNESS = span_danger("I am weak to wounds that others could survive."),
TRAIT_MANIAC_AWOKEN = span_danger("I am <b>WAKING UP</b> and the sheeple know this. They will resist."),
TRAIT_NOROGSTAM = "I have boundless energy, I will never tire.",
TRAIT_NUDIST = "I <b>refuse</b> to wear clothes. They are a hindrance to my freedom.",
TRAIT_CYCLOPS_LEFT = "<span class='warning'>My left eye has been poked out...</span>",
TRAIT_CYCLOPS_RIGHT = "<span class='warning'>My right eye has been poked out...</span>",
TRAIT_CYCLOPS_LEFT = span_warning("My left eye has been poked out..."),
TRAIT_CYCLOPS_RIGHT = span_warning("My right eye has been poked out..."),
TRAIT_RETARD_ANATOMY = "My anatomy is inhumen, preventing me from wearing hats and shoes.",
TRAIT_NASTY_EATER = "<span class='dead'>I can eat bad food, and water that would be toxic to humen will not affect me.</span>",
TRAIT_NOFALLDAMAGE1 = "<span class='warning'>I can easily handle minor falls.</span>",
TRAIT_DISFIGURED = "<span class='warning'>No one can recognize me...</span>",
TRAIT_MISSING_NOSE = "<span class='warning'>I struggle to breathe.</span>",
TRAIT_SPELLCOCKBLOCK = "<span class='warning'>I cannot cast any spells.</span>",
TRAIT_NASTY_EATER = span_dead("I can eat bad food, and water that would be toxic to humen will not affect me."),
TRAIT_NOFALLDAMAGE1 = span_warning("I can easily handle minor falls."),
TRAIT_DISFIGURED = span_warning("No one can recognize me..."),
TRAIT_MISSING_NOSE = span_warning("I struggle to breathe."),
TRAIT_SPELLCOCKBLOCK = span_warning("I cannot cast any spells."),
TRAIT_ANTIMAGIC = "I am immune to most forms of magic.",
TRAIT_SHOCKIMMUNE = "I am immune to electrical shocks.",
TRAIT_NOSLEEP = "<span class='warning'>I can't sleep.</span>",
TRAIT_ROT_EATER = "<span class='necrosis'>I can eat rotten food.</span>",
TRAIT_ORGAN_EATER = "<span class='bloody'>I can eat organs and raw flesh.</span>",
TRAIT_NOSLEEP = span_warning("I can't sleep."),
TRAIT_ROT_EATER = span_necrosis("I can eat rotten food."),
TRAIT_ORGAN_EATER = span_bloody("I can eat organs and raw flesh."),
TRAIT_KNEESTINGER_IMMUNITY = "I am immune to the shock of kneestingers.",
TRAIT_SOUL_EXAMINE = "<span class='deadsay'>I know when someone's soul has departed.</span>",
TRAIT_CRACKHEAD = "<span class='love'>I can use drugs as much as I want!</span>",
TRAIT_COMMIE = "<span class='bloody'>I can recognize other free men, and they can recognize me too.</span>",
TRAIT_SOUL_EXAMINE = span_deadsay("I know when someone's soul has departed."),
TRAIT_CRACKHEAD = span_love("I can use drugs as much as I want!"),
TRAIT_COMMIE = span_bloody("I can recognize other free men, and they can recognize me too."),
))

// trait accessor defines
Expand Down
10 changes: 5 additions & 5 deletions code/__HELPERS/areas.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
))
var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2)
if(!turfs)
to_chat(creator, "<span class='warning'>The new area must be completely airtight and not a part of a shuttle.</span>")
to_chat(creator, span_warning("The new area must be completely airtight and not a part of a shuttle."))
return
if(turfs.len > BP_MAX_ROOM_SIZE)
to_chat(creator, "<span class='warning'>The room you're in is too big. It is [turfs.len >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.</span>")
to_chat(creator, span_warning("The room you're in is too big. It is [turfs.len >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed."))
return
var/list/areas = list("New Area" = /area)
for(var/i in 1 to turfs.len)
Expand All @@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
area_choice = areas[area_choice]

if(!area_choice)
to_chat(creator, "<span class='warning'>No choice selected. The area remains undefined.</span>")
to_chat(creator, span_warning("No choice selected. The area remains undefined."))
return
var/area/newA
var/area/oldA = get_area(get_turf(creator))
Expand All @@ -78,7 +78,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
if(!str || !length(str)) //cancel
return
if(length(str) > 50)
to_chat(creator, "<span class='warning'>The given name is too long. The area remains undefined.</span>")
to_chat(creator, span_warning("The given name is too long. The area remains undefined."))
return
newA = new area_choice
newA.setup(str)
Expand All @@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
var/obj/machinery/door/firedoor/FD = door
FD.CalculateAffectingAreas()

to_chat(creator, "<span class='notice'>I have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.</span>")
to_chat(creator, span_notice("I have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered."))
return TRUE

#undef BP_MAX_ROOM_SIZE
8 changes: 4 additions & 4 deletions code/__HELPERS/game.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,22 +417,22 @@
window_flash(M.client)
switch(ignore_category ? askuser(M,Question,"Please answer in [DisplayTimeText(poll_time)]!","Yes","No","Never for this round", StealFocus=0, Timeout=poll_time) : askuser(M,Question,"Please answer in [DisplayTimeText(poll_time)]!","Yes","No", StealFocus=0, Timeout=poll_time))
if(1)
to_chat(M, "<span class='notice'>Choice registered: Yes.</span>")
to_chat(M, span_notice("Choice registered: Yes."))
if(time_passed + poll_time <= world.time)
to_chat(M, "<span class='danger'>Sorry, you answered too late to be considered!</span>")
to_chat(M, span_danger("Sorry, you answered too late to be considered!"))
SEND_SOUND(M, 'sound/blank.ogg')
candidates -= M
else
candidates += M
if(2)
to_chat(M, "<span class='danger'>Choice registered: No.</span>")
to_chat(M, span_danger("Choice registered: No."))
candidates -= M
if(3)
var/list/L = GLOB.poll_ignore[ignore_category]
if(!L)
GLOB.poll_ignore[ignore_category] = list()
GLOB.poll_ignore[ignore_category] += M.ckey
to_chat(M, "<span class='danger'>Choice registered: Never for this round.</span>")
to_chat(M, span_danger("Choice registered: Never for this round."))
candidates -= M
else
candidates -= M
Expand Down
Loading

0 comments on commit c4ee86d

Please sign in to comment.