From 552f751c2d2b4e130d30a2b50b21e0557957fdee Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 7 Sep 2014 20:59:09 -0700 Subject: [PATCH 1/6] CRITICAL BUGFIX for Magic Mania $1.75 >department revolt event >no potential for the rng to roll "cargonia" important bugfix merge asap --- code/modules/events/wizard/departmentrevolt.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index 118220799a1..2a0136de228 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -33,7 +33,7 @@ jobs_to_revolt = list("Bartender", "Chef", "Botanist", "Clown", "Mime", "Janitor", "Chaplain") nation = pick("Honka", "Boozo", "Fatu", "Danka") - nation += pick("stan", "topia", "land") + nation += pick("stan", "topia", "land", "nia") for(var/mob/living/carbon/human/H in mob_list) if(H.mind) @@ -50,4 +50,4 @@ var/message for(var/job in jobs_to_revolt) message += "[job]," - message_admins("The nation of [nation] has been formed. Affected jobs are [message]") \ No newline at end of file + message_admins("The nation of [nation] has been formed. Affected jobs are [message]") From 4b311777a446dbd558b8b163608ff62ec53f4835 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 7 Sep 2014 21:21:39 -0700 Subject: [PATCH 2/6] =?UTF-8?q?estaci=C3=B3n=20de=20marea=20gris=20de=20an?= =?UTF-8?q?cho?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/events/wizard/departmentrevolt.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index 2a0136de228..4d432e99a6b 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -16,24 +16,24 @@ switch(tidecolor) if("grey") //God help you jobs_to_revolt = list("Assistant") - nation = pick("Assa", "Mainte") + nation = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey") if("white") jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist") - nation = pick("Mede", "Healtha") + nation = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych") if("yellow") jobs_to_revolt = list("Chief Engineer", "Station Engineer", "Atmospheric Technician") - nation = pick("Atomo", "Engino") + nation = pick("Atomo", "Engino", "Power", "Teleco") if("purple") jobs_to_revolt = list("Research Director","Scientist", "Roboticist") - nation = pick("Sci", "Griffa") + nation = pick("Sci", "Griffa", "Explosi", "Mecha", "Xeno") if("brown") jobs_to_revolt = list("Quartermaster", "Cargo Technician", "Shaft Miner") - nation = pick("Cargo", "Guna") + nation = pick("Cargo", "Guna", "Suppli", "Mule", "Crate", "Ore", "Mini", "Shaf") if("whatevercolorrepresentstheservicepeople") //the few, the proud, the technically aligned jobs_to_revolt = list("Bartender", "Chef", "Botanist", "Clown", "Mime", "Janitor", "Chaplain") - nation = pick("Honka", "Boozo", "Fatu", "Danka") + nation = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi") - nation += pick("stan", "topia", "land", "nia") + nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "marea", "co") for(var/mob/living/carbon/human/H in mob_list) if(H.mind) From 8120a6eb231b1fc71e12aa64c9c998fe8c8598a9 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 7 Sep 2014 21:28:10 -0700 Subject: [PATCH 3/6] Update departmentrevolt.dm --- code/modules/events/wizard/departmentrevolt.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index 4d432e99a6b..93f917fe0da 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -33,7 +33,7 @@ jobs_to_revolt = list("Bartender", "Chef", "Botanist", "Clown", "Mime", "Janitor", "Chaplain") nation = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi") - nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "marea", "co") + nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co") for(var/mob/living/carbon/human/H in mob_list) if(H.mind) From 48d3f17ecf2f1da681990d86f628b144a7764fae Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Mon, 8 Sep 2014 18:49:45 -0700 Subject: [PATCH 4/6] =?UTF-8?q?=E3=82=B0=E3=83=AC=E3=83=BC=20mar=C3=A9e=20?= =?UTF-8?q?estaci=C3=B3n=20ar=20fud=20an=20google=20translate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit multilingual grey tides --- code/modules/events/wizard/departmentrevolt.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index 93f917fe0da..92aee011b6e 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -16,7 +16,7 @@ switch(tidecolor) if("grey") //God help you jobs_to_revolt = list("Assistant") - nation = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey") + nation = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Xám", "Grigio", "グレー", "Ass", "Assi") if("white") jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist") nation = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych") @@ -33,7 +33,7 @@ jobs_to_revolt = list("Bartender", "Chef", "Botanist", "Clown", "Mime", "Janitor", "Chaplain") nation = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi") - nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co") + nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "潮", "marée", "taoide", "slavia", "stotska") for(var/mob/living/carbon/human/H in mob_list) if(H.mind) From a15fc944607a2d1bb736ec67ea092817aae3da27 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Fri, 12 Sep 2014 15:56:45 -0700 Subject: [PATCH 5/6] Update departmentrevolt.dm --- code/modules/events/wizard/departmentrevolt.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index 92aee011b6e..ee95ca57bdd 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -16,7 +16,7 @@ switch(tidecolor) if("grey") //God help you jobs_to_revolt = list("Assistant") - nation = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Xám", "Grigio", "グレー", "Ass", "Assi") + nation = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Xám", "Grigio", "Ass", "Assi") if("white") jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist") nation = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych") @@ -33,7 +33,7 @@ jobs_to_revolt = list("Bartender", "Chef", "Botanist", "Clown", "Mime", "Janitor", "Chaplain") nation = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi") - nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "潮", "marée", "taoide", "slavia", "stotska") + nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotska") for(var/mob/living/carbon/human/H in mob_list) if(H.mind) From af7be3cfdcd2d9ca429921cf2420ec5cd5566cff Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Fri, 12 Sep 2014 16:41:37 -0700 Subject: [PATCH 6/6] Update departmentrevolt.dm --- code/modules/events/wizard/departmentrevolt.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index ee95ca57bdd..68c9d68e430 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -16,7 +16,7 @@ switch(tidecolor) if("grey") //God help you jobs_to_revolt = list("Assistant") - nation = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Xám", "Grigio", "Ass", "Assi") + nation = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi") if("white") jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist") nation = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych") @@ -33,7 +33,7 @@ jobs_to_revolt = list("Bartender", "Chef", "Botanist", "Clown", "Mime", "Janitor", "Chaplain") nation = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi") - nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotska") + nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotzka") for(var/mob/living/carbon/human/H in mob_list) if(H.mind)