Merge branch 'master' of https://github.com/grilledham/RedMew into disable-ag

custom_commands.lua

@@ -100,7 +100,7 @@ local function kill(cmd)
                 player_print("Sorry, you don't have a character to kill.")
             end
         elseif target and player.admin then
-            if not do_fish_kill(player) then
+            if not do_fish_kill(target) then
                 player_print(table.concat {"'Sorry, '", target.name, "' doesn't have a character to kill."})
             end
         else

map_gen/presets/world_map.lua

@@ -7,4 +7,6 @@ map = b.single_x_pattern(map, pic.width)
 
 map = b.translate(map, -369, 46)
 
+map = b.scale(map, 2, 2)
+
 return map

resources/regulars.lua

@@ -76,7 +76,6 @@ return {
     ['bobbje'] = true,
     ['bobucles'] = true,
     ['brainclot'] = true,
-    ['brathahn'] = true,
     ['brftjx'] = true,
     ['brikir'] = true,
     ['brl_chacal'] = true,
@@ -129,7 +128,6 @@ return {
     ['fremiamagus'] = true,
     ['frissi'] = true,
     ['fullfruntall'] = true,
-    ['furancebob'] = true,
     ['fuzz_pucker'] = true,
     ['fynko'] = true,
     ['g-h-o-s-t'] = true,
@@ -147,7 +145,6 @@ return {
     ['heardofsnails'] = true,
     ['heaser'] = true,
     ['helpower2'] = true,
-    ['heretek'] = true,
     ['hunter117x'] = true,
     ['i-make-robots'] = true,
     ['iexyi'] = true,
@@ -194,7 +191,6 @@ return {
     ['merssedes'] = true,
     ['mesohorknee'] = true,
     ['mh'] = true,
-    ['mike-_-'] = true,
     ['miniman10000'] = true,
     ['mithril_ryder'] = true,
     ['morgan3rd'] = true,
@@ -209,7 +205,6 @@ return {
     ['oliveawesomesauz'] = true,
     ['palulukan'] = true,
     ['passepartout911'] = true,
-    ['paul1998'] = true,
     ['petebra11'] = true,
     ['pfg'] = true,
     ['philip017'] = true,
@@ -280,9 +275,7 @@ return {
     ['tuttifrectte'] = true,
     ['tvardero'] = true,
     ['twinotter'] = true,
-    ['twltriston'] = true,
     ['vengefulpm'] = true,
-    ['vincentmonster'] = true,
     ['vintageaura'] = true,
     ['vonlam999'] = true,
     ['wadiyatalkinabeet'] = true,
@@ -332,7 +325,6 @@ return {
     ['GeneralB.97'] = true,
     ['Spechok'] = true,
     ['emailkanji'] = true,
-    ['ruetama'] = true,
     ['StarLite'] = true,
     ['Velguarder'] = true,
     ['VIRUSgamesplay'] = true,
@@ -350,5 +342,59 @@ return {
     ['StandaardStefan'] = true,
     ['Liutio'] = true,
     ['actorpuss'] = true,
-    ['TeZwo'] = true
+    ['TeZwo'] = true,
+    ['Furancebob'] = true,
+    ['NathanG'] = true,
+    ['Jayefuu'] = true,
+    ['VincentMonster'] = true,
+    ['Marcuss2'] = true,
+    ['Some_meme'] = true,
+    ['Ralozey'] = true,
+    ['Azer'] = true,
+    ['ruetama'] = true,
+    ['invincibl_'] = true,
+    ['TWLTriston'] = true,
+    ['GerMic'] = true,
+    ['ausmister'] = true,
+    ['rimbas'] = true,
+    ['ManuelG'] = true,
+    ['vvictor'] = true,
+    ['zellking'] = true,
+    ['GhostThunder'] = true,
+    ['Melduron'] = true,
+    ['musa3299'] = true,
+    ['puycss'] = true,
+    ['Aronak'] = true,
+    ['samrrr'] = true,
+    ['Brathahn'] = true,
+    ['Bryce940'] = true,
+    ['kuumottaja'] = true,
+    ['DrunkBoxer'] = true,
+    ['Bobbuilder2222d'] = true,
+    ['tbell91'] = true,
+    ['Progman'] = true,
+    ['Andreas133'] = true,
+    ['Jaertof'] = true,
+    ['hsxu'] = true,
+    ['ponderer1'] = true,
+    ['lone-pine'] = true,
+    ['LevyTaxes'] = true,
+    ['50fffff'] = true,
+    ['Flashbacks'] = true,
+    ['MrTrainCow'] = true,
+    ['Akhrem'] = true,
+    ['YAMATO_Hajime'] = true,
+    ['Jimarad'] = true,
+    ['Aerost'] = true,
+    ['doubleh2'] = true,
+    ['pY4x3g'] = true,
+    ['murph_murph'] = true,
+    ['Epresba'] = true,
+    ['Paul1998'] = true,
+    ['TBob'] = true,
+    ['balintbcs'] = true,
+    ['Mike-_-'] = true,
+    ['mexicanninja'] = true,
+    ['StormMA'] = true,
+    ['Heretek'] = true
 }