fixes compiling errors and string regressions

This commit is contained in:
deathride58
2018-01-04 10:24:57 -05:00
parent 7d6519cbce
commit 1e1f83d945
4 changed files with 65 additions and 2 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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)",