From 60be04da679978a6a90e05adbb5712e99f55eeb1 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Thu, 25 Jul 2013 02:13:42 -0700 Subject: [PATCH 1/4] Added sprites for new race: Dakaii. --- icons/mob/human_races/r_spaceelf.dmi | Bin 0 -> 1915 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/mob/human_races/r_spaceelf.dmi diff --git a/icons/mob/human_races/r_spaceelf.dmi b/icons/mob/human_races/r_spaceelf.dmi new file mode 100644 index 0000000000000000000000000000000000000000..66490f25e90aebaae35a8529ac06eaced47380c3 GIT binary patch literal 1915 zcmZWqc~sJg7XG0SE~P^1q>f8!(x&N2$2CKSQp<6r#B#)?Y+NwcEDh00wA@>)83UJU zjHEPI3JCaG{YBOGCptzW30%lB0nyP9_hdZ%&>}`uJmfD{%VZ(O)I@6v+($ zC^s^)my?U%u_HlE?Xir^IRGHTVEq8lsi#K;fu{BJiUFWTQSqj-vQ&ldgGCs^*(BhV z0hSsF0QUgEV?V%TGPSg{>~w(pNl%vk5+3X6>IEQY27{%9o`Au|qA$h-MTbPjhFp#S zfUA$Qx*HXm^;Dn&pF-5##?`PTPxvX)j2aJ_)olnZ#m|ilv=n>2#m5W2@DF&Gg(WT| z^o`oCSE|aspD%gOXjJ9<-|gz0+n-t&AfTF?IaJouoMeA`plamqtK>W(XT<1DE7bJ4 zQ=K+s+Jp_)+gUZvtg+%eil~+ivdY$9QrT^g*$VeWw<+Ek5yLM3VLExXmQ1?#?4;-y zNoEd_eiqNAZGMB~qvuFmyfhRp64h{wv%}7RpGKw!z*Pj?Q@WGwBxRfyC6ZR6(PqZZ@56!)GeKm%C_2s-<|BUP3Wpj@OYA5kogee^mBZQW&_)I)`A?|eBpn`&tQxnhfQ zMGlJ^Ay(7tw$KO~cr}X~D@Ykjs30u(5g`|DQ>QFp$m?U{4||1Q^|N2UJLJhh{9l~` zw+k6L#SwD^`R=I$ z9V?S1WfD1pAF$@9nEP@%EggIvIL%h4r)EUWlZTW4PF4R1s>_NRV^i%=AIJ#n6jsw1J|0V2F5&nIuEYI49G7vl1e*cy0p91qkx1a8tHUk@iG_ zZ4o6ANd*0`a_PXXbz-$V3}?a)^HAov8!@*jiPV0C?{*R)uFnT&{0YA64cG$3eCv*p zL6(>Ne&*q0P}$l>C_Iv&-GRJszprVZ`AB=BX>pXgt;e5~GE!|6R23;*+FV?I0cA}# zhZts5M_3H5r8mQt)vGe6xQxVjSre-di@^!e8}bm-Dz{QZPxutq^*2gcV75hKjDtdh ze$yMcFXo;NbG>2d&B8J(w(7E$){~s`3=j&({ zyi<+I9FP{X1h%9mSW9`p*c z*1xQcd?)+9#(Xon9$PGGqp82U$P{*3@{Tnzu}xo0yTa?+E$yY3``0Sw;^1L|u?BO- z$HjBXJjvl6_TH=%j_JmmkJ!N z2T|ssC5HpfyPZF{E%UOO<@+?dd@_>L@zGhk@V}3wJpDz|>g)2d&@Ao!Yb}_Cjg-Z& za^@)=%7D^~rAODPrFA5Y^ba|Hfvxcg^Wart$_3@2E@IJ?*IJaE#-6@SkYN#`Jn4pl z=$K*54y-usn52+TobcJQgTgP(#XKh;oPMX`h~$H))J&5~u3@EH%J1&DnGY1Jkc|DDlU&8Q=J7M{27pJ2I*uFVu7=Eyrf-MqNyDV_WZDDra{yh#}v$N;4U#r zhuOUFXtC8+!w_cSVdsobElZU1?(WzVp5tj;;EOop$Zh>$OAEE%P}{3n`GB3C*;ipk z_9r7*EX$^mHp^0883Vb{=oBw2(au#evR|If+friclCCOttpn-({RFtR8>{o1wa7)} gPbI;KSPc=>(!wuqEdVd!?0X?^r!~g&Q literal 0 HcmV?d00001 From 941f36ddec44f42af65b0ec6f9f1ddb38716e7e5 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Wed, 7 Aug 2013 16:56:41 +0100 Subject: [PATCH 2/4] Fix for autotraitor not working in secret probabilities. All modes default to 0 prob in secret now. Signed-off-by: Mloc-Argent --- code/game/gamemodes/autotraitor/autotraitor.dm | 2 +- code/game/gamemodes/game_mode.dm | 2 +- config/config.txt | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index 74bced44214..de795b19222 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -4,7 +4,7 @@ /datum/game_mode/traitor/autotraitor name = "AutoTraitor" - config_tag = "Extend-A-Traitormongous" + config_tag = "extend-a-traitormongous" var/list/possible_traitors var/num_players = 0 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 85fdca943e9..904e7570e4b 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -17,7 +17,7 @@ var/config_tag = null var/intercept_hacked = 0 var/votable = 1 - var/probability = 1 + var/probability = 0 var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm var/explosion_in_progress = 0 //sit back and relax var/list/datum/mind/modePlayer = new diff --git a/config/config.txt b/config/config.txt index 6538a9edbfb..a0e32f3179e 100644 --- a/config/config.txt +++ b/config/config.txt @@ -74,25 +74,13 @@ LOG_PDA ## ## default probablity is 1, increase to make that mode more likely to be picked ## set to 0 to disable that mode -## Cult mode is in alpha test, enable at your own risk PROBABILITY EXTENDED 1 -PROBABILITY TRAITOR 0 -PROBABILITY METEOR 0 PROBABILITY MALFUNCTION 1 -PROBABILITY BLOB 0 PROBABILITY NUCLEAR 1 -PROBABILITY SANDBOX 0 PROBABILITY WIZARD 1 -PROBABILITY RESTRUCTURING 0 -PROBABILITY REVOLUTION 0 PROBABILITY CHANGELING 1 PROBABILITY CULT 1 -PROBABILITY MONKEY 0 -PROBABILITY TRAITORCHAN 0 PROBABILITY EXTEND-A-TRAITORMONGOUS 6 -PROBABILITY EPIDEMIC 0 -PROBABILITY MEME 0 -PROBABILITY RP-REVOLUTION 0 ## Hash out to disable random events during the round. ALLOW_RANDOM_EVENTS From 0feea48cf8e8413b95f4282550092144a93ded41 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Thu, 8 Aug 2013 14:32:22 -0700 Subject: [PATCH 3/4] Changed observe button warning to reflect 30 minute wait time. --- code/modules/mob/new_player/new_player.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 48704fd8213..eb0c5e3b461 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -106,7 +106,7 @@ if(href_list["observe"]) - if(alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") == "Yes") + if(alert(src,"Are you sure you wish to observe? You will have to wait 30 minutes before being able to respawn!","Player Setup","Yes","No") == "Yes") if(!client) return 1 var/mob/dead/observer/observer = new() From c7da7860fc347b5e32c3de9b1c9537a367d29dc1 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Thu, 8 Aug 2013 15:13:01 -0700 Subject: [PATCH 4/4] Removing one of my old working files --- icons/mob/human_races/r_spaceelf.dmi | Bin 1915 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 icons/mob/human_races/r_spaceelf.dmi diff --git a/icons/mob/human_races/r_spaceelf.dmi b/icons/mob/human_races/r_spaceelf.dmi deleted file mode 100644 index 66490f25e90aebaae35a8529ac06eaced47380c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1915 zcmZWqc~sJg7XG0SE~P^1q>f8!(x&N2$2CKSQp<6r#B#)?Y+NwcEDh00wA@>)83UJU zjHEPI3JCaG{YBOGCptzW30%lB0nyP9_hdZ%&>}`uJmfD{%VZ(O)I@6v+($ zC^s^)my?U%u_HlE?Xir^IRGHTVEq8lsi#K;fu{BJiUFWTQSqj-vQ&ldgGCs^*(BhV z0hSsF0QUgEV?V%TGPSg{>~w(pNl%vk5+3X6>IEQY27{%9o`Au|qA$h-MTbPjhFp#S zfUA$Qx*HXm^;Dn&pF-5##?`PTPxvX)j2aJ_)olnZ#m|ilv=n>2#m5W2@DF&Gg(WT| z^o`oCSE|aspD%gOXjJ9<-|gz0+n-t&AfTF?IaJouoMeA`plamqtK>W(XT<1DE7bJ4 zQ=K+s+Jp_)+gUZvtg+%eil~+ivdY$9QrT^g*$VeWw<+Ek5yLM3VLExXmQ1?#?4;-y zNoEd_eiqNAZGMB~qvuFmyfhRp64h{wv%}7RpGKw!z*Pj?Q@WGwBxRfyC6ZR6(PqZZ@56!)GeKm%C_2s-<|BUP3Wpj@OYA5kogee^mBZQW&_)I)`A?|eBpn`&tQxnhfQ zMGlJ^Ay(7tw$KO~cr}X~D@Ykjs30u(5g`|DQ>QFp$m?U{4||1Q^|N2UJLJhh{9l~` zw+k6L#SwD^`R=I$ z9V?S1WfD1pAF$@9nEP@%EggIvIL%h4r)EUWlZTW4PF4R1s>_NRV^i%=AIJ#n6jsw1J|0V2F5&nIuEYI49G7vl1e*cy0p91qkx1a8tHUk@iG_ zZ4o6ANd*0`a_PXXbz-$V3}?a)^HAov8!@*jiPV0C?{*R)uFnT&{0YA64cG$3eCv*p zL6(>Ne&*q0P}$l>C_Iv&-GRJszprVZ`AB=BX>pXgt;e5~GE!|6R23;*+FV?I0cA}# zhZts5M_3H5r8mQt)vGe6xQxVjSre-di@^!e8}bm-Dz{QZPxutq^*2gcV75hKjDtdh ze$yMcFXo;NbG>2d&B8J(w(7E$){~s`3=j&({ zyi<+I9FP{X1h%9mSW9`p*c z*1xQcd?)+9#(Xon9$PGGqp82U$P{*3@{Tnzu}xo0yTa?+E$yY3``0Sw;^1L|u?BO- z$HjBXJjvl6_TH=%j_JmmkJ!N z2T|ssC5HpfyPZF{E%UOO<@+?dd@_>L@zGhk@V}3wJpDz|>g)2d&@Ao!Yb}_Cjg-Z& za^@)=%7D^~rAODPrFA5Y^ba|Hfvxcg^Wart$_3@2E@IJ?*IJaE#-6@SkYN#`Jn4pl z=$K*54y-usn52+TobcJQgTgP(#XKh;oPMX`h~$H))J&5~u3@EH%J1&DnGY1Jkc|DDlU&8Q=J7M{27pJ2I*uFVu7=Eyrf-MqNyDV_WZDDra{yh#}v$N;4U#r zhuOUFXtC8+!w_cSVdsobElZU1?(WzVp5tj;;EOop$Zh>$OAEE%P}{3n`GB3C*;ipk z_9r7*EX$^mHp^0883Vb{=oBw2(au#evR|If+friclCCOttpn-({RFtR8>{o1wa7)} gPbI;KSPc=>(!wuqEdVd!?0X?^r!~g&Q