From 0916de9bcf32c3a3ec2eff673f0018361854230b Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Tue, 4 Mar 2014 00:20:47 -0500 Subject: [PATCH 1/9] Shiiiiiet --- code/game/gamemodes/nuclear/nuclear.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 9a422e41904..f3939bee819 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -210,6 +210,7 @@ synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack) var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(synd_mob) + U.hidden_uplink.uplink_owner="[synd_mob]" U.hidden_uplink.uses = 10 synd_mob.equip_to_slot_or_del(U, slot_in_backpack) From f4e2d30749254af82945e8b7be625a3f3cb5d351 Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Tue, 4 Mar 2014 14:55:03 -0500 Subject: [PATCH 2/9] Made uplink_owner key rather than name Had issues with clowns/mimes/nuke ops due to name changes. --- code/game/gamemodes/nuclear/nuclear.dm | 4 ++-- code/game/gamemodes/traitor/traitor.dm | 6 +++--- code/game/objects/items/weapons/implants/implantuplink.dm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index f3939bee819..448947cda82 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -210,7 +210,7 @@ synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack) var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(synd_mob) - U.hidden_uplink.uplink_owner="[synd_mob]" + U.hidden_uplink.uplink_owner="[synd_mob.key]" U.hidden_uplink.uses = 10 synd_mob.equip_to_slot_or_del(U, slot_in_backpack) @@ -324,7 +324,7 @@ text += ")" for(var/obj/item/device/uplink/H in world_uplinks) - if(H && H.uplink_owner && H.uplink_owner==syndicate.name) + if(H && H.uplink_owner && H.uplink_owner==syndicate.key) TC_uses += H.used_TC purchases += H.purchase_log diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 976ab5d719d..345dfa1943c 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -198,7 +198,7 @@ var/uplink_true = 0 var/purchases = "" for(var/obj/item/device/uplink/H in world_uplinks) - if(H && H.uplink_owner && H.uplink_owner==traitor.name) + if(H && H.uplink_owner && H.uplink_owner==traitor.key) TC_uses += H.used_TC uplink_true=1 purchases += H.purchase_log @@ -272,7 +272,7 @@ var/obj/item/device/uplink/hidden/T = new(R) target_radio.hidden_uplink = T - T.uplink_owner = "[traitor_mob]" + T.uplink_owner = "[traitor_mob.key]" target_radio.traitor_frequency = freq traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features." traitor_mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [loc]).") @@ -282,7 +282,7 @@ var/obj/item/device/uplink/hidden/T = new(R) R.hidden_uplink = T - T.uplink_owner = "[traitor_mob]" + T.uplink_owner = "[traitor_mob.key]" var/obj/item/device/pda/P = R P.lock_code = pda_pass diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index 325e53cce16..394c736c3cc 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -14,7 +14,7 @@ activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") source.mind.store_memory("Uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", 0, 0) source << "The implanted uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate." - hidden_uplink.uplink_owner="[source]" + hidden_uplink.uplink_owner="[source.key]" return 1 From c172a6023026e23b534890f3964728c2a8810e18 Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Tue, 4 Mar 2014 17:12:43 -0500 Subject: [PATCH 3/9] MLG 2PRO --- code/game/gamemodes/traitor/traitor.dm | 15 ++++++++++----- icons/MLG_PRO.dmi | Bin 0 -> 2014 bytes 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 icons/MLG_PRO.dmi diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 345dfa1943c..10dc2ca9a00 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -203,21 +203,26 @@ uplink_true=1 purchases += H.purchase_log - if(uplink_true) text += " (used [TC_uses] TC) [purchases]" - - + var/objectives = "" if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this. var/count = 1 for(var/datum/objective/objective in traitor.objectives) if(objective.check_completion()) - text += "
Objective #[count]: [objective.explanation_text] Success!" + objectives += "
Objective #[count]: [objective.explanation_text] Success!" feedback_add_details("traitor_objective","[objective.type]|SUCCESS") else - text += "
Objective #[count]: [objective.explanation_text] Fail." + objectives += "
Objective #[count]: [objective.explanation_text] Fail." feedback_add_details("traitor_objective","[objective.type]|FAIL") traitorwin = 0 count++ + if(uplink_true) + text += " (used [TC_uses] TC) [purchases]" + if(TC_uses==0 && traitorwin) + text += "" + + text += objectives + var/special_role_text if(traitor.special_role) special_role_text = lowertext(traitor.special_role) diff --git a/icons/MLG_PRO.dmi b/icons/MLG_PRO.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7c55334afda0e12a68fc1e71752515caaf9a6bb5 GIT binary patch literal 2014 zcmV<42O;>0P)V=-0C=1w$Gr-GAQT4B+4~e9wnu-fODN%>?;vCQC#-FJ18q5jiwLx>KRLD zd&1xV00%BfL_t(og}s-1a8%VD$3N%Zz5C8?B50lv9s-eS0i`JD5Ia!B7O)1W&~a*~ z;8e#4jF^KvXsIaZO>sHT`^b4vQDu!pu8I4S2BUh8qa|;2D%@fl>p@ z^?i6W4jgTvX69ICR$q?-yoOF&N0Q?w+Sz;X3|U7~HF7XdKU&R zVQzX25sCCGBPPz;pt`yw;fJv6_G0hcg(xV>H`RZP@>GsEWl%uU&_8>J(@i{>6(hrc54CKJ@G}WcTey zc6YsR_};Y{K^mW;6_h&qw{*h_mLsHuf`ThjoCmKLp%m8Je}Zk>-Lc;ffadk;G@g!e^7Q!u_d6#W zk*%%Z?V)9*z_N19hHbm!UV3#L_m>w6f$;edfdImrqjyaRL3cbu{h^B!rEhOE+Lv%R z4oXV2swzZjDJqdb3>ktpW;80BbrnY<5RK+FA}W(=9+ zKbO?19}>U+0eti4;i;|$U3WVmr67|*n=pa!+7~c4zeV?#XJNmyli-Twi0iI%BjE99 zoNbS@|H#M8n0kHx1^`HjHnb9_sTobM7a!siakT$c_9X!Lt zapn0+r357r!64S=&184)Mg;uG=4KM#T8!%I0wG8|{0Oq81=-X@_pCYSBS(OyA&(p- zwPOeNoZ09jMv!^=6|#Tbfi`$hep{X~ZEn7?oZ4S6%+sGecAW0n_w)>U5-bpKIl(kt zR_mz}VHjW-U|DYGL(gNSX{c1nbw<}+LMkdm%Vu-kkk9Mk{SR8HKb%iW=B7=kWU43R zhMRCoxerbtkjsNW06ZRd%`gzbAR-uauT2OoJBw#fVSv0psFuUZHM>}| w{BA}MAB_3xM$Fo+Xyv6>`~Y1kL?p_80Sv9m4L34!sQ>@~07*qoM6N<$f`Yim-2eap literal 0 HcmV?d00001 From 2e9fcdeb561175c6f217159b10493c2c5de9f152 Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Tue, 4 Mar 2014 17:25:58 -0500 Subject: [PATCH 4/9] MLG NUKERS 2 PRO --- code/game/gamemodes/nuclear/nuclear.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 448947cda82..3b7014c572f 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -332,6 +332,9 @@ text += "(Syndicates used [TC_uses] TC) [purchases]" + if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead()) + text += "" + world << text return 1 From bf42b8f38e4c272ceeab4652cb36cd81cb8b6351 Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Wed, 5 Mar 2014 00:18:00 -0500 Subject: [PATCH 5/9] Cheridan Hates Fun --- code/game/gamemodes/nuclear/nuclear.dm | 3 --- code/game/gamemodes/traitor/traitor.dm | 15 +++++---------- icons/MLG_PRO.dmi | Bin 2014 -> 0 bytes 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 icons/MLG_PRO.dmi diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 3b7014c572f..448947cda82 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -332,9 +332,6 @@ text += "(Syndicates used [TC_uses] TC) [purchases]" - if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead()) - text += "" - world << text return 1 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 10dc2ca9a00..1655a3b3036 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -203,26 +203,21 @@ uplink_true=1 purchases += H.purchase_log - var/objectives = "" + if(uplink_true) + text += " (used [TC_uses] TC) [purchases]" + if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this. var/count = 1 for(var/datum/objective/objective in traitor.objectives) if(objective.check_completion()) - objectives += "
Objective #[count]: [objective.explanation_text] Success!" + text += "
Objective #[count]: [objective.explanation_text] Success!" feedback_add_details("traitor_objective","[objective.type]|SUCCESS") else - objectives += "
Objective #[count]: [objective.explanation_text] Fail." + text += "
Objective #[count]: [objective.explanation_text] Fail." feedback_add_details("traitor_objective","[objective.type]|FAIL") traitorwin = 0 count++ - if(uplink_true) - text += " (used [TC_uses] TC) [purchases]" - if(TC_uses==0 && traitorwin) - text += "" - - text += objectives - var/special_role_text if(traitor.special_role) special_role_text = lowertext(traitor.special_role) diff --git a/icons/MLG_PRO.dmi b/icons/MLG_PRO.dmi deleted file mode 100644 index 7c55334afda0e12a68fc1e71752515caaf9a6bb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2014 zcmV<42O;>0P)V=-0C=1w$Gr-GAQT4B+4~e9wnu-fODN%>?;vCQC#-FJ18q5jiwLx>KRLD zd&1xV00%BfL_t(og}s-1a8%VD$3N%Zz5C8?B50lv9s-eS0i`JD5Ia!B7O)1W&~a*~ z;8e#4jF^KvXsIaZO>sHT`^b4vQDu!pu8I4S2BUh8qa|;2D%@fl>p@ z^?i6W4jgTvX69ICR$q?-yoOF&N0Q?w+Sz;X3|U7~HF7XdKU&R zVQzX25sCCGBPPz;pt`yw;fJv6_G0hcg(xV>H`RZP@>GsEWl%uU&_8>J(@i{>6(hrc54CKJ@G}WcTey zc6YsR_};Y{K^mW;6_h&qw{*h_mLsHuf`ThjoCmKLp%m8Je}Zk>-Lc;ffadk;G@g!e^7Q!u_d6#W zk*%%Z?V)9*z_N19hHbm!UV3#L_m>w6f$;edfdImrqjyaRL3cbu{h^B!rEhOE+Lv%R z4oXV2swzZjDJqdb3>ktpW;80BbrnY<5RK+FA}W(=9+ zKbO?19}>U+0eti4;i;|$U3WVmr67|*n=pa!+7~c4zeV?#XJNmyli-Twi0iI%BjE99 zoNbS@|H#M8n0kHx1^`HjHnb9_sTobM7a!siakT$c_9X!Lt zapn0+r357r!64S=&184)Mg;uG=4KM#T8!%I0wG8|{0Oq81=-X@_pCYSBS(OyA&(p- zwPOeNoZ09jMv!^=6|#Tbfi`$hep{X~ZEn7?oZ4S6%+sGecAW0n_w)>U5-bpKIl(kt zR_mz}VHjW-U|DYGL(gNSX{c1nbw<}+LMkdm%Vu-kkk9Mk{SR8HKb%iW=B7=kWU43R zhMRCoxerbtkjsNW06ZRd%`gzbAR-uauT2OoJBw#fVSv0psFuUZHM>}| w{BA}MAB_3xM$Fo+Xyv6>`~Y1kL?p_80Sv9m4L34!sQ>@~07*qoM6N<$f`Yim-2eap From caf64b86668551a218521ebf078fb43cfc99af87 Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Wed, 5 Mar 2014 00:30:35 -0500 Subject: [PATCH 6/9] Revert "Cheridan Hates Fun" This reverts commit bf42b8f38e4c272ceeab4652cb36cd81cb8b6351. --- code/game/gamemodes/nuclear/nuclear.dm | 3 +++ code/game/gamemodes/traitor/traitor.dm | 15 ++++++++++----- icons/MLG_PRO.dmi | Bin 0 -> 2014 bytes 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 icons/MLG_PRO.dmi diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 448947cda82..3b7014c572f 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -332,6 +332,9 @@ text += "(Syndicates used [TC_uses] TC) [purchases]" + if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead()) + text += "" + world << text return 1 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 1655a3b3036..10dc2ca9a00 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -203,21 +203,26 @@ uplink_true=1 purchases += H.purchase_log - if(uplink_true) - text += " (used [TC_uses] TC) [purchases]" - + var/objectives = "" if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this. var/count = 1 for(var/datum/objective/objective in traitor.objectives) if(objective.check_completion()) - text += "
Objective #[count]: [objective.explanation_text] Success!" + objectives += "
Objective #[count]: [objective.explanation_text] Success!" feedback_add_details("traitor_objective","[objective.type]|SUCCESS") else - text += "
Objective #[count]: [objective.explanation_text] Fail." + objectives += "
Objective #[count]: [objective.explanation_text] Fail." feedback_add_details("traitor_objective","[objective.type]|FAIL") traitorwin = 0 count++ + if(uplink_true) + text += " (used [TC_uses] TC) [purchases]" + if(TC_uses==0 && traitorwin) + text += "" + + text += objectives + var/special_role_text if(traitor.special_role) special_role_text = lowertext(traitor.special_role) diff --git a/icons/MLG_PRO.dmi b/icons/MLG_PRO.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7c55334afda0e12a68fc1e71752515caaf9a6bb5 GIT binary patch literal 2014 zcmV<42O;>0P)V=-0C=1w$Gr-GAQT4B+4~e9wnu-fODN%>?;vCQC#-FJ18q5jiwLx>KRLD zd&1xV00%BfL_t(og}s-1a8%VD$3N%Zz5C8?B50lv9s-eS0i`JD5Ia!B7O)1W&~a*~ z;8e#4jF^KvXsIaZO>sHT`^b4vQDu!pu8I4S2BUh8qa|;2D%@fl>p@ z^?i6W4jgTvX69ICR$q?-yoOF&N0Q?w+Sz;X3|U7~HF7XdKU&R zVQzX25sCCGBPPz;pt`yw;fJv6_G0hcg(xV>H`RZP@>GsEWl%uU&_8>J(@i{>6(hrc54CKJ@G}WcTey zc6YsR_};Y{K^mW;6_h&qw{*h_mLsHuf`ThjoCmKLp%m8Je}Zk>-Lc;ffadk;G@g!e^7Q!u_d6#W zk*%%Z?V)9*z_N19hHbm!UV3#L_m>w6f$;edfdImrqjyaRL3cbu{h^B!rEhOE+Lv%R z4oXV2swzZjDJqdb3>ktpW;80BbrnY<5RK+FA}W(=9+ zKbO?19}>U+0eti4;i;|$U3WVmr67|*n=pa!+7~c4zeV?#XJNmyli-Twi0iI%BjE99 zoNbS@|H#M8n0kHx1^`HjHnb9_sTobM7a!siakT$c_9X!Lt zapn0+r357r!64S=&184)Mg;uG=4KM#T8!%I0wG8|{0Oq81=-X@_pCYSBS(OyA&(p- zwPOeNoZ09jMv!^=6|#Tbfi`$hep{X~ZEn7?oZ4S6%+sGecAW0n_w)>U5-bpKIl(kt zR_mz}VHjW-U|DYGL(gNSX{c1nbw<}+LMkdm%Vu-kkk9Mk{SR8HKb%iW=B7=kWU43R zhMRCoxerbtkjsNW06ZRd%`gzbAR-uauT2OoJBw#fVSv0psFuUZHM>}| w{BA}MAB_3xM$Fo+Xyv6>`~Y1kL?p_80Sv9m4L34!sQ>@~07*qoM6N<$f`Yim-2eap literal 0 HcmV?d00001 From 07a3eac4a8cb151a9eda09116f5ecabfb24e4af9 Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Wed, 5 Mar 2014 00:46:56 -0500 Subject: [PATCH 7/9] Syndicate Balloon instead of MLG --- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- icons/MLG_PRO.dmi | Bin 2014 -> 0 bytes 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 icons/MLG_PRO.dmi diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 3b7014c572f..7885e8ee9e5 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -333,7 +333,7 @@ text += "(Syndicates used [TC_uses] TC) [purchases]" if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead()) - text += "" + text += "" world << text return 1 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 10dc2ca9a00..e0350aaccb7 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -219,7 +219,7 @@ if(uplink_true) text += " (used [TC_uses] TC) [purchases]" if(TC_uses==0 && traitorwin) - text += "" + text += "" text += objectives diff --git a/icons/MLG_PRO.dmi b/icons/MLG_PRO.dmi deleted file mode 100644 index 7c55334afda0e12a68fc1e71752515caaf9a6bb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2014 zcmV<42O;>0P)V=-0C=1w$Gr-GAQT4B+4~e9wnu-fODN%>?;vCQC#-FJ18q5jiwLx>KRLD zd&1xV00%BfL_t(og}s-1a8%VD$3N%Zz5C8?B50lv9s-eS0i`JD5Ia!B7O)1W&~a*~ z;8e#4jF^KvXsIaZO>sHT`^b4vQDu!pu8I4S2BUh8qa|;2D%@fl>p@ z^?i6W4jgTvX69ICR$q?-yoOF&N0Q?w+Sz;X3|U7~HF7XdKU&R zVQzX25sCCGBPPz;pt`yw;fJv6_G0hcg(xV>H`RZP@>GsEWl%uU&_8>J(@i{>6(hrc54CKJ@G}WcTey zc6YsR_};Y{K^mW;6_h&qw{*h_mLsHuf`ThjoCmKLp%m8Je}Zk>-Lc;ffadk;G@g!e^7Q!u_d6#W zk*%%Z?V)9*z_N19hHbm!UV3#L_m>w6f$;edfdImrqjyaRL3cbu{h^B!rEhOE+Lv%R z4oXV2swzZjDJqdb3>ktpW;80BbrnY<5RK+FA}W(=9+ zKbO?19}>U+0eti4;i;|$U3WVmr67|*n=pa!+7~c4zeV?#XJNmyli-Twi0iI%BjE99 zoNbS@|H#M8n0kHx1^`HjHnb9_sTobM7a!siakT$c_9X!Lt zapn0+r357r!64S=&184)Mg;uG=4KM#T8!%I0wG8|{0Oq81=-X@_pCYSBS(OyA&(p- zwPOeNoZ09jMv!^=6|#Tbfi`$hep{X~ZEn7?oZ4S6%+sGecAW0n_w)>U5-bpKIl(kt zR_mz}VHjW-U|DYGL(gNSX{c1nbw<}+LMkdm%Vu-kkk9Mk{SR8HKb%iW=B7=kWU43R zhMRCoxerbtkjsNW06ZRd%`gzbAR-uauT2OoJBw#fVSv0psFuUZHM>}| w{BA}MAB_3xM$Fo+Xyv6>`~Y1kL?p_80Sv9m4L34!sQ>@~07*qoM6N<$f`Yim-2eap From 394ecc41978464dee7eaef832c827425bda9d5db Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Wed, 5 Mar 2014 01:13:43 -0500 Subject: [PATCH 8/9] Bad Ass --- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- icons/BadAss.dmi | Bin 0 -> 546 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 icons/BadAss.dmi diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 7885e8ee9e5..d9ee049d051 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -333,7 +333,7 @@ text += "(Syndicates used [TC_uses] TC) [purchases]" if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead()) - text += "" + text += "" world << text return 1 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index e0350aaccb7..346f24676ce 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -219,7 +219,7 @@ if(uplink_true) text += " (used [TC_uses] TC) [purchases]" if(TC_uses==0 && traitorwin) - text += "" + text += "" text += objectives diff --git a/icons/BadAss.dmi b/icons/BadAss.dmi new file mode 100644 index 0000000000000000000000000000000000000000..fcf27d53e60cdfa1e9034284eb31554a15b823db GIT binary patch literal 546 zcmV+-0^R+IP)@8e`5Jkj?fsen00ACJL_t(IjfGK(c7z}d z1cEghT6OpT|FyZebYD9>2#{f7#t;lKMvs1qVMa_T4k0Fpw>;0FQ-Wk?hG?ciyRrra z5N!^ST*;S8=<@#BB^`POj(Xt9N&thv{roSoV``%|Bl+b^v35puo2&^Ytb!%?d}z&q z5*9^n`lb!H5}i=}X(hBmBSZ+ZPuU7I0@Sto_o0jGC?xSWuZ{=d52NsbElla1h>DDc zZ^WM8X?*)*3Z-Dn7d(!0#&uvJXCO=OR)A>dec|0pZm Date: Wed, 5 Mar 2014 01:14:32 -0500 Subject: [PATCH 9/9] Whoops --- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index d9ee049d051..b03f7ef275b 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -333,7 +333,7 @@ text += "(Syndicates used [TC_uses] TC) [purchases]" if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead()) - text += "" + text += "" world << text return 1 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 346f24676ce..2ba796e294f 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -219,7 +219,7 @@ if(uplink_true) text += " (used [TC_uses] TC) [purchases]" if(TC_uses==0 && traitorwin) - text += "" + text += "" text += objectives