From 1e1f83d94513a92b464e0dfa8a04f01b4305cf05 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 4 Jan 2018 10:24:57 -0500 Subject: [PATCH] fixes compiling errors and string regressions --- .../mob/living/carbon/human/species.dm | 2 +- .../items/devices/radio/shockcollar.dm | 2 +- strings/round_start_sounds.txt | 19 ++++++++ strings/traumas.json | 44 +++++++++++++++++++ 4 files changed, 65 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 1cae4491b0..05cb67cdaa 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -634,7 +634,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/image/I - for(var/layer in relevent_layers) + for(var/layer in relevant_layers) var/layertext = mutant_bodyparts_layertext(layer) for(var/bodypart in bodyparts_to_add) diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm index 5b8fb5dada..5c610983f4 100644 --- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm +++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm @@ -21,7 +21,7 @@ ..() /obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal) - if(!signal || signal.encryption != code) + if(!signal || signal.data["code"] != code) return if(isliving(loc) && on) diff --git a/strings/round_start_sounds.txt b/strings/round_start_sounds.txt index 0788672367..18fbb3f98f 100644 --- a/strings/round_start_sounds.txt +++ b/strings/round_start_sounds.txt @@ -1,4 +1,23 @@ sound/ambience/title1.ogg sound/ambience/title2.ogg sound/ambience/title3.ogg +sound/ambience/title4.ogg +sound/misc/i_did_not_grief_them.ogg sound/ambience/clown.ogg +sound/music/1.ogg +sound/music/carmenmirandasghost.ogg +sound/music/century21march.ogg +sound/music/dawsonschristian.ogg +sound/music/gaytony.ogg +sound/music/gi.ogg +sound/music/moonbaseoddity.ogg +sound/music/space_asshole.ogg +sound/music/space_oddity.ogg +sound/music/starman.ogg +sound/music/torvus.ogg +sound/music/shootingstars.ogg +sound/music/oceanman.ogg +sound/music/indeep.ogg +sound/music/goodbyemoonmen.ogg +sound/music/flytothemoon_otomatone.ogg +sound/music/milkyway.ogg diff --git a/strings/traumas.json b/strings/traumas.json index e536655986..717d032d07 100644 --- a/strings/traumas.json +++ b/strings/traumas.json @@ -58,6 +58,50 @@ "@pick(semicolon)the ai and borgs are mettacomming I think", "u just did the world a little bit more sad place for someone", "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?", + "CEMISTRY SUKS!!!!!!!!", + "youed call her a toeugh bithc", + "git gud!!", + "CHEMIT GIB HALNOM PLS", + "PLASMA iS MENT 2 BE FREE", + "LoL tROLED U", + "SEC IS A REV, LINCH!!", + "FUCK U IM WAY MORE ROBUST u bITCH!!1!!", + "iS tHis bay?", + "NO PRED CAN eVER CATCH MI", + "SCIENCE GIB SHINK RAY PLS", + "KILL PUNPUN 4 FUN xDD", + "ooc wow rly?", + "i play @pick(roles) to only ORDER not DO", + "CRAGO ORDER @pick(cargo) PLS", + "erp?", + "i want to digest u!!!", + "i shure hop dere are no PRED arund!!!!", + "NOM!1!", + "iF it COMPILES it werks!", + "LYNCH RObOTIKS NOT GIBING ME MECH WTF?/?", + "GWURGLE!!", + "balid saled!", + "LINCH VIRO", + "VIRO GIB SuPR VIrUS!!", + "Ai plai vxtest2!", + "ahelp kan i b pick@(s_roles)???", + ";taitor trie to make meh malk/?!1!!", + ";ENGIE TATOR HE SET UP SINGULO!!!11", + "WHEN NAGAS ADdED?/?", + "SINDYIE ON SAtIONS GiB gUNS PLISE", + "CcLOWN IV SlIPPING MI, SEc t BAR@", + "ahelp iT's RP vALiDZ!", + "HYDROBONIX PLS WEED PLIESe PLIsE BLAzE IT1!!!", + "HALP GOLIATH TENETCAL RAPPPP!!!!111", + "DudSE it'S 4:20 LmAO BLAZZ IT xDDDDD", + "ahelp DUDE I JUT LOST MY JOBB!!", + "looc dude rly", + "pray can i heff spells", + "aI state dem1!", + "SINGULO eNGINE 2 DANGER, SOLARS PLS!", + "nerf blob!1", + "iM NOT A FUWRRYY!!!", + "FOURTEEN INCHES SOFT!!!", "@pick(semicolon)N-NYAAAAAA~", "@pick(bug)", "@pick(semicolon)wtf??????????? @pick(bug)",